projects / packages / doomlegacy.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a49077e ER |
1 | --- ./src/linux_x/i_video_xshm.c~ 2011-01-20 03:42:37.000000000 +0200 |
| 2 | +++ ./src/linux_x/i_video_xshm.c 2011-01-20 03:42:41.607999561 +0200 | |
| 3 | @@ -570,21 +570,9 @@ | |
| 4 | return; | |
| 5 | } | |
| 6 | ||
| 7 | -static int dirtyMapTable[256] = | |
| 8 | -{0, 0, 0, 0, 0, 0, 0, 0, 0, 65307, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, | |
| 9 | - 45, 61, 65288, 65289, 113, 119, 101, 114, 116, 121, 117, 105, 111, 112, 91, | |
| 10 | - 93, 65293, 65507, 97, 115, 100, 102, 103, 104, 106, 107, 108, 59, 39, 96, | |
| 11 | - 65505, 92, 122, 120, 99, 118, 98, 110, 109, 44, 46, 47, 65506, 65450, 65511, | |
| 12 | - 32, 65509, 65470, 65471, 65472, 65473, 65474, 65475, 65476, 65477, 65478, | |
| 13 | - 65479, 65407, 65300, 65429, 65431, 65434, 65453, 65430, 65437, 65432, 65451, | |
| 14 | - 65436, 65433, 65435, 65438, 65439, 0, 0, 0, 65480, 65481, 65360, 65362, 65365, | |
| 15 | - 65361, 0, 65363, 65367, 65364, 65366, 65379, 65535, 65421, 65312, 65299, 65377, | |
| 16 | - 65455, 65514, 0, 65515, 65516, 65518, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 17 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 18 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 19 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 20 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 21 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; | |
| 22 | +// compat with 1.42 | |
| 23 | +#define KEY_EQUALS 61 // '=' | |
| 24 | +#define KEY_MINUS 45 // '-' | |
| 25 | ||
| 26 | // | |
| 27 | // Translates the key currently in X_event | |
| 28 | @@ -598,13 +586,7 @@ | |
| 29 | keycode = X_event.xkey.keycode; | |
| 30 | keysym = XKeycodeToKeysym(X_display, keycode, 0); | |
| 31 | ||
| 32 | - if(con_keymap == english) { | |
| 33 | - rc = keysym; | |
| 34 | - } | |
| 35 | - else { | |
| 36 | - rc = dirtyMapTable[keycode]; | |
| 37 | - } | |
| 38 | - | |
| 39 | + rc = keysym; | |
| 40 | switch(rc) | |
| 41 | { | |
| 42 | case XK_Left : rc = KEY_LEFTARROW; break; | |
| 43 | @@ -629,7 +611,7 @@ | |
| 44 | case XK_F12: rc = KEY_F12; break; | |
| 45 | // hey, it's not a sparc 19990128 by Kin | |
| 46 | case XK_BackSpace: rc = KEY_BACKSPACE; break; | |
| 47 | - case XK_Delete: rc = KEY_DEL; break; | |
| 48 | + case XK_Delete: rc = KEY_DELETE; break; | |
| 49 | ||
| 50 | case XK_Pause: rc = KEY_PAUSE; break; | |
| 51 | ||
| 52 | @@ -641,8 +623,10 @@ | |
| 53 | case XK_minus: rc = KEY_MINUS; break; | |
| 54 | ||
| 55 | case XK_Shift_L: | |
| 56 | + rc = KEY_LSHIFT; | |
| 57 | + break; | |
| 58 | case XK_Shift_R: | |
| 59 | - rc = KEY_SHIFT; | |
| 60 | + rc = KEY_RSHIFT; | |
| 61 | break; | |
| 62 | ||
| 63 | case XK_Caps_Lock: | |
| 64 | @@ -650,17 +634,25 @@ | |
| 65 | break; | |
| 66 | ||
| 67 | case XK_Multi_key: | |
| 68 | + rc = KEY_RWIN; // best pick: glen | |
| 69 | + break; | |
| 70 | case XK_Control_L: | |
| 71 | + rc = KEY_LCTRL; | |
| 72 | + break; | |
| 73 | case XK_Control_R: | |
| 74 | - rc = KEY_CTRL; | |
| 75 | + rc = KEY_RCTRL; | |
| 76 | break; | |
| 77 | ||
| 78 | case XK_Mode_switch: | |
| 79 | + rc = KEY_MODE; | |
| 80 | + break; | |
| 81 | case XK_Alt_L: | |
| 82 | case XK_Meta_L: | |
| 83 | + rc = KEY_LALT; | |
| 84 | + break; | |
| 85 | case XK_Alt_R: | |
| 86 | case XK_Meta_R: | |
| 87 | - rc = KEY_ALT; | |
| 88 | + rc = KEY_RALT; | |
| 89 | break; | |
| 90 | ||
| 91 | // I forgot them..... 19990128 by Kin | |
| 92 | @@ -681,7 +673,7 @@ | |
| 93 | case XK_KP_Home : rc = KEY_KEYPAD7; break; | |
| 94 | case XK_KP_Up : rc = KEY_KEYPAD8; break; | |
| 95 | case XK_KP_Page_Up : rc = KEY_KEYPAD9; break; | |
| 96 | - case XK_KP_Delete : rc = KEY_KPADDEL; break; | |
| 97 | + case XK_KP_Delete : rc = KEY_DELETE; break; | |
| 98 | case XK_KP_Divide : rc = KEY_KPADSLASH; break; | |
| 99 | case XK_KP_Enter : rc = KEY_ENTER; break; | |
| 100 |