Mercurial > sdl-ios-xcode
annotate include/SDL_getenv.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 | 4c4113c2162c |
children |
rev | line source |
---|---|
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
1 /* |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
2 SDL - Simple DirectMedia Layer |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
4 |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
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:
1277
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
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:
1277
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
9 |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
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:
1277
diff
changeset
|
13 Lesser General Public License for more details. |
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1277
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:
1277
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:
1277
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
1277
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
18 |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
19 Sam Lantinga |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
20 slouken@libsdl.org |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
21 */ |
088b806d877e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1268
diff
changeset
|
22 |
4217 | 23 /** @file SDL_getenv.h |
24 * @deprecated Use SDL_stdinc.h instead | |
25 */ | |
26 | |
1354
22f39393668a
Fixed build problem with SDL_string.c
Sam Lantinga <slouken@libsdl.org>
parents:
1353
diff
changeset
|
27 /* DEPRECATED */ |
1353
7ba544e2888d
Started the process of improving configure support, and merging C types
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
28 #include "SDL_stdinc.h" |