Mercurial > sdl-ios-xcode
annotate src/video/maccommon/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 | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1133
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #ifndef _SDL_lowvideo_h | |
| 25 #define _SDL_lowvideo_h | |
| 26 | |
|
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
774
diff
changeset
|
27 #if defined(__APPLE__) && defined(__MACH__) |
|
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
774
diff
changeset
|
28 #include <Carbon/Carbon.h> |
|
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
774
diff
changeset
|
29 #elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335) |
| 0 | 30 #include <Carbon.h> |
| 31 #else | |
| 32 #include <Quickdraw.h> | |
| 33 #include <Palettes.h> | |
| 34 #include <Menus.h> | |
| 35 #include <DrawSprocket.h> | |
| 36 #endif | |
| 37 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
38 #if SDL_VIDEO_OPENGL |
|
1432
0801c9fdbdd6
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1424
diff
changeset
|
39 typedef struct __AGLContextRec *AGLContext; |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
40 #endif |
| 0 | 41 |
| 42 #include "SDL_video.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
43 #include "../SDL_sysvideo.h" |
| 0 | 44 |
| 45 /* Hidden "this" pointer for the video functions */ | |
| 46 #define _THIS SDL_VideoDevice *this | |
| 47 | |
| 48 #if !TARGET_API_MAC_CARBON /* not available in OS X (or more accurately, Carbon) */ | |
| 49 /* Global QuickDraw data */ | |
| 50 extern QDGlobals *theQD; | |
| 51 #endif | |
| 52 | |
| 53 /* Private display data */ | |
| 54 struct SDL_PrivateVideoData { | |
| 55 GDevice **SDL_Display; | |
| 56 WindowRef SDL_Window; | |
| 57 SDL_Rect **SDL_modelist; | |
| 58 CTabHandle SDL_CTab; | |
| 59 PaletteHandle SDL_CPal; | |
| 60 | |
| 61 #if TARGET_API_MAC_CARBON | |
| 62 /* For entering and leaving fullscreen mode */ | |
| 63 Ptr fullscreen_ctx; | |
| 64 #endif | |
| 65 | |
| 66 /* The current window document style */ | |
| 67 int current_style; | |
| 68 | |
| 69 /* Information about the last cursor position */ | |
| 70 Point last_where; | |
| 71 | |
| 72 /* Information about the last keys down */ | |
| 73 EventModifiers last_mods; | |
| 74 KeyMap last_keys; | |
| 75 | |
| 76 /* A handle to the Apple Menu */ | |
| 77 MenuRef apple_menu; | |
| 78 | |
| 79 /* Information used by DrawSprocket driver */ | |
| 80 struct DSpInfo *dspinfo; | |
| 81 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
82 #if SDL_VIDEO_OPENGL |
| 0 | 83 AGLContext appleGLContext; |
|
774
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
84 |
|
0c3e00cc9580
Date: Mon, 5 Jan 2004 00:09:36 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
85 void *libraryHandle; |
| 0 | 86 #endif |
| 87 }; | |
| 88 /* Old variable names */ | |
| 89 #define SDL_Display (this->hidden->SDL_Display) | |
| 90 #define SDL_Window (this->hidden->SDL_Window) | |
| 91 #define SDL_modelist (this->hidden->SDL_modelist) | |
| 92 #define SDL_CTab (this->hidden->SDL_CTab) | |
| 93 #define SDL_CPal (this->hidden->SDL_CPal) | |
| 94 #define fullscreen_ctx (this->hidden->fullscreen_ctx) | |
| 95 #define current_style (this->hidden->current_style) | |
| 96 #define last_where (this->hidden->last_where) | |
| 97 #define last_mods (this->hidden->last_mods) | |
| 98 #define last_keys (this->hidden->last_keys) | |
| 99 #define apple_menu (this->hidden->apple_menu) | |
| 100 #define glContext (this->hidden->appleGLContext) | |
| 101 | |
| 102 #endif /* _SDL_lowvideo_h */ |