Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 816:428f688f2ad2
Date: Fri, 13 Feb 2004 17:03:16 +0100
From: Max Horn
Subject: Modifier key fix
The internal modifier state can get out of sync with reality. To
trigger this, do for example this:
1) Launch an SDL app
2) Alt-click on the desktop (this will hide the SDL app).
3) Bring the SDL app back to the front
4) SDL will still think alt is pressed (and as such will treat left
clicks like middle clicks). If you press and release alt, it'll be fine
again.
The attached patch cures this by rechecking the modifier state whenever
we process an event.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Fri, 13 Feb 2004 17:57:16 +0000 |
| parents | b8d311d90021 |
| children | 045f186426e1 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 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 | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 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 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* Handle the event stream, converting DGA events into SDL events */ | |
| 29 | |
| 30 #include <stdio.h> | |
| 31 #include <X11/Xlib.h> | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
32 #include <XFree86/extensions/xf86dga.h> |
| 0 | 33 |
| 34 #include "SDL_sysvideo.h" | |
| 35 #include "SDL_events_c.h" | |
| 36 #include "SDL_dgavideo.h" | |
| 37 #include "SDL_dgaevents_c.h" | |
| 38 | |
| 39 /* Heheh we're using X11 event code */ | |
| 40 extern int X11_Pending(Display *display); | |
| 41 extern void X11_InitKeymap(void); | |
| 42 extern SDL_keysym *X11_TranslateKey(Display *display, XKeyEvent *xkey, | |
| 43 KeyCode kc, SDL_keysym *keysym); | |
| 44 | |
| 45 static int DGA_DispatchEvent(_THIS) | |
| 46 { | |
| 47 int posted; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
48 SDL_NAME(XDGAEvent) xevent; |
| 0 | 49 |
| 50 XNextEvent(DGA_Display, (XEvent *)&xevent); | |
| 51 | |
| 52 posted = 0; | |
| 53 xevent.type -= DGA_event_base; | |
| 54 switch (xevent.type) { | |
| 55 | |
| 56 /* Mouse motion? */ | |
| 57 case MotionNotify: { | |
| 58 if ( SDL_VideoSurface ) { | |
| 59 posted = SDL_PrivateMouseMotion(0, 1, | |
| 60 xevent.xmotion.dx, xevent.xmotion.dy); | |
| 61 } | |
| 62 } | |
| 63 break; | |
| 64 | |
| 65 /* Mouse button press? */ | |
| 66 case ButtonPress: { | |
| 67 posted = SDL_PrivateMouseButton(SDL_PRESSED, | |
| 68 xevent.xbutton.button, 0, 0); | |
| 69 } | |
| 70 break; | |
| 71 | |
| 72 /* Mouse button release? */ | |
| 73 case ButtonRelease: { | |
| 74 posted = SDL_PrivateMouseButton(SDL_RELEASED, | |
| 75 xevent.xbutton.button, 0, 0); | |
| 76 } | |
| 77 break; | |
| 78 | |
| 79 /* Key press or release? */ | |
| 80 case KeyPress: | |
| 81 case KeyRelease: { | |
| 82 SDL_keysym keysym; | |
| 83 XKeyEvent xkey; | |
| 84 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
85 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); |
| 0 | 86 posted = SDL_PrivateKeyboard((xevent.type == KeyPress), |
| 87 X11_TranslateKey(DGA_Display, | |
| 88 &xkey, xkey.keycode, | |
| 89 &keysym)); | |
| 90 } | |
| 91 break; | |
| 92 | |
| 93 } | |
| 94 return(posted); | |
| 95 } | |
| 96 | |
| 97 void DGA_PumpEvents(_THIS) | |
| 98 { | |
| 99 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
100 LOCK_DISPLAY(); |
| 0 | 101 while ( X11_Pending(DGA_Display) ) { |
| 102 DGA_DispatchEvent(this); | |
| 103 } | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
104 UNLOCK_DISPLAY(); |
| 0 | 105 } |
| 106 | |
| 107 void DGA_InitOSKeymap(_THIS) | |
| 108 { | |
| 109 X11_InitKeymap(); | |
| 110 } | |
| 111 |