Mercurial > sdl-ios-xcode
view src/video/photon/SDL_ph_image_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 | 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 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" #ifndef __SDL_PH_IMAGE_H__ #define __SDL_PH_IMAGE_H__ #include "../../events/SDL_events_c.h" #include "SDL_ph_video.h" struct private_hwdata { PdOffscreenContext_t* offscreenctx; PdOSCCreateLockParams_t crlockparam; PdOSCLockParams_t lockparam; Uint32 colorkey; }; extern int ph_SetupImage(_THIS, SDL_Surface* screen); extern void ph_DestroyImage(_THIS, SDL_Surface* screen); extern int ph_SetupUpdateFunction(_THIS, SDL_Surface* screen, Uint32 flags); extern int ph_AllocHWSurface(_THIS, SDL_Surface* surface); extern void ph_FreeHWSurface(_THIS, SDL_Surface* surface); extern int ph_CheckHWBlit(_THIS, SDL_Surface *src, SDL_Surface *dst); extern int ph_FillHWRect(_THIS, SDL_Surface* surface, SDL_Rect* rect, Uint32 color); extern int ph_LockHWSurface(_THIS, SDL_Surface* surface); extern void ph_UnlockHWSurface(_THIS, SDL_Surface* surface); extern int ph_FlipHWSurface(_THIS, SDL_Surface* surface); extern int ph_SetHWColorKey(_THIS, SDL_Surface* surface, Uint32 key); extern int ph_SetHWAlpha(_THIS, SDL_Surface* surface, Uint8 alpha); extern int ph_HWAccelBlit(SDL_Surface* src, SDL_Rect *srcrect, SDL_Surface* dst, SDL_Rect* dstrect); extern int ph_UpdateHWInfo(_THIS); extern void ph_NormalUpdate(_THIS, int numrects, SDL_Rect* rects); extern void ph_OCUpdate(_THIS, int numrects, SDL_Rect* rects); extern void ph_OCDCUpdate(_THIS, int numrects, SDL_Rect* rects); extern void ph_OpenGLUpdate(_THIS, int numrects, SDL_Rect* rects); #endif /* __SDL_PH_IMAGE_H__ */