From 7677ff78f860db1b27885cc2b64e3eec7c4467c3 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 18 Feb 2023 20:21:10 +0200 Subject: [PATCH] Default keymap changes. --- inputevents.def | 1 + od-win32/dinput.cpp | 2 ++ od-win32/keyboard_win32.cpp | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/inputevents.def b/inputevents.def index 78e310fa..4aba3c7e 100644 --- a/inputevents.def +++ b/inputevents.def @@ -265,6 +265,7 @@ DEFEVENT(KEY_0,_T("0"),AM_K,0,0,AK_0) DEFEVENT(KEY_SUB,_T("Minus"),AM_K,0,0,AK_MINUS) DEFEVENT(KEY_EQUALS,_T("Equals"),AM_K,0,0,AK_EQUAL) DEFEVENT(KEY_BACKSLASH,_T("Backslash"),AM_K,0,0,AK_BACKSLASH) +DEFEVENT(KEY_NUMBERSIGN,_T("Numbersign"),AM_K,0,0,AK_NUMBERSIGN) DEFEVENT(KEY_LEFTBRACKET,_T("Left Bracket"),AM_K,0,0,AK_LBRACKET) DEFEVENT(KEY_RIGHTBRACKET,_T("Right Bracket"),AM_K,0,0,AK_RBRACKET) diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp index edc041b8..5a9e3d08 100644 --- a/od-win32/dinput.cpp +++ b/od-win32/dinput.cpp @@ -586,6 +586,7 @@ static int keyhack (int scancode, int pressed, int num) return -1; } +#if 0 if (!keyboard_german) return scancode; @@ -648,6 +649,7 @@ static int keyhack (int scancode, int pressed, int num) } } } +#endif return scancode; } diff --git a/od-win32/keyboard_win32.cpp b/od-win32/keyboard_win32.cpp index 50366b67..72181b58 100644 --- a/od-win32/keyboard_win32.cpp +++ b/od-win32/keyboard_win32.cpp @@ -155,11 +155,17 @@ static struct uae_input_device_kbr_default keytrans_amiga[] = { { DIK_SEMICOLON, INPUTEVENT_KEY_SEMICOLON }, { DIK_APOSTROPHE, INPUTEVENT_KEY_SINGLEQUOTE }, { DIK_GRAVE, INPUTEVENT_KEY_BACKQUOTE }, - { DIK_BACKSLASH, INPUTEVENT_KEY_BACKSLASH }, + { DIK_BACKSLASH, INPUTEVENT_KEY_NUMBERSIGN }, { DIK_COMMA, INPUTEVENT_KEY_COMMA }, { DIK_PERIOD, INPUTEVENT_KEY_PERIOD }, { DIK_SLASH, INPUTEVENT_KEY_DIV }, + { DIK_OEM_102, INPUTEVENT_KEY_30 }, + { DIK_F11, INPUTEVENT_KEY_BACKSLASH }, + { DIK_F13, INPUTEVENT_KEY_BACKSLASH }, + { DIK_F14, INPUTEVENT_KEY_NP_LPAREN }, + { DIK_F15, INPUTEVENT_KEY_NP_RPAREN }, + { DIK_SYSRQ, INPUTEVENT_SPC_SCREENSHOT_CLIPBOARD, 0, INPUTEVENT_SPC_SCREENSHOT, ID_FLAG_QUALIFIER_SPECIAL }, { DIK_END, INPUTEVENT_SPC_QUALIFIER_SPECIAL }, -- 2.47.3