Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11keyboard.c @ 4746:0c39b36dd104
Merge
author | dewyatt |
---|---|
date | Tue, 06 Jul 2010 02:07:42 -0400 |
parents | 3e69e077cb95 |
children | ce811c9247da |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11keyboard.c Tue Jul 06 02:06:17 2010 -0400 +++ b/src/video/x11/SDL_x11keyboard.c Tue Jul 06 02:07:42 2010 -0400 @@ -172,7 +172,6 @@ X11_InitKeyboard(_THIS) { SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; - SDL_Keyboard keyboard; int i, j; int min_keycode, max_keycode; struct { @@ -251,8 +250,6 @@ } } - SDL_zero(keyboard); - data->keyboard = SDL_AddKeyboard(&keyboard, -1); X11_UpdateKeymap(_this); SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu"); @@ -280,15 +277,12 @@ keymap[scancode] = X11_KeyCodeToSDLKey(data->display, (KeyCode)i); } - SDL_SetKeymap(data->keyboard, 0, keymap, SDL_NUM_SCANCODES); + SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES); } void X11_QuitKeyboard(_THIS) { - SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; - - SDL_DelKeyboard(data->keyboard); } /* vi: set ts=4 sw=4 expandtab: */