Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios_tveille.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 | a1b03ba2fcd0 |
| 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 Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Turbo veille screensaver Patrice Mandin */ #ifndef _SDL_xbios_tveille_h #define _SDL_xbios_tveille_h #include "SDL_xbios.h" /*--- Defines ---*/ #ifndef C_VeiL #define C_VeiL 0x5665694CL #endif /*--- Structures ---*/ typedef struct { unsigned long version; void (*prg_ptr)(); void (*kbd_ptr)(); void (*vbl_ptr)(); unsigned long vbl_count; void (*oldkbd_ptr)(); unsigned long off_count; unsigned long prg_size; unsigned long dummy1[4]; unsigned char dummy2; unsigned char status; unsigned short freq; unsigned short dummy3; unsigned char clear_first; unsigned char enabled; /* 0=enabled, 0xff=disabled */ unsigned char serial_redir; unsigned char dummy4; void (*oldserial_ptr)(); } __attribute__((packed)) tveille_t; /*--- Functions prototypes ---*/ int SDL_XBIOS_TveillePresent(_THIS); void SDL_XBIOS_TveilleDisable(_THIS); void SDL_XBIOS_TveilleEnable(_THIS); #endif /* _SDL_xbios_tveille_h */