src/video/x11/SDL_x11events.c
changeset 5981 75caa8a7d559
parent 5603 e1ca92e7f2ff
child 6138 4c64952a58fb
     1.1 --- a/src/video/x11/SDL_x11events.c	Wed Oct 12 20:01:09 2011 -0400
     1.2 +++ b/src/video/x11/SDL_x11events.c	Thu Oct 13 01:08:30 2011 -0400
     1.3 @@ -234,7 +234,6 @@
     1.4      case KeyPress:{
     1.5              KeyCode keycode = xevent.xkey.keycode;
     1.6              KeySym keysym = NoSymbol;
     1.7 -            SDL_Scancode scancode;
     1.8              char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
     1.9              Status status = 0;
    1.10  
    1.11 @@ -243,7 +242,7 @@
    1.12  #endif
    1.13              SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
    1.14  #if 1
    1.15 -            if (videodata->key_layout[keycode] == SDLK_UNKNOWN) {
    1.16 +            if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN) {
    1.17                  int min_keycode, max_keycode;
    1.18                  XDisplayKeycodes(display, &min_keycode, &max_keycode);
    1.19                  keysym = XKeycodeToKeysym(display, keycode, 0);
    1.20 @@ -522,6 +521,11 @@
    1.21      return (0);
    1.22  }
    1.23  
    1.24 +
    1.25 +/* !!! FIXME: this should be exposed in a header, or something. */
    1.26 +int SDL_GetNumTouch(void);
    1.27 +
    1.28 +
    1.29  void
    1.30  X11_PumpEvents(_THIS)
    1.31  {
    1.32 @@ -545,7 +549,6 @@
    1.33  #ifdef SDL_INPUT_LINUXEV
    1.34      /* Process Touch events - TODO When X gets touch support, use that instead*/
    1.35      int i = 0,rd;
    1.36 -    char name[256];
    1.37      struct input_event ev[64];
    1.38      int size = sizeof (struct input_event);
    1.39