Mercurial > sdl-ios-xcode
view src/events/SDL_events_c.h @ 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 | 429c8dd3175d |
| children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Useful functions and variables from SDL_events.c */ #include "SDL_events.h" /* Start and stop the event processing loop */ extern int SDL_StartEventLoop(Uint32 flags); extern void SDL_StopEventLoop(void); extern void SDL_QuitInterrupt(void); extern void SDL_Lock_EventThread(void); extern void SDL_Unlock_EventThread(void); extern Uint32 SDL_EventThreadID(void); /* Event handler init routines */ extern int SDL_AppActiveInit(void); extern int SDL_KeyboardInit(void); extern int SDL_MouseInit(void); extern int SDL_QuitInit(void); /* Event handler quit routines */ extern void SDL_AppActiveQuit(void); extern void SDL_KeyboardQuit(void); extern void SDL_MouseQuit(void); extern void SDL_QuitQuit(void); /* The event filter function */ extern SDL_EventFilter SDL_EventOK; /* The array of event processing states */ extern Uint8 SDL_ProcessEvents[SDL_NUMEVENTS]; /* Internal event queueing functions (from SDL_active.c, SDL_mouse.c, SDL_keyboard.c, SDL_quit.c, SDL_events.c) */ extern int SDL_PrivateAppActive(Uint8 gain, Uint8 state); extern int SDL_PrivateMouseMotion(Uint8 buttonstate, int relative, Sint16 x, Sint16 y); extern int SDL_PrivateMouseButton(Uint8 state, Uint8 button,Sint16 x,Sint16 y); extern int SDL_PrivateKeyboard(Uint8 state, SDL_keysym *key); extern int SDL_PrivateResize(int w, int h); extern int SDL_PrivateExpose(void); extern int SDL_PrivateQuit(void); extern int SDL_PrivateSysWMEvent(SDL_SysWMmsg *message); /* Used to clamp the mouse coordinates separately from the video surface */ extern void SDL_SetMouseRange(int maxX, int maxY); /* Used by the activity event handler to remove mouse focus */ extern void SDL_ResetMouse(void); /* Used by the activity event handler to remove keyboard focus */ extern void SDL_ResetKeyboard(void); /* Used by the event loop to queue pending keyboard repeat events */ extern void SDL_CheckKeyRepeat(void); /* Used by the OS keyboard code to detect whether or not to do UNICODE */ #ifndef DEFAULT_UNICODE_TRANSLATION #define DEFAULT_UNICODE_TRANSLATION 0 /* Default off because of overhead */ #endif extern int SDL_TranslateUNICODE;