From 6b3c9a549ac6ee368403d41e94433f0afd690494 Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Thu, 2 Jun 2022 23:30:11 +0700 Subject: [PATCH] use one version of doomkeys.h --- Source/doomkeys.h | 187 +++++++++++++++++++++++----------------- Source/g_game.c | 4 +- Source/hu_lib.c | 4 +- Source/hu_lib.h | 2 +- Source/hu_stuff.c | 20 ++--- Source/hu_stuff.h | 2 +- Source/i_video.c | 8 +- Source/m_input.c | 68 +++++++-------- Source/m_menu.c | 4 +- Source/m_misc.c | 76 ++++++++-------- textscreen/doomkeys.h | 154 --------------------------------- textscreen/textscreen.h | 2 +- 12 files changed, 205 insertions(+), 326 deletions(-) delete mode 100644 textscreen/doomkeys.h diff --git a/Source/doomkeys.h b/Source/doomkeys.h index 7ea8f50c..b6dd1420 100644 --- a/Source/doomkeys.h +++ b/Source/doomkeys.h @@ -19,102 +19,135 @@ #ifndef __DOOMKEYS__ #define __DOOMKEYS__ +// // DOOM keyboard definition. // This is the stuff configured by Setup.Exe. // Most key data are simple ascii (uppercased). +// +#define KEY_RIGHTARROW 0xae +#define KEY_LEFTARROW 0xac +#define KEY_UPARROW 0xad +#define KEY_DOWNARROW 0xaf +#define KEY_ESCAPE 27 +#define KEY_ENTER 13 +#define KEY_TAB 9 +#define KEY_F1 (0x80+0x3b) +#define KEY_F2 (0x80+0x3c) +#define KEY_F3 (0x80+0x3d) +#define KEY_F4 (0x80+0x3e) +#define KEY_F5 (0x80+0x3f) +#define KEY_F6 (0x80+0x40) +#define KEY_F7 (0x80+0x41) +#define KEY_F8 (0x80+0x42) +#define KEY_F9 (0x80+0x43) +#define KEY_F10 (0x80+0x44) +#define KEY_F11 (0x80+0x57) +#define KEY_F12 (0x80+0x58) -#define KEYD_RIGHTARROW 0xae -#define KEYD_LEFTARROW 0xac -#define KEYD_UPARROW 0xad -#define KEYD_DOWNARROW 0xaf -#define KEYD_ESCAPE 27 -#define KEYD_ENTER 13 -#define KEYD_TAB 9 -#define KEYD_F1 (0x80+0x3b) -#define KEYD_F2 (0x80+0x3c) -#define KEYD_F3 (0x80+0x3d) -#define KEYD_F4 (0x80+0x3e) -#define KEYD_F5 (0x80+0x3f) -#define KEYD_F6 (0x80+0x40) -#define KEYD_F7 (0x80+0x41) -#define KEYD_F8 (0x80+0x42) -#define KEYD_F9 (0x80+0x43) -#define KEYD_F10 (0x80+0x44) -#define KEYD_F11 (0x80+0x57) -#define KEYD_F12 (0x80+0x58) -#define KEYD_BACKSPACE 0x7f -#define KEYD_PAUSE 0xff -#define KEYD_EQUALS 0x3d -#define KEYD_MINUS 0x2d -#define KEYD_RSHIFT (0x80+0x36) -#define KEYD_RCTRL (0x80+0x1d) -#define KEYD_RALT (0x80+0x38) -#define KEYD_LALT KEYD_RALT +#define KEY_BACKSPACE 0x7f +#define KEY_PAUSE 0xff -// [FG] updated from Chocolate Doom 3.0 (src/doomkeys.h) +#define KEY_EQUALS 0x3d +#define KEY_MINUS 0x2d + +#define KEY_RSHIFT (0x80+0x36) +#define KEY_RCTRL (0x80+0x1d) +#define KEY_RALT (0x80+0x38) + +#define KEY_LALT KEY_RALT // new keys: -#define KEYD_CAPSLOCK (0x80+0x3a) -#define KEYD_NUMLOCK (0x80+0x45) -#define KEYD_SCRLCK (0x80+0x46) -#define KEYD_PRTSCR (0x80+0x59) +#define KEY_CAPSLOCK (0x80+0x3a) +#define KEY_NUMLOCK (0x80+0x45) +#define KEY_SCRLCK (0x80+0x46) +#define KEY_PRTSCR (0x80+0x59) -#define KEYD_HOME (0x80+0x47) -#define KEYD_END (0x80+0x4f) -#define KEYD_PGUP (0x80+0x49) -#define KEYD_PGDN (0x80+0x51) -#define KEYD_INS (0x80+0x52) -#define KEYD_DEL (0x80+0x53) +#define KEY_HOME (0x80+0x47) +#define KEY_END (0x80+0x4f) +#define KEY_PGUP (0x80+0x49) +#define KEY_PGDN (0x80+0x51) +#define KEY_INS (0x80+0x52) +#define KEY_DEL (0x80+0x53) -#define KEYP_0 KEYD_INS -#define KEYP_1 KEYD_END -#define KEYP_2 KEYD_DOWNARROW -#define KEYP_3 KEYD_PGDN -#define KEYP_4 KEYD_LEFTARROW +#define KEYP_0 KEY_INS +#define KEYP_1 KEY_END +#define KEYP_2 KEY_DOWNARROW +#define KEYP_3 KEY_PGDN +#define KEYP_4 KEY_LEFTARROW #define KEYP_5 (0x80+0x4c) -#define KEYP_6 KEYD_RIGHTARROW -#define KEYP_7 KEYD_HOME -#define KEYP_8 KEYD_UPARROW -#define KEYP_9 KEYD_PGUP +#define KEYP_6 KEY_RIGHTARROW +#define KEYP_7 KEY_HOME +#define KEYP_8 KEY_UPARROW +#define KEYP_9 KEY_PGUP #define KEYP_DIVIDE '/' #define KEYP_PLUS '+' #define KEYP_MINUS '-' #define KEYP_MULTIPLY '*' #define KEYP_PERIOD 0 -#define KEYP_EQUALS KEYD_EQUALS -#define KEYP_ENTER KEYD_ENTER +#define KEYP_EQUALS KEY_EQUALS +#define KEYP_ENTER KEY_ENTER -#define KEYD_SPACEBAR ' ' -#define KEYD_SCROLLLOCK KEYD_SCRLCK -#define KEYD_PAGEUP KEYD_PGUP -#define KEYD_PAGEDOWN KEYD_PGDN -#define KEYD_INSERT KEYD_INS +#define SCANCODE_TO_KEYS_ARRAY { \ + 0, 0, 0, 0, 'a', /* 0-9 */ \ + 'b', 'c', 'd', 'e', 'f', \ + 'g', 'h', 'i', 'j', 'k', /* 10-19 */ \ + 'l', 'm', 'n', 'o', 'p', \ + 'q', 'r', 's', 't', 'u', /* 20-29 */ \ + 'v', 'w', 'x', 'y', 'z', \ + '1', '2', '3', '4', '5', /* 30-39 */ \ + '6', '7', '8', '9', '0', \ + KEY_ENTER, KEY_ESCAPE, KEY_BACKSPACE, KEY_TAB, ' ', /* 40-49 */ \ + KEY_MINUS, KEY_EQUALS, '[', ']', '\\', \ + 0, ';', '\'', '`', ',', /* 50-59 */ \ + '.', '/', KEY_CAPSLOCK, KEY_F1, KEY_F2, \ + KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, /* 60-69 */ \ + KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, \ + KEY_PRTSCR, KEY_SCRLCK, KEY_PAUSE, KEY_INS, KEY_HOME, /* 70-79 */ \ + KEY_PGUP, KEY_DEL, KEY_END, KEY_PGDN, KEY_RIGHTARROW, \ + KEY_LEFTARROW, KEY_DOWNARROW, KEY_UPARROW, /* 80-89 */ \ + KEY_NUMLOCK, KEYP_DIVIDE, \ + KEYP_MULTIPLY, KEYP_MINUS, KEYP_PLUS, KEYP_ENTER, KEYP_1, \ + KEYP_2, KEYP_3, KEYP_4, KEYP_5, KEYP_6, /* 90-99 */ \ + KEYP_7, KEYP_8, KEYP_9, KEYP_0, KEYP_PERIOD, \ + 0, 0, 0, KEYP_EQUALS, /* 100-103 */ \ +} -#define SCANCODE_TO_KEYS_ARRAY { \ - 0, 0, 0, 0, 'a', /* 0-9 */ \ - 'b', 'c', 'd', 'e', 'f', \ - 'g', 'h', 'i', 'j', 'k', /* 10-19 */ \ - 'l', 'm', 'n', 'o', 'p', \ - 'q', 'r', 's', 't', 'u', /* 20-29 */ \ - 'v', 'w', 'x', 'y', 'z', \ - '1', '2', '3', '4', '5', /* 30-39 */ \ - '6', '7', '8', '9', '0', \ - KEYD_ENTER, KEYD_ESCAPE, KEYD_BACKSPACE, KEYD_TAB, ' ', /* 40-49 */ \ - KEYD_MINUS, KEYD_EQUALS, '[', ']', '\\', \ - 0, ';', '\'', '`', ',', /* 50-59 */ \ - '.', '/', KEYD_CAPSLOCK, KEYD_F1, KEYD_F2, \ - KEYD_F3, KEYD_F4, KEYD_F5, KEYD_F6, KEYD_F7, /* 60-69 */ \ - KEYD_F8, KEYD_F9, KEYD_F10, KEYD_F11, KEYD_F12, \ - KEYD_PRTSCR, KEYD_SCRLCK, KEYD_PAUSE, KEYD_INS, KEYD_HOME, /* 70-79 */ \ - KEYD_PGUP, KEYD_DEL, KEYD_END, KEYD_PGDN, KEYD_RIGHTARROW, \ - KEYD_LEFTARROW, KEYD_DOWNARROW, KEYD_UPARROW, /* 80-89 */ \ - KEYD_NUMLOCK, KEYP_DIVIDE, \ - KEYP_MULTIPLY, KEYP_MINUS, KEYP_PLUS, KEYP_ENTER, KEYP_1, \ - KEYP_2, KEYP_3, KEYP_4, KEYP_5, KEYP_6, /* 90-99 */ \ - KEYP_7, KEYP_8, KEYP_9, KEYP_0, KEYP_PERIOD, \ - 0, 0, 0, KEYP_EQUALS, /* 100-103 */ \ +// Default names for keys, to use in English or as fallback. +#define KEY_NAMES_ARRAY { \ + { KEY_BACKSPACE, "BACKSP" }, { KEY_TAB, "TAB" }, \ + { KEY_INS, "INS" }, { KEY_DEL, "DEL" }, \ + { KEY_PGUP, "PGUP" }, { KEY_PGDN, "PGDN" }, \ + { KEY_ENTER, "ENTER" }, { KEY_ESCAPE, "ESC" }, \ + { KEY_F1, "F1" }, { KEY_F2, "F2" }, \ + { KEY_F3, "F3" }, { KEY_F4, "F4" }, \ + { KEY_F5, "F5" }, { KEY_F6, "F6" }, \ + { KEY_F7, "F7" }, { KEY_F8, "F8" }, \ + { KEY_F9, "F9" }, { KEY_F10, "F10" }, \ + { KEY_F11, "F11" }, { KEY_F12, "F12" }, \ + { KEY_HOME, "HOME" }, { KEY_END, "END" }, \ + { KEY_MINUS, "-" }, { KEY_EQUALS, "=" }, \ + { KEY_NUMLOCK, "NUMLCK" }, { KEY_SCRLCK, "SCRLCK" }, \ + { KEY_PAUSE, "PAUSE" }, { KEY_PRTSCR, "PRTSC" }, \ + { KEY_UPARROW, "UP" }, { KEY_DOWNARROW, "DOWN" }, \ + { KEY_LEFTARROW, "LEFT" }, { KEY_RIGHTARROW, "RIGHT" }, \ + { KEY_RALT, "ALT" }, { KEY_LALT, "ALT" }, \ + { KEY_RSHIFT, "SHIFT" }, { KEY_CAPSLOCK, "CAPS" }, \ + { KEY_RCTRL, "CTRL" }, { KEYP_5, "NUM5" }, \ + { ' ', "SPACE" }, \ + { 'a', "A" }, { 'b', "B" }, { 'c', "C" }, { 'd', "D" }, \ + { 'e', "E" }, { 'f', "F" }, { 'g', "G" }, { 'h', "H" }, \ + { 'i', "I" }, { 'j', "J" }, { 'k', "K" }, { 'l', "L" }, \ + { 'm', "M" }, { 'n', "N" }, { 'o', "O" }, { 'p', "P" }, \ + { 'q', "Q" }, { 'r', "R" }, { 's', "S" }, { 't', "T" }, \ + { 'u', "U" }, { 'v', "V" }, { 'w', "W" }, { 'x', "X" }, \ + { 'y', "Y" }, { 'z', "Z" }, { '0', "0" }, { '1', "1" }, \ + { '2', "2" }, { '3', "3" }, { '4', "4" }, { '5', "5" }, \ + { '6', "6" }, { '7', "7" }, { '8', "8" }, { '9', "9" }, \ + { '[', "[" }, { ']', "]" }, { ';', ";" }, { '`', "`" }, \ + { ',', "," }, { '.', "." }, { '/', "/" }, { '\\', "\\" }, \ + { '\'', "\'" }, \ } enum diff --git a/Source/g_game.c b/Source/g_game.c index 2bc60699..732f5817 100644 --- a/Source/g_game.c +++ b/Source/g_game.c @@ -133,8 +133,8 @@ int default_complevel; // // controls (have defaults) // -int key_escape = KEYD_ESCAPE; // phares 4/13/98 -int key_help = KEYD_F1; // phares 4/13/98 +int key_escape = KEY_ESCAPE; // phares 4/13/98 +int key_help = KEY_F1; // phares 4/13/98 // [FG] double click acts as "use" int dclick_use; // [FG] invert vertical axis diff --git a/Source/hu_lib.c b/Source/hu_lib.c index d22cbdbc..68be2bd0 100644 --- a/Source/hu_lib.c +++ b/Source/hu_lib.c @@ -574,10 +574,10 @@ boolean HUlib_keyInIText(hu_itext_t *it, unsigned char ch) if (ch >= ' ' && ch <= '_') HUlib_addCharToTextLine(&it->l, (char) ch); else - if (ch == KEYD_BACKSPACE) // phares + if (ch == KEY_BACKSPACE) // phares HUlib_delCharFromIText(it); else - if (ch != KEYD_ENTER) // phares + if (ch != KEY_ENTER) // phares return false; // did not eat key return true; // ate the key } diff --git a/Source/hu_lib.h b/Source/hu_lib.h index 5901f35c..ed00ef7e 100644 --- a/Source/hu_lib.h +++ b/Source/hu_lib.h @@ -39,7 +39,7 @@ #define FG 0 // font stuff -// #define HU_CHARERASE KEYD_BACKSPACE // not used // phares +// #define HU_CHARERASE KEY_BACKSPACE // not used // phares #define HU_MAXLINES 4 #define HU_MAXLINELENGTH 80 diff --git a/Source/hu_stuff.c b/Source/hu_stuff.c index 50a351e2..e696f7f8 100644 --- a/Source/hu_stuff.c +++ b/Source/hu_stuff.c @@ -1697,7 +1697,7 @@ void HU_Ticker(void) // wait a few tics before sending a backspace character if (bsdown && bscounter++ > 9) { - HUlib_keyInIText(&w_chat, KEYD_BACKSPACE); + HUlib_keyInIText(&w_chat, KEY_BACKSPACE); bscounter = 8; } @@ -1784,7 +1784,7 @@ void HU_Ticker(void) if (c >= 'a' && c <= 'z') c = (char) shiftxform[(unsigned char) c]; rc = HUlib_keyInIText(&w_inputbuffer[i], c); - if (rc && c == KEYD_ENTER) + if (rc && c == KEY_ENTER) { if (w_inputbuffer[i].l.len && (chat_dest[i] == consoleplayer+1 @@ -1944,13 +1944,13 @@ boolean HU_Responder(event_t *ev) for (i=0 ; idata1 == KEYD_RSHIFT) + if (ev->data1 == KEY_RSHIFT) { shiftdown = ev->type == ev_keydown; return false; } - if (ev->data1 == KEYD_RALT) + if (ev->data1 == KEY_RALT) { altdown = ev->type == ev_keydown; return false; @@ -1960,7 +1960,7 @@ boolean HU_Responder(event_t *ev) { bsdown = true; bscounter = 0; - c = KEYD_BACKSPACE; + c = KEY_BACKSPACE; } else if (M_InputDeactivated(input_chat_backspace)) { @@ -2030,7 +2030,7 @@ boolean HU_Responder(event_t *ev) { if (M_InputActivated(input_chat_enter)) { - c = KEYD_ENTER; + c = KEY_ENTER; } // send a macro @@ -2043,12 +2043,12 @@ boolean HU_Responder(event_t *ev) macromessage = chat_macros[c]; // kill last message with a '\n' - HU_queueChatChar(KEYD_ENTER); // DEBUG!!! // phares + HU_queueChatChar(KEY_ENTER); // DEBUG!!! // phares // send the macro message while (*macromessage) HU_queueChatChar(*macromessage++); - HU_queueChatChar(KEYD_ENTER); // phares + HU_queueChatChar(KEY_ENTER); // phares // leave chat mode and notify that it was sent chat_on = false; @@ -2064,7 +2064,7 @@ boolean HU_Responder(event_t *ev) if (eatkey) HU_queueChatChar(c); - if (c == KEYD_ENTER) // phares + if (c == KEY_ENTER) // phares { chat_on = false; if (w_chat.l.len) @@ -2074,7 +2074,7 @@ boolean HU_Responder(event_t *ev) } } else - if (c == KEYD_ESCAPE) // phares + if (c == KEY_ESCAPE) // phares chat_on = false; } } diff --git a/Source/hu_stuff.h b/Source/hu_stuff.h index 5c993966..6c2b2ab6 100644 --- a/Source/hu_stuff.h +++ b/Source/hu_stuff.h @@ -39,7 +39,7 @@ #define HU_BROADCAST 5 -//#define HU_MSGREFRESH KEYD_ENTER // phares +//#define HU_MSGREFRESH KEY_ENTER // phares #define HU_MSGX (0 - WIDESCREENDELTA) #define HU_MSGY 0 #define HU_MSGWIDTH 64 /* in characters */ diff --git a/Source/i_video.c b/Source/i_video.c index 54bc7c10..b609f717 100644 --- a/Source/i_video.c +++ b/Source/i_video.c @@ -397,17 +397,17 @@ static int TranslateKey(SDL_Keysym *sym) { case SDL_SCANCODE_LCTRL: case SDL_SCANCODE_RCTRL: - return KEYD_RCTRL; + return KEY_RCTRL; case SDL_SCANCODE_LSHIFT: case SDL_SCANCODE_RSHIFT: - return KEYD_RSHIFT; + return KEY_RSHIFT; case SDL_SCANCODE_LALT: - return KEYD_LALT; + return KEY_LALT; case SDL_SCANCODE_RALT: - return KEYD_RALT; + return KEY_RALT; default: if (scancode >= 0 && scancode < arrlen(scancode_translate_table)) diff --git a/Source/m_input.c b/Source/m_input.c index 85567155..6c3f40f4 100644 --- a/Source/m_input.c +++ b/Source/m_input.c @@ -277,40 +277,40 @@ struct const char* name; } key_names[] = { { 0, "none" }, - { KEYD_TAB, "tab" }, - { KEYD_ENTER, "enter" }, - { KEYD_ESCAPE, "esc" }, - { KEYD_SPACEBAR, "spacebar" }, - { KEYD_BACKSPACE, "backspace" }, - { KEYD_RCTRL, "ctrl" }, - { KEYD_LEFTARROW, "leftarrow" }, - { KEYD_UPARROW, "uparrow" }, - { KEYD_RIGHTARROW, "rightarrow" }, - { KEYD_DOWNARROW, "downarrow" }, - { KEYD_RSHIFT, "shift"}, - { KEYD_RALT, "alt" }, - { KEYD_CAPSLOCK, "capslock" }, - { KEYD_F1, "f1" }, - { KEYD_F2, "f2" }, - { KEYD_F3, "f3" }, - { KEYD_F4, "f4" }, - { KEYD_F5, "f5" }, - { KEYD_F6, "f6" }, - { KEYD_F7, "f7" }, - { KEYD_F8, "f8" }, - { KEYD_F9, "f9" }, - { KEYD_F10, "f10" }, - { KEYD_F11, "f11" }, - { KEYD_F12, "f12" }, - { KEYD_SCROLLLOCK, "scrolllock" }, - { KEYD_HOME, "home" }, - { KEYD_PAGEUP, "pageup" }, - { KEYD_END, "end" }, - { KEYD_PAGEDOWN, "pagedown" }, - { KEYD_INSERT, "insert" }, - { KEYD_PAUSE, "pause" }, - { KEYD_DEL, "del" }, - { KEYD_PRTSCR, "prtscr" } + { KEY_TAB, "tab" }, + { KEY_ENTER, "enter" }, + { KEY_ESCAPE, "esc" }, + { ' ', "spacebar" }, + { KEY_BACKSPACE, "backspace" }, + { KEY_RCTRL, "ctrl" }, + { KEY_LEFTARROW, "leftarrow" }, + { KEY_UPARROW, "uparrow" }, + { KEY_RIGHTARROW, "rightarrow" }, + { KEY_DOWNARROW, "downarrow" }, + { KEY_RSHIFT, "shift"}, + { KEY_RALT, "alt" }, + { KEY_CAPSLOCK, "capslock" }, + { KEY_F1, "f1" }, + { KEY_F2, "f2" }, + { KEY_F3, "f3" }, + { KEY_F4, "f4" }, + { KEY_F5, "f5" }, + { KEY_F6, "f6" }, + { KEY_F7, "f7" }, + { KEY_F8, "f8" }, + { KEY_F9, "f9" }, + { KEY_F10, "f10" }, + { KEY_F11, "f11" }, + { KEY_F12, "f12" }, + { KEY_SCRLCK, "scrolllock" }, + { KEY_HOME, "home" }, + { KEY_PGUP, "pageup" }, + { KEY_END, "end" }, + { KEY_PGDN, "pagedown" }, + { KEY_INS, "insert" }, + { KEY_PAUSE, "pause" }, + { KEY_DEL, "del" }, + { KEY_PRTSCR, "prtscr" } }; struct diff --git a/Source/m_menu.c b/Source/m_menu.c index 804bea14..fdf17306 100644 --- a/Source/m_menu.c +++ b/Source/m_menu.c @@ -4912,11 +4912,11 @@ boolean M_Responder (event_t* ev) if (ev->type == ev_keydown) { ch = ev->data1; // phares 4/11/98: - if (ch == KEYD_RSHIFT) // For chat string processing, need + if (ch == KEY_RSHIFT) // For chat string processing, need shiftdown = true; // to know when shift key is up or } // down so you can get at the !,#, else if (ev->type == ev_keyup) // etc. keys. Keydowns are allowed - if (ev->data1 == KEYD_RSHIFT) // past this point, but keyups aren't + if (ev->data1 == KEY_RSHIFT) // past this point, but keyups aren't shiftdown = false; // so we need to note the difference } // here using the 'shiftdown' boolean. diff --git a/Source/m_misc.c b/Source/m_misc.c index 12863097..32a87d82 100644 --- a/Source/m_misc.c +++ b/Source/m_misc.c @@ -751,7 +751,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to turn right", - input_turnright, { {input_type_key, KEYD_RIGHTARROW} } + input_turnright, { {input_type_key, KEY_RIGHTARROW} } }, { @@ -759,7 +759,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to turn left", - input_turnleft, { {input_type_key, KEYD_LEFTARROW} } + input_turnleft, { {input_type_key, KEY_LEFTARROW} } }, { @@ -767,7 +767,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move forward", - input_forward, { {input_type_key, 'w'}, {input_type_key, KEYD_UPARROW} } + input_forward, { {input_type_key, 'w'}, {input_type_key, KEY_UPARROW} } }, { @@ -775,7 +775,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move backward", - input_backward, { {input_type_key, 's'}, {input_type_key, KEYD_DOWNARROW} } + input_backward, { {input_type_key, 's'}, {input_type_key, KEY_DOWNARROW} } }, { @@ -791,7 +791,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move right in a menu", - input_menu_right, { {input_type_key, KEYD_RIGHTARROW}, + input_menu_right, { {input_type_key, KEY_RIGHTARROW}, {input_type_joyb, CONTROLLER_DPAD_RIGHT}, {input_type_joyb, CONTROLLER_LEFT_STICK_RIGHT} } }, @@ -800,7 +800,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move left in a menu", - input_menu_left, { {input_type_key, KEYD_LEFTARROW}, + input_menu_left, { {input_type_key, KEY_LEFTARROW}, {input_type_joyb, CONTROLLER_DPAD_LEFT}, {input_type_joyb, CONTROLLER_LEFT_STICK_LEFT} } }, @@ -810,7 +810,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move up in a menu", - input_menu_up, { {input_type_key, KEYD_UPARROW}, + input_menu_up, { {input_type_key, KEY_UPARROW}, {input_type_joyb, CONTROLLER_DPAD_UP}, {input_type_joyb, CONTROLLER_LEFT_STICK_UP} } }, @@ -820,7 +820,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to move down in a menu", - input_menu_down, { {input_type_key, KEYD_DOWNARROW}, + input_menu_down, { {input_type_key, KEY_DOWNARROW}, {input_type_joyb, CONTROLLER_DPAD_DOWN}, {input_type_joyb, CONTROLLER_LEFT_STICK_DOWN} } }, @@ -830,7 +830,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to erase last character typed in a menu", - input_menu_backspace, { {input_type_key, KEYD_BACKSPACE}, + input_menu_backspace, { {input_type_key, KEY_BACKSPACE}, {input_type_joyb, CONTROLLER_B} } }, @@ -839,7 +839,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to leave a menu", - input_menu_escape, { {input_type_key, KEYD_ESCAPE}, + input_menu_escape, { {input_type_key, KEY_ESCAPE}, {input_type_joyb, CONTROLLER_START} } }, // phares 3/7/98 @@ -848,7 +848,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to select from menu or review past messages", - input_menu_enter, { {input_type_key, KEYD_ENTER}, + input_menu_enter, { {input_type_key, KEY_ENTER}, {input_type_joyb, CONTROLLER_A} } }, @@ -858,7 +858,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to clear a key binding", - input_menu_clear, { {input_type_key, KEYD_DEL} } + input_menu_clear, { {input_type_key, KEY_DEL} } }, // [FG] reload current level / go to next level @@ -939,7 +939,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to fire current weapon", - input_fire, { {input_type_key, KEYD_RCTRL}, + input_fire, { {input_type_key, KEY_RCTRL}, {input_type_mouseb, MOUSE_BUTTON_LEFT}, {input_type_joyb, CONTROLLER_RIGHT_TRIGGER} } }, @@ -958,7 +958,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to use with arrows to strafe", - input_strafe, { {input_type_key, KEYD_RALT}, + input_strafe, { {input_type_key, KEY_RALT}, {input_type_mouseb, MOUSE_BUTTON_RIGHT} } }, @@ -967,7 +967,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to run (move fast)", - input_speed, { {input_type_key, KEYD_RSHIFT} } + input_speed, { {input_type_key, KEY_RSHIFT} } }, { @@ -975,7 +975,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to save current game", - input_savegame, { {input_type_key, KEYD_F2} } + input_savegame, { {input_type_key, KEY_F2} } }, { @@ -983,7 +983,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to restore from saved games", - input_loadgame, { {input_type_key, KEYD_F3} } + input_loadgame, { {input_type_key, KEY_F3} } }, { @@ -991,7 +991,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to bring up sound control panel", - input_soundvolume, { {input_type_key, KEYD_F4} } + input_soundvolume, { {input_type_key, KEY_F4} } }, { @@ -999,7 +999,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to adjust heads up display mode", - input_hud, { {input_type_key, KEYD_F5} } + input_hud, { {input_type_key, KEY_F5} } }, { @@ -1007,7 +1007,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to to save to last slot saved", - input_quicksave, { {input_type_key, KEYD_F6} } + input_quicksave, { {input_type_key, KEY_F6} } }, { @@ -1015,7 +1015,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to end the game", - input_endgame, { {input_type_key, KEYD_F7} } + input_endgame, { {input_type_key, KEY_F7} } }, { @@ -1023,7 +1023,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to toggle message enable", - input_messages, { {input_type_key, KEYD_F8} } + input_messages, { {input_type_key, KEY_F8} } }, { @@ -1031,7 +1031,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to load from quick saved game", - input_quickload, { {input_type_key, KEYD_F9} } + input_quickload, { {input_type_key, KEY_F9} } }, { @@ -1039,7 +1039,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to quit game to DOS", - input_quit, { {input_type_key, KEYD_F10} } + input_quit, { {input_type_key, KEY_F10} } }, { @@ -1047,7 +1047,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to adjust screen brightness (gamma correction)", - input_gamma, { {input_type_key, KEYD_F11} } + input_gamma, { {input_type_key, KEY_F11} } }, { @@ -1055,7 +1055,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to view from another player's vantage", - input_spy, { {input_type_key, KEYD_F12} } + input_spy, { {input_type_key, KEY_F12} } }, { @@ -1063,7 +1063,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to pause the game", - input_pause, { {input_type_key, KEYD_PAUSE} } + input_pause, { {input_type_key, KEY_PAUSE} } }, { @@ -1071,7 +1071,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to toggle always run mode", - input_autorun, { {input_type_key, KEYD_CAPSLOCK}, + input_autorun, { {input_type_key, KEY_CAPSLOCK}, {input_type_joyb, CONTROLLER_LEFT_STICK} } }, @@ -1096,7 +1096,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to erase last character typed", - input_chat_backspace, { {input_type_key, KEYD_BACKSPACE} } + input_chat_backspace, { {input_type_key, KEY_BACKSPACE} } }, { @@ -1104,7 +1104,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to select from menu or review past messages", - input_chat_enter, { {input_type_key, KEYD_ENTER} } + input_chat_enter, { {input_type_key, KEY_ENTER} } }, { @@ -1112,7 +1112,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to toggle automap display", - input_map, { {input_type_key, KEYD_TAB}, + input_map, { {input_type_key, KEY_TAB}, {input_type_joyb, CONTROLLER_Y} } }, @@ -1121,7 +1121,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to shift automap right", - input_map_right, { {input_type_key, KEYD_RIGHTARROW} } + input_map_right, { {input_type_key, KEY_RIGHTARROW} } }, { @@ -1129,7 +1129,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to shift automap left", - input_map_left, { {input_type_key, KEYD_LEFTARROW} } + input_map_left, { {input_type_key, KEY_LEFTARROW} } }, { @@ -1137,7 +1137,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to shift automap up", - input_map_up, { {input_type_key, KEYD_UPARROW} } + input_map_up, { {input_type_key, KEY_UPARROW} } }, { @@ -1145,7 +1145,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to shift automap down", - input_map_down, { {input_type_key, KEYD_DOWNARROW} } + input_map_down, { {input_type_key, KEY_DOWNARROW} } }, { @@ -1382,7 +1382,7 @@ default_t defaults[] = { NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, "key to take a screenshot (devparm independent)", - input_screenshot, { {input_type_key, KEYD_PRTSCR} } + input_screenshot, { {input_type_key, KEY_PRTSCR} } }, { // HOME key // killough 10/98: shortcut to setup menu @@ -2707,8 +2707,8 @@ void M_LoadDefaults (void) // special fallback input values { - input_value_t fallback_help = {input_type_key, KEYD_F1}; - input_value_t fallback_escape = {input_type_key, KEYD_ESCAPE}; + input_value_t fallback_help = {input_type_key, KEY_F1}; + input_value_t fallback_escape = {input_type_key, KEY_ESCAPE}; M_InputAdd(input_help, fallback_help); M_InputAdd(input_escape, fallback_escape); diff --git a/textscreen/doomkeys.h b/textscreen/doomkeys.h deleted file mode 100644 index 42b17293..00000000 --- a/textscreen/doomkeys.h +++ /dev/null @@ -1,154 +0,0 @@ -// -// Copyright(C) 1993-1996 Id Software, Inc. -// Copyright(C) 2005-2014 Simon Howard -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program 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 General Public License for more details. -// -// DESCRIPTION: -// Key definitions -// - -#ifndef __DOOMKEYS__ -#define __DOOMKEYS__ - -// -// DOOM keyboard definition. -// This is the stuff configured by Setup.Exe. -// Most key data are simple ascii (uppercased). -// -#define KEY_RIGHTARROW 0xae -#define KEY_LEFTARROW 0xac -#define KEY_UPARROW 0xad -#define KEY_DOWNARROW 0xaf -#define KEY_ESCAPE 27 -#define KEY_ENTER 13 -#define KEY_TAB 9 -#define KEY_F1 (0x80+0x3b) -#define KEY_F2 (0x80+0x3c) -#define KEY_F3 (0x80+0x3d) -#define KEY_F4 (0x80+0x3e) -#define KEY_F5 (0x80+0x3f) -#define KEY_F6 (0x80+0x40) -#define KEY_F7 (0x80+0x41) -#define KEY_F8 (0x80+0x42) -#define KEY_F9 (0x80+0x43) -#define KEY_F10 (0x80+0x44) -#define KEY_F11 (0x80+0x57) -#define KEY_F12 (0x80+0x58) - -#define KEY_BACKSPACE 0x7f -#define KEY_PAUSE 0xff - -#define KEY_EQUALS 0x3d -#define KEY_MINUS 0x2d - -#define KEY_RSHIFT (0x80+0x36) -#define KEY_RCTRL (0x80+0x1d) -#define KEY_RALT (0x80+0x38) - -#define KEY_LALT KEY_RALT - -// new keys: - -#define KEY_CAPSLOCK (0x80+0x3a) -#define KEY_NUMLOCK (0x80+0x45) -#define KEY_SCRLCK (0x80+0x46) -#define KEY_PRTSCR (0x80+0x59) - -#define KEY_HOME (0x80+0x47) -#define KEY_END (0x80+0x4f) -#define KEY_PGUP (0x80+0x49) -#define KEY_PGDN (0x80+0x51) -#define KEY_INS (0x80+0x52) -#define KEY_DEL (0x80+0x53) - -#define KEYP_0 KEY_INS -#define KEYP_1 KEY_END -#define KEYP_2 KEY_DOWNARROW -#define KEYP_3 KEY_PGDN -#define KEYP_4 KEY_LEFTARROW -#define KEYP_5 (0x80+0x4c) -#define KEYP_6 KEY_RIGHTARROW -#define KEYP_7 KEY_HOME -#define KEYP_8 KEY_UPARROW -#define KEYP_9 KEY_PGUP - -#define KEYP_DIVIDE '/' -#define KEYP_PLUS '+' -#define KEYP_MINUS '-' -#define KEYP_MULTIPLY '*' -#define KEYP_PERIOD 0 -#define KEYP_EQUALS KEY_EQUALS -#define KEYP_ENTER KEY_ENTER - -#define SCANCODE_TO_KEYS_ARRAY { \ - 0, 0, 0, 0, 'a', /* 0-9 */ \ - 'b', 'c', 'd', 'e', 'f', \ - 'g', 'h', 'i', 'j', 'k', /* 10-19 */ \ - 'l', 'm', 'n', 'o', 'p', \ - 'q', 'r', 's', 't', 'u', /* 20-29 */ \ - 'v', 'w', 'x', 'y', 'z', \ - '1', '2', '3', '4', '5', /* 30-39 */ \ - '6', '7', '8', '9', '0', \ - KEY_ENTER, KEY_ESCAPE, KEY_BACKSPACE, KEY_TAB, ' ', /* 40-49 */ \ - KEY_MINUS, KEY_EQUALS, '[', ']', '\\', \ - 0, ';', '\'', '`', ',', /* 50-59 */ \ - '.', '/', KEY_CAPSLOCK, KEY_F1, KEY_F2, \ - KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, /* 60-69 */ \ - KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, \ - KEY_PRTSCR, KEY_SCRLCK, KEY_PAUSE, KEY_INS, KEY_HOME, /* 70-79 */ \ - KEY_PGUP, KEY_DEL, KEY_END, KEY_PGDN, KEY_RIGHTARROW, \ - KEY_LEFTARROW, KEY_DOWNARROW, KEY_UPARROW, /* 80-89 */ \ - KEY_NUMLOCK, KEYP_DIVIDE, \ - KEYP_MULTIPLY, KEYP_MINUS, KEYP_PLUS, KEYP_ENTER, KEYP_1, \ - KEYP_2, KEYP_3, KEYP_4, KEYP_5, KEYP_6, /* 90-99 */ \ - KEYP_7, KEYP_8, KEYP_9, KEYP_0, KEYP_PERIOD, \ - 0, 0, 0, KEYP_EQUALS, /* 100-103 */ \ -} - -// Default names for keys, to use in English or as fallback. -#define KEY_NAMES_ARRAY { \ - { KEY_BACKSPACE, "BACKSP" }, { KEY_TAB, "TAB" }, \ - { KEY_INS, "INS" }, { KEY_DEL, "DEL" }, \ - { KEY_PGUP, "PGUP" }, { KEY_PGDN, "PGDN" }, \ - { KEY_ENTER, "ENTER" }, { KEY_ESCAPE, "ESC" }, \ - { KEY_F1, "F1" }, { KEY_F2, "F2" }, \ - { KEY_F3, "F3" }, { KEY_F4, "F4" }, \ - { KEY_F5, "F5" }, { KEY_F6, "F6" }, \ - { KEY_F7, "F7" }, { KEY_F8, "F8" }, \ - { KEY_F9, "F9" }, { KEY_F10, "F10" }, \ - { KEY_F11, "F11" }, { KEY_F12, "F12" }, \ - { KEY_HOME, "HOME" }, { KEY_END, "END" }, \ - { KEY_MINUS, "-" }, { KEY_EQUALS, "=" }, \ - { KEY_NUMLOCK, "NUMLCK" }, { KEY_SCRLCK, "SCRLCK" }, \ - { KEY_PAUSE, "PAUSE" }, { KEY_PRTSCR, "PRTSC" }, \ - { KEY_UPARROW, "UP" }, { KEY_DOWNARROW, "DOWN" }, \ - { KEY_LEFTARROW, "LEFT" }, { KEY_RIGHTARROW, "RIGHT" }, \ - { KEY_RALT, "ALT" }, { KEY_LALT, "ALT" }, \ - { KEY_RSHIFT, "SHIFT" }, { KEY_CAPSLOCK, "CAPS" }, \ - { KEY_RCTRL, "CTRL" }, { KEYP_5, "NUM5" }, \ - { ' ', "SPACE" }, \ - { 'a', "A" }, { 'b', "B" }, { 'c', "C" }, { 'd', "D" }, \ - { 'e', "E" }, { 'f', "F" }, { 'g', "G" }, { 'h', "H" }, \ - { 'i', "I" }, { 'j', "J" }, { 'k', "K" }, { 'l', "L" }, \ - { 'm', "M" }, { 'n', "N" }, { 'o', "O" }, { 'p', "P" }, \ - { 'q', "Q" }, { 'r', "R" }, { 's', "S" }, { 't', "T" }, \ - { 'u', "U" }, { 'v', "V" }, { 'w', "W" }, { 'x', "X" }, \ - { 'y', "Y" }, { 'z', "Z" }, { '0', "0" }, { '1', "1" }, \ - { '2', "2" }, { '3', "3" }, { '4', "4" }, { '5', "5" }, \ - { '6', "6" }, { '7', "7" }, { '8', "8" }, { '9', "9" }, \ - { '[', "[" }, { ']', "]" }, { ';', ";" }, { '`', "`" }, \ - { ',', "," }, { '.', "." }, { '/', "/" }, { '\\', "\\" }, \ - { '\'', "\'" }, \ -} - -#endif // __DOOMKEYS__ - diff --git a/textscreen/textscreen.h b/textscreen/textscreen.h index 8b0d5eef..5a49bad1 100644 --- a/textscreen/textscreen.h +++ b/textscreen/textscreen.h @@ -19,7 +19,7 @@ extern "C" { #endif -#include "doomkeys.h" +#include "..\Source\doomkeys.h" #include "txt_main.h"