Mercurial > sdl-ios-xcode
view src/video/wincommon/SDL_lowvideo.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 | a6f635e5eaa6 |
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_lowvideo_h #define _SDL_lowvideo_h #define WIN32_LEAN_AND_MEAN #include <windows.h> #ifndef SetClassLongPtr #define SetClassLongPtr SetClassLong #endif #ifndef GetWindowLongPtr #define GetWindowLongPtr GetWindowLong #endif #ifndef SetWindowLongPtr #define SetWindowLongPtr SetWindowLong #endif #ifndef GWLP_WNDPROC #define GWLP_WNDPROC GWL_WNDPROC #endif #ifndef GWLP_HINSTANCE #define GWLP_HINSTANCE GWL_HINSTANCE #endif #ifndef GCLP_HICON #define GCLP_HICON GCL_HICON #endif #include "../SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this #define FULLSCREEN() \ ((SDL_VideoSurface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN) #define WINDIB_FULLSCREEN() \ ( \ SDL_VideoSurface && \ FULLSCREEN() && \ (((SDL_VideoSurface->flags & SDL_OPENGL ) == SDL_OPENGL ) || \ ((SDL_strcmp(this->name, "windib") == 0) || \ (SDL_strcmp(this->name, "gapi") == 0))) \ ) #define DDRAW_FULLSCREEN() \ ( \ SDL_VideoSurface && \ FULLSCREEN() && \ ((SDL_VideoSurface->flags & SDL_OPENGL ) != SDL_OPENGL ) && \ (SDL_strcmp(this->name, "directx") == 0) \ ) #define DINPUT_FULLSCREEN() \ ( \ FULLSCREEN() && \ (strcmp(this->name, "directx") == 0) \ ) #define DINPUT() (strcmp(this->name, "directx") == 0) /* The main window -- and a function to set it for the audio */ #ifdef _WIN32_WCE extern LPWSTR SDL_Appname; #else extern LPSTR SDL_Appname; #endif extern HINSTANCE SDL_Instance; extern HWND SDL_Window; extern BOOL SDL_windowid; /* Variables and functions exported to other parts of the native video subsystem (SDL_sysevents.c) */ extern void WIN_FlushMessageQueue(); /* Called by windows message loop when application is activated */ extern void (*WIN_Activate)(_THIS, BOOL active, BOOL minimized); /* Called by windows message loop when system palette is available */ extern void (*WIN_RealizePalette)(_THIS); /* Called by windows message loop when the system palette changes */ extern void (*WIN_PaletteChanged)(_THIS, HWND window); /* Called by windows message loop when a portion of the screen needs update */ extern void (*WIN_WinPAINT)(_THIS, HDC hdc); /* Called by windows message loop when the message isn't handled */ extern LONG (*HandleMessage)(_THIS, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); /* The window cursor (from SDL_sysmouse.c) */ extern HCURSOR SDL_hcursor; /* The bounds of the window in screen coordinates */ extern RECT SDL_bounds; /* The position of the window in windowed mode */ extern int SDL_windowX; extern int SDL_windowY; /* Flag -- SDL is performing a resize, rather than the user */ extern int SDL_resizing; /* Flag -- the mouse is in relative motion mode */ extern int mouse_relative; /* The GDI fullscreen mode currently active */ #ifndef NO_CHANGEDISPLAYSETTINGS extern DEVMODE SDL_desktop_mode; extern DEVMODE SDL_fullscreen_mode; #endif /* The system gamma ramp for GDI modes */ extern WORD *gamma_saved; /* This is really from SDL_dx5audio.c */ extern void DX5_SoundFocus(HWND window); /* DJM: This is really from SDL_sysevents.c, we need it in GDL_CreateWindow as well */ LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */ typedef int (WINAPI *ToUnicodeFN)(UINT, UINT, PBYTE, LPWSTR, int, UINT); extern ToUnicodeFN SDL_ToUnicode; #endif /* SDL_lowvideo_h */