Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 1327:d12a63a8d95a
Resolved bug #130
Use XFilterEvent() to handle dead-key composition under X11
Cleaned up the code in preparation for 1.3 API changes
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 04 Feb 2006 08:35:11 +0000 |
| parents | c9b51268668f |
| children | 19418e4422cb |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1306
diff
changeset
|
3 Copyright (C) 1997-2006 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 */ |
| 22 | |
| 23 /* Handle the event stream, converting DGA events into SDL events */ | |
| 24 | |
| 25 #include <stdio.h> | |
| 26 #include <X11/Xlib.h> | |
|
1306
0c105755b110
Changed references to XFree86 to Xext to match change in directory structure.
Ryan C. Gordon <icculus@icculus.org>
parents:
1194
diff
changeset
|
27 #include <Xext/extensions/xf86dga.h> |
| 0 | 28 |
| 29 #include "SDL_sysvideo.h" | |
| 30 #include "SDL_events_c.h" | |
| 31 #include "SDL_dgavideo.h" | |
| 32 #include "SDL_dgaevents_c.h" | |
| 33 | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
34 /* get function pointers... */ |
|
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
35 #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
|
36 |
| 0 | 37 /* Heheh we're using X11 event code */ |
| 38 extern int X11_Pending(Display *display); | |
| 39 extern void X11_InitKeymap(void); | |
| 1327 | 40 extern SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); |
| 0 | 41 |
| 42 static int DGA_DispatchEvent(_THIS) | |
| 43 { | |
| 44 int posted; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
45 SDL_NAME(XDGAEvent) xevent; |
| 0 | 46 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
47 pXNextEvent(DGA_Display, (XEvent *)&xevent); |
| 0 | 48 |
| 49 posted = 0; | |
| 50 xevent.type -= DGA_event_base; | |
| 51 switch (xevent.type) { | |
| 52 | |
| 53 /* Mouse motion? */ | |
| 54 case MotionNotify: { | |
| 55 if ( SDL_VideoSurface ) { | |
| 56 posted = SDL_PrivateMouseMotion(0, 1, | |
| 57 xevent.xmotion.dx, xevent.xmotion.dy); | |
| 58 } | |
| 59 } | |
| 60 break; | |
| 61 | |
| 62 /* Mouse button press? */ | |
| 63 case ButtonPress: { | |
| 64 posted = SDL_PrivateMouseButton(SDL_PRESSED, | |
| 65 xevent.xbutton.button, 0, 0); | |
| 66 } | |
| 67 break; | |
| 68 | |
| 69 /* Mouse button release? */ | |
| 70 case ButtonRelease: { | |
| 71 posted = SDL_PrivateMouseButton(SDL_RELEASED, | |
| 72 xevent.xbutton.button, 0, 0); | |
| 73 } | |
| 74 break; | |
| 75 | |
| 1327 | 76 /* Key press? */ |
| 77 case KeyPress: { | |
| 0 | 78 SDL_keysym keysym; |
| 1327 | 79 KeyCode keycode; |
| 0 | 80 XKeyEvent xkey; |
| 81 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
82 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); |
| 1327 | 83 keycode = xkey.keycode; |
| 84 #ifdef DEBUG_XEVENTS | |
| 85 printf("KeyPress (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 86 #endif | |
| 87 /* Get the translated SDL virtual keysym */ | |
| 88 keysym.scancode = keycode; | |
| 89 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 90 keysym.mod = KMOD_NONE; | |
| 91 keysym.unicode = 0; | |
| 92 | |
| 93 /* Look up the translated value for the key event */ | |
| 94 if ( SDL_TranslateUNICODE ) { | |
| 95 static XComposeStatus state; | |
| 96 char keybuf[32]; | |
| 97 | |
| 98 if ( pXLookupString(&xkey, keybuf, sizeof(keybuf), NULL, &state) ) { | |
| 99 /* | |
| 100 * FIXME: XLookupString() may yield more than one | |
| 101 * character, so we need a mechanism to allow for | |
| 102 * this (perhaps null keypress events with a | |
| 103 * unicode value) | |
| 104 */ | |
| 105 keysym.unicode = (Uint8)keybuf[0]; | |
| 106 } | |
| 107 } | |
| 108 posted = SDL_PrivateKeyboard(SDL_PRESSED, &keysym); | |
| 0 | 109 } |
| 110 break; | |
| 111 | |
| 1327 | 112 /* Key release? */ |
| 113 case KeyRelease: { | |
| 114 SDL_keysym keysym; | |
| 115 KeyCode keycode; | |
| 116 XKeyEvent xkey; | |
| 117 | |
| 118 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); | |
| 119 keycode = xkey.keycode; | |
| 120 #ifdef DEBUG_XEVENTS | |
| 121 printf("KeyRelease (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 122 #endif | |
| 123 /* Get the translated SDL virtual keysym */ | |
| 124 keysym.scancode = keycode; | |
| 125 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 126 keysym.mod = KMOD_NONE; | |
| 127 keysym.unicode = 0; | |
| 128 posted = SDL_PrivateKeyboard(SDL_RELEASED, &keysym); | |
| 129 } | |
| 130 break; | |
| 131 | |
| 132 break; | |
| 133 | |
| 0 | 134 } |
| 135 return(posted); | |
| 136 } | |
| 137 | |
| 138 void DGA_PumpEvents(_THIS) | |
| 139 { | |
| 140 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
141 LOCK_DISPLAY(); |
| 0 | 142 while ( X11_Pending(DGA_Display) ) { |
| 143 DGA_DispatchEvent(this); | |
| 144 } | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
145 UNLOCK_DISPLAY(); |
| 0 | 146 } |
| 147 | |
| 148 void DGA_InitOSKeymap(_THIS) | |
| 149 { | |
| 150 X11_InitKeymap(); | |
| 151 } | |
| 152 |