Fix debauchee#1531: Revert control key remapping from grave/tilde to …

…zenkaku The bug was introduced in the pull request debauchee#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.
vladimirlagunov · Jan 26, 2022 · 4fa7f25 · 4fa7f25
1 parent 433126e
commit 4fa7f25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/doc/newsfragments/1531_remove_zenkaku_remapping.bugfix b/doc/newsfragments/1531_remove_zenkaku_remapping.bugfix
@@ -0,0 +1 @@
+macOS servers can send the grave accent and the tilde to clients.
diff --git a/doc/newsfragments/1531_zenkaku_remapping.removal b/doc/newsfragments/1531_zenkaku_remapping.removal
@@ -0,0 +1 @@
+Removed remapping from the grave accent to the zenkaku.
diff --git 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 }
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		macOS servers can send the grave accent and the tilde to clients.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Removed remapping from the grave accent to the zenkaku.