Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 1585:980d2a0dc2a3
Date: Tue, 4 Mar 2003 15:05:31 -0800
From: "Jim"
Subject: [SDL] Frame Buffer patches...
Okay I'm new at patch generation - so please tell me if there's a better way
I could have done this.
Attached are two patch files generated with 'cvs diff -u'
SDL-fb-open-lock.patch applies to SDL_fbvideo.c
Modifies the open loop to check /dev/fb/0 found on devfs...
Modifies the lock code to return failure if the current virtual terminal
is not the one opened for frame buffer writing...
Lock would hang forever if switched away (ctrl-alt-F1) ...
SDL-fb-mousedrv-screensave.patch applies to SDL_fbevents.c
Switches default mouse mode based on SDL_MOUSEDRV - currently only
accepts PS2 - otherwise default is MS Mouse.
When the screen is switched - exisiting code (wrapped in ifdef
SAVE_SCREEN_COTENTS) would save the wrong bit of the screen....
( I run frame buffer 1600x1200, the size I requested was 800x600 - the
save would save the top 800 lines (non biased) and restore them... Adding
screen->offset fixed that )
However, if that option is not set, then a call to SDL_UpdateRect (full
screen) is made. (which may have had it's contents changed since the screen
is not entirely locked because of lock-failure patch)
Jim
[patches slightly tweaked for SDL 1.2.10]
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 22 Mar 2006 07:48:22 +0000 |
| parents | 3ba88cb7eb1b |
| children | 782fd950bd46 c121d94672cb cbad710a6509 |
| 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 */ |
|
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 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
30 #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
|
31 #include "../../events/SDL_events_c.h" |
| 0 | 32 #include "SDL_dgavideo.h" |
| 33 #include "SDL_dgaevents_c.h" | |
| 34 | |
|
1194
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
35 /* get function pointers... */ |
|
b8f167923bfc
Date: Sun, 04 Dec 2005 21:43:46 -0500
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
36 #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
|
37 |
| 0 | 38 /* Heheh we're using X11 event code */ |
| 39 extern int X11_Pending(Display *display); | |
| 40 extern void X11_InitKeymap(void); | |
| 1327 | 41 extern SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); |
| 0 | 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 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
48 XNextEvent(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 | |
| 1327 | 77 /* Key press? */ |
| 78 case KeyPress: { | |
| 0 | 79 SDL_keysym keysym; |
| 1327 | 80 KeyCode keycode; |
| 0 | 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); |
| 1327 | 84 keycode = xkey.keycode; |
| 85 #ifdef DEBUG_XEVENTS | |
| 86 printf("KeyPress (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 87 #endif | |
| 88 /* Get the translated SDL virtual keysym */ | |
| 89 keysym.scancode = keycode; | |
| 90 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 91 keysym.mod = KMOD_NONE; | |
| 92 keysym.unicode = 0; | |
| 93 | |
| 94 /* Look up the translated value for the key event */ | |
| 95 if ( SDL_TranslateUNICODE ) { | |
| 96 static XComposeStatus state; | |
| 97 char keybuf[32]; | |
| 98 | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1402
diff
changeset
|
99 if ( XLookupString(&xkey, keybuf, sizeof(keybuf), NULL, &state) ) { |
| 1327 | 100 /* |
| 101 * FIXME: XLookupString() may yield more than one | |
| 102 * character, so we need a mechanism to allow for | |
| 103 * this (perhaps null keypress events with a | |
| 104 * unicode value) | |
| 105 */ | |
| 106 keysym.unicode = (Uint8)keybuf[0]; | |
| 107 } | |
| 108 } | |
| 109 posted = SDL_PrivateKeyboard(SDL_PRESSED, &keysym); | |
| 0 | 110 } |
| 111 break; | |
| 112 | |
| 1327 | 113 /* Key release? */ |
| 114 case KeyRelease: { | |
| 115 SDL_keysym keysym; | |
| 116 KeyCode keycode; | |
| 117 XKeyEvent xkey; | |
| 118 | |
| 119 SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey); | |
| 120 keycode = xkey.keycode; | |
| 121 #ifdef DEBUG_XEVENTS | |
| 122 printf("KeyRelease (X11 keycode = 0x%X)\n", xkey.keycode); | |
| 123 #endif | |
| 124 /* Get the translated SDL virtual keysym */ | |
| 125 keysym.scancode = keycode; | |
| 126 keysym.sym = X11_TranslateKeycode(DGA_Display, keycode); | |
| 127 keysym.mod = KMOD_NONE; | |
| 128 keysym.unicode = 0; | |
| 129 posted = SDL_PrivateKeyboard(SDL_RELEASED, &keysym); | |
| 130 } | |
| 131 break; | |
| 132 | |
| 133 break; | |
| 134 | |
| 0 | 135 } |
| 136 return(posted); | |
| 137 } | |
| 138 | |
| 139 void DGA_PumpEvents(_THIS) | |
| 140 { | |
| 141 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
142 LOCK_DISPLAY(); |
| 0 | 143 while ( X11_Pending(DGA_Display) ) { |
| 144 DGA_DispatchEvent(this); | |
| 145 } | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
146 UNLOCK_DISPLAY(); |
| 0 | 147 } |
| 148 | |
| 149 void DGA_InitOSKeymap(_THIS) | |
| 150 { | |
| 151 X11_InitKeymap(); | |
| 152 } | |
| 153 |