Mercurial > sdl-ios-xcode
view src/video/ggi/SDL_ggievents.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 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* Handle the event stream, converting GGI events into SDL events */ #include <sys/types.h> #include <sys/time.h> #include <unistd.h> #include <fcntl.h> #include <termios.h> #include <ggi/keyboard.h> #include "SDL_ggikeys.h" #include "SDL.h" #include "../SDL_sysvideo.h" #include "../../events/SDL_sysevents.h" #include "../../events/SDL_events_c.h" #include "SDL_ggivideo.h" #include "SDL_ggievents_c.h" /* The translation tables from a GGI keycode to a SDL keysym */ static SDLKey keymap[128]; static SDL_keysym *GGI_TranslateKey(ggi_event *ev, SDL_keysym *keysym); static int posted = 0; void GGI_PumpEvents(_THIS) { struct timeval *tvp, tv = { 0, 0 }; ggi_event ev; tvp = &tv; /* ggiFlush(VIS); */ while (ggiEventPoll(VIS, emAll, tvp)) /* while (ggiEventPoll(VIS, (emKeyboard | emPointer | emCommand), tvp)) */ { int queueevent_mouse = 0, queueevent_kbd = 0; static int buttons = 0; static int mouse_x = 0, mouse_y = 0, mouse_z = 0; int x = 0, y = 0, z = 0, rx = 0, ry = 0, rz = 0; int pressed_mouse, pressed_kbd; SDL_keysym keysym; posted = 0; /* FIXME: We do not actually want all events, only * mouse and keyboard events. Having to handle all * events will slow things down. */ ggiEventRead(VIS, &ev, emAll); /* ggiEventRead(VIS, &ev, (emKeyboard | emPointer | emCommand)); */ switch (ev.any.type) { case evPtrRelative: x = ev.pmove.x; y = ev.pmove.y; z = ev.pmove.wheel; posted += SDL_PrivateMouseMotion(0, 1, x, y); break; case evPtrAbsolute: if (mouse_x != ev.pmove.x || mouse_y != ev.pmove.y || mouse_z != ev.pmove.wheel) { x = ev.pmove.x - mouse_x; y = ev.pmove.y - mouse_y; z = ev.pmove.wheel - mouse_z; mouse_x = ev.pmove.x; mouse_y = ev.pmove.y; mouse_z = ev.pmove.wheel; posted += SDL_PrivateMouseMotion(0, 1, x, y); } break; case evPtrButtonPress: posted += SDL_PrivateMouseButton(SDL_PRESSED, ev.pbutton.button, 0, 0); break; case evPtrButtonRelease: posted += SDL_PrivateMouseButton(SDL_RELEASED, ev.pbutton.button, 0, 0); break; case evKeyPress: case evKeyRepeat: posted += SDL_PrivateKeyboard(SDL_PRESSED, GGI_TranslateKey(&ev, &keysym)); break; case evKeyRelease: posted += SDL_PrivateKeyboard(SDL_RELEASED, GGI_TranslateKey(&ev, &keysym)); break; case evCommand: fprintf(stderr, "Command event %x recieved\n", ev.cmd.code); break; default: fprintf(stderr, "Unhandled event type %d\n", ev.any.type); break; } } } void GGI_InitOSKeymap(_THIS) { int i; /* Initialize the GGI key translation table */ for ( i=0; i<SDL_arraysize(keymap); ++i ) keymap[i] = SDLK_UNKNOWN; keymap[SCANCODE_ESCAPE] = SDLK_ESCAPE; keymap[SCANCODE_1] = SDLK_1; keymap[SCANCODE_2] = SDLK_2; keymap[SCANCODE_3] = SDLK_3; keymap[SCANCODE_4] = SDLK_4; keymap[SCANCODE_5] = SDLK_5; keymap[SCANCODE_6] = SDLK_6; keymap[SCANCODE_7] = SDLK_7; keymap[SCANCODE_8] = SDLK_8; keymap[SCANCODE_9] = SDLK_9; keymap[SCANCODE_0] = SDLK_0; keymap[SCANCODE_MINUS] = SDLK_MINUS; keymap[SCANCODE_EQUAL] = SDLK_EQUALS; keymap[SCANCODE_BACKSPACE] = SDLK_BACKSPACE; keymap[SCANCODE_TAB] = SDLK_TAB; keymap[SCANCODE_Q] = SDLK_q; keymap[SCANCODE_W] = SDLK_w; keymap[SCANCODE_E] = SDLK_e; keymap[SCANCODE_R] = SDLK_r; keymap[SCANCODE_T] = SDLK_t; keymap[SCANCODE_Y] = SDLK_y; keymap[SCANCODE_U] = SDLK_u; keymap[SCANCODE_I] = SDLK_i; keymap[SCANCODE_O] = SDLK_o; keymap[SCANCODE_P] = SDLK_p; keymap[SCANCODE_BRACKET_LEFT] = SDLK_LEFTBRACKET; keymap[SCANCODE_BRACKET_RIGHT] = SDLK_RIGHTBRACKET; keymap[SCANCODE_ENTER] = SDLK_RETURN; keymap[SCANCODE_LEFTCONTROL] = SDLK_LCTRL; keymap[SCANCODE_A] = SDLK_a; keymap[SCANCODE_S] = SDLK_s; keymap[SCANCODE_D] = SDLK_d; keymap[SCANCODE_F] = SDLK_f; keymap[SCANCODE_G] = SDLK_g; keymap[SCANCODE_H] = SDLK_h; keymap[SCANCODE_J] = SDLK_j; keymap[SCANCODE_K] = SDLK_k; keymap[SCANCODE_L] = SDLK_l; keymap[SCANCODE_SEMICOLON] = SDLK_SEMICOLON; keymap[SCANCODE_APOSTROPHE] = SDLK_QUOTE; keymap[SCANCODE_GRAVE] = SDLK_BACKQUOTE; keymap[SCANCODE_LEFTSHIFT] = SDLK_LSHIFT; keymap[SCANCODE_BACKSLASH] = SDLK_BACKSLASH; keymap[SCANCODE_Z] = SDLK_z; keymap[SCANCODE_X] = SDLK_x; keymap[SCANCODE_C] = SDLK_c; keymap[SCANCODE_V] = SDLK_v; keymap[SCANCODE_B] = SDLK_b; keymap[SCANCODE_N] = SDLK_n; keymap[SCANCODE_M] = SDLK_m; keymap[SCANCODE_COMMA] = SDLK_COMMA; keymap[SCANCODE_PERIOD] = SDLK_PERIOD; keymap[SCANCODE_SLASH] = SDLK_SLASH; keymap[SCANCODE_RIGHTSHIFT] = SDLK_RSHIFT; keymap[SCANCODE_KEYPADMULTIPLY] = SDLK_KP_MULTIPLY; keymap[SCANCODE_LEFTALT] = SDLK_LALT; keymap[SCANCODE_SPACE] = SDLK_SPACE; keymap[SCANCODE_CAPSLOCK] = SDLK_CAPSLOCK; keymap[SCANCODE_F1] = SDLK_F1; keymap[SCANCODE_F2] = SDLK_F2; keymap[SCANCODE_F3] = SDLK_F3; keymap[SCANCODE_F4] = SDLK_F4; keymap[SCANCODE_F5] = SDLK_F5; keymap[SCANCODE_F6] = SDLK_F6; keymap[SCANCODE_F7] = SDLK_F7; keymap[SCANCODE_F8] = SDLK_F8; keymap[SCANCODE_F9] = SDLK_F9; keymap[SCANCODE_F10] = SDLK_F10; keymap[SCANCODE_NUMLOCK] = SDLK_NUMLOCK; keymap[SCANCODE_SCROLLLOCK] = SDLK_SCROLLOCK; keymap[SCANCODE_KEYPAD7] = SDLK_KP7; keymap[SCANCODE_CURSORUPLEFT] = SDLK_KP7; keymap[SCANCODE_KEYPAD8] = SDLK_KP8; keymap[SCANCODE_CURSORUP] = SDLK_KP8; keymap[SCANCODE_KEYPAD9] = SDLK_KP9; keymap[SCANCODE_CURSORUPRIGHT] = SDLK_KP9; keymap[SCANCODE_KEYPADMINUS] = SDLK_KP_MINUS; keymap[SCANCODE_KEYPAD4] = SDLK_KP4; keymap[SCANCODE_CURSORLEFT] = SDLK_KP4; keymap[SCANCODE_KEYPAD5] = SDLK_KP5; keymap[SCANCODE_KEYPAD6] = SDLK_KP6; keymap[SCANCODE_CURSORRIGHT] = SDLK_KP6; keymap[SCANCODE_KEYPADPLUS] = SDLK_KP_PLUS; keymap[SCANCODE_KEYPAD1] = SDLK_KP1; keymap[SCANCODE_CURSORDOWNLEFT] = SDLK_KP1; keymap[SCANCODE_KEYPAD2] = SDLK_KP2; keymap[SCANCODE_CURSORDOWN] = SDLK_KP2; keymap[SCANCODE_KEYPAD3] = SDLK_KP3; keymap[SCANCODE_CURSORDOWNRIGHT] = SDLK_KP3; keymap[SCANCODE_KEYPAD0] = SDLK_KP0; keymap[SCANCODE_KEYPADPERIOD] = SDLK_KP_PERIOD; keymap[SCANCODE_LESS] = SDLK_LESS; keymap[SCANCODE_F11] = SDLK_F11; keymap[SCANCODE_F12] = SDLK_F12; keymap[SCANCODE_KEYPADENTER] = SDLK_KP_ENTER; keymap[SCANCODE_RIGHTCONTROL] = SDLK_RCTRL; keymap[SCANCODE_CONTROL] = SDLK_RCTRL; keymap[SCANCODE_KEYPADDIVIDE] = SDLK_KP_DIVIDE; keymap[SCANCODE_PRINTSCREEN] = SDLK_PRINT; keymap[SCANCODE_RIGHTALT] = SDLK_RALT; keymap[SCANCODE_BREAK] = SDLK_BREAK; keymap[SCANCODE_BREAK_ALTERNATIVE] = SDLK_UNKNOWN; keymap[SCANCODE_HOME] = SDLK_HOME; keymap[SCANCODE_CURSORBLOCKUP] = SDLK_UP; keymap[SCANCODE_PAGEUP] = SDLK_PAGEUP; keymap[SCANCODE_CURSORBLOCKLEFT] = SDLK_LEFT; keymap[SCANCODE_CURSORBLOCKRIGHT] = SDLK_RIGHT; keymap[SCANCODE_END] = SDLK_END; keymap[SCANCODE_CURSORBLOCKDOWN] = SDLK_DOWN; keymap[SCANCODE_PAGEDOWN] = SDLK_PAGEDOWN; keymap[SCANCODE_INSERT] = SDLK_INSERT; keymap[SCANCODE_REMOVE] = SDLK_DELETE; keymap[119] = SDLK_PAUSE; keymap[SCANCODE_RIGHTWIN] = SDLK_RSUPER; keymap[SCANCODE_LEFTWIN] = SDLK_LSUPER; keymap[127] = SDLK_MENU; } static SDL_keysym *GGI_TranslateKey(gii_event *ev, SDL_keysym *keysym) { /* Set the keysym information */ keysym->scancode = ev->key.button; keysym->sym = keymap[ev->key.button]; keysym->mod = KMOD_NONE; /* If UNICODE is on, get the UNICODE value for the key */ keysym->unicode = 0; if (SDL_TranslateUNICODE) { keysym->unicode = GII_UNICODE(ev->key.sym); } return keysym; }