Mercurial > sdl-ios-xcode
annotate src/timer/beos/SDL_systimer.c @ 4393:9afe12fb4c41 SDL-1.2
Fixed bug #901
Tim Angus 2009-12-11 11:45:46 PST
Disable mouse event generation when state is not SDL_APPMOUSEFOCUS
If a Windows SDL application is minimised by using alt-tab, SDL_APPMOUSEFOCUS
is lost as part of the minimisation. Unfortunately, the directx driver doesn't
pay any attention to this state when generating mouse button events, so
clicking on the Desktop can cause mouse clicks in the SDL application, while
it's still minimised. The attached patch fixes this. It looks much more
complicated than it actually is due to indentation; here it is ignoring
whitespace:
tma@abraxas:~/sources/SDL-1.2-svn$ svn diff -x -b
Index: src/video/windx5/SDL_dx5events.c
===================================================================
--- src/video/windx5/SDL_dx5events.c (revision 5376)
+++ src/video/windx5/SDL_dx5events.c (working copy)
@@ -374,10 +374,9 @@
if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
mouse_lost = 1;
ClipCursor(NULL);
- }
-
+ } else {
/* If the mouse was lost, regain some sense of mouse state */
- if ( mouse_lost && (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
+ if ( mouse_lost ) {
POINT mouse_pos;
Uint8 old_state;
Uint8 new_state;
@@ -548,6 +547,7 @@
if ( xrel || yrel ) {
post_mouse_motion(1, xrel, yrel);
}
+ }
}
/* The main Win32 event handler */
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 14 Dec 2009 22:41:31 +0000 |
| 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:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
1635
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
24 #ifdef SDL_TIMER_BEOS |
|
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
25 |
| 0 | 26 #include <be/kernel/OS.h> |
| 27 | |
| 28 #include "SDL_thread.h" | |
| 29 #include "SDL_timer.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
30 #include "../SDL_timer_c.h" |
| 0 | 31 |
| 32 static bigtime_t start; | |
| 33 | |
| 34 void SDL_StartTicks(void) | |
| 35 { | |
| 36 /* Set first ticks value */ | |
| 37 start = system_time(); | |
| 38 } | |
| 39 | |
| 40 Uint32 SDL_GetTicks(void) | |
| 41 { | |
| 42 return((system_time()-start)/1000); | |
| 43 } | |
| 44 | |
| 45 void SDL_Delay(Uint32 ms) | |
| 46 { | |
| 47 snooze(ms*1000); | |
| 48 } | |
| 49 | |
| 50 /* Data to handle a single periodic alarm */ | |
| 51 static int timer_alive = 0; | |
| 52 static SDL_Thread *timer = NULL; | |
| 53 | |
| 54 static int RunTimer(void *unused) | |
| 55 { | |
| 56 while ( timer_alive ) { | |
| 57 if ( SDL_timer_running ) { | |
| 58 SDL_ThreadedTimerCheck(); | |
| 59 } | |
| 60 SDL_Delay(10); | |
| 61 } | |
| 62 return(0); | |
| 63 } | |
| 64 | |
| 65 /* This is only called if the event thread is not running */ | |
| 66 int SDL_SYS_TimerInit(void) | |
| 67 { | |
| 68 timer_alive = 1; | |
| 69 timer = SDL_CreateThread(RunTimer, NULL); | |
| 70 if ( timer == NULL ) | |
| 71 return(-1); | |
| 72 return(SDL_SetTimerThreaded(1)); | |
| 73 } | |
| 74 | |
| 75 void SDL_SYS_TimerQuit(void) | |
| 76 { | |
| 77 timer_alive = 0; | |
| 78 if ( timer ) { | |
| 79 SDL_WaitThread(timer, NULL); | |
| 80 timer = NULL; | |
| 81 } | |
| 82 } | |
| 83 | |
| 84 int SDL_SYS_StartTimer(void) | |
| 85 { | |
| 86 SDL_SetError("Internal logic error: BeOS uses threaded timer"); | |
| 87 return(-1); | |
| 88 } | |
| 89 | |
| 90 void SDL_SYS_StopTimer(void) | |
| 91 { | |
| 92 return; | |
| 93 } | |
|
1635
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
94 |
|
92947e3a18db
Make sure code is only compiled if the appropriate subsystem is enabled
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
95 #endif /* SDL_TIMER_BEOS */ |