diff --git a/similar/main/kconfig.cpp b/similar/main/kconfig.cpp index 165cf2f19..0702bf346 100644 --- a/similar/main/kconfig.cpp +++ b/similar/main/kconfig.cpp @@ -176,9 +176,9 @@ struct kc_menu : embed_window_pointer_t const struct player_config::KeySettings DefaultKeySettings{ /* Keyboard */ {{ #if defined(DXX_BUILD_DESCENT_I) - KEY_UP, KEY_PAD8, KEY_DOWN, KEY_PAD2, KEY_LEFT, KEY_PAD4, KEY_RIGHT, KEY_PAD6, KEY_LALT, 0xff, 0xff, KEY_PAD1, 0xff, KEY_PAD3, 0xff, KEY_PADMINUS, 0xff, KEY_PADPLUS, 0xff, 0xff, KEY_Q, KEY_PAD7, KEY_E, KEY_PAD9, KEY_LCTRL, KEY_RCTRL, KEY_SPACEBAR, 0xff, KEY_F, 0xff, KEY_A, 0xff, KEY_Z, 0xff, KEY_B, 0xff, KEY_R, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, KEY_TAB, 0xff, KEY_COMMA, 0x0, KEY_PERIOD, 0x0 + KEY_UP, KEY_PAD8, KEY_DOWN, KEY_PAD2, KEY_LEFT, KEY_PAD4, KEY_RIGHT, KEY_PAD6, KEY_LALT, 0xff, KEY_A, KEY_PAD1, KEY_D, KEY_PAD3, KEY_C, KEY_PADMINUS, KEY_X, KEY_PADPLUS, 0xff, 0xff, KEY_Q, KEY_PAD7, KEY_E, KEY_PAD9, KEY_LCTRL, KEY_RCTRL, KEY_SPACEBAR, 0xff, KEY_F, 0xff, KEY_W, 0xff, KEY_S, 0xff, KEY_B, 0xff, KEY_R, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, KEY_TAB, 0xff, KEY_COMMA, 0x0, KEY_PERIOD, 0x0 #elif defined(DXX_BUILD_DESCENT_II) - KEY_UP, KEY_PAD8, KEY_DOWN, KEY_PAD2, KEY_LEFT, KEY_PAD4, KEY_RIGHT, KEY_PAD6, KEY_LALT, 0xff, 0xff, KEY_PAD1, 0xff, KEY_PAD3, 0xff, KEY_PADMINUS, 0xff, KEY_PADPLUS, 0xff, 0xff, KEY_Q, KEY_PAD7, KEY_E, KEY_PAD9, KEY_LCTRL, KEY_RCTRL, KEY_SPACEBAR, 0xff, KEY_F, 0xff, KEY_A, 0xff, KEY_Z, 0xff, KEY_B, 0xff, KEY_R, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, KEY_TAB, 0xff, KEY_S, 0xff, KEY_COMMA, 0xff, KEY_PERIOD, 0xff, KEY_H, 0xff, KEY_T, 0xff, 0xff, 0xff, 0x0, 0x0 + KEY_UP, KEY_PAD8, KEY_DOWN, KEY_PAD2, KEY_LEFT, KEY_PAD4, KEY_RIGHT, KEY_PAD6, KEY_LALT, 0xff, KEY_A, KEY_PAD1, KEY_D, KEY_PAD3, KEY_C, KEY_PADMINUS, KEY_X, KEY_PADPLUS, 0xff, 0xff, KEY_Q, KEY_PAD7, KEY_E, KEY_PAD9, KEY_LCTRL, KEY_RCTRL, KEY_SPACEBAR, 0xff, KEY_F, 0xff, KEY_W, 0xff, KEY_S, 0xff, KEY_B, 0xff, KEY_R, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, KEY_TAB, 0xff, KEY_LSHIFT, 0xff, KEY_COMMA, 0xff, KEY_PERIOD, 0xff, KEY_H, 0xff, KEY_T, 0xff, 0xff, 0xff, 0x0, 0x0 #endif }}, #if DXX_MAX_JOYSTICKS diff --git a/unexpand-cpp-kconfig-key.py b/unexpand-cpp-kconfig-key.py deleted file mode 100644 index 97c2a0e0c..000000000 --- a/unexpand-cpp-kconfig-key.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python3 - -class ReverseMapping(dict): - def re_sub(self, match): - i = int(match.group(2), 16) - symbolic = self.get(i, self) - if symbolic is self: - return match.group(0) - return '{}{}{}'.format(match.group(1), symbolic, match.group(3)) - -def main(): - import re, sys - argv = sys.argv - if len(argv) != 2: - print('usage: {} '.format(argv[0]), file=sys.stderr) - sys.exit(1) - match = re.compile(r'#define\s+(KEY\w+)\s+(0x[0-9a-fA-F]{1,2})$').match - reverse_cpp_mapping = ReverseMapping() - with open(argv[1], 'rt') as key_header: - for line in key_header: - line = line.strip() - m = match(line) - if not m: - continue - i = int(m.group(2), 16) - reverse_cpp_mapping[i] = m.group(1) - sub = re.compile(r'(\s*)\b(0x[0-9a-fA-F]{1,2})\b(\s*)').sub - for line in sys.stdin: - print(','.join([sub(reverse_cpp_mapping.re_sub, field) for field in line.rstrip().split(',')])) - -if __name__ == '__main__': - main()