Mercurial > sdl-ios-xcode
view src/video/caca/SDL_cacavideo.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 | d1c0ac95d023 |
| children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 2003 Sam Hocevar 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 Hocevar sam@zoy.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $"; #endif #ifndef _SDL_cacavideo_h #define _SDL_cacavideo_h #include "SDL_mouse.h" #include "../SDL_sysvideo.h" #include "SDL_mutex.h" #include <sys/time.h> #include <time.h> #include <caca.h> #ifdef CACA_API_VERSION_1 #include <caca0.h> #endif /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this #define SDL_NUMMODES 6 /* Private display data */ struct SDL_PrivateVideoData { SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; SDL_mutex *mutex; struct caca_bitmap *bitmap; void *buffer; int w, h; int lastkey; struct timeval lasttime; }; /* Old variable names */ #define SDL_modelist (this->hidden->SDL_modelist) #define Caca_palette (this->hidden->palette) #define Caca_bitmap (this->hidden->bitmap) #define Caca_buffer (this->hidden->buffer) #define Caca_w (this->hidden->w) #define Caca_h (this->hidden->h) #define Caca_lastkey (this->hidden->lastkey) #define Caca_lasttime (this->hidden->lasttime) #define Caca_mutex (this->hidden->mutex) #endif /* _SDL_cacavideo_h */