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

KASM-1882 Improved pinch&zoom responsiveness

This commit is contained in:
Mariusz Marciniak 2021-09-15 16:05:11 +02:00
parent f509f5231a
commit 09707e9820
2 changed files with 29769 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/rfb.js
View File

@ -183,19 +183,6 @@ export default class RFB extends EventTargetMixin {
this._accumulatedWheelDeltaX = 0; this._accumulatedWheelDeltaX = 0;
this._accumulatedWheelDeltaY = 0; this._accumulatedWheelDeltaY = 0;
// On MacOs we simulate the CTRL key being pressed on pinch and zoom
// so we need to manually unselect it whenever the action is completed (500ms since last scroll)
if (isMac()) {
setInterval(() => {
const timeSinceLastPinchAndZoom = Math.max(0, +new Date() - this._mouseLastPinchAndZoomTime);
if (timeSinceLastPinchAndZoom > 500) {
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", false);
this._mouseLastPinchAndZoomTime = Infinity;
}
}, 10);
}
// Gesture state // Gesture state
this._gestureLastTapTime = null; this._gestureLastTapTime = null;
this._gestureFirstDoubleTapEv = null; this._gestureFirstDoubleTapEv = null;
@ -1365,9 +1352,25 @@ export default class RFB extends EventTargetMixin {
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true); this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
} }
// On MacOs we need to send a CTRL key to let the remote know we are pinch and zooming // In a pinch and zoom gesture we're sending only a wheel event so we need
if (isMac() && ev.ctrlKey && !this._keyboard._keyDownList["ControlLeft"]) { // to make sure a CTRL press event is sent alongside it if we want to trigger zooming.
// Moreover, we don't have a way to know that the gesture has stopped so we
// need to check manually every now and then and "unpress" the CTRL key when it ends.
if (ev.ctrlKey && !this._keyboard._keyDownList["ControlLeft"]) {
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true); this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
this._watchForPinchAndZoom = this._watchForPinchAndZoom || setInterval(() => {
const timeSinceLastPinchAndZoom = +new Date() - this._mouseLastPinchAndZoomTime;
if (timeSinceLastPinchAndZoom > 250) {
clearInterval(this._watchForPinchAndZoom);
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", false);
this._watchForPinchAndZoom = null;
this._mouseLastPinchAndZoomTime = 0;
}
}, 10);
}
if (this._watchForPinchAndZoom) {
this._mouseLastPinchAndZoomTime = +new Date(); this._mouseLastPinchAndZoomTime = +new Date();
} }

29751
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff