src/video/directfb/SDL_DirectFB_events.c
changeset 382 74bdcae44bf5
parent 297 f6ffac90895c
child 395 276d0d7ba96c
     1.1 --- a/src/video/directfb/SDL_DirectFB_events.c	Tue May 28 20:01:29 2002 +0000
     1.2 +++ b/src/video/directfb/SDL_DirectFB_events.c	Wed May 29 20:47:19 2002 +0000
     1.3 @@ -100,109 +100,100 @@
     1.4    for (i=0; i<SDL_TABLESIZE(keymap); ++i)
     1.5      keymap[i] = SDLK_UNKNOWN;
     1.6  
     1.7 -  keymap[DIKC_A] = SDLK_a;
     1.8 -  keymap[DIKC_B] = SDLK_b;
     1.9 -  keymap[DIKC_C] = SDLK_c;
    1.10 -  keymap[DIKC_D] = SDLK_d;
    1.11 -  keymap[DIKC_E] = SDLK_e;
    1.12 -  keymap[DIKC_F] = SDLK_f;
    1.13 -  keymap[DIKC_G] = SDLK_g;
    1.14 -  keymap[DIKC_H] = SDLK_h;
    1.15 -  keymap[DIKC_I] = SDLK_i;
    1.16 -  keymap[DIKC_J] = SDLK_j;
    1.17 -  keymap[DIKC_K] = SDLK_k;
    1.18 -  keymap[DIKC_L] = SDLK_l;
    1.19 -  keymap[DIKC_M] = SDLK_m;
    1.20 -  keymap[DIKC_N] = SDLK_n;
    1.21 -  keymap[DIKC_O] = SDLK_o;
    1.22 -  keymap[DIKC_P] = SDLK_p;
    1.23 -  keymap[DIKC_Q] = SDLK_q;
    1.24 -  keymap[DIKC_R] = SDLK_r;
    1.25 -  keymap[DIKC_S] = SDLK_s;
    1.26 -  keymap[DIKC_T] = SDLK_t;
    1.27 -  keymap[DIKC_U] = SDLK_u;
    1.28 -  keymap[DIKC_V] = SDLK_v;
    1.29 -  keymap[DIKC_W] = SDLK_w;
    1.30 -  keymap[DIKC_X] = SDLK_x;
    1.31 -  keymap[DIKC_Y] = SDLK_y;
    1.32 -  keymap[DIKC_Z] = SDLK_z;
    1.33 +  keymap[DIKI_A] = SDLK_a;
    1.34 +  keymap[DIKI_B] = SDLK_b;
    1.35 +  keymap[DIKI_C] = SDLK_c;
    1.36 +  keymap[DIKI_D] = SDLK_d;
    1.37 +  keymap[DIKI_E] = SDLK_e;
    1.38 +  keymap[DIKI_F] = SDLK_f;
    1.39 +  keymap[DIKI_G] = SDLK_g;
    1.40 +  keymap[DIKI_H] = SDLK_h;
    1.41 +  keymap[DIKI_I] = SDLK_i;
    1.42 +  keymap[DIKI_J] = SDLK_j;
    1.43 +  keymap[DIKI_K] = SDLK_k;
    1.44 +  keymap[DIKI_L] = SDLK_l;
    1.45 +  keymap[DIKI_M] = SDLK_m;
    1.46 +  keymap[DIKI_N] = SDLK_n;
    1.47 +  keymap[DIKI_O] = SDLK_o;
    1.48 +  keymap[DIKI_P] = SDLK_p;
    1.49 +  keymap[DIKI_Q] = SDLK_q;
    1.50 +  keymap[DIKI_R] = SDLK_r;
    1.51 +  keymap[DIKI_S] = SDLK_s;
    1.52 +  keymap[DIKI_T] = SDLK_t;
    1.53 +  keymap[DIKI_U] = SDLK_u;
    1.54 +  keymap[DIKI_V] = SDLK_v;
    1.55 +  keymap[DIKI_W] = SDLK_w;
    1.56 +  keymap[DIKI_X] = SDLK_x;
    1.57 +  keymap[DIKI_Y] = SDLK_y;
    1.58 +  keymap[DIKI_Z] = SDLK_z;
    1.59    
    1.60 -  keymap[DIKC_0] = SDLK_0;
    1.61 -  keymap[DIKC_1] = SDLK_1;
    1.62 -  keymap[DIKC_2] = SDLK_2;
    1.63 -  keymap[DIKC_3] = SDLK_3;
    1.64 -  keymap[DIKC_4] = SDLK_4;
    1.65 -  keymap[DIKC_5] = SDLK_5;
    1.66 -  keymap[DIKC_6] = SDLK_6;
    1.67 -  keymap[DIKC_7] = SDLK_7;
    1.68 -  keymap[DIKC_8] = SDLK_8;
    1.69 -  keymap[DIKC_9] = SDLK_9;
    1.70 +  keymap[DIKI_0] = SDLK_0;
    1.71 +  keymap[DIKI_1] = SDLK_1;
    1.72 +  keymap[DIKI_2] = SDLK_2;
    1.73 +  keymap[DIKI_3] = SDLK_3;
    1.74 +  keymap[DIKI_4] = SDLK_4;
    1.75 +  keymap[DIKI_5] = SDLK_5;
    1.76 +  keymap[DIKI_6] = SDLK_6;
    1.77 +  keymap[DIKI_7] = SDLK_7;
    1.78 +  keymap[DIKI_8] = SDLK_8;
    1.79 +  keymap[DIKI_9] = SDLK_9;
    1.80    
    1.81 -  keymap[DIKC_F1] = SDLK_F1;
    1.82 -  keymap[DIKC_F2] = SDLK_F2;
    1.83 -  keymap[DIKC_F3] = SDLK_F3;
    1.84 -  keymap[DIKC_F4] = SDLK_F4;
    1.85 -  keymap[DIKC_F5] = SDLK_F5;
    1.86 -  keymap[DIKC_F6] = SDLK_F6;
    1.87 -  keymap[DIKC_F7] = SDLK_F7;
    1.88 -  keymap[DIKC_F8] = SDLK_F8;
    1.89 -  keymap[DIKC_F9] = SDLK_F9;
    1.90 -  keymap[DIKC_F10] = SDLK_F10;
    1.91 -  keymap[DIKC_F11] = SDLK_F11;
    1.92 -  keymap[DIKC_F12] = SDLK_F12;
    1.93 +  keymap[DIKI_F1] = SDLK_F1;
    1.94 +  keymap[DIKI_F2] = SDLK_F2;
    1.95 +  keymap[DIKI_F3] = SDLK_F3;
    1.96 +  keymap[DIKI_F4] = SDLK_F4;
    1.97 +  keymap[DIKI_F5] = SDLK_F5;
    1.98 +  keymap[DIKI_F6] = SDLK_F6;
    1.99 +  keymap[DIKI_F7] = SDLK_F7;
   1.100 +  keymap[DIKI_F8] = SDLK_F8;
   1.101 +  keymap[DIKI_F9] = SDLK_F9;
   1.102 +  keymap[DIKI_F10] = SDLK_F10;
   1.103 +  keymap[DIKI_F11] = SDLK_F11;
   1.104 +  keymap[DIKI_F12] = SDLK_F12;
   1.105    
   1.106 -  keymap[DIKC_ESCAPE] = SDLK_ESCAPE;
   1.107 -  keymap[DIKC_LEFT] = SDLK_LEFT;
   1.108 -  keymap[DIKC_RIGHT] = SDLK_RIGHT;
   1.109 -  keymap[DIKC_UP] = SDLK_UP;
   1.110 -  keymap[DIKC_DOWN] = SDLK_DOWN;
   1.111 -  keymap[DIKC_CTRL] = SDLK_LCTRL;
   1.112 -  keymap[DIKC_SHIFT] = SDLK_LSHIFT;
   1.113 -  keymap[DIKC_ALT] = SDLK_LALT;
   1.114 -  keymap[DIKC_ALTGR] = SDLK_RALT;
   1.115 -  keymap[DIKC_TAB] = SDLK_TAB;
   1.116 -  keymap[DIKC_ENTER] = SDLK_RETURN;
   1.117 -  keymap[DIKC_SPACE] = SDLK_SPACE;
   1.118 -  keymap[DIKC_BACKSPACE] = SDLK_BACKSPACE;
   1.119 -  keymap[DIKC_INSERT] = SDLK_INSERT;
   1.120 -  keymap[DIKC_DELETE] = SDLK_DELETE;
   1.121 -  keymap[DIKC_HOME] = SDLK_HOME;
   1.122 -  keymap[DIKC_END] = SDLK_END;
   1.123 -  keymap[DIKC_PAGEUP] = SDLK_PAGEUP;
   1.124 -  keymap[DIKC_PAGEDOWN] = SDLK_PAGEDOWN;
   1.125 -  keymap[DIKC_CAPSLOCK] = SDLK_CAPSLOCK;
   1.126 -  keymap[DIKC_NUMLOCK] = SDLK_NUMLOCK;
   1.127 -  keymap[DIKC_SCRLOCK] = SDLK_SCROLLOCK;
   1.128 -  keymap[DIKC_PRINT] = SDLK_PRINT;
   1.129 -  keymap[DIKC_PAUSE] = SDLK_PAUSE;
   1.130 -  keymap[DIKC_KP_DIV] = SDLK_KP_DIVIDE;
   1.131 -  keymap[DIKC_KP_MULT] = SDLK_KP_MULTIPLY;
   1.132 -  keymap[DIKC_KP_MINUS] = SDLK_KP_MINUS;
   1.133 -  keymap[DIKC_KP_PLUS] = SDLK_KP_PLUS;
   1.134 -  keymap[DIKC_KP_ENTER] = SDLK_KP_ENTER;
   1.135 -  
   1.136 -  keymap[DIKC_OK] = SDLK_RETURN;
   1.137 -  keymap[DIKC_CANCEL] = SDLK_BREAK;
   1.138 -  keymap[DIKC_CLEAR] = SDLK_DELETE;
   1.139 -  keymap[DIKC_POWER] = SDLK_POWER;
   1.140 -  keymap[DIKC_POWER2] = SDLK_POWER;
   1.141 -  keymap[DIKC_MENU] = SDLK_MENU;
   1.142 -  keymap[DIKC_HELP] = SDLK_HELP;
   1.143 -  keymap[DIKC_BACK] = SDLK_ESCAPE;
   1.144 +  keymap[DIKI_ESCAPE] = SDLK_ESCAPE;
   1.145 +  keymap[DIKI_LEFT] = SDLK_LEFT;
   1.146 +  keymap[DIKI_RIGHT] = SDLK_RIGHT;
   1.147 +  keymap[DIKI_UP] = SDLK_UP;
   1.148 +  keymap[DIKI_DOWN] = SDLK_DOWN;
   1.149 +  keymap[DIKI_CTRL] = SDLK_LCTRL;
   1.150 +  keymap[DIKI_SHIFT] = SDLK_LSHIFT;
   1.151 +  keymap[DIKI_ALT] = SDLK_LALT;
   1.152 +  keymap[DIKI_ALTGR] = SDLK_RALT;
   1.153 +  keymap[DIKI_TAB] = SDLK_TAB;
   1.154 +  keymap[DIKI_ENTER] = SDLK_RETURN;
   1.155 +  keymap[DIKI_SPACE] = SDLK_SPACE;
   1.156 +  keymap[DIKI_BACKSPACE] = SDLK_BACKSPACE;
   1.157 +  keymap[DIKI_INSERT] = SDLK_INSERT;
   1.158 +  keymap[DIKI_DELETE] = SDLK_DELETE;
   1.159 +  keymap[DIKI_HOME] = SDLK_HOME;
   1.160 +  keymap[DIKI_END] = SDLK_END;
   1.161 +  keymap[DIKI_PAGE_UP] = SDLK_PAGEUP;
   1.162 +  keymap[DIKI_PAGE_DOWN] = SDLK_PAGEDOWN;
   1.163 +  keymap[DIKI_CAPSLOCK] = SDLK_CAPSLOCK;
   1.164 +  keymap[DIKI_NUMLOCK] = SDLK_NUMLOCK;
   1.165 +  keymap[DIKI_SCRLOCK] = SDLK_SCROLLOCK;
   1.166 +  keymap[DIKI_PRINT] = SDLK_PRINT;
   1.167 +  keymap[DIKI_PAUSE] = SDLK_PAUSE;
   1.168 +  keymap[DIKI_KP_DIV] = SDLK_KP_DIVIDE;
   1.169 +  keymap[DIKI_KP_MULT] = SDLK_KP_MULTIPLY;
   1.170 +  keymap[DIKI_KP_MINUS] = SDLK_KP_MINUS;
   1.171 +  keymap[DIKI_KP_PLUS] = SDLK_KP_PLUS;
   1.172 +  keymap[DIKI_KP_ENTER] = SDLK_KP_ENTER;
   1.173  }
   1.174  
   1.175  
   1.176  static SDL_keysym *DirectFB_TranslateKey (DFBInputEvent *ev, SDL_keysym *keysym)
   1.177  {
   1.178    /* Set the keysym information */
   1.179 -  keysym->scancode = ev->keycode;
   1.180 -  keysym->mod = KMOD_NONE;
   1.181 -  keysym->unicode = 0;
   1.182 +  keysym->scancode = ev->key_id;
   1.183 +  keysym->mod = KMOD_NONE; /* FIXME */
   1.184 +  keysym->unicode = (DFB_KEY_TYPE (ev->key_symbol) == DIKT_UNICODE) ? ev->key_symbol : 0;
   1.185  
   1.186 -  if (ev->key_ascii > 0 && ev->key_ascii < 128)
   1.187 -    keysym->sym = ev->key_ascii;
   1.188 +  if (ev->key_symbol > 0 && ev->key_symbol < 128)
   1.189 +    keysym->sym = ev->key_symbol;
   1.190    else
   1.191 -    keysym->sym = keymap[ev->keycode];
   1.192 +    keysym->sym = keymap[ev->key_id];
   1.193  
   1.194    return keysym;
   1.195  }