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

KASM-4039 Limit clipboard checks only after a focus change (#59) 

* limit clipboard checks only after a focus change

---------

Co-authored-by: mattmcclaskey <matt@kasmweb.com>
This commit is contained in:
Matt McClaskey 2023-03-02 07:53:10 -05:00 committed by GitHub
parent d83f94c886
commit 4a9d5cebb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/rfb.js
View File

@ -142,6 +142,7 @@ export default class RFB extends EventTargetMixin {
this._forcedResolutionX = null; this._forcedResolutionX = null;
this._forcedResolutionY = null; this._forcedResolutionY = null;
this._clipboardBinary = true; this._clipboardBinary = true;
this._resendClipboardNextUserDrivenEvent = true;
this._useUdp = true; this._useUdp = true;
this._hiDpi = false; this._hiDpi = false;
this._enableQOI = false; this._enableQOI = false;
@ -220,6 +221,7 @@ export default class RFB extends EventTargetMixin {
handlePointerLockError: this._handlePointerLockError.bind(this), handlePointerLockError: this._handlePointerLockError.bind(this),
handleWheel: this._handleWheel.bind(this), handleWheel: this._handleWheel.bind(this),
handleGesture: this._handleGesture.bind(this), handleGesture: this._handleGesture.bind(this),
handleFocusChange: this._handleFocusChange.bind(this),
}; };
// main setup // main setup
@ -867,8 +869,8 @@ export default class RFB extends EventTargetMixin {
} }
checkLocalClipboard() { checkLocalClipboard() {
if (this.clipboardUp && this.clipboardSeamless) { if (this.clipboardUp && this.clipboardSeamless && this._resendClipboardNextUserDrivenEvent) {
this._resendClipboardNextUserDrivenEvent = false;
if (this.clipboardBinary) { if (this.clipboardBinary) {
navigator.clipboard.read().then((data) => { navigator.clipboard.read().then((data) => {
this.clipboardPasteDataFrom(data); this.clipboardPasteDataFrom(data);
@ -1029,6 +1031,9 @@ export default class RFB extends EventTargetMixin {
// Always grab focus on some kind of click event // Always grab focus on some kind of click event
this._canvas.addEventListener("mousedown", this._eventHandlers.focusCanvas); this._canvas.addEventListener("mousedown", this._eventHandlers.focusCanvas);
this._canvas.addEventListener("touchstart", this._eventHandlers.focusCanvas); this._canvas.addEventListener("touchstart", this._eventHandlers.focusCanvas);
this._canvas.addEventListener("focus", this._eventHandlers.handleFocusChange);
window.addEventListener("focus", this._eventHandlers.handleFocusChange);
window.addEventListener("blur", this._eventHandlers.handleFocusChange);
// In order for the keyboard to not occlude the input being edited // In order for the keyboard to not occlude the input being edited
// we move the hidden input we use for triggering the keyboard to the last click // we move the hidden input we use for triggering the keyboard to the last click
@ -1066,6 +1071,8 @@ export default class RFB extends EventTargetMixin {
this._canvas.addEventListener("gesturemove", this._eventHandlers.handleGesture); this._canvas.addEventListener("gesturemove", this._eventHandlers.handleGesture);
this._canvas.addEventListener("gestureend", this._eventHandlers.handleGesture); this._canvas.addEventListener("gestureend", this._eventHandlers.handleGesture);
this._resendClipboardNextUserDrivenEvent = true;
// WebRTC UDP datachannel inits // WebRTC UDP datachannel inits
{ {
this._udpBuffer = new Map(); this._udpBuffer = new Map();
@ -1200,7 +1207,10 @@ export default class RFB extends EventTargetMixin {
} }
this._canvas.removeEventListener("mousedown", this._eventHandlers.focusCanvas); this._canvas.removeEventListener("mousedown", this._eventHandlers.focusCanvas);
this._canvas.removeEventListener("touchstart", this._eventHandlers.focusCanvas); this._canvas.removeEventListener("touchstart", this._eventHandlers.focusCanvas);
this._canvas.removeEventListener("focus", this._eventHandlers.handleFocusChange);
window.removeEventListener('resize', this._eventHandlers.windowResize); window.removeEventListener('resize', this._eventHandlers.windowResize);
window.removeEventListener('focus', this._eventHandlers.handleFocusChange);
window.removeEventListener('focus', this._eventHandlers.handleFocusChange);
this._keyboard.ungrab(); this._keyboard.ungrab();
this._gestures.detach(); this._gestures.detach();
this._sock.close(); this._sock.close();
@ -1226,6 +1236,10 @@ export default class RFB extends EventTargetMixin {
document.querySelector("#noVNC_keyboardinput").style.top = `${y}px`; document.querySelector("#noVNC_keyboardinput").style.top = `${y}px`;
} }
_handleFocusChange(event) {
this._resendClipboardNextUserDrivenEvent = true;
}
_focusCanvas(event) { _focusCanvas(event) {
// Hack: // Hack:
// On most mobile phones it's possible to play audio // On most mobile phones it's possible to play audio
@ -1243,6 +1257,10 @@ export default class RFB extends EventTargetMixin {
this.pointerLock = true; this.pointerLock = true;
} }
if (this._resendClipboardNextUserDrivenEvent) {
this.checkLocalClipboard();
}
if (!this.focusOnClick) { if (!this.focusOnClick) {
return; return;
} }
@ -1625,7 +1643,6 @@ export default class RFB extends EventTargetMixin {
this._keyboard._sendKeyEvent(this._keyboard._keyDownList["MetaRight"], "MetaRight", false); this._keyboard._sendKeyEvent(this._keyboard._keyDownList["MetaRight"], "MetaRight", false);
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true); this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
} }
this.checkLocalClipboard();
this._handleMouseButton(pos.x, pos.y, this._handleMouseButton(pos.x, pos.y,
true, xvncButtonToMask(mappedButton)); true, xvncButtonToMask(mappedButton));