GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-14 02:00:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

web: mouse: simplified touch code

Browse Source
This commit is contained in:
Maxim Devaev 2025-06-12 03:00:21 +03:00
parent 8b5c87c893
commit e8498858bb
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
web/share/js/kvm/mouse.js
View File

@ -37,19 +37,18 @@ export function Mouse(__getGeometry, __recordWsEvent) {
var __abs = true; var __abs = true;
var __keypad = null; var __keypad = null;
var __timer = null; var __timer = null;
var __touch_pos = null;
var __abs_pos = null; var __abs_pos = null;
var __rel_sens = 1.0; var __rel_sens = 1.0;
var __rel_deltas = []; var __rel_deltas = [];
var __rel_touch_pos = null;
var __scroll_rate = 5; var __scroll_rate = 5;
var __scroll_fix = (tools.browser.is_mac ? 5 : 1); var __scroll_fix = (tools.browser.is_mac ? 5 : 1);
var __scroll_delta = {"x": 0, "y": 0}; var __scroll_delta = {"x": 0, "y": 0};
var __scroll_touch_pos = null;
var __stream_hovered = false; var __stream_hovered = false;
@ -106,8 +105,8 @@ export function Mouse(__getGeometry, __recordWsEvent) {
document.exitPointerLock(); document.exitPointerLock();
} }
if (__abs && !abs) { if (__abs && !abs) {
__touch_pos = null;
__rel_deltas = []; __rel_deltas = [];
__rel_touch_pos = null;
} }
__abs = abs; __abs = abs;
__updateOnlineLeds(); __updateOnlineLeds();
@ -213,41 +212,35 @@ export function Mouse(__getGeometry, __recordWsEvent) {
var __streamTouchStartHandler = function(ev) { var __streamTouchStartHandler = function(ev) {
ev.preventDefault(); ev.preventDefault();
if (ev.touches.length === 1) { let pos = __getTouchPosition(ev, 0);
if (__abs) { if (__abs && ev.touches.length === 1) {
__abs_pos = __getTouchPosition(ev, 0); __abs_pos = pos;
__sendPlannedMove(); __sendPlannedMove();
} else { } else if (!__abs) {
__rel_touch_pos = __getTouchPosition(ev, 0); __touch_pos = pos;
}
} else if (ev.touches.length >= 2) {
__abs_pos = null; __abs_pos = null;
__rel_touch_pos = null;
} }
}; };
var __streamTouchMoveHandler = function(ev) { var __streamTouchMoveHandler = function(ev) {
ev.preventDefault(); ev.preventDefault();
if (ev.touches.length === 1) {
let pos = __getTouchPosition(ev, 0); let pos = __getTouchPosition(ev, 0);
if (ev.touches.length === 1) {
if (__abs) { if (__abs) {
__abs_pos = pos; __abs_pos = pos;
} else if (__rel_touch_pos === null) { } else if (__touch_pos !== null) {
__rel_touch_pos = pos;
} else {
__sendOrPlanRelativeMove({ __sendOrPlanRelativeMove({
"x": (pos.x - __rel_touch_pos.x), "x": (pos.x - __touch_pos.x),
"y": (pos.y - __rel_touch_pos.y), "y": (pos.y - __touch_pos.y),
}); });
__rel_touch_pos = pos; __touch_pos = pos;
} }
} else if (ev.touches.length >= 2) { } else if (ev.touches.length >= 2) {
let pos = __getTouchPosition(ev, 0); if (__touch_pos === null) {
if (__scroll_touch_pos === null) { __touch_pos = pos;
__scroll_touch_pos = pos;
} else { } else {
let dx = __scroll_touch_pos.x - pos.x; let dx = __touch_pos.x - pos.x;
let dy = __scroll_touch_pos.y - pos.y; let dy = __touch_pos.y - pos.y;
if (Math.abs(dx) < 15) { if (Math.abs(dx) < 15) {
dx = 0; dx = 0;
} }
@ -256,22 +249,18 @@ export function Mouse(__getGeometry, __recordWsEvent) {
} }
if (dx || dy) { if (dx || dy) {
__sendScroll({"x": dx, "y": dy}); __sendScroll({"x": dx, "y": dy});
__scroll_touch_pos = null; __touch_pos = null;
} }
} }
__abs_pos = null; __abs_pos = null;
__rel_touch_pos = null;
} }
}; };
var __streamTouchEndHandler = function(ev) { var __streamTouchEndHandler = function(ev) {
ev.preventDefault(); ev.preventDefault();
__sendPlannedMove(); __sendPlannedMove();
__scroll_touch_pos = null; __touch_pos = null;
if (ev.touches.length >= 2) {
__abs_pos = null; __abs_pos = null;
__rel_touch_pos = null;
}
}; };
var __getTouchPosition = function(ev, index) { var __getTouchPosition = function(ev, index) {