Default keymap changes.

diff --git a/inputevents.def b/inputevents.def
index 78e310fa08008cdd0673a1906eb836b5d97b3841..4aba3c7e411eafffaaefc6db5aab536b3442678e 100644 (file)
--- 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 edc041b81f360432121c2db7cad4fd112761d203..5a9e3d08a3d62c13ef33e3e580f1095161955284 100644 (file)
--- 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 50366b6786909169b27ee7310477064fd6404ca1..72181b5895fd90a16659ed1bea973f71f6091658 100644 (file)
--- 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 },