From 84708c77d2dcd6a38418e75d6311928d3e13b2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 23 Jul 2022 14:05:29 +0200 Subject: [PATCH] overlay send events over WS if not connected. --- src/component/overlay.vue | 43 +++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/src/component/overlay.vue b/src/component/overlay.vue index fecdb31e..8687b277 100644 --- a/src/component/overlay.vue +++ b/src/component/overlay.vue @@ -150,7 +150,12 @@ const isCtrlKey = key == KeyTable.XK_Control_L || key == KeyTable.XK_Control_R if (isCtrlKey) ctrlKey = key - this.webrtc.send('keydown', { key }) + if (this.webrtc.connected) { + this.webrtc.send('keydown', { key }) + } else { + this.control.keyDown(key) + } + return isCtrlKey } this.keyboard.onkeyup = (key: number) => { @@ -164,7 +169,11 @@ const isCtrlKey = key == KeyTable.XK_Control_L || key == KeyTable.XK_Control_R if (isCtrlKey) ctrlKey = 0 - this.webrtc.send('keyup', { key }) + if (this.webrtc.connected) { + this.webrtc.send('keyup', { key }) + } else { + this.control.keyUp(key) + } } this.keyboard.listenTo(this._textarea) @@ -244,8 +253,6 @@ return } - this.sendMousePos(e) - const now = Date.now() const firstScroll = now - this.wheelDate > 250 @@ -292,8 +299,14 @@ } } - if (x != 0 || y != 0) { + // skip if not scrolled + if (x == 0 && y == 0) return + + if (this.webrtc.connected) { + this.sendMousePos(e) this.webrtc.send('wheel', { x, y }) + } else { + this.control.scroll(x, y) } } @@ -313,8 +326,14 @@ return } - this.sendMousePos(e) - this.webrtc.send('mousedown', { key: e.button + 1 }) + const key = e.button + 1 + if (this.webrtc.connected) { + this.sendMousePos(e) + this.webrtc.send('mousedown', { key }) + } else { + const { x, y } = this.getMousePos(e.clientX, e.clientY) + this.control.buttonDown(key, x, y) + } } onMouseUp(e: MouseEvent) { @@ -323,8 +342,14 @@ return } - this.sendMousePos(e) - this.webrtc.send('mouseup', { key: e.button + 1 }) + const key = e.button + 1 + if (this.webrtc.connected) { + this.sendMousePos(e) + this.webrtc.send('mouseup', { key }) + } else { + const { x, y } = this.getMousePos(e.clientX, e.clientY) + this.control.buttonUp(key, x, y) + } } onMouseEnter(e: MouseEvent) {