jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KASM-1980 Add support for CMD right + key shortcuts on MacOs

This commit is contained in:
Mariusz Marciniak 2021-10-05 12:18:00 +02:00
parent fff810d45a
commit 66cc16a894
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/input/keyboard.js
View File

@ -43,7 +43,11 @@ export default class Keyboard {
} else {
// On MacOs zoom and shortcut actions are CMD based so we need to
// let the remote know that it should unselect the CTRL key instead
if (browser.isMac() && code === "MetaLeft" && this._keyDownList["ControlLeft"]) {
if (
browser.isMac() &&
this._keyDownList["ControlLeft"] &&
(code === "MetaLeft" || code === "MetaRight")
) {
keysym = KeyTable.XK_Control_L;
code = "ControlLeft";
}
@ -135,8 +139,14 @@ export default class Keyboard {
}
// Translate MacOs CMD based shortcuts to their CTRL based counterpart
if (browser.isMac() && UI.rfb.translateShortcuts && code !== "MetaLeft" && e.metaKey && !e.ctrlKey && !e.altKey) {
if (
browser.isMac() &&
UI.rfb && UI.rfb.translateShortcuts &&
code !== "MetaLeft" && code !== "MetaRight" &&
e.metaKey && !e.ctrlKey && !e.altKey
) {
this._sendKeyEvent(this._keyDownList["MetaLeft"], "MetaLeft", false);
this._sendKeyEvent(this._keyDownList["MetaRight"], "MetaRight", false);
this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
this._sendKeyEvent(keysym, code, true);
stopEvent(e);

3
core/rfb.js
View File

@ -1331,8 +1331,9 @@ export default class RFB extends EventTargetMixin {
ev.preventDefault();
// On MacOs we need to translate zooming CMD+wheel to CTRL+wheel
if (isMac() && this._keyboard._keyDownList["MetaLeft"]) {
if (isMac() && (this._keyboard._keyDownList["MetaLeft"] || this._keyboard._keyDownList["MetaRight"])) {
this._keyboard._sendKeyEvent(this._keyboard._keyDownList["MetaLeft"], "MetaLeft", false);
this._keyboard._sendKeyEvent(this._keyboard._keyDownList["MetaRight"], "MetaRight", false);
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
}