From 4fa7f250c7042d8236b080f0ce6223ab282f9079 Mon Sep 17 00:00:00 2001 From: Vladimir Lagunov Date: Thu, 27 Jan 2022 01:49:17 +0700 Subject: [PATCH] Fix #1531: Revert control key remapping from grave/tilde to zenkaku The bug was introduced in the pull request #1214, and even in the description of the request it had been acknowledged that there is no such key on mac keyboards. As a consequence, it led to inability to transfer the grave accent and and the tilde, at least from macOS to Windows on default "ABC" keyboard layout. Unfortunately, I don't have a JIS keyboard, nor understand how to use it. The only thing I can suggest now is to revert the controversial remapping. --- doc/newsfragments/1531_remove_zenkaku_remapping.bugfix | 1 + doc/newsfragments/1531_zenkaku_remapping.removal | 1 + src/lib/platform/OSXKeyState.cpp | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 doc/newsfragments/1531_remove_zenkaku_remapping.bugfix create mode 100644 doc/newsfragments/1531_zenkaku_remapping.removal diff --git a/doc/newsfragments/1531_remove_zenkaku_remapping.bugfix b/doc/newsfragments/1531_remove_zenkaku_remapping.bugfix new file mode 100644 index 0000000000..e99b110e37 --- /dev/null +++ b/doc/newsfragments/1531_remove_zenkaku_remapping.bugfix @@ -0,0 +1 @@ +macOS servers can send the grave accent and the tilde to clients. \ No newline at end of file diff --git a/doc/newsfragments/1531_zenkaku_remapping.removal b/doc/newsfragments/1531_zenkaku_remapping.removal new file mode 100644 index 0000000000..82288b1b3a --- /dev/null +++ b/doc/newsfragments/1531_zenkaku_remapping.removal @@ -0,0 +1 @@ +Removed remapping from the grave accent to the zenkaku. \ No newline at end of file diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp index aad207290e..2a215eb314 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -131,8 +131,7 @@ static const KeyEntry s_controlKeys[] = { { kKeyEisuToggle, kVK_JIS_Eisu }, { kKeyKana, kVK_JIS_Kana }, { kKeyMuhenkan, s_int5VK }, - { kKeyHenkan, s_int4VK }, - { kKeyZenkaku, kVK_ANSI_Grave } + { kKeyHenkan, s_int4VK } };