Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 1194:b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
From: Jonathan Atkins <jcatki@jcatki.no-ip.org>
Subject: SDL patch: DGA key events
I kept seeing DGA die on me whenever I press a key.
I tracked it down and it seems that the new indirect X via pointers
system messed it up. It needed to have the pX* pointers well defined to
call, in particular, pXNextEvent. Also, the X11_TranslateKey function
prototype was changed, but not updated in the dga driver. perhaps other
files are also affected.
Not sure what releases may suffer from this too.
thanks!
-Jon Atkins
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 05 Dec 2005 04:36:53 +0000 |
| parents | 045f186426e1 |
| children | 0c105755b110 |
| 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 | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
39 /* get function pointers... */ |
|
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
40 #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
|
41 |
| 0 | 42 /* Heheh we're using X11 event code */ |
| 43 extern int X11_Pending(Display *display); | |
| 44 extern void X11_InitKeymap(void); | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
45 extern SDL_keysym *X11_TranslateKey(Display *display, XIC ic, XKeyEvent *xkey, |
| 0 | 46 KeyCode kc, SDL_keysym *keysym); |
| 47 | |
| 48 static int DGA_DispatchEvent(_THIS) | |
| 49 { | |
| 50 int posted; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
51 SDL_NAME(XDGAEvent) xevent; |
| 0 | 52 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
53 pXNextEvent(DGA_Display, (XEvent *)&xevent); |
| 0 | 54 |
| 55 posted = 0; | |
| 56 xevent.type -= DGA_event_base; | |
| 57 switch (xevent.type) { | |
| 58 | |
| 59 /* Mouse motion? */ | |
| 60 case MotionNotify: { | |
| 61 if ( SDL_VideoSurface ) { | |
| 62 posted = SDL_PrivateMouseMotion(0, 1, | |
| 63 xevent.xmotion.dx, xevent.xmotion.dy); | |
| 64 } | |
| 65 } | |
| 66 break; | |
| 67 | |
| 68 /* Mouse button press? */ | |
| 69 case ButtonPress: { | |
| 70 posted = SDL_PrivateMouseButton(SDL_PRESSED, | |
| 71 xevent.xbutton.button, 0, 0); | |
| 72 } | |
| 73 break; | |
| 74 | |
| 75 /* Mouse button release? */ | |
| 76 case ButtonRelease: { | |
| 77 posted = SDL_PrivateMouseButton(SDL_RELEASED, | |
| 78 xevent.xbutton.button, 0, 0); | |
| 79 } | |
| 80 break; | |
| 81 | |
| 82 /* Key press or release? */ | |
| 83 case KeyPress: | |
| 84 case KeyRelease: { | |
| 85 SDL_keysym keysym; | |
| 86 XKeyEvent xkey; | |
| 87 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
88 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); |
| 0 | 89 posted = SDL_PrivateKeyboard((xevent.type == KeyPress), |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
90 X11_TranslateKey(DGA_Display, NULL/*no XIC*/, |
| 0 | 91 &xkey, xkey.keycode, |
| 92 &keysym)); | |
| 93 } | |
| 94 break; | |
| 95 | |
| 96 } | |
| 97 return(posted); | |
| 98 } | |
| 99 | |
| 100 void DGA_PumpEvents(_THIS) | |
| 101 { | |
| 102 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
103 LOCK_DISPLAY(); |
| 0 | 104 while ( X11_Pending(DGA_Display) ) { |
| 105 DGA_DispatchEvent(this); | |
| 106 } | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
107 UNLOCK_DISPLAY(); |
| 0 | 108 } |
| 109 | |
| 110 void DGA_InitOSKeymap(_THIS) | |
| 111 { | |
| 112 X11_InitKeymap(); | |
| 113 } | |
| 114 |