From 339c2ec3b4be9ff62c28b2861cc04ceddebc1684 Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 18 Nov 2018 18:08:32 +0000 Subject: [PATCH] Move sctokeylut[] in mact to keyboard.h from keyboard.cpp git-svn-id: https://svn.eduke32.com/eduke32@7178 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/mact/include/keyboard.h | 41 ++++++++++++++++++++++++++-------- source/mact/src/keyboard.cpp | 25 --------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/source/mact/include/keyboard.h b/source/mact/include/keyboard.h index a77a390aa..c940dc860 100644 --- a/source/mact/include/keyboard.h +++ b/source/mact/include/keyboard.h @@ -39,24 +39,47 @@ extern "C" { typedef uint8_t kb_scancode; +// translation table for taking key names to scancodes and back again +static struct +{ + const char *key; + kb_scancode sc; +} CONSTEXPR sctokeylut[] = { + { "Escape", 0x1 }, { "1", 0x2 }, { "2", 0x3 }, { "3", 0x4 }, { "4", 0x5 }, { "5", 0x6 }, { "6", 0x7 }, + { "7", 0x8 }, { "8", 0x9 }, { "9", 0xa }, { "0", 0xb }, { "-", 0xc }, { "=", 0xd }, { "BakSpc", 0xe }, + { "Tab", 0xf }, { "Q", 0x10 }, { "W", 0x11 }, { "E", 0x12 }, { "R", 0x13 }, { "T", 0x14 }, { "Y", 0x15 }, + { "U", 0x16 }, { "I", 0x17 }, { "O", 0x18 }, { "P", 0x19 }, { "[", 0x1a }, { "]", 0x1b }, { "Enter", 0x1c }, + { "LCtrl", 0x1d }, { "A", 0x1e }, { "S", 0x1f }, { "D", 0x20 }, { "F", 0x21 }, { "G", 0x22 }, { "H", 0x23 }, + { "J", 0x24 }, { "K", 0x25 }, { "L", 0x26 }, { ";", 0x27 }, { "'", 0x28 }, { "`", 0x29 }, { "LShift", 0x2a }, + { "Backslash", 0x2b }, { "Z", 0x2c }, { "X", 0x2d }, { "C", 0x2e }, { "V", 0x2f }, { "B", 0x30 }, { "N", 0x31 }, + { "M", 0x32 }, { ",", 0x33 }, { ".", 0x34 }, { "/", 0x35 }, { "RShift", 0x36 }, { "Kpad*", 0x37 }, { "LAlt", 0x38 }, + { "Space", 0x39 }, { "CapLck", 0x3a }, { "F1", 0x3b }, { "F2", 0x3c }, { "F3", 0x3d }, { "F4", 0x3e }, { "F5", 0x3f }, + { "F6", 0x40 }, { "F7", 0x41 }, { "F8", 0x42 }, { "F9", 0x43 }, { "F10", 0x44 }, { "NumLck", 0x45 }, { "ScrLck", 0x46 }, + { "Kpad7", 0x47 }, { "Kpad8", 0x48 }, { "Kpad9", 0x49 }, { "Kpad-", 0x4a }, { "Kpad4", 0x4b }, { "Kpad5", 0x4c }, { "Kpad6", 0x4d }, + { "Kpad+", 0x4e }, { "Kpad1", 0x4f }, { "Kpad2", 0x50 }, { "Kpad3", 0x51 }, { "Kpad0", 0x52 }, { "Kpad.", 0x53 }, { "F11", 0x57 }, + { "F12", 0x58 }, { "KpdEnt", 0x9c }, { "RCtrl", 0x9d }, { "Kpad/", 0xb5 }, { "RAlt", 0xb8 }, { "PrtScn", 0xb7 }, { "Pause", 0xc5 }, + { "Home", 0xc7 }, { "Up", 0xc8 }, { "PgUp", 0xc9 }, { "Left", 0xcb }, { "Right", 0xcd }, { "End", 0xcf }, { "Down", 0xd0 }, + { "PgDn", 0xd1 }, { "Insert", 0xd2 }, { "Delete", 0xd3 }, +}; + #define MAXKEYBOARDSCAN 256 #define KB_KeyDown keystatus extern kb_scancode KB_LastScan; #define KB_GetLastScanCode() (KB_LastScan) -#define KB_SetLastScanCode(scancode) \ - { \ - KB_LastScan = (scancode); \ +#define KB_SetLastScanCode(scancode) \ + { \ + KB_LastScan = (scancode); \ } -#define KB_ClearLastScanCode() \ - { \ - KB_SetLastScanCode(sc_None); \ +#define KB_ClearLastScanCode() \ + { \ + KB_SetLastScanCode(sc_None); \ } #define KB_KeyPressed(scan) (keystatus[(scan)] != 0) -#define KB_ClearKeyDown(scan) \ - { \ - keystatus[(scan)] = FALSE; \ +#define KB_ClearKeyDown(scan) \ + { \ + keystatus[(scan)] = FALSE; \ } #define KB_UnBoundKeyPressed(scan) (keystatus[(scan)] != 0 && !CONTROL_KeyBinds[scan].cmdstr) #define KB_GetCh keyGetChar diff --git a/source/mact/src/keyboard.cpp b/source/mact/src/keyboard.cpp index 24e2749eb..51a439ccc 100644 --- a/source/mact/src/keyboard.cpp +++ b/source/mact/src/keyboard.cpp @@ -39,31 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. kb_scancode KB_LastScan; -// translation table for taking key names to scancodes and back again -static struct -{ - const char *key; - kb_scancode sc; -} sctokeylut[] = { - { "Escape", 0x1 }, { "1", 0x2 }, { "2", 0x3 }, { "3", 0x4 }, { "4", 0x5 }, { "5", 0x6 }, - { "6", 0x7 }, { "7", 0x8 }, { "8", 0x9 }, { "9", 0xa }, { "0", 0xb }, { "-", 0xc }, - { "=", 0xd }, { "BakSpc", 0xe }, { "Tab", 0xf }, { "Q", 0x10 }, { "W", 0x11 }, { "E", 0x12 }, - { "R", 0x13 }, { "T", 0x14 }, { "Y", 0x15 }, { "U", 0x16 }, { "I", 0x17 }, { "O", 0x18 }, - { "P", 0x19 }, { "[", 0x1a }, { "]", 0x1b }, { "Enter", 0x1c }, { "LCtrl", 0x1d }, { "A", 0x1e }, - { "S", 0x1f }, { "D", 0x20 }, { "F", 0x21 }, { "G", 0x22 }, { "H", 0x23 }, { "J", 0x24 }, - { "K", 0x25 }, { "L", 0x26 }, { ";", 0x27 }, { "'", 0x28 }, { "`", 0x29 }, { "LShift", 0x2a }, - { "Backslash", 0x2b }, { "Z", 0x2c }, { "X", 0x2d }, { "C", 0x2e }, { "V", 0x2f }, { "B", 0x30 }, - { "N", 0x31 }, { "M", 0x32 }, { ",", 0x33 }, { ".", 0x34 }, { "/", 0x35 }, { "RShift", 0x36 }, - { "Kpad*", 0x37 }, { "LAlt", 0x38 }, { "Space", 0x39 }, { "CapLck", 0x3a }, { "F1", 0x3b }, { "F2", 0x3c }, - { "F3", 0x3d }, { "F4", 0x3e }, { "F5", 0x3f }, { "F6", 0x40 }, { "F7", 0x41 }, { "F8", 0x42 }, - { "F9", 0x43 }, { "F10", 0x44 }, { "NumLck", 0x45 }, { "ScrLck", 0x46 }, { "Kpad7", 0x47 }, { "Kpad8", 0x48 }, - { "Kpad9", 0x49 }, { "Kpad-", 0x4a }, { "Kpad4", 0x4b }, { "Kpad5", 0x4c }, { "Kpad6", 0x4d }, { "Kpad+", 0x4e }, - { "Kpad1", 0x4f }, { "Kpad2", 0x50 }, { "Kpad3", 0x51 }, { "Kpad0", 0x52 }, { "Kpad.", 0x53 }, { "F11", 0x57 }, - { "F12", 0x58 }, { "KpdEnt", 0x9c }, { "RCtrl", 0x9d }, { "Kpad/", 0xb5 }, { "RAlt", 0xb8 }, { "PrtScn", 0xb7 }, - { "Pause", 0xc5 }, { "Home", 0xc7 }, { "Up", 0xc8 }, { "PgUp", 0xc9 }, { "Left", 0xcb }, { "Right", 0xcd }, - { "End", 0xcf }, { "Down", 0xd0 }, { "PgDn", 0xd1 }, { "Insert", 0xd2 }, { "Delete", 0xd3 }, -}; - // this is horrible! const char *KB_ScanCodeToString(kb_scancode scancode) {