From 89ef310ec6085e01aa53790ce080192494a058c0 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Thu, 21 Apr 2011 21:22:46 +0200 Subject: [PATCH] Added SDLK_WORLD_** symbols to keyboard array to enable layout specific keys and make the game more flexible --- CHANGELOG.txt | 1 + arch/sdl/key.c | 194 ++++++++++++++++++++++++------------------------- 2 files changed, 98 insertions(+), 97 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 99ad0d854..8064d1144 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D2X-Rebirth Changelog 20110421 -------- main/net_ipx.c, main/net_udp.c: When leaving game and still sending extras, don't forget to update the timer so we won't get stuck in an infinite loop +arch/sdl/key.c: Added SDLK_WORLD_** symbols to keyboard array to enable layout specific keys and make the game more flexible 20110420 -------- diff --git a/arch/sdl/key.c b/arch/sdl/key.c index f6542cb67..d7b613c2c 100644 --- a/arch/sdl/key.c +++ b/arch/sdl/key.c @@ -131,7 +131,7 @@ key_props key_properties[256] = { { "", 255, -1 }, { "F11", 255, SDLK_F11 }, { "F12", 255, SDLK_F12 }, -{ "", 255, -1 }, +{ "", 255, -1 }, { "", 255, -1 }, // 90 { "", 255, -1 }, { "", 255, -1 }, @@ -140,58 +140,58 @@ key_props key_properties[256] = { { "", 255, -1 }, { "", 255, -1 }, { "PAUSE", 255, SDLK_PAUSE }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 100 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 110 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 120 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 130 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 140 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, +{ "W0", 255, SDLK_WORLD_0 }, +{ "W1", 255, SDLK_WORLD_1 }, +{ "W2", 255, SDLK_WORLD_2 }, // 100 +{ "W3", 255, SDLK_WORLD_3 }, +{ "W4", 255, SDLK_WORLD_4 }, +{ "W5", 255, SDLK_WORLD_5 }, +{ "W6", 255, SDLK_WORLD_6 }, +{ "W7", 255, SDLK_WORLD_7 }, +{ "W8", 255, SDLK_WORLD_8 }, +{ "W9", 255, SDLK_WORLD_9 }, +{ "W10", 255, SDLK_WORLD_10 }, +{ "W11", 255, SDLK_WORLD_11 }, +{ "W12", 255, SDLK_WORLD_12 }, // 110 +{ "W13", 255, SDLK_WORLD_13 }, +{ "W14", 255, SDLK_WORLD_14 }, +{ "W15", 255, SDLK_WORLD_15 }, +{ "W16", 255, SDLK_WORLD_16 }, +{ "W17", 255, SDLK_WORLD_17 }, +{ "W18", 255, SDLK_WORLD_18 }, +{ "W19", 255, SDLK_WORLD_19 }, +{ "W20", 255, SDLK_WORLD_20 }, +{ "W21", 255, SDLK_WORLD_21 }, +{ "W22", 255, SDLK_WORLD_22 }, // 120 +{ "W23", 255, SDLK_WORLD_23 }, +{ "W24", 255, SDLK_WORLD_24 }, +{ "W25", 255, SDLK_WORLD_25 }, +{ "W26", 255, SDLK_WORLD_26 }, +{ "W27", 255, SDLK_WORLD_27 }, +{ "W28", 255, SDLK_WORLD_28 }, +{ "W29", 255, SDLK_WORLD_29 }, +{ "W30", 255, SDLK_WORLD_30 }, +{ "W31", 255, SDLK_WORLD_31 }, +{ "W32", 255, SDLK_WORLD_32 }, // 130 +{ "W33", 255, SDLK_WORLD_33 }, +{ "W34", 255, SDLK_WORLD_34 }, +{ "W35", 255, SDLK_WORLD_35 }, +{ "W36", 255, SDLK_WORLD_36 }, +{ "W37", 255, SDLK_WORLD_37 }, +{ "W38", 255, SDLK_WORLD_38 }, +{ "W39", 255, SDLK_WORLD_39 }, +{ "W40", 255, SDLK_WORLD_40 }, +{ "W41", 255, SDLK_WORLD_41 }, +{ "W42", 255, SDLK_WORLD_42 }, // 140 +{ "W43", 255, SDLK_WORLD_43 }, +{ "W44", 255, SDLK_WORLD_44 }, +{ "W45", 255, SDLK_WORLD_45 }, +{ "W46", 255, SDLK_WORLD_46 }, +{ "W47", 255, SDLK_WORLD_47 }, +{ "W48", 255, SDLK_WORLD_48 }, +{ "W49", 255, SDLK_WORLD_49 }, +{ "W50", 255, SDLK_WORLD_50 }, +{ "W51", 255, SDLK_WORLD_51 }, { "", 255, -1 }, // 150 { "", 255, -1 }, { "", 255, -1 }, @@ -254,50 +254,50 @@ key_props key_properties[256] = { { "PGDN", 255, SDLK_PAGEDOWN }, { "INS", 255, SDLK_INSERT }, // 210 { "DEL", 255, SDLK_DELETE }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 220 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 230 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 240 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 250 -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, -{ "", 255, -1 }, // 255 +{ "W52", 255, SDLK_WORLD_52 }, +{ "W53", 255, SDLK_WORLD_53 }, +{ "W54", 255, SDLK_WORLD_54 }, +{ "W55", 255, SDLK_WORLD_55 }, +{ "W56", 255, SDLK_WORLD_56 }, +{ "W57", 255, SDLK_WORLD_57 }, +{ "W58", 255, SDLK_WORLD_58 }, +{ "W59", 255, SDLK_WORLD_59 }, +{ "W60", 255, SDLK_WORLD_60 }, // 220 +{ "W61", 255, SDLK_WORLD_61 }, +{ "W62", 255, SDLK_WORLD_62 }, +{ "W63", 255, SDLK_WORLD_63 }, +{ "W64", 255, SDLK_WORLD_64 }, +{ "W65", 255, SDLK_WORLD_65 }, +{ "W66", 255, SDLK_WORLD_66 }, +{ "W67", 255, SDLK_WORLD_67 }, +{ "W68", 255, SDLK_WORLD_68 }, +{ "W69", 255, SDLK_WORLD_69 }, +{ "W70", 255, SDLK_WORLD_70 }, // 230 +{ "W71", 255, SDLK_WORLD_71 }, +{ "W72", 255, SDLK_WORLD_72 }, +{ "W73", 255, SDLK_WORLD_73 }, +{ "W74", 255, SDLK_WORLD_74 }, +{ "W75", 255, SDLK_WORLD_75 }, +{ "W76", 255, SDLK_WORLD_76 }, +{ "W77", 255, SDLK_WORLD_77 }, +{ "W78", 255, SDLK_WORLD_78 }, +{ "W79", 255, SDLK_WORLD_79 }, +{ "W80", 255, SDLK_WORLD_80 }, // 240 +{ "W81", 255, SDLK_WORLD_81 }, +{ "W82", 255, SDLK_WORLD_82 }, +{ "W83", 255, SDLK_WORLD_83 }, +{ "W84", 255, SDLK_WORLD_84 }, +{ "W85", 255, SDLK_WORLD_85 }, +{ "W86", 255, SDLK_WORLD_86 }, +{ "W87", 255, SDLK_WORLD_87 }, +{ "W88", 255, SDLK_WORLD_88 }, +{ "W89", 255, SDLK_WORLD_89 }, +{ "W90", 255, SDLK_WORLD_90 }, // 250 +{ "W91", 255, SDLK_WORLD_91 }, +{ "W92", 255, SDLK_WORLD_92 }, +{ "W93", 255, SDLK_WORLD_93 }, +{ "W94", 255, SDLK_WORLD_94 }, +{ "W95", 255, SDLK_WORLD_95 }, // 255 }; typedef struct d_event_keycommand