Mercurial > sdl-ios-xcode
annotate src/video/os2fslib/SDL_vkeys.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 |
---|---|
1190 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
1190 | 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:
1190
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
1190 | 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:
1190
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
1190 | 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:
1190
diff
changeset
|
13 Lesser General Public License for more details. |
1190 | 14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
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:
1190
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:
1190
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
1190 | 18 |
19 Sam Lantinga | |
20 slouken@libsdl.org | |
21 */ | |
22 | |
23 #ifndef VK_0 | |
24 #define VK_0 '0' | |
25 #define VK_1 '1' | |
26 #define VK_2 '2' | |
27 #define VK_3 '3' | |
28 #define VK_4 '4' | |
29 #define VK_5 '5' | |
30 #define VK_6 '6' | |
31 #define VK_7 '7' | |
32 #define VK_8 '8' | |
33 #define VK_9 '9' | |
34 #define VK_A 'A' | |
35 #define VK_B 'B' | |
36 #define VK_C 'C' | |
37 #define VK_D 'D' | |
38 #define VK_E 'E' | |
39 #define VK_F 'F' | |
40 #define VK_G 'G' | |
41 #define VK_H 'H' | |
42 #define VK_I 'I' | |
43 #define VK_J 'J' | |
44 #define VK_K 'K' | |
45 #define VK_L 'L' | |
46 #define VK_M 'M' | |
47 #define VK_N 'N' | |
48 #define VK_O 'O' | |
49 #define VK_P 'P' | |
50 #define VK_Q 'Q' | |
51 #define VK_R 'R' | |
52 #define VK_S 'S' | |
53 #define VK_T 'T' | |
54 #define VK_U 'U' | |
55 #define VK_V 'V' | |
56 #define VK_W 'W' | |
57 #define VK_X 'X' | |
58 #define VK_Y 'Y' | |
59 #define VK_Z 'Z' | |
60 #endif /* VK_0 */ | |
61 | |
62 /* These keys haven't been defined, but were experimentally determined */ | |
63 #define VK_SEMICOLON 0xBA | |
64 #define VK_EQUALS 0xBB | |
65 #define VK_COMMA 0xBC | |
66 #define VK_MINUS 0xBD | |
67 #define VK_PERIOD 0xBE | |
68 #define VK_SLASH 0xBF | |
69 #define VK_GRAVE 0xC0 | |
70 #define VK_LBRACKET 0xDB | |
71 #define VK_BACKSLASH 0xDC | |
72 #define VK_RBRACKET 0xDD | |
73 #define VK_APOSTROPHE 0xDE | |
74 #define VK_BACKTICK 0xDF |