Mercurial > sdl-ios-xcode
view src/video/os2fslib/SDL_os2fslib.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" #ifndef _SDL_os2fslib_h #define _SDL_os2fslib_h // OS2 specific includes #define INCL_TYPES #define INCL_DOS #define INCL_DOSERRORS #define INCL_DOSPROCESS #define INCL_WIN #define INCL_GPI #include <os2.h> #include <FSLib.h> /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *_this /* Private display data */ struct SDL_PrivateVideoData { FSLib_VideoMode_p pAvailableFSLibVideoModes; SDL_Rect **pListModesResult; // Allocated memory to return list of modes for os2fslib_ListModes() API FSLib_VideoMode SrcBufferDesc; // Description of current source image buffer char *pchSrcBuffer; // The source image buffer itself SDL_Surface *pSDLSurface; // The SDL surface describing the buffer HMTX hmtxUseSrcBuffer; // Mutex semaphore to manipulate src buffer HWND hwndFrame, hwndClient; // Window handle of frame and client int iPMThreadStatus; // 0: Not running // 1: Running // Other: Not running, had an error int tidPMThread; // Thread ID of PM Thread int fInFocus; // True if we're in focus! int iSkipWMMOUSEMOVE; // Number of WM_MOUSEMOVE messages to skip! int iMouseVisible; // PFNWP pfnOldFrameProc; // Old window frame procedure int bProportionalResize; // 0: No proportional resizing // 1: Do proportional resizing ULONG ulResizingFlag; // First resizing flag value }; /* OS/2 specific backdoor function to be able to set FrameControlFlags of */ /* the SDL window before creating it. */ extern DECLSPEC void SDLCALL SDL_OS2FSLIB_SetFCFToUse(ULONG ulFCF); #endif /* _SDL_os2fslib_h */