Mercurial > sdl-ios-xcode
annotate src/thread/win32/SDL_sysmutex.c @ 5079:8c88cae7911e SDL-1.2
Michael Bicha to Sam
I came across further issues with SDL 1.2.14 on win32 in combination
with touch screens.
When you touched the screen older SDLs reported
SDL_MOUSEMOTION to the touch position
SDL_MOUSEBUTTONDOWN at the touch position
1.2.14 reports
SDL_MOUSEBUTTONDOWN at the last mouse position before the touch
and then a
SDL_MOUSEMOTION to the touch position
I found that to fix it in the file SDL_sysevents.c i had to put back the
following lines from 1.2.12 to get it working correctly again:
if ( mouse_relative ) {
/* RJR: March 28, 2000
report internal mouse position if in relative mode */
x = 0; y = 0;
} else {
x = (Sint16)LOWORD(lParam);
y = (Sint16)HIWORD(lParam);
#ifdef _WIN32_WCE
if (SDL_VideoSurface)
GapiTransform(this->hidden->userOrientation,
this->hidden->hiresFix, &x, &y);
#endif
}
posted = SDL_PrivateMouseButton(
state, button, x, y);
where there was only
posted = SDL_PrivateMouseButton(
state, button, 0, 0);
in 1.2.14 (appx. line 484)
please feel free to put that change into any SDL lib you like in any way
you like and thanks for your great work !
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 23 Jan 2011 21:02:02 -0800 |
| parents | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* Mutex functions using the Win32 API */ | |
| 25 | |
|
1433
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
26 #define WIN32_LEAN_AND_MEAN |
|
bb6839704ed6
SDL_windows.h is no longer necessary
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
27 #include <windows.h> |
| 0 | 28 |
| 29 #include "SDL_mutex.h" | |
| 30 | |
| 31 | |
| 32 struct SDL_mutex { | |
| 33 HANDLE id; | |
| 34 }; | |
| 35 | |
| 36 /* Create a mutex */ | |
| 37 SDL_mutex *SDL_CreateMutex(void) | |
| 38 { | |
| 39 SDL_mutex *mutex; | |
| 40 | |
| 41 /* Allocate mutex memory */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
42 mutex = (SDL_mutex *)SDL_malloc(sizeof(*mutex)); |
| 0 | 43 if ( mutex ) { |
| 44 /* Create the mutex, with initial value signaled */ | |
| 45 mutex->id = CreateMutex(NULL, FALSE, NULL); | |
| 46 if ( ! mutex->id ) { | |
| 47 SDL_SetError("Couldn't create mutex"); | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
48 SDL_free(mutex); |
| 0 | 49 mutex = NULL; |
| 50 } | |
| 51 } else { | |
| 52 SDL_OutOfMemory(); | |
| 53 } | |
| 54 return(mutex); | |
| 55 } | |
| 56 | |
| 57 /* Free the mutex */ | |
| 58 void SDL_DestroyMutex(SDL_mutex *mutex) | |
| 59 { | |
| 60 if ( mutex ) { | |
| 61 if ( mutex->id ) { | |
| 62 CloseHandle(mutex->id); | |
| 63 mutex->id = 0; | |
| 64 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
65 SDL_free(mutex); |
| 0 | 66 } |
| 67 } | |
| 68 | |
| 69 /* Lock the mutex */ | |
| 70 int SDL_mutexP(SDL_mutex *mutex) | |
| 71 { | |
| 72 if ( mutex == NULL ) { | |
| 73 SDL_SetError("Passed a NULL mutex"); | |
| 74 return -1; | |
| 75 } | |
| 76 if ( WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED ) { | |
| 77 SDL_SetError("Couldn't wait on mutex"); | |
| 78 return -1; | |
| 79 } | |
| 80 return(0); | |
| 81 } | |
| 82 | |
| 83 /* Unlock the mutex */ | |
| 84 int SDL_mutexV(SDL_mutex *mutex) | |
| 85 { | |
| 86 if ( mutex == NULL ) { | |
| 87 SDL_SetError("Passed a NULL mutex"); | |
| 88 return -1; | |
| 89 } | |
| 90 if ( ReleaseMutex(mutex->id) == FALSE ) { | |
| 91 SDL_SetError("Couldn't release mutex"); | |
| 92 return -1; | |
| 93 } | |
| 94 return(0); | |
| 95 } |