diff --git a/clsave/pub/controls.json b/clsave/pub/controls.json index 1c0206c..f412ba3 100644 --- a/clsave/pub/controls.json +++ b/clsave/pub/controls.json @@ -1,39 +1,39 @@ { "__COMMENT_000": " - + This is the sort of place you set up your controls. It can be read by all mods, but not writeable by any. - + By the way, don't store anything important in this comment. It is possible that a hacked server might be able to read it. - + READ THIS FILE: docs/setup_json.txt READ THIS URL: http://wiki.libsdl.org/moin.cgi/SDLKeycodeLookup - + For more info on the syntax itself, see http://json.org/ ", - - "forward": 26, - "back": 22, - "left": 4, - "right": 7, - "jump": 44, - "crouch": 224, - "sneak": 225, - "reload": 21, - "tools": [30, 31, 32, 33, 34, 35, 36, 37, 38, 39], - "colorleft": 92, - "colorright": 94, - "colorup": 90, - "colordown": 96, - "chat": 23, - "teamchat": 28, - "squadchat": 24, - "chatup": 82, - "chatdn": 81, - "scores": 43, - "quit": 41, - "map": 16, - "team": 54, - "wpn": 55 + + "forward": 119, + "back": 115, + "left": 97, + "right": 100, + "jump": 32, + "crouch": 306, + "sneak": 118, + "reload": 114, + "tools": [49, 50, 51, 52, 53, 54, 55, 56, 57, 48], + "colorleft": 276, + "colorright": 275, + "colorup": 273, + "colordown": 274, + "chat": 116, + "teamchat": 121, + "squadchat": 117, + "chatup": 280, + "chatdn": 281, + "scores": 9, + "quit": 27, + "map": 109, + "team": 44, + "wpn": 46 } diff --git a/pkg/base/lib_sdlkey.lua b/pkg/base/lib_sdlkey.lua index 5a3c4f2..57b2e45 100644 --- a/pkg/base/lib_sdlkey.lua +++ b/pkg/base/lib_sdlkey.lua @@ -1,272 +1,259 @@ --[[ - 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 + Simple DirectMedia Layer + Copyright (C) 1997-2014 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. ]] ---[[ - part of SDL_scancode.h accurate as of SDL 2.0.3 -]] +SDLK_UNKNOWN = 0 +SDLK_FIRST = 0 +SDLK_BACKSPACE = 8 +SDLK_TAB = 9 +SDLK_CLEAR = 12 +SDLK_RETURN = 13 +SDLK_PAUSE = 19 +SDLK_ESCAPE = 27 +SDLK_SPACE = 32 +SDLK_EXCLAIM = 33 +SDLK_QUOTEDBL = 34 +SDLK_HASH = 35 +SDLK_DOLLAR = 36 +SDLK_AMPERSAND = 38 +SDLK_QUOTE = 39 +SDLK_LEFTPAREN = 40 +SDLK_RIGHTPAREN = 41 +SDLK_ASTERISK = 42 +SDLK_PLUS = 43 +SDLK_COMMA = 44 +SDLK_MINUS = 45 +SDLK_PERIOD = 46 +SDLK_SLASH = 47 +SDLK_0 = 48 +SDLK_1 = 49 +SDLK_2 = 50 +SDLK_3 = 51 +SDLK_4 = 52 +SDLK_5 = 53 +SDLK_6 = 54 +SDLK_7 = 55 +SDLK_8 = 56 +SDLK_9 = 57 +SDLK_COLON = 58 +SDLK_SEMICOLON = 59 +SDLK_LESS = 60 +SDLK_EQUALS = 61 +SDLK_GREATER = 62 +SDLK_QUESTION = 63 +SDLK_AT = 64 +SDLK_LEFTBRACKET = 91 +SDLK_BACKSLASH = 92 +SDLK_RIGHTBRACKET = 93 +SDLK_CARET = 94 +SDLK_UNDERSCORE = 95 +SDLK_BACKQUOTE = 96 +SDLK_a = 97 +SDLK_b = 98 +SDLK_c = 99 +SDLK_d = 100 +SDLK_e = 101 +SDLK_f = 102 +SDLK_g = 103 +SDLK_h = 104 +SDLK_i = 105 +SDLK_j = 106 +SDLK_k = 107 +SDLK_l = 108 +SDLK_m = 109 +SDLK_n = 110 +SDLK_o = 111 +SDLK_p = 112 +SDLK_q = 113 +SDLK_r = 114 +SDLK_s = 115 +SDLK_t = 116 +SDLK_u = 117 +SDLK_v = 118 +SDLK_w = 119 +SDLK_x = 120 +SDLK_y = 121 +SDLK_z = 122 +SDLK_DELETE = 127 +SDLK_WORLD_0 = 160 +SDLK_WORLD_1 = 161 +SDLK_WORLD_2 = 162 +SDLK_WORLD_3 = 163 +SDLK_WORLD_4 = 164 +SDLK_WORLD_5 = 165 +SDLK_WORLD_6 = 166 +SDLK_WORLD_7 = 167 +SDLK_WORLD_8 = 168 +SDLK_WORLD_9 = 169 +SDLK_WORLD_10 = 170 +SDLK_WORLD_11 = 171 +SDLK_WORLD_12 = 172 +SDLK_WORLD_13 = 173 +SDLK_WORLD_14 = 174 +SDLK_WORLD_15 = 175 +SDLK_WORLD_16 = 176 +SDLK_WORLD_17 = 177 +SDLK_WORLD_18 = 178 +SDLK_WORLD_19 = 179 +SDLK_WORLD_20 = 180 +SDLK_WORLD_21 = 181 +SDLK_WORLD_22 = 182 +SDLK_WORLD_23 = 183 +SDLK_WORLD_24 = 184 +SDLK_WORLD_25 = 185 +SDLK_WORLD_26 = 186 +SDLK_WORLD_27 = 187 +SDLK_WORLD_28 = 188 +SDLK_WORLD_29 = 189 +SDLK_WORLD_30 = 190 +SDLK_WORLD_31 = 191 +SDLK_WORLD_32 = 192 +SDLK_WORLD_33 = 193 +SDLK_WORLD_34 = 194 +SDLK_WORLD_35 = 195 +SDLK_WORLD_36 = 196 +SDLK_WORLD_37 = 197 +SDLK_WORLD_38 = 198 +SDLK_WORLD_39 = 199 +SDLK_WORLD_40 = 200 +SDLK_WORLD_41 = 201 +SDLK_WORLD_42 = 202 +SDLK_WORLD_43 = 203 +SDLK_WORLD_44 = 204 +SDLK_WORLD_45 = 205 +SDLK_WORLD_46 = 206 +SDLK_WORLD_47 = 207 +SDLK_WORLD_48 = 208 +SDLK_WORLD_49 = 209 +SDLK_WORLD_50 = 210 +SDLK_WORLD_51 = 211 +SDLK_WORLD_52 = 212 +SDLK_WORLD_53 = 213 +SDLK_WORLD_54 = 214 +SDLK_WORLD_55 = 215 +SDLK_WORLD_56 = 216 +SDLK_WORLD_57 = 217 +SDLK_WORLD_58 = 218 +SDLK_WORLD_59 = 219 +SDLK_WORLD_60 = 220 +SDLK_WORLD_61 = 221 +SDLK_WORLD_62 = 222 +SDLK_WORLD_63 = 223 +SDLK_WORLD_64 = 224 +SDLK_WORLD_65 = 225 +SDLK_WORLD_66 = 226 +SDLK_WORLD_67 = 227 +SDLK_WORLD_68 = 228 +SDLK_WORLD_69 = 229 +SDLK_WORLD_70 = 230 +SDLK_WORLD_71 = 231 +SDLK_WORLD_72 = 232 +SDLK_WORLD_73 = 233 +SDLK_WORLD_74 = 234 +SDLK_WORLD_75 = 235 +SDLK_WORLD_76 = 236 +SDLK_WORLD_77 = 237 +SDLK_WORLD_78 = 238 +SDLK_WORLD_79 = 239 +SDLK_WORLD_80 = 240 +SDLK_WORLD_81 = 241 +SDLK_WORLD_82 = 242 +SDLK_WORLD_83 = 243 +SDLK_WORLD_84 = 244 +SDLK_WORLD_85 = 245 +SDLK_WORLD_86 = 246 +SDLK_WORLD_87 = 247 +SDLK_WORLD_88 = 248 +SDLK_WORLD_89 = 249 +SDLK_WORLD_90 = 250 +SDLK_WORLD_91 = 251 +SDLK_WORLD_92 = 252 +SDLK_WORLD_93 = 253 +SDLK_WORLD_94 = 254 +SDLK_WORLD_95 = 255 +SDLK_KP0 = 256 +SDLK_KP1 = 257 +SDLK_KP2 = 258 +SDLK_KP3 = 259 +SDLK_KP4 = 260 +SDLK_KP5 = 261 +SDLK_KP6 = 262 +SDLK_KP7 = 263 +SDLK_KP8 = 264 +SDLK_KP9 = 265 +SDLK_KP_PERIOD = 266 +SDLK_KP_DIVIDE = 267 +SDLK_KP_MULTIPLY = 268 +SDLK_KP_MINUS = 269 +SDLK_KP_PLUS = 270 +SDLK_KP_ENTER = 271 +SDLK_KP_EQUALS = 272 +SDLK_UP = 273 +SDLK_DOWN = 274 +SDLK_RIGHT = 275 +SDLK_LEFT = 276 +SDLK_INSERT = 277 +SDLK_HOME = 278 +SDLK_END = 279 +SDLK_PAGEUP = 280 +SDLK_PAGEDOWN = 281 +SDLK_F1 = 282 +SDLK_F2 = 283 +SDLK_F3 = 284 +SDLK_F4 = 285 +SDLK_F5 = 286 +SDLK_F6 = 287 +SDLK_F7 = 288 +SDLK_F8 = 289 +SDLK_F9 = 290 +SDLK_F10 = 291 +SDLK_F11 = 292 +SDLK_F12 = 293 +SDLK_F13 = 294 +SDLK_F14 = 295 +SDLK_F15 = 296 +SDLK_NUMLOCK = 300 +SDLK_CAPSLOCK = 301 +SDLK_SCROLLOCK = 302 +SDLK_RSHIFT = 303 +SDLK_LSHIFT = 304 +SDLK_RCTRL = 305 +SDLK_LCTRL = 306 +SDLK_RALT = 307 +SDLK_LALT = 308 +SDLK_RMETA = 309 +SDLK_LMETA = 310 +SDLK_LSUPER = 311 +SDLK_RSUPER = 312 +SDLK_MODE = 313 +SDLK_COMPOSE = 314 +SDLK_HELP = 315 +SDLK_PRINT = 316 +SDLK_SYSREQ = 317 +SDLK_BREAK = 318 +SDLK_MENU = 319 +SDLK_POWER = 320 +SDLK_EURO = 321 +SDLK_UNDO = 322 -SDLK_UNKNOWN = 0 -SDLK_a = 4 -SDLK_b = 5 -SDLK_c = 6 -SDLK_d = 7 -SDLK_e = 8 -SDLK_f = 9 -SDLK_g = 10 -SDLK_h = 11 -SDLK_i = 12 -SDLK_j = 13 -SDLK_k = 14 -SDLK_l = 15 -SDLK_m = 16 -SDLK_n = 17 -SDLK_o = 18 -SDLK_p = 19 -SDLK_q = 20 -SDLK_r = 21 -SDLK_s = 22 -SDLK_t = 23 -SDLK_u = 24 -SDLK_v = 25 -SDLK_w = 26 -SDLK_x = 27 -SDLK_y = 28 -SDLK_z = 29 -SDLK_1 = 30 -SDLK_2 = 31 -SDLK_3 = 32 -SDLK_4 = 33 -SDLK_5 = 34 -SDLK_6 = 35 -SDLK_7 = 36 -SDLK_8 = 37 -SDLK_9 = 38 -SDLK_0 = 39 -SDLK_RETURN = 40 -SDLK_ESCAPE = 41 -SDLK_BACKSPACE = 42 -SDLK_TAB = 43 -SDLK_SPACE = 44 -SDLK_MINUS = 45 -SDLK_EQUALS = 46 -SDLK_LEFTBRACKET = 47 -SDLK_RIGHTBRACKET = 48 -SDLK_BACKSLASH = 49 -SDLK_NONUSHASH = 50 -SDLK_SEMICOLON = 51 -SDLK_APOSTROPHE = 52 -SDLK_GRAVE = 53 -SDLK_COMMA = 54 -SDLK_PERIOD = 55 -SDLK_SLASH = 56 -SDLK_CAPSLOCK = 57 -SDLK_F1 = 58 -SDLK_F2 = 59 -SDLK_F3 = 60 -SDLK_F4 = 61 -SDLK_F5 = 62 -SDLK_F6 = 63 -SDLK_F7 = 64 -SDLK_F8 = 65 -SDLK_F9 = 66 -SDLK_F10 = 67 -SDLK_F11 = 68 -SDLK_F12 = 69 -SDLK_PRINTSCREEN = 70 -SDLK_SCROLLLOCK = 71 -SDLK_PAUSE = 72 -SDLK_INSERT = 73 -SDLK_HOME = 74 -SDLK_PAGEUP = 75 -SDLK_DELETE = 76 -SDLK_END = 77 -SDLK_PAGEDOWN = 78 -SDLK_RIGHT = 79 -SDLK_LEFT = 80 -SDLK_DOWN = 81 -SDLK_UP = 82 -SDLK_NUMLOCKCLEAR = 83 -SDLK_KP_DIVIDE = 84 -SDLK_KP_MULTIPLY = 85 -SDLK_KP_MINUS = 86 -SDLK_KP_PLUS = 87 -SDLK_KP_ENTER = 88 -SDLK_KP_1 = 89 -SDLK_KP_2 = 90 -SDLK_KP_3 = 91 -SDLK_KP_4 = 92 -SDLK_KP_5 = 93 -SDLK_KP_6 = 94 -SDLK_KP_7 = 95 -SDLK_KP_8 = 96 -SDLK_KP_9 = 97 -SDLK_KP_0 = 98 -SDLK_KP_PERIOD = 99 -SDLK_NONUSBACKSLASH = 100 -SDLK_APPLICATION = 101 -SDLK_POWER = 102 -SDLK_KP_EQUALS = 103 -SDLK_F13 = 104 -SDLK_F14 = 105 -SDLK_F15 = 106 -SDLK_F16 = 107 -SDLK_F17 = 108 -SDLK_F18 = 109 -SDLK_F19 = 110 -SDLK_F20 = 111 -SDLK_F21 = 112 -SDLK_F22 = 113 -SDLK_F23 = 114 -SDLK_F24 = 115 -SDLK_EXECUTE = 116 -SDLK_HELP = 117 -SDLK_MENU = 118 -SDLK_SELECT = 119 -SDLK_STOP = 120 -SDLK_AGAIN = 121 -SDLK_UNDO = 122 -SDLK_CUT = 123 -SDLK_COPY = 124 -SDLK_PASTE = 125 -SDLK_FIND = 126 -SDLK_MUTE = 127 -SDLK_VOLUMEUP = 128 -SDLK_VOLUMEDOWN = 129 -SDLK_KP_COMMA = 133 -SDLK_KP_EQUALSAS400 = 134 -SDLK_INTERNATIONAL1 = 135 -SDLK_INTERNATIONAL2 = 136 -SDLK_INTERNATIONAL3 = 137 -SDLK_INTERNATIONAL4 = 138 -SDLK_INTERNATIONAL5 = 139 -SDLK_INTERNATIONAL6 = 140 -SDLK_INTERNATIONAL7 = 141 -SDLK_INTERNATIONAL8 = 142 -SDLK_INTERNATIONAL9 = 143 -SDLK_LANG1 = 144 -SDLK_LANG2 = 145 -SDLK_LANG3 = 146 -SDLK_LANG4 = 147 -SDLK_LANG5 = 148 -SDLK_LANG6 = 149 -SDLK_LANG7 = 150 -SDLK_LANG8 = 151 -SDLK_LANG9 = 152 -SDLK_ALTERASE = 153 -SDLK_SYSREQ = 154 -SDLK_CANCEL = 155 -SDLK_CLEAR = 156 -SDLK_PRIOR = 157 -SDLK_RETURN2 = 158 -SDLK_SEPARATOR = 159 -SDLK_OUT = 160 -SDLK_OPER = 161 -SDLK_CLEARAGAIN = 162 -SDLK_CRSEL = 163 -SDLK_EXSEL = 164 -SDLK_KP_00 = 176 -SDLK_KP_000 = 177 -SDLK_THOUSANDSSEPARATOR = 178 -SDLK_DECIMALSEPARATOR = 179 -SDLK_CURRENCYUNIT = 180 -SDLK_CURRENCYSUBUNIT = 181 -SDLK_KP_LEFTPAREN = 182 -SDLK_KP_RIGHTPAREN = 183 -SDLK_KP_LEFTBRACE = 184 -SDLK_KP_RIGHTBRACE = 185 -SDLK_KP_TAB = 186 -SDLK_KP_BACKSPACE = 187 -SDLK_KP_A = 188 -SDLK_KP_B = 189 -SDLK_KP_C = 190 -SDLK_KP_D = 191 -SDLK_KP_E = 192 -SDLK_KP_F = 193 -SDLK_KP_XOR = 194 -SDLK_KP_POWER = 195 -SDLK_KP_PERCENT = 196 -SDLK_KP_LESS = 197 -SDLK_KP_GREATER = 198 -SDLK_KP_AMPERSAND = 199 -SDLK_KP_DBLAMPERSAND = 200 -SDLK_KP_VERTICALBAR = 201 -SDLK_KP_DBLVERTICALBAR = 202 -SDLK_KP_COLON = 203 -SDLK_KP_HASH = 204 -SDLK_KP_SPACE = 205 -SDLK_KP_AT = 206 -SDLK_KP_EXCLAM = 207 -SDLK_KP_MEMSTORE = 208 -SDLK_KP_MEMRECALL = 209 -SDLK_KP_MEMCLEAR = 210 -SDLK_KP_MEMADD = 211 -SDLK_KP_MEMSUBTRACT = 212 -SDLK_KP_MEMMULTIPLY = 213 -SDLK_KP_MEMDIVIDE = 214 -SDLK_KP_PLUSMINUS = 215 -SDLK_KP_CLEAR = 216 -SDLK_KP_CLEARENTRY = 217 -SDLK_KP_BINARY = 218 -SDLK_KP_OCTAL = 219 -SDLK_KP_DECIMAL = 220 -SDLK_KP_HEXADECIMAL = 221 -SDLK_LCTRL = 224 -SDLK_LSHIFT = 225 -SDLK_LALT = 226 -SDLK_LGUI = 227 -SDLK_RCTRL = 228 -SDLK_RSHIFT = 229 -SDLK_RALT = 230 -SDLK_RGUI = 231 -SDLK_MODE = 257 -SDLK_AUDIONEXT = 258 -SDLK_AUDIOPREV = 259 -SDLK_AUDIOSTOP = 260 -SDLK_AUDIOPLAY = 261 -SDLK_AUDIOMUTE = 262 -SDLK_MEDIASELECT = 263 -SDLK_WWW = 264 -SDLK_MAIL = 265 -SDLK_CALCULATOR = 266 -SDLK_COMPUTER = 267 -SDLK_AC_SEARCH = 268 -SDLK_AC_HOME = 269 -SDLK_AC_BACK = 270 -SDLK_AC_FORWARD = 271 -SDLK_AC_STOP = 272 -SDLK_AC_REFRESH = 273 -SDLK_AC_BOOKMARKS = 274 -SDLK_BRIGHTNESSDOWN = 275 -SDLK_BRIGHTNESSUP = 276 -SDLK_DISPLAYSWITCH = 277 -SDLK_KBDILLUMTOGGLE = 278 -SDLK_KBDILLUMDOWN = 279 -SDLK_KBDILLUMUP = 280 -SDLK_EJECT = 281 -SDLK_SLEEP = 282 -SDLK_APP1 = 283 -SDLK_APP2 = 284 - --- not sure where this is defined it was copied from the man page +-- not sure where this is defined, it was copied from the man page KMOD_NONE = 0x0000 KMOD_LSHIFT = 0x0001 KMOD_RSHIFT = 0x0002 diff --git a/pkg/gm/abos/main_client.lua b/pkg/gm/abos/main_client.lua index b9f2a27..303365f 100644 --- a/pkg/gm/abos/main_client.lua +++ b/pkg/gm/abos/main_client.lua @@ -1,7 +1,7 @@ dofile("pkg/gm/abos/common.lua") dofile("pkg/gm/abos/genmap.lua") dofile("pkg/gm/abos/player.lua") -dofile("pkg/iceball/lib/sdlkey.lua") +dofile("pkg/base/lib_sdlkey.lua") client.mk_compat_disable() client.mk_set_title("A Buttfull Of Skateboards") diff --git a/pkg/iceball/altgame/client_start.lua b/pkg/iceball/altgame/client_start.lua index 9ac1f24..ab6fd05 100644 --- a/pkg/iceball/altgame/client_start.lua +++ b/pkg/iceball/altgame/client_start.lua @@ -31,9 +31,9 @@ dofile("pkg/iceball/lib/font.lua") dofile("pkg/iceball/lib/map.lua") dofile("pkg/iceball/lib/player.lua") dofile("pkg/iceball/lib/phys.lua") -dofile("pkg/iceball/lib/sdlkey.lua") dofile("pkg/iceball/lib/vector.lua") dofile("pkg/iceball/lib/wobj.lua") +dofile("pkg/base/lib_sdlkey.lua") -- Here's some version information while you wait for me to do everything ever. -- Or you could help by not making me have to do everything ever. diff --git a/pkg/iceball/config/lib_sdlkey.lua b/pkg/iceball/config/lib_sdlkey.lua deleted file mode 100644 index 5a3c4f2..0000000 --- a/pkg/iceball/config/lib_sdlkey.lua +++ /dev/null @@ -1,286 +0,0 @@ ---[[ - 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 -]] - ---[[ - part of SDL_scancode.h accurate as of SDL 2.0.3 -]] - -SDLK_UNKNOWN = 0 -SDLK_a = 4 -SDLK_b = 5 -SDLK_c = 6 -SDLK_d = 7 -SDLK_e = 8 -SDLK_f = 9 -SDLK_g = 10 -SDLK_h = 11 -SDLK_i = 12 -SDLK_j = 13 -SDLK_k = 14 -SDLK_l = 15 -SDLK_m = 16 -SDLK_n = 17 -SDLK_o = 18 -SDLK_p = 19 -SDLK_q = 20 -SDLK_r = 21 -SDLK_s = 22 -SDLK_t = 23 -SDLK_u = 24 -SDLK_v = 25 -SDLK_w = 26 -SDLK_x = 27 -SDLK_y = 28 -SDLK_z = 29 -SDLK_1 = 30 -SDLK_2 = 31 -SDLK_3 = 32 -SDLK_4 = 33 -SDLK_5 = 34 -SDLK_6 = 35 -SDLK_7 = 36 -SDLK_8 = 37 -SDLK_9 = 38 -SDLK_0 = 39 -SDLK_RETURN = 40 -SDLK_ESCAPE = 41 -SDLK_BACKSPACE = 42 -SDLK_TAB = 43 -SDLK_SPACE = 44 -SDLK_MINUS = 45 -SDLK_EQUALS = 46 -SDLK_LEFTBRACKET = 47 -SDLK_RIGHTBRACKET = 48 -SDLK_BACKSLASH = 49 -SDLK_NONUSHASH = 50 -SDLK_SEMICOLON = 51 -SDLK_APOSTROPHE = 52 -SDLK_GRAVE = 53 -SDLK_COMMA = 54 -SDLK_PERIOD = 55 -SDLK_SLASH = 56 -SDLK_CAPSLOCK = 57 -SDLK_F1 = 58 -SDLK_F2 = 59 -SDLK_F3 = 60 -SDLK_F4 = 61 -SDLK_F5 = 62 -SDLK_F6 = 63 -SDLK_F7 = 64 -SDLK_F8 = 65 -SDLK_F9 = 66 -SDLK_F10 = 67 -SDLK_F11 = 68 -SDLK_F12 = 69 -SDLK_PRINTSCREEN = 70 -SDLK_SCROLLLOCK = 71 -SDLK_PAUSE = 72 -SDLK_INSERT = 73 -SDLK_HOME = 74 -SDLK_PAGEUP = 75 -SDLK_DELETE = 76 -SDLK_END = 77 -SDLK_PAGEDOWN = 78 -SDLK_RIGHT = 79 -SDLK_LEFT = 80 -SDLK_DOWN = 81 -SDLK_UP = 82 -SDLK_NUMLOCKCLEAR = 83 -SDLK_KP_DIVIDE = 84 -SDLK_KP_MULTIPLY = 85 -SDLK_KP_MINUS = 86 -SDLK_KP_PLUS = 87 -SDLK_KP_ENTER = 88 -SDLK_KP_1 = 89 -SDLK_KP_2 = 90 -SDLK_KP_3 = 91 -SDLK_KP_4 = 92 -SDLK_KP_5 = 93 -SDLK_KP_6 = 94 -SDLK_KP_7 = 95 -SDLK_KP_8 = 96 -SDLK_KP_9 = 97 -SDLK_KP_0 = 98 -SDLK_KP_PERIOD = 99 -SDLK_NONUSBACKSLASH = 100 -SDLK_APPLICATION = 101 -SDLK_POWER = 102 -SDLK_KP_EQUALS = 103 -SDLK_F13 = 104 -SDLK_F14 = 105 -SDLK_F15 = 106 -SDLK_F16 = 107 -SDLK_F17 = 108 -SDLK_F18 = 109 -SDLK_F19 = 110 -SDLK_F20 = 111 -SDLK_F21 = 112 -SDLK_F22 = 113 -SDLK_F23 = 114 -SDLK_F24 = 115 -SDLK_EXECUTE = 116 -SDLK_HELP = 117 -SDLK_MENU = 118 -SDLK_SELECT = 119 -SDLK_STOP = 120 -SDLK_AGAIN = 121 -SDLK_UNDO = 122 -SDLK_CUT = 123 -SDLK_COPY = 124 -SDLK_PASTE = 125 -SDLK_FIND = 126 -SDLK_MUTE = 127 -SDLK_VOLUMEUP = 128 -SDLK_VOLUMEDOWN = 129 -SDLK_KP_COMMA = 133 -SDLK_KP_EQUALSAS400 = 134 -SDLK_INTERNATIONAL1 = 135 -SDLK_INTERNATIONAL2 = 136 -SDLK_INTERNATIONAL3 = 137 -SDLK_INTERNATIONAL4 = 138 -SDLK_INTERNATIONAL5 = 139 -SDLK_INTERNATIONAL6 = 140 -SDLK_INTERNATIONAL7 = 141 -SDLK_INTERNATIONAL8 = 142 -SDLK_INTERNATIONAL9 = 143 -SDLK_LANG1 = 144 -SDLK_LANG2 = 145 -SDLK_LANG3 = 146 -SDLK_LANG4 = 147 -SDLK_LANG5 = 148 -SDLK_LANG6 = 149 -SDLK_LANG7 = 150 -SDLK_LANG8 = 151 -SDLK_LANG9 = 152 -SDLK_ALTERASE = 153 -SDLK_SYSREQ = 154 -SDLK_CANCEL = 155 -SDLK_CLEAR = 156 -SDLK_PRIOR = 157 -SDLK_RETURN2 = 158 -SDLK_SEPARATOR = 159 -SDLK_OUT = 160 -SDLK_OPER = 161 -SDLK_CLEARAGAIN = 162 -SDLK_CRSEL = 163 -SDLK_EXSEL = 164 -SDLK_KP_00 = 176 -SDLK_KP_000 = 177 -SDLK_THOUSANDSSEPARATOR = 178 -SDLK_DECIMALSEPARATOR = 179 -SDLK_CURRENCYUNIT = 180 -SDLK_CURRENCYSUBUNIT = 181 -SDLK_KP_LEFTPAREN = 182 -SDLK_KP_RIGHTPAREN = 183 -SDLK_KP_LEFTBRACE = 184 -SDLK_KP_RIGHTBRACE = 185 -SDLK_KP_TAB = 186 -SDLK_KP_BACKSPACE = 187 -SDLK_KP_A = 188 -SDLK_KP_B = 189 -SDLK_KP_C = 190 -SDLK_KP_D = 191 -SDLK_KP_E = 192 -SDLK_KP_F = 193 -SDLK_KP_XOR = 194 -SDLK_KP_POWER = 195 -SDLK_KP_PERCENT = 196 -SDLK_KP_LESS = 197 -SDLK_KP_GREATER = 198 -SDLK_KP_AMPERSAND = 199 -SDLK_KP_DBLAMPERSAND = 200 -SDLK_KP_VERTICALBAR = 201 -SDLK_KP_DBLVERTICALBAR = 202 -SDLK_KP_COLON = 203 -SDLK_KP_HASH = 204 -SDLK_KP_SPACE = 205 -SDLK_KP_AT = 206 -SDLK_KP_EXCLAM = 207 -SDLK_KP_MEMSTORE = 208 -SDLK_KP_MEMRECALL = 209 -SDLK_KP_MEMCLEAR = 210 -SDLK_KP_MEMADD = 211 -SDLK_KP_MEMSUBTRACT = 212 -SDLK_KP_MEMMULTIPLY = 213 -SDLK_KP_MEMDIVIDE = 214 -SDLK_KP_PLUSMINUS = 215 -SDLK_KP_CLEAR = 216 -SDLK_KP_CLEARENTRY = 217 -SDLK_KP_BINARY = 218 -SDLK_KP_OCTAL = 219 -SDLK_KP_DECIMAL = 220 -SDLK_KP_HEXADECIMAL = 221 -SDLK_LCTRL = 224 -SDLK_LSHIFT = 225 -SDLK_LALT = 226 -SDLK_LGUI = 227 -SDLK_RCTRL = 228 -SDLK_RSHIFT = 229 -SDLK_RALT = 230 -SDLK_RGUI = 231 -SDLK_MODE = 257 -SDLK_AUDIONEXT = 258 -SDLK_AUDIOPREV = 259 -SDLK_AUDIOSTOP = 260 -SDLK_AUDIOPLAY = 261 -SDLK_AUDIOMUTE = 262 -SDLK_MEDIASELECT = 263 -SDLK_WWW = 264 -SDLK_MAIL = 265 -SDLK_CALCULATOR = 266 -SDLK_COMPUTER = 267 -SDLK_AC_SEARCH = 268 -SDLK_AC_HOME = 269 -SDLK_AC_BACK = 270 -SDLK_AC_FORWARD = 271 -SDLK_AC_STOP = 272 -SDLK_AC_REFRESH = 273 -SDLK_AC_BOOKMARKS = 274 -SDLK_BRIGHTNESSDOWN = 275 -SDLK_BRIGHTNESSUP = 276 -SDLK_DISPLAYSWITCH = 277 -SDLK_KBDILLUMTOGGLE = 278 -SDLK_KBDILLUMDOWN = 279 -SDLK_KBDILLUMUP = 280 -SDLK_EJECT = 281 -SDLK_SLEEP = 282 -SDLK_APP1 = 283 -SDLK_APP2 = 284 - --- not sure where this is defined it was copied from the man page -KMOD_NONE = 0x0000 -KMOD_LSHIFT = 0x0001 -KMOD_RSHIFT = 0x0002 -KMOD_LCTRL = 0x0040 -KMOD_RCTRL = 0x0080 -KMOD_LALT = 0x0100 -KMOD_RALT = 0x0200 -KMOD_LMETA = 0x0400 -KMOD_RMETA = 0x0800 -KMOD_NUM = 0x1000 -KMOD_CAPS = 0x2000 -KMOD_MODE = 0x4000 - -KMOD_CTRL = (KMOD_LCTRL+KMOD_RCTRL) -KMOD_SHIFT = (KMOD_LSHIFT+KMOD_RSHIFT) -KMOD_ALT = (KMOD_LALT+KMOD_RALT) -KMOD_META = (KMOD_LMETA+KMOD_RMETA) diff --git a/pkg/iceball/config/main_client.lua b/pkg/iceball/config/main_client.lua index 5465da2..28701e2 100644 --- a/pkg/iceball/config/main_client.lua +++ b/pkg/iceball/config/main_client.lua @@ -15,7 +15,7 @@ along with Ice Lua Components. If not, see . ]] -dofile("pkg/iceball/config/lib_sdlkey.lua") +dofile("pkg/base/lib_sdlkey.lua") function string.split(s, sep, plain) local start = 1 diff --git a/pkg/iceball/halp/lib_sdlkey.lua b/pkg/iceball/halp/lib_sdlkey.lua deleted file mode 100644 index 5a3c4f2..0000000 --- a/pkg/iceball/halp/lib_sdlkey.lua +++ /dev/null @@ -1,286 +0,0 @@ ---[[ - 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 -]] - ---[[ - part of SDL_scancode.h accurate as of SDL 2.0.3 -]] - -SDLK_UNKNOWN = 0 -SDLK_a = 4 -SDLK_b = 5 -SDLK_c = 6 -SDLK_d = 7 -SDLK_e = 8 -SDLK_f = 9 -SDLK_g = 10 -SDLK_h = 11 -SDLK_i = 12 -SDLK_j = 13 -SDLK_k = 14 -SDLK_l = 15 -SDLK_m = 16 -SDLK_n = 17 -SDLK_o = 18 -SDLK_p = 19 -SDLK_q = 20 -SDLK_r = 21 -SDLK_s = 22 -SDLK_t = 23 -SDLK_u = 24 -SDLK_v = 25 -SDLK_w = 26 -SDLK_x = 27 -SDLK_y = 28 -SDLK_z = 29 -SDLK_1 = 30 -SDLK_2 = 31 -SDLK_3 = 32 -SDLK_4 = 33 -SDLK_5 = 34 -SDLK_6 = 35 -SDLK_7 = 36 -SDLK_8 = 37 -SDLK_9 = 38 -SDLK_0 = 39 -SDLK_RETURN = 40 -SDLK_ESCAPE = 41 -SDLK_BACKSPACE = 42 -SDLK_TAB = 43 -SDLK_SPACE = 44 -SDLK_MINUS = 45 -SDLK_EQUALS = 46 -SDLK_LEFTBRACKET = 47 -SDLK_RIGHTBRACKET = 48 -SDLK_BACKSLASH = 49 -SDLK_NONUSHASH = 50 -SDLK_SEMICOLON = 51 -SDLK_APOSTROPHE = 52 -SDLK_GRAVE = 53 -SDLK_COMMA = 54 -SDLK_PERIOD = 55 -SDLK_SLASH = 56 -SDLK_CAPSLOCK = 57 -SDLK_F1 = 58 -SDLK_F2 = 59 -SDLK_F3 = 60 -SDLK_F4 = 61 -SDLK_F5 = 62 -SDLK_F6 = 63 -SDLK_F7 = 64 -SDLK_F8 = 65 -SDLK_F9 = 66 -SDLK_F10 = 67 -SDLK_F11 = 68 -SDLK_F12 = 69 -SDLK_PRINTSCREEN = 70 -SDLK_SCROLLLOCK = 71 -SDLK_PAUSE = 72 -SDLK_INSERT = 73 -SDLK_HOME = 74 -SDLK_PAGEUP = 75 -SDLK_DELETE = 76 -SDLK_END = 77 -SDLK_PAGEDOWN = 78 -SDLK_RIGHT = 79 -SDLK_LEFT = 80 -SDLK_DOWN = 81 -SDLK_UP = 82 -SDLK_NUMLOCKCLEAR = 83 -SDLK_KP_DIVIDE = 84 -SDLK_KP_MULTIPLY = 85 -SDLK_KP_MINUS = 86 -SDLK_KP_PLUS = 87 -SDLK_KP_ENTER = 88 -SDLK_KP_1 = 89 -SDLK_KP_2 = 90 -SDLK_KP_3 = 91 -SDLK_KP_4 = 92 -SDLK_KP_5 = 93 -SDLK_KP_6 = 94 -SDLK_KP_7 = 95 -SDLK_KP_8 = 96 -SDLK_KP_9 = 97 -SDLK_KP_0 = 98 -SDLK_KP_PERIOD = 99 -SDLK_NONUSBACKSLASH = 100 -SDLK_APPLICATION = 101 -SDLK_POWER = 102 -SDLK_KP_EQUALS = 103 -SDLK_F13 = 104 -SDLK_F14 = 105 -SDLK_F15 = 106 -SDLK_F16 = 107 -SDLK_F17 = 108 -SDLK_F18 = 109 -SDLK_F19 = 110 -SDLK_F20 = 111 -SDLK_F21 = 112 -SDLK_F22 = 113 -SDLK_F23 = 114 -SDLK_F24 = 115 -SDLK_EXECUTE = 116 -SDLK_HELP = 117 -SDLK_MENU = 118 -SDLK_SELECT = 119 -SDLK_STOP = 120 -SDLK_AGAIN = 121 -SDLK_UNDO = 122 -SDLK_CUT = 123 -SDLK_COPY = 124 -SDLK_PASTE = 125 -SDLK_FIND = 126 -SDLK_MUTE = 127 -SDLK_VOLUMEUP = 128 -SDLK_VOLUMEDOWN = 129 -SDLK_KP_COMMA = 133 -SDLK_KP_EQUALSAS400 = 134 -SDLK_INTERNATIONAL1 = 135 -SDLK_INTERNATIONAL2 = 136 -SDLK_INTERNATIONAL3 = 137 -SDLK_INTERNATIONAL4 = 138 -SDLK_INTERNATIONAL5 = 139 -SDLK_INTERNATIONAL6 = 140 -SDLK_INTERNATIONAL7 = 141 -SDLK_INTERNATIONAL8 = 142 -SDLK_INTERNATIONAL9 = 143 -SDLK_LANG1 = 144 -SDLK_LANG2 = 145 -SDLK_LANG3 = 146 -SDLK_LANG4 = 147 -SDLK_LANG5 = 148 -SDLK_LANG6 = 149 -SDLK_LANG7 = 150 -SDLK_LANG8 = 151 -SDLK_LANG9 = 152 -SDLK_ALTERASE = 153 -SDLK_SYSREQ = 154 -SDLK_CANCEL = 155 -SDLK_CLEAR = 156 -SDLK_PRIOR = 157 -SDLK_RETURN2 = 158 -SDLK_SEPARATOR = 159 -SDLK_OUT = 160 -SDLK_OPER = 161 -SDLK_CLEARAGAIN = 162 -SDLK_CRSEL = 163 -SDLK_EXSEL = 164 -SDLK_KP_00 = 176 -SDLK_KP_000 = 177 -SDLK_THOUSANDSSEPARATOR = 178 -SDLK_DECIMALSEPARATOR = 179 -SDLK_CURRENCYUNIT = 180 -SDLK_CURRENCYSUBUNIT = 181 -SDLK_KP_LEFTPAREN = 182 -SDLK_KP_RIGHTPAREN = 183 -SDLK_KP_LEFTBRACE = 184 -SDLK_KP_RIGHTBRACE = 185 -SDLK_KP_TAB = 186 -SDLK_KP_BACKSPACE = 187 -SDLK_KP_A = 188 -SDLK_KP_B = 189 -SDLK_KP_C = 190 -SDLK_KP_D = 191 -SDLK_KP_E = 192 -SDLK_KP_F = 193 -SDLK_KP_XOR = 194 -SDLK_KP_POWER = 195 -SDLK_KP_PERCENT = 196 -SDLK_KP_LESS = 197 -SDLK_KP_GREATER = 198 -SDLK_KP_AMPERSAND = 199 -SDLK_KP_DBLAMPERSAND = 200 -SDLK_KP_VERTICALBAR = 201 -SDLK_KP_DBLVERTICALBAR = 202 -SDLK_KP_COLON = 203 -SDLK_KP_HASH = 204 -SDLK_KP_SPACE = 205 -SDLK_KP_AT = 206 -SDLK_KP_EXCLAM = 207 -SDLK_KP_MEMSTORE = 208 -SDLK_KP_MEMRECALL = 209 -SDLK_KP_MEMCLEAR = 210 -SDLK_KP_MEMADD = 211 -SDLK_KP_MEMSUBTRACT = 212 -SDLK_KP_MEMMULTIPLY = 213 -SDLK_KP_MEMDIVIDE = 214 -SDLK_KP_PLUSMINUS = 215 -SDLK_KP_CLEAR = 216 -SDLK_KP_CLEARENTRY = 217 -SDLK_KP_BINARY = 218 -SDLK_KP_OCTAL = 219 -SDLK_KP_DECIMAL = 220 -SDLK_KP_HEXADECIMAL = 221 -SDLK_LCTRL = 224 -SDLK_LSHIFT = 225 -SDLK_LALT = 226 -SDLK_LGUI = 227 -SDLK_RCTRL = 228 -SDLK_RSHIFT = 229 -SDLK_RALT = 230 -SDLK_RGUI = 231 -SDLK_MODE = 257 -SDLK_AUDIONEXT = 258 -SDLK_AUDIOPREV = 259 -SDLK_AUDIOSTOP = 260 -SDLK_AUDIOPLAY = 261 -SDLK_AUDIOMUTE = 262 -SDLK_MEDIASELECT = 263 -SDLK_WWW = 264 -SDLK_MAIL = 265 -SDLK_CALCULATOR = 266 -SDLK_COMPUTER = 267 -SDLK_AC_SEARCH = 268 -SDLK_AC_HOME = 269 -SDLK_AC_BACK = 270 -SDLK_AC_FORWARD = 271 -SDLK_AC_STOP = 272 -SDLK_AC_REFRESH = 273 -SDLK_AC_BOOKMARKS = 274 -SDLK_BRIGHTNESSDOWN = 275 -SDLK_BRIGHTNESSUP = 276 -SDLK_DISPLAYSWITCH = 277 -SDLK_KBDILLUMTOGGLE = 278 -SDLK_KBDILLUMDOWN = 279 -SDLK_KBDILLUMUP = 280 -SDLK_EJECT = 281 -SDLK_SLEEP = 282 -SDLK_APP1 = 283 -SDLK_APP2 = 284 - --- not sure where this is defined it was copied from the man page -KMOD_NONE = 0x0000 -KMOD_LSHIFT = 0x0001 -KMOD_RSHIFT = 0x0002 -KMOD_LCTRL = 0x0040 -KMOD_RCTRL = 0x0080 -KMOD_LALT = 0x0100 -KMOD_RALT = 0x0200 -KMOD_LMETA = 0x0400 -KMOD_RMETA = 0x0800 -KMOD_NUM = 0x1000 -KMOD_CAPS = 0x2000 -KMOD_MODE = 0x4000 - -KMOD_CTRL = (KMOD_LCTRL+KMOD_RCTRL) -KMOD_SHIFT = (KMOD_LSHIFT+KMOD_RSHIFT) -KMOD_ALT = (KMOD_LALT+KMOD_RALT) -KMOD_META = (KMOD_LMETA+KMOD_RMETA) diff --git a/pkg/iceball/halp/main_client.lua b/pkg/iceball/halp/main_client.lua index c369913..f70785d 100644 --- a/pkg/iceball/halp/main_client.lua +++ b/pkg/iceball/halp/main_client.lua @@ -15,7 +15,7 @@ along with Ice Lua Components. If not, see . ]] -dofile("pkg/iceball/halp/lib_sdlkey.lua") +dofile("pkg/base/lib_sdlkey.lua") function string.split(s, sep, plain) local start = 1 diff --git a/pkg/iceball/launch/main_client.lua b/pkg/iceball/launch/main_client.lua index c4bc15c..c57a7a0 100644 --- a/pkg/iceball/launch/main_client.lua +++ b/pkg/iceball/launch/main_client.lua @@ -53,7 +53,7 @@ end -- Some libraries dofile("pkg/iceball/lib/font.lua") -dofile("pkg/iceball/lib/sdlkey.lua") +dofile("pkg/base/lib_sdlkey.lua") -- Some other stuff that needs done early local page = 0 diff --git a/pkg/iceball/lib/sdlkey.lua b/pkg/iceball/lib/sdlkey.lua deleted file mode 100644 index 5a3c4f2..0000000 --- a/pkg/iceball/lib/sdlkey.lua +++ /dev/null @@ -1,286 +0,0 @@ ---[[ - 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 -]] - ---[[ - part of SDL_scancode.h accurate as of SDL 2.0.3 -]] - -SDLK_UNKNOWN = 0 -SDLK_a = 4 -SDLK_b = 5 -SDLK_c = 6 -SDLK_d = 7 -SDLK_e = 8 -SDLK_f = 9 -SDLK_g = 10 -SDLK_h = 11 -SDLK_i = 12 -SDLK_j = 13 -SDLK_k = 14 -SDLK_l = 15 -SDLK_m = 16 -SDLK_n = 17 -SDLK_o = 18 -SDLK_p = 19 -SDLK_q = 20 -SDLK_r = 21 -SDLK_s = 22 -SDLK_t = 23 -SDLK_u = 24 -SDLK_v = 25 -SDLK_w = 26 -SDLK_x = 27 -SDLK_y = 28 -SDLK_z = 29 -SDLK_1 = 30 -SDLK_2 = 31 -SDLK_3 = 32 -SDLK_4 = 33 -SDLK_5 = 34 -SDLK_6 = 35 -SDLK_7 = 36 -SDLK_8 = 37 -SDLK_9 = 38 -SDLK_0 = 39 -SDLK_RETURN = 40 -SDLK_ESCAPE = 41 -SDLK_BACKSPACE = 42 -SDLK_TAB = 43 -SDLK_SPACE = 44 -SDLK_MINUS = 45 -SDLK_EQUALS = 46 -SDLK_LEFTBRACKET = 47 -SDLK_RIGHTBRACKET = 48 -SDLK_BACKSLASH = 49 -SDLK_NONUSHASH = 50 -SDLK_SEMICOLON = 51 -SDLK_APOSTROPHE = 52 -SDLK_GRAVE = 53 -SDLK_COMMA = 54 -SDLK_PERIOD = 55 -SDLK_SLASH = 56 -SDLK_CAPSLOCK = 57 -SDLK_F1 = 58 -SDLK_F2 = 59 -SDLK_F3 = 60 -SDLK_F4 = 61 -SDLK_F5 = 62 -SDLK_F6 = 63 -SDLK_F7 = 64 -SDLK_F8 = 65 -SDLK_F9 = 66 -SDLK_F10 = 67 -SDLK_F11 = 68 -SDLK_F12 = 69 -SDLK_PRINTSCREEN = 70 -SDLK_SCROLLLOCK = 71 -SDLK_PAUSE = 72 -SDLK_INSERT = 73 -SDLK_HOME = 74 -SDLK_PAGEUP = 75 -SDLK_DELETE = 76 -SDLK_END = 77 -SDLK_PAGEDOWN = 78 -SDLK_RIGHT = 79 -SDLK_LEFT = 80 -SDLK_DOWN = 81 -SDLK_UP = 82 -SDLK_NUMLOCKCLEAR = 83 -SDLK_KP_DIVIDE = 84 -SDLK_KP_MULTIPLY = 85 -SDLK_KP_MINUS = 86 -SDLK_KP_PLUS = 87 -SDLK_KP_ENTER = 88 -SDLK_KP_1 = 89 -SDLK_KP_2 = 90 -SDLK_KP_3 = 91 -SDLK_KP_4 = 92 -SDLK_KP_5 = 93 -SDLK_KP_6 = 94 -SDLK_KP_7 = 95 -SDLK_KP_8 = 96 -SDLK_KP_9 = 97 -SDLK_KP_0 = 98 -SDLK_KP_PERIOD = 99 -SDLK_NONUSBACKSLASH = 100 -SDLK_APPLICATION = 101 -SDLK_POWER = 102 -SDLK_KP_EQUALS = 103 -SDLK_F13 = 104 -SDLK_F14 = 105 -SDLK_F15 = 106 -SDLK_F16 = 107 -SDLK_F17 = 108 -SDLK_F18 = 109 -SDLK_F19 = 110 -SDLK_F20 = 111 -SDLK_F21 = 112 -SDLK_F22 = 113 -SDLK_F23 = 114 -SDLK_F24 = 115 -SDLK_EXECUTE = 116 -SDLK_HELP = 117 -SDLK_MENU = 118 -SDLK_SELECT = 119 -SDLK_STOP = 120 -SDLK_AGAIN = 121 -SDLK_UNDO = 122 -SDLK_CUT = 123 -SDLK_COPY = 124 -SDLK_PASTE = 125 -SDLK_FIND = 126 -SDLK_MUTE = 127 -SDLK_VOLUMEUP = 128 -SDLK_VOLUMEDOWN = 129 -SDLK_KP_COMMA = 133 -SDLK_KP_EQUALSAS400 = 134 -SDLK_INTERNATIONAL1 = 135 -SDLK_INTERNATIONAL2 = 136 -SDLK_INTERNATIONAL3 = 137 -SDLK_INTERNATIONAL4 = 138 -SDLK_INTERNATIONAL5 = 139 -SDLK_INTERNATIONAL6 = 140 -SDLK_INTERNATIONAL7 = 141 -SDLK_INTERNATIONAL8 = 142 -SDLK_INTERNATIONAL9 = 143 -SDLK_LANG1 = 144 -SDLK_LANG2 = 145 -SDLK_LANG3 = 146 -SDLK_LANG4 = 147 -SDLK_LANG5 = 148 -SDLK_LANG6 = 149 -SDLK_LANG7 = 150 -SDLK_LANG8 = 151 -SDLK_LANG9 = 152 -SDLK_ALTERASE = 153 -SDLK_SYSREQ = 154 -SDLK_CANCEL = 155 -SDLK_CLEAR = 156 -SDLK_PRIOR = 157 -SDLK_RETURN2 = 158 -SDLK_SEPARATOR = 159 -SDLK_OUT = 160 -SDLK_OPER = 161 -SDLK_CLEARAGAIN = 162 -SDLK_CRSEL = 163 -SDLK_EXSEL = 164 -SDLK_KP_00 = 176 -SDLK_KP_000 = 177 -SDLK_THOUSANDSSEPARATOR = 178 -SDLK_DECIMALSEPARATOR = 179 -SDLK_CURRENCYUNIT = 180 -SDLK_CURRENCYSUBUNIT = 181 -SDLK_KP_LEFTPAREN = 182 -SDLK_KP_RIGHTPAREN = 183 -SDLK_KP_LEFTBRACE = 184 -SDLK_KP_RIGHTBRACE = 185 -SDLK_KP_TAB = 186 -SDLK_KP_BACKSPACE = 187 -SDLK_KP_A = 188 -SDLK_KP_B = 189 -SDLK_KP_C = 190 -SDLK_KP_D = 191 -SDLK_KP_E = 192 -SDLK_KP_F = 193 -SDLK_KP_XOR = 194 -SDLK_KP_POWER = 195 -SDLK_KP_PERCENT = 196 -SDLK_KP_LESS = 197 -SDLK_KP_GREATER = 198 -SDLK_KP_AMPERSAND = 199 -SDLK_KP_DBLAMPERSAND = 200 -SDLK_KP_VERTICALBAR = 201 -SDLK_KP_DBLVERTICALBAR = 202 -SDLK_KP_COLON = 203 -SDLK_KP_HASH = 204 -SDLK_KP_SPACE = 205 -SDLK_KP_AT = 206 -SDLK_KP_EXCLAM = 207 -SDLK_KP_MEMSTORE = 208 -SDLK_KP_MEMRECALL = 209 -SDLK_KP_MEMCLEAR = 210 -SDLK_KP_MEMADD = 211 -SDLK_KP_MEMSUBTRACT = 212 -SDLK_KP_MEMMULTIPLY = 213 -SDLK_KP_MEMDIVIDE = 214 -SDLK_KP_PLUSMINUS = 215 -SDLK_KP_CLEAR = 216 -SDLK_KP_CLEARENTRY = 217 -SDLK_KP_BINARY = 218 -SDLK_KP_OCTAL = 219 -SDLK_KP_DECIMAL = 220 -SDLK_KP_HEXADECIMAL = 221 -SDLK_LCTRL = 224 -SDLK_LSHIFT = 225 -SDLK_LALT = 226 -SDLK_LGUI = 227 -SDLK_RCTRL = 228 -SDLK_RSHIFT = 229 -SDLK_RALT = 230 -SDLK_RGUI = 231 -SDLK_MODE = 257 -SDLK_AUDIONEXT = 258 -SDLK_AUDIOPREV = 259 -SDLK_AUDIOSTOP = 260 -SDLK_AUDIOPLAY = 261 -SDLK_AUDIOMUTE = 262 -SDLK_MEDIASELECT = 263 -SDLK_WWW = 264 -SDLK_MAIL = 265 -SDLK_CALCULATOR = 266 -SDLK_COMPUTER = 267 -SDLK_AC_SEARCH = 268 -SDLK_AC_HOME = 269 -SDLK_AC_BACK = 270 -SDLK_AC_FORWARD = 271 -SDLK_AC_STOP = 272 -SDLK_AC_REFRESH = 273 -SDLK_AC_BOOKMARKS = 274 -SDLK_BRIGHTNESSDOWN = 275 -SDLK_BRIGHTNESSUP = 276 -SDLK_DISPLAYSWITCH = 277 -SDLK_KBDILLUMTOGGLE = 278 -SDLK_KBDILLUMDOWN = 279 -SDLK_KBDILLUMUP = 280 -SDLK_EJECT = 281 -SDLK_SLEEP = 282 -SDLK_APP1 = 283 -SDLK_APP2 = 284 - --- not sure where this is defined it was copied from the man page -KMOD_NONE = 0x0000 -KMOD_LSHIFT = 0x0001 -KMOD_RSHIFT = 0x0002 -KMOD_LCTRL = 0x0040 -KMOD_RCTRL = 0x0080 -KMOD_LALT = 0x0100 -KMOD_RALT = 0x0200 -KMOD_LMETA = 0x0400 -KMOD_RMETA = 0x0800 -KMOD_NUM = 0x1000 -KMOD_CAPS = 0x2000 -KMOD_MODE = 0x4000 - -KMOD_CTRL = (KMOD_LCTRL+KMOD_RCTRL) -KMOD_SHIFT = (KMOD_LSHIFT+KMOD_RSHIFT) -KMOD_ALT = (KMOD_LALT+KMOD_RALT) -KMOD_META = (KMOD_LMETA+KMOD_RMETA) diff --git a/src/main.c b/src/main.c index 2258d68..9ef1026 100644 --- a/src/main.c +++ b/src/main.c @@ -179,6 +179,122 @@ void platform_deinit(void) { SDL_Quit(); } + +int remap_scancodes(int scancode) { + switch (scancode) { + case SDL_SCANCODE_UNKNOWN: return SDLK_UNKNOWN; + case SDL_SCANCODE_A: return SDLK_a; + case SDL_SCANCODE_B: return SDLK_b; + case SDL_SCANCODE_C: return SDLK_c; + case SDL_SCANCODE_D: return SDLK_d; + case SDL_SCANCODE_E: return SDLK_e; + case SDL_SCANCODE_F: return SDLK_f; + case SDL_SCANCODE_G: return SDLK_g; + case SDL_SCANCODE_H: return SDLK_h; + case SDL_SCANCODE_I: return SDLK_i; + case SDL_SCANCODE_J: return SDLK_j; + case SDL_SCANCODE_K: return SDLK_k; + case SDL_SCANCODE_L: return SDLK_l; + case SDL_SCANCODE_M: return SDLK_m; + case SDL_SCANCODE_N: return SDLK_n; + case SDL_SCANCODE_O: return SDLK_o; + case SDL_SCANCODE_P: return SDLK_p; + case SDL_SCANCODE_Q: return SDLK_q; + case SDL_SCANCODE_R: return SDLK_r; + case SDL_SCANCODE_S: return SDLK_s; + case SDL_SCANCODE_T: return SDLK_t; + case SDL_SCANCODE_U: return SDLK_u; + case SDL_SCANCODE_V: return SDLK_v; + case SDL_SCANCODE_W: return SDLK_w; + case SDL_SCANCODE_X: return SDLK_x; + case SDL_SCANCODE_Y: return SDLK_y; + case SDL_SCANCODE_Z: return SDLK_z; + case SDL_SCANCODE_1: return SDLK_1; + case SDL_SCANCODE_2: return SDLK_2; + case SDL_SCANCODE_3: return SDLK_3; + case SDL_SCANCODE_4: return SDLK_4; + case SDL_SCANCODE_5: return SDLK_5; + case SDL_SCANCODE_6: return SDLK_6; + case SDL_SCANCODE_7: return SDLK_7; + case SDL_SCANCODE_8: return SDLK_8; + case SDL_SCANCODE_9: return SDLK_9; + case SDL_SCANCODE_0: return SDLK_0; + case SDL_SCANCODE_RETURN: return SDLK_RETURN; + case SDL_SCANCODE_ESCAPE: return SDLK_ESCAPE; + case SDL_SCANCODE_BACKSPACE: return SDLK_BACKSPACE; + case SDL_SCANCODE_TAB: return SDLK_TAB; + case SDL_SCANCODE_SPACE: return SDLK_SPACE; + case SDL_SCANCODE_MINUS: return SDLK_MINUS; + case SDL_SCANCODE_EQUALS: return SDLK_EQUALS; + case SDL_SCANCODE_LEFTBRACKET: return SDLK_LEFTBRACKET; + case SDL_SCANCODE_RIGHTBRACKET: return SDLK_RIGHTBRACKET; + case SDL_SCANCODE_BACKSLASH: return SDLK_BACKSLASH; + case SDL_SCANCODE_SEMICOLON: return SDLK_SEMICOLON; + case SDL_SCANCODE_COMMA: return SDLK_COMMA; + case SDL_SCANCODE_PERIOD: return SDLK_PERIOD; + case SDL_SCANCODE_SLASH: return SDLK_SLASH; + case SDL_SCANCODE_CAPSLOCK: return 301 /* SDLK_CAPSLOCK */; + case SDL_SCANCODE_F1: return 282 /* SDLK_F1 */; + case SDL_SCANCODE_F2: return 283 /* SDLK_F2 */; + case SDL_SCANCODE_F3: return 284 /* SDLK_F3 */; + case SDL_SCANCODE_F4: return 285 /* SDLK_F4 */; + case SDL_SCANCODE_F5: return 286 /* SDLK_F5 */; + case SDL_SCANCODE_F6: return 287 /* SDLK_F6 */; + case SDL_SCANCODE_F7: return 288 /* SDLK_F7 */; + case SDL_SCANCODE_F8: return 289 /* SDLK_F8 */; + case SDL_SCANCODE_F9: return 290 /* SDLK_F9 */; + case SDL_SCANCODE_F10: return 291 /* SDLK_F10 */; + case SDL_SCANCODE_F11: return 292 /* SDLK_F11 */; + case SDL_SCANCODE_F12: return 293 /* SDLK_F12 */; + case SDL_SCANCODE_F13: return 294 /* SDLK_F13 */; + case SDL_SCANCODE_F14: return 295 /* SDLK_F14 */; + case SDL_SCANCODE_F15: return 296 /* SDLK_F15 */; + case SDL_SCANCODE_SCROLLLOCK: return 302 /* SDLK_SCROLLLOCK */; + case SDL_SCANCODE_PAUSE: return 19 /* SDLK_PAUSE */; + case SDL_SCANCODE_INSERT: return 277 /* SDLK_INSERT */; + case SDL_SCANCODE_HOME: return 278 /* SDLK_HOME */; + case SDL_SCANCODE_PAGEUP: return 280 /* SDLK_PAGEUP */; + case SDL_SCANCODE_DELETE: return 127 /* SDLK_DELETE */; + case SDL_SCANCODE_END: return 279 /* SDLK_END */; + case SDL_SCANCODE_PAGEDOWN: return 281 /* SDLK_PAGEDOWN */; + case SDL_SCANCODE_RIGHT: return 275 /* SDLK_RIGHT */; + case SDL_SCANCODE_LEFT: return 276 /* SDLK_LEFT */; + case SDL_SCANCODE_DOWN: return 274 /* SDLK_DOWN */; + case SDL_SCANCODE_UP: return 273 /* SDLK_UP */; + case SDL_SCANCODE_KP_DIVIDE: return 267 /* SDLK_KP_DIVIDE */; + case SDL_SCANCODE_KP_MULTIPLY: return 268 /* SDLK_KP_MULTIPLY */; + case SDL_SCANCODE_KP_MINUS: return 269 /* SDLK_KP_MINUS */; + case SDL_SCANCODE_KP_PLUS: return 270 /* SDLK_KP_PLUS */; + case SDL_SCANCODE_KP_ENTER: return 271 /* SDLK_KP_ENTER */; + case SDL_SCANCODE_KP_1: return 257 /* SDLK_KP_1 */; + case SDL_SCANCODE_KP_2: return 258 /* SDLK_KP_2 */; + case SDL_SCANCODE_KP_3: return 259 /* SDLK_KP_3 */; + case SDL_SCANCODE_KP_4: return 260 /* SDLK_KP_4 */; + case SDL_SCANCODE_KP_5: return 261 /* SDLK_KP_5 */; + case SDL_SCANCODE_KP_6: return 262 /* SDLK_KP_6 */; + case SDL_SCANCODE_KP_7: return 263 /* SDLK_KP_7 */; + case SDL_SCANCODE_KP_8: return 264 /* SDLK_KP_8 */; + case SDL_SCANCODE_KP_9: return 265 /* SDLK_KP_9 */; + case SDL_SCANCODE_KP_0: return 256 /* SDLK_KP_0 */; + case SDL_SCANCODE_KP_PERIOD: return 266 /* SDLK_KP_PERIOD */; + case SDL_SCANCODE_POWER: return 320 /* SDLK_POWER */; + case SDL_SCANCODE_KP_EQUALS: return 272 /* SDLK_KP_EQUALS */; + case SDL_SCANCODE_SYSREQ: return 317 /* SDLK_SYSREQ */; + case SDL_SCANCODE_HELP: return 315 /* SDLK_HELP */; + case SDL_SCANCODE_MENU: return 319 /* SDLK_MENU */; + case SDL_SCANCODE_UNDO: return 322 /* SDLK_UNDO */; + case SDL_SCANCODE_LCTRL: return 306 /* SDLK_LCTRL */; + case SDL_SCANCODE_LSHIFT: return 304 /* SDLK_LSHIFT */; + case SDL_SCANCODE_LALT: return 308 /* SDLK_LALT */; + case SDL_SCANCODE_LGUI: return 310 /* SDLK_LGUI */; + case SDL_SCANCODE_RCTRL: return 305 /* SDLK_RCTRL */; + case SDL_SCANCODE_RSHIFT: return 303 /* SDLK_RSHIFT */; + case SDL_SCANCODE_RALT: return 307 /* SDLK_RALT */; + case SDL_SCANCODE_RGUI: return 309 /* SDLK_RGUI */; + case SDL_SCANCODE_MODE: return 313 /* SDLK_MODE */; + default: return -1; + } +} #endif #if defined(DEDI) && defined(WIN32) @@ -274,7 +390,7 @@ static int ib_client_key_hook(SDL_Event ev) { return 0; } - int ch = ev.key.keysym.scancode; + int ch = remap_scancodes(ev.key.keysym.scancode); //if ((ev.key.keysym.unicode & 0xFF80) == 0) // ch = ev.key.keysym.unicode & 0x1FF;