From f4d8fea4653d5918f28df90feca934bdd91b4939 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 5 May 2014 21:50:17 +0300 Subject: [PATCH] Correct keycode mappings for KEY_QUOTE{LEFT,RIGHT} /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/Headers/Events.h says that 0x27 is kVK_ANSI_Quote, which we call KEY_QUOTERIGHT, i.e. the plain ASCII apostrophe, while 0x32 is not the ASCII tilde but kVK_ANSI_Grave, which we call KEY_QUOTELEFT. Makes the Command-' binding (see Kohei's 56cce6fd8151a916e1be540ac18724b46d1b15fc) work at least for the US English keyboard. But not for the Finnish keyboard, for instance, where the key labeled with an apostrophe (or "ASCII-style" single quote) generates a different keycode than the single quote key on the US English keyboard. (Which, I guess, isn't surprising as it after all is a different physical key.) In other words, situation normal, using keycodes is a horror as always... Change-Id: Ibf8f994370fec75849391e1dba30c7b7d54d237f --- vcl/osx/salframeview.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index c766179ceac8..6825c9b1559a 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -127,9 +127,9 @@ static sal_uInt16 ImplMapKeyCode(sal_uInt16 nKeyCode) KEY_C, KEY_V, 0, KEY_B, KEY_Q, KEY_W, KEY_E, KEY_R, KEY_Y, KEY_T, KEY_1, KEY_2, KEY_3, KEY_4, KEY_6, KEY_5, KEY_EQUAL, KEY_9, KEY_7, KEY_SUBTRACT, KEY_8, KEY_0, KEY_BRACKETRIGHT, KEY_0, - KEY_U, KEY_BRACKETLEFT, KEY_I, KEY_P, KEY_RETURN, KEY_L, KEY_J, KEY_QUOTELEFT, + KEY_U, KEY_BRACKETLEFT, KEY_I, KEY_P, KEY_RETURN, KEY_L, KEY_J, KEY_QUOTERIGHT, KEY_K, KEY_SEMICOLON, 0, KEY_COMMA, KEY_DIVIDE, KEY_N, KEY_M, KEY_POINT, - KEY_TAB, KEY_SPACE, KEY_TILDE, KEY_DELETE, 0, KEY_ESCAPE, 0, 0, + KEY_TAB, KEY_SPACE, KEY_QUOTELEFT, KEY_DELETE, 0, KEY_ESCAPE, 0, 0, 0, KEY_CAPSLOCK, 0, 0, 0, 0, 0, 0, KEY_F17, KEY_DECIMAL, 0, KEY_MULTIPLY, 0, KEY_ADD, 0, 0, 0, 0, 0, KEY_DIVIDE, KEY_RETURN, 0, KEY_SUBTRACT, KEY_F18,