Mercurial > sdl-ios-xcode
view src/video/directfb/SDL_DirectFB_keys.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 | cb384ef627f6 |
children | 782fd950bd46 |
line wrap: on
line source
#define SCANCODE_ESCAPE 1 #define SCANCODE_1 2 #define SCANCODE_2 3 #define SCANCODE_3 4 #define SCANCODE_4 5 #define SCANCODE_5 6 #define SCANCODE_6 7 #define SCANCODE_7 8 #define SCANCODE_8 9 #define SCANCODE_9 10 #define SCANCODE_0 11 #define SCANCODE_MINUS 12 #define SCANCODE_EQUAL 13 #define SCANCODE_BACKSPACE 14 #define SCANCODE_TAB 15 #define SCANCODE_Q 16 #define SCANCODE_W 17 #define SCANCODE_E 18 #define SCANCODE_R 19 #define SCANCODE_T 20 #define SCANCODE_Y 21 #define SCANCODE_U 22 #define SCANCODE_I 23 #define SCANCODE_O 24 #define SCANCODE_P 25 #define SCANCODE_BRACKET_LEFT 26 #define SCANCODE_BRACKET_RIGHT 27 #define SCANCODE_ENTER 28 #define SCANCODE_LEFTCONTROL 29 #define SCANCODE_A 30 #define SCANCODE_S 31 #define SCANCODE_D 32 #define SCANCODE_F 33 #define SCANCODE_G 34 #define SCANCODE_H 35 #define SCANCODE_J 36 #define SCANCODE_K 37 #define SCANCODE_L 38 #define SCANCODE_SEMICOLON 39 #define SCANCODE_APOSTROPHE 40 #define SCANCODE_GRAVE 41 #define SCANCODE_LEFTSHIFT 42 #define SCANCODE_BACKSLASH 43 #define SCANCODE_Z 44 #define SCANCODE_X 45 #define SCANCODE_C 46 #define SCANCODE_V 47 #define SCANCODE_B 48 #define SCANCODE_N 49 #define SCANCODE_M 50 #define SCANCODE_COMMA 51 #define SCANCODE_PERIOD 52 #define SCANCODE_SLASH 53 #define SCANCODE_RIGHTSHIFT 54 #define SCANCODE_KEYPADMULTIPLY 55 #define SCANCODE_LEFTALT 56 #define SCANCODE_SPACE 57 #define SCANCODE_CAPSLOCK 58 #define SCANCODE_F1 59 #define SCANCODE_F2 60 #define SCANCODE_F3 61 #define SCANCODE_F4 62 #define SCANCODE_F5 63 #define SCANCODE_F6 64 #define SCANCODE_F7 65 #define SCANCODE_F8 66 #define SCANCODE_F9 67 #define SCANCODE_F10 68 #define SCANCODE_NUMLOCK 69 #define SCANCODE_SCROLLLOCK 70 #define SCANCODE_KEYPAD7 71 #define SCANCODE_CURSORUPLEFT 71 #define SCANCODE_KEYPAD8 72 #define SCANCODE_CURSORUP 72 #define SCANCODE_KEYPAD9 73 #define SCANCODE_CURSORUPRIGHT 73 #define SCANCODE_KEYPADMINUS 74 #define SCANCODE_KEYPAD4 75 #define SCANCODE_CURSORLEFT 75 #define SCANCODE_KEYPAD5 76 #define SCANCODE_KEYPAD6 77 #define SCANCODE_CURSORRIGHT 77 #define SCANCODE_KEYPADPLUS 78 #define SCANCODE_KEYPAD1 79 #define SCANCODE_CURSORDOWNLEFT 79 #define SCANCODE_KEYPAD2 80 #define SCANCODE_CURSORDOWN 80 #define SCANCODE_KEYPAD3 81 #define SCANCODE_CURSORDOWNRIGHT 81 #define SCANCODE_KEYPAD0 82 #define SCANCODE_KEYPADPERIOD 83 #define SCANCODE_LESS 86 #define SCANCODE_F11 87 #define SCANCODE_F12 88 #define SCANCODE_KEYPADENTER 96 #define SCANCODE_RIGHTCONTROL 97 #define SCANCODE_CONTROL 97 #define SCANCODE_KEYPADDIVIDE 98 #define SCANCODE_PRINTSCREEN 99 #define SCANCODE_RIGHTALT 100 #define SCANCODE_BREAK 101 /* Beware: is 119 */ #define SCANCODE_BREAK_ALTERNATIVE 119 /* on some keyboards! */ #define SCANCODE_HOME 102 #define SCANCODE_CURSORBLOCKUP 90 /* Cursor key block */ #define SCANCODE_PAGEUP 104 #define SCANCODE_CURSORBLOCKLEFT 92 /* Cursor key block */ #define SCANCODE_CURSORBLOCKRIGHT 94 /* Cursor key block */ #define SCANCODE_END 107 #define SCANCODE_CURSORBLOCKDOWN 108 /* Cursor key block */ #define SCANCODE_PAGEDOWN 109 #define SCANCODE_INSERT 110 #define SCANCODE_REMOVE 111 #define SCANCODE_RIGHTWIN 126 #define SCANCODE_LEFTWIN 125