diff options
author | Pierre Ossman <ossman@cendio.se> | 2020-12-10 09:43:49 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2020-12-10 10:00:44 +0100 |
commit | 146258291ad546a18b05a6c3704a26b8c5d819d4 (patch) | |
tree | 978cdfd2ec0e298d4dab205bfce22176256939e9 | |
parent | 3e55d5d71af51eaa1d960bbd67b744ec61df9aba (diff) | |
download | novnc-146258291ad546a18b05a6c3704a26b8c5d819d4.tar.gz |
Send combination keysyms for some Japanese keys
Windows doesn't give us stable symbols for a bunch of Japanese IM keys,
instead alternating between two symbols. This state is not synchronised
with the IM running on the remote server so to have stable behaviour we
have to collapse these multiple symbols in to a single keysym.
-rw-r--r-- | core/input/util.js | 15 | ||||
-rw-r--r-- | tests/test.helper.js | 33 |
2 files changed, 48 insertions, 0 deletions
diff --git a/core/input/util.js b/core/input/util.js index 182be7f..58f84e5 100644 --- a/core/input/util.js +++ b/core/input/util.js @@ -157,6 +157,21 @@ export function getKeysym(evt) { } } + // Windows sends alternating symbols for some keys when using a + // Japanese layout. We have no way of synchronising with the IM + // running on the remote system, so we send some combined keysym + // instead and hope for the best. + if (browser.isWindows()) { + switch (key) { + case 'Zenkaku': + case 'Hankaku': + return KeyTable.XK_Zenkaku_Hankaku; + case 'Romaji': + case 'KanaMode': + return KeyTable.XK_Romaji; + } + } + return DOMKeyTable[key][location]; } diff --git a/tests/test.helper.js b/tests/test.helper.js index 5552ec4..ed65770 100644 --- a/tests/test.helper.js +++ b/tests/test.helper.js @@ -186,5 +186,38 @@ describe('Helpers', function () { expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: ',', location: 3})).to.be.equal(0xFFAC); }); }); + + describe('Japanese IM keys on Windows', function () { + let origNavigator; + beforeEach(function () { + // window.navigator is a protected read-only property in many + // environments, so we need to redefine it whilst running these + // tests. + origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); + + Object.defineProperty(window, "navigator", {value: {}}); + if (window.navigator.platform !== undefined) { + // Object.defineProperty() doesn't work properly in old + // versions of Chrome + this.skip(); + } + + window.navigator.platform = "Windows"; + }); + + afterEach(function () { + if (origNavigator !== undefined) { + Object.defineProperty(window, "navigator", origNavigator); + } + }); + + const keys = { 'Zenkaku': 0xff2a, 'Hankaku': 0xff2a, + 'Romaji': 0xff24, 'KanaMode': 0xff24 }; + for (let [key, keysym] of Object.entries(keys)) { + it(`should fake combined key for ${key} on Windows`, function () { + expect(KeyboardUtil.getKeysym({code: 'FakeIM', key: key})).to.be.equal(keysym); + }); + } + }); }); }); |