Mercurial > sdl-ios-xcode
annotate src/video/dga/SDL_dgaevents.c @ 4216:5b99971a27b4 SDL-1.2
Fixed bug #698
Hans de Goede 2009-02-13 01:10:52 PST
Since the new "glitch free" version of pulseaudio (used in Fedora 10 amongst
others), the sound of SDL using apps (like a simple playmus call) has been
crackling.
While looking in to fixing this I noticed that the current pulseaudio code in
SDL uses pa_simple. However pa_simple uses a thread to pump pulseaudio events
and ipc, given that SDL already has its own thread for audio handling this is
clearly suboptimal, leading to unnecessary context switching IPC, etc. Also
pa_simple does not allow one to implement the WaitAudio() callback for SDL
audiodrivers properly.
Given that my work is mostly a rewrite (although some original pieces remain)
I'm attaching the new .c and .h file, as that is easier to review then the huge
diff.
Let me know if you also want the diff.
This new version has the following features:
-no longer use an additional thread next to the SDL sound thread
-do not crackle with glitch free audio
-when used with a newer pulse, which does glitch free audio, the total latency
is
the same as with the alsa driver
-proper WaitAudio() implementation, saving another mixlen worth of latency
-adds a WaitDone() implementation
This patch has been written in consultancy with Lennart Poetering (the
pulseaudio author) and has been reviewed by him for correct use of the pa API.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 21 Sep 2009 09:27:08 +0000 |
| parents | a1b03ba2fcd0 |
| children | f00e178dfc9e |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 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; | |
| 0 | 132 } |
| 133 return(posted); | |
| 134 } | |
| 135 | |
| 136 void DGA_PumpEvents(_THIS) | |
| 137 { | |
| 138 /* Keep processing pending events */ | |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
139 LOCK_DISPLAY(); |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
140 |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
141 /* Update activity every five seconds to prevent screensaver. --ryan. */ |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
142 if (!allow_screensaver) { |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
143 static Uint32 screensaverTicks; |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
144 Uint32 nowTicks = SDL_GetTicks(); |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
145 if ((nowTicks - screensaverTicks) > 5000) { |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
146 XResetScreenSaver(DGA_Display); |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
147 screensaverTicks = nowTicks; |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
148 } |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
149 } |
|
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
150 |
| 0 | 151 while ( X11_Pending(DGA_Display) ) { |
| 152 DGA_DispatchEvent(this); | |
| 153 } | |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4030
diff
changeset
|
154 |
|
101
825b2fa28e2e
DGA video driver is now thread-safe
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
155 UNLOCK_DISPLAY(); |
| 0 | 156 } |
| 157 | |
| 158 void DGA_InitOSKeymap(_THIS) | |
| 159 { | |
| 160 X11_InitKeymap(); | |
| 161 } | |
| 162 |