Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 1319:66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
when it should be != NULL.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 01 Feb 2006 19:59:02 +0000 |
| parents | c9b51268668f |
| children | d12a63a8d95a |
| 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); | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
40 extern SDL_keysym *X11_TranslateKey(Display *display, XIC ic, XKeyEvent *xkey, |
| 0 | 41 KeyCode kc, SDL_keysym *keysym); |
| 42 | |
| 43 static int DGA_DispatchEvent(_THIS) | |
| 44 { | |
| 45 int posted; | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
46 SDL_NAME(XDGAEvent) xevent; |
| 0 | 47 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
48 pXNextEvent(DGA_Display, (XEvent *)&xevent); |
| 0 | 49 |
| 50 posted = 0; | |
| 51 xevent.type -= DGA_event_base; | |
| 52 switch (xevent.type) { | |
| 53 | |
| 54 /* Mouse motion? */ | |
| 55 case MotionNotify: { | |
| 56 if ( SDL_VideoSurface ) { | |
| 57 posted = SDL_PrivateMouseMotion(0, 1, | |
| 58 xevent.xmotion.dx, xevent.xmotion.dy); | |
| 59 } | |
| 60 } | |
| 61 break; | |
| 62 | |
| 63 /* Mouse button press? */ | |
| 64 case ButtonPress: { | |
| 65 posted = SDL_PrivateMouseButton(SDL_PRESSED, | |
| 66 xevent.xbutton.button, 0, 0); | |
| 67 } | |
| 68 break; | |
| 69 | |
| 70 /* Mouse button release? */ | |
| 71 case ButtonRelease: { | |
| 72 posted = SDL_PrivateMouseButton(SDL_RELEASED, | |
| 73 xevent.xbutton.button, 0, 0); | |
| 74 } | |
| 75 break; | |
| 76 | |
| 77 /* Key press or release? */ | |
| 78 case KeyPress: | |
| 79 case KeyRelease: { | |
| 80 SDL_keysym keysym; | |
| 81 XKeyEvent xkey; | |
| 82 | |
|
292
eadc0746dfaf
Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
83 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); |
| 0 | 84 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
|
85 X11_TranslateKey(DGA_Display, NULL/*no XIC*/, |
| 0 | 86 &xkey, xkey.keycode, |
| 87 &keysym)); | |
| 88 } | |
| 89 break; | |
| 90 | |
| 91 } | |
| 92 return(posted); | |
| 93 } | |
| 94 | |
| 95 void DGA_PumpEvents(_THIS) | |
| 96 { | |
| 97 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
98 LOCK_DISPLAY(); |
| 0 | 99 while ( X11_Pending(DGA_Display) ) { |
| 100 DGA_DispatchEvent(this); | |
| 101 } | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
102 UNLOCK_DISPLAY(); |
| 0 | 103 } |
| 104 | |
| 105 void DGA_InitOSKeymap(_THIS) | |
| 106 { | |
| 107 X11_InitKeymap(); | |
| 108 } | |
| 109 |