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

rebase from master

This commit is contained in:
matt 2021-10-12 18:36:43 +00:00
parent f8fde81dfb a4cf389029
commit 0bd7bf8b3e
6 changed files with 29875 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/styles/base.css
View File

@ -278,9 +278,6 @@ select:active {
max-width: 90%;
padding: 15px;
transition: 0.5s ease-in-out;
transform: translateY(-50px);
opacity: 0;
text-align: center;
@ -291,7 +288,7 @@ select:active {
background: rgba(33, 130, 177, 0.8);
}
#noVNC_fallback_error.noVNC_open > div {
transform: translateY(0);
transition: 0.5s ease-in-out;
opacity: 1;
}
@ -862,17 +859,24 @@ select:active {
#noVNC_credentials_dlg {
position: relative;
}
transform: translateY(-50px);
}
#noVNC_credentials_dlg.noVNC_open {
transform: translateY(0);
}
#noVNC_credentials_dlg ul {
list-style: none;
margin: 0px;
padding: 0px;
}
#noVNC_credentials_dlg.noVNC_panel {
transition: none;
transform: none;
}
#noVNC_credentials_dlg.noVNC_panel.noVNC_open {
transition: none;
transform: none;
}
.noVNC_hidden {
display: none;
}

22
app/ui.js
View File

@ -20,6 +20,16 @@ window.addEventListener("load", function() {
}
});
window.updateSetting = (name, value) => {
WebUtil.writeSetting(name, value);
switch (name) {
case "translate_shortcuts":
UI.updateShortcutTranslation();
break;
}
}
import * as Log from '../core/util/logging.js';
import _, { l10n } from './localization.js';
import { isTouchDevice, isSafari, hasScrollbarGutter, dragThreshold, supportsBinaryClipboard, isFirefox }
@ -190,6 +200,7 @@ const UI = {
UI.initSetting('quality', 6);
UI.initSetting('dynamic_quality_min', 3);
UI.initSetting('dynamic_quality_max', 9);
UI.initSetting('translate_shortcuts', true);
UI.initSetting('treat_lossless', 7);
UI.initSetting('jpeg_video_quality', 5);
UI.initSetting('webp_video_quality', 5);
@ -411,6 +422,8 @@ const UI = {
UI.addSettingChangeHandler('dynamic_quality_min', UI.updateQuality);
UI.addSettingChangeHandler('dynamic_quality_max');
UI.addSettingChangeHandler('dynamic_quality_max', UI.updateQuality);
UI.addSettingChangeHandler('translate_shortcuts');
UI.addSettingChangeHandler('translate_shortcuts', UI.updateShortcutTranslation);
UI.addSettingChangeHandler('treat_lossless');
UI.addSettingChangeHandler('treat_lossless', UI.updateQuality);
UI.addSettingChangeHandler('anti_aliasing');
@ -1254,6 +1267,7 @@ const UI = {
document.addEventListener('mousedown', UI.mouseDownVNC);
UI.rfb.addEventListener("bell", UI.bell);
UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
UI.rfb.translateShortcuts = UI.getSetting('translate_shortcuts');
UI.rfb.clipViewport = UI.getSetting('view_clip');
UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale';
UI.rfb.resizeSession = UI.getSetting('resize') === 'remote';
@ -1726,12 +1740,18 @@ const UI = {
UI.rfb.compressionLevel = parseInt(UI.getSetting('compression'));
},
/* ------^-------
* /COMPRESSION
* ==============
* KEYBOARD
* MOUSE AND KEYBOARD
* ------v------*/
updateShortcutTranslation() {
UI.rfb.translateShortcuts = UI.getSetting('translate_shortcuts');
},
showVirtualKeyboard() {
if (!isTouchDevice) return;

22
core/input/keyboard.js
View File

@ -9,6 +9,7 @@ import { stopEvent } from '../util/events.js';
import * as KeyboardUtil from "./util.js";
import KeyTable from "./keysym.js";
import * as browser from "../util/browser.js";
import UI from '../../app/ui.js';
//
// Keyboard event handler
@ -42,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";
}
@ -133,6 +138,21 @@ export default class Keyboard {
return;
}
// Translate MacOs CMD based shortcuts to their CTRL based counterpart
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);
return;
}
// Alt behaves more like AltGraph on macOS, so shuffle the
// keys around a bit to make things more sane for the remote
// server. This method is used by RealVNC and TigerVNC (and

125
core/rfb.js
View File

@ -11,7 +11,7 @@ import { toUnsigned32bit, toSigned32bit } from './util/int.js';
import * as Log from './util/logging.js';
import { encodeUTF8, decodeUTF8 } from './util/strings.js';
import { hashUInt8Array } from './util/int.js';
import { dragThreshold, supportsCursorURIs, isTouchDevice, isMac } from './util/browser.js';
import { dragThreshold, supportsCursorURIs, isTouchDevice, isWindows, isMac } from './util/browser.js';
import { clientToElement } from './util/element.js';
import { setCapture } from './util/events.js';
import EventTargetMixin from './util/eventtarget.js';
@ -45,8 +45,7 @@ var _enableWebP = false;
const MOUSE_MOVE_DELAY = 17;
// Wheel thresholds
const WHEEL_STEP = 50; // Pixels needed for one step
const WHEEL_LINE_HEIGHT = 19; // Assumed pixels for one line step
let WHEEL_LINE_HEIGHT = 19; // Pixels for one line step (on Windows)
// Gesture thresholds
const GESTURE_ZOOMSENS = 75;
@ -185,19 +184,6 @@ export default class RFB extends EventTargetMixin {
this._accumulatedWheelDeltaX = 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
this._gestureLastTapTime = null;
this._gestureFirstDoubleTapEv = null;
@ -1302,6 +1288,18 @@ export default class RFB extends EventTargetMixin {
switch (ev.type) {
case 'mousedown':
setCapture(this._canvas);
// Translate CMD+Click into CTRL+click on MacOs
if (
isMac() &&
ev.metaKey &&
(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);
}
this._handleMouseButton(pos.x, pos.y,
true, 1 << ev.button);
break;
@ -1409,6 +1407,13 @@ export default class RFB extends EventTargetMixin {
this._display.absY(y), mask);
}
_sendScroll(x, y, dX, dY) {
if (this._rfbConnectionState !== 'connected') { return; }
if (this._viewOnly) { return; } // View only, skip mouse events
RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), 0, dX, dY);
}
_handleWheel(ev) {
if (this._rfbConnectionState !== 'connected') { return; }
if (this._viewOnly) { return; } // View only, skip mouse events
@ -1416,64 +1421,50 @@ export default class RFB extends EventTargetMixin {
ev.stopPropagation();
ev.preventDefault();
let pos = clientToElement(ev.clientX, ev.clientY,
this._canvas);
// On MacOs we need to translate zooming CMD+wheel to CTRL+wheel
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);
}
let dX = ev.deltaX;
let dY = ev.deltaY;
// In a pinch and zoom gesture we're sending only a wheel event so we need
// 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._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();
}
// Pixel units unless it's non-zero.
// Note that if deltamode is line or page won't matter since we aren't
// sending the mouse wheel delta to the server anyway.
// The difference between pixel and line can be important however since
// we have a threshold that can be smaller than the line height.
let dX = ev.deltaX;
let dY = ev.deltaY;
if (ev.deltaMode !== 0) {
dX *= WHEEL_LINE_HEIGHT;
dY *= WHEEL_LINE_HEIGHT;
}
// Mouse wheel events are sent in steps over VNC. This means that the VNC
// protocol can't handle a wheel event with specific distance or speed.
// Therefor, if we get a lot of small mouse wheel events we combine them.
this._accumulatedWheelDeltaX += dX;
this._accumulatedWheelDeltaY += dY;
// On MacOs we need to translate zooming CMD+wheel to CTRL+wheel
if (isMac() && this._keyboard._keyDownList["MetaLeft"]) {
this._keyboard._sendKeyEvent(this._keyboard._keyDownList["MetaLeft"], "MetaLeft", false);
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
if (isMac() && ev.ctrlKey && !this._keyboard._keyDownList["ControlLeft"]) {
this._keyboard._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
this._mouseLastPinchAndZoomTime = +new Date();
}
// Generate a mouse wheel step event when the accumulated delta
// for one of the axes is large enough.
if (Math.abs(this._accumulatedWheelDeltaX) >= WHEEL_STEP) {
if (this._accumulatedWheelDeltaX < 0) {
this._handleMouseButton(pos.x, pos.y, true, 1 << 5);
this._handleMouseButton(pos.x, pos.y, false, 1 << 5);
} else if (this._accumulatedWheelDeltaX > 0) {
this._handleMouseButton(pos.x, pos.y, true, 1 << 6);
this._handleMouseButton(pos.x, pos.y, false, 1 << 6);
}
this._accumulatedWheelDeltaX = 0;
}
if (Math.abs(this._accumulatedWheelDeltaY) >= WHEEL_STEP) {
if (this._accumulatedWheelDeltaY < 0) {
this._handleMouseButton(pos.x, pos.y, true, 1 << 3);
this._handleMouseButton(pos.x, pos.y, false, 1 << 3);
} else if (this._accumulatedWheelDeltaY > 0) {
this._handleMouseButton(pos.x, pos.y, true, 1 << 4);
this._handleMouseButton(pos.x, pos.y, false, 1 << 4);
}
this._accumulatedWheelDeltaY = 0;
}
const pointer = clientToElement(ev.clientX, ev.clientY, this._canvas);
this._sendScroll(pointer.x, pointer.y, dX, dY);
}
_fakeMouseMove(ev, elementX, elementY) {
@ -3191,7 +3182,7 @@ RFB.messages = {
sock.flush();
},
pointerEvent(sock, x, y, mask) {
pointerEvent(sock, x, y, mask, dX = 0, dY = 0) {
const buff = sock._sQ;
const offset = sock._sQlen;
@ -3205,7 +3196,13 @@ RFB.messages = {
buff[offset + 4] = y >> 8;
buff[offset + 5] = y;
sock._sQlen += 6;
buff[offset + 6] = dX >> 8;
buff[offset + 7] = dX;
buff[offset + 8] = dY >> 8;
buff[offset + 9] = dY;
sock._sQlen += 10;
sock.flush();
},

29751
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

9
vnc.html
View File

@ -190,7 +190,14 @@
<li>
<label><input id="noVNC_setting_clipboard_seamless" type="checkbox" /> Clipboard Seamless</label></li>
<li>
<label><input id="noVNC_setting_prefer_local_cursor" type="checkbox" /> Prefer Local Cursor</label></li>
<label><input id="noVNC_setting_prefer_local_cursor" type="checkbox" /> Prefer Local Cursor</label>
</li>
<li>
<label>
<input id="noVNC_setting_translate_shortcuts" type="checkbox" />Translate keyboard shurtcuts
</label>
</li>
</li>
<li>
<label><input id="noVNC_setting_enable_webp" type="checkbox" /> Enable WebP Compression</label></li>
<li>