Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 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 | f00e178dfc9e |
| 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:
1306
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:
1306
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:
1306
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:
1306
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:
1306
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:
1306
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:
101
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 /* Handle the event stream, converting DGA events into SDL events */ | |
| 25 | |
| 26 #include <stdio.h> | |
| 27 #include <X11/Xlib.h> | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
28 #include "../Xext/extensions/xf86dga.h" |
| 0 | 29 |
| 4366 | 30 #include "SDL_timer.h" |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
31 #include "../SDL_sysvideo.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
32 #include "../../events/SDL_events_c.h" |
| 0 | 33 #include "SDL_dgavideo.h" |
| 34 #include "SDL_dgaevents_c.h" | |
| 35 | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
36 /* get function pointers... */ |
|
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
37 #include "../x11/SDL_x11dyn.h" |
|
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
38 |
| 0 | 39 /* Heheh we're using X11 event code */ |
| 40 extern int X11_Pending(Display *display); | |
| 41 extern void X11_InitKeymap(void); | |
| 1327 | 42 extern SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); |
| 0 | 43 |
| 44 static int DGA_DispatchEvent(_THIS) | |
| 45 { | |
| 46 int posted; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
47 SDL_NAME(XDGAEvent) xevent; |
| 0 | 48 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
49 XNextEvent(DGA_Display, (XEvent *)&xevent); |
| 0 | 50 |
| 51 posted = 0; | |
| 52 xevent.type -= DGA_event_base; | |
| 53 switch (xevent.type) { | |
| 54 | |
| 55 /* Mouse motion? */ | |
| 56 case MotionNotify: { | |
| 57 if ( SDL_VideoSurface ) { | |
| 58 posted = SDL_PrivateMouseMotion(0, 1, | |
| 59 xevent.xmotion.dx, xevent.xmotion.dy); | |
| 60 } | |
| 61 } | |
| 62 break; | |
| 63 | |
| 64 /* Mouse button press? */ | |
| 65 case ButtonPress: { | |
| 66 posted = SDL_PrivateMouseButton(SDL_PRESSED, | |
| 67 xevent.xbutton.button, 0, 0); | |
| 68 } | |
| 69 break; | |
| 70 | |
| 71 /* Mouse button release? */ | |
| 72 case ButtonRelease: { | |
| 73 posted = SDL_PrivateMouseButton(SDL_RELEASED, | |
| 74 xevent.xbutton.button, 0, 0); | |
| 75 } | |
| 76 break; | |
| 77 | |
| 1327 | 78 /* Key press? */ |
| 79 case KeyPress: { | |
| 0 | 80 SDL_keysym keysym; |
| 1327 | 81 KeyCode keycode; |
| 0 | 82 XKeyEvent xkey; |
| 83 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
84 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); |
| 1327 | 85 keycode = xkey.keycode; |
| 86 #ifdef DEBUG_XEVENTS | |
| 87 printf("KeyPress (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 88 #endif | |
| 89 /* Get the translated SDL virtual keysym */ | |
| 90 keysym.scancode = keycode; | |
| 91 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 92 keysym.mod = KMOD_NONE; | |
| 93 keysym.unicode = 0; | |
| 94 | |
| 95 /* Look up the translated value for the key event */ | |
| 96 if ( SDL_TranslateUNICODE ) { | |
| 97 static XComposeStatus state; | |
| 98 char keybuf[32]; | |
| 99 | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
100 if ( XLookupString(&xkey, keybuf, sizeof(keybuf), NULL, &state) ) { |
| 1327 | 101 /* |
| 102 * FIXME: XLookupString() may yield more than one | |
| 103 * character, so we need a mechanism to allow for | |
| 104 * this (perhaps null keypress events with a | |
| 105 * unicode value) | |
| 106 */ | |
| 107 keysym.unicode = (Uint8)keybuf[0]; | |
| 108 } | |
| 109 } | |
| 110 posted = SDL_PrivateKeyboard(SDL_PRESSED, &keysym); | |
| 0 | 111 } |
| 112 break; | |
| 113 | |
| 1327 | 114 /* Key release? */ |
| 115 case KeyRelease: { | |
| 116 SDL_keysym keysym; | |
| 117 KeyCode keycode; | |
| 118 XKeyEvent xkey; | |
| 119 | |
| 120 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); | |
| 121 keycode = xkey.keycode; | |
| 122 #ifdef DEBUG_XEVENTS | |
| 123 printf("KeyRelease (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 124 #endif | |
| 125 /* Get the translated SDL virtual keysym */ | |
| 126 keysym.scancode = keycode; | |
| 127 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 128 keysym.mod = KMOD_NONE; | |
| 129 keysym.unicode = 0; | |
| 130 posted = SDL_PrivateKeyboard(SDL_RELEASED, &keysym); | |
| 131 } | |
| 132 break; | |
| 0 | 133 } |
| 134 return(posted); | |
| 135 } | |
| 136 | |
| 137 void DGA_PumpEvents(_THIS) | |
| 138 { | |
| 139 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
140 LOCK_DISPLAY(); |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
141 |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
142 /* Update activity every five seconds to prevent screensaver. --ryan. */ |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
143 if (!allow_screensaver) { |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
144 static Uint32 screensaverTicks; |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
145 Uint32 nowTicks = SDL_GetTicks(); |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
146 if ((nowTicks - screensaverTicks) > 5000) { |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
147 XResetScreenSaver(DGA_Display); |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
148 screensaverTicks = nowTicks; |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
149 } |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
150 } |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
151 |
| 0 | 152 while ( X11_Pending(DGA_Display) ) { |
| 153 DGA_DispatchEvent(this); | |
| 154 } | |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
155 |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
156 UNLOCK_DISPLAY(); |
| 0 | 157 } |
| 158 | |
| 159 void DGA_InitOSKeymap(_THIS) | |
| 160 { | |
| 161 X11_InitKeymap(); | |
| 162 } | |
| 163 |