GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 09:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-09-21 15:42:23 +03:00
parent 0ebd2da83d
commit cb8534dfe7
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/share/js/keypad.js
View File

@@ -88,13 +88,19 @@ export function Keypad(__keys_parent, __sendKey, __apply_fixes) {
for (let dict of [__keys, __modifiers]) { for (let dict of [__keys, __modifiers]) {
for (let code in dict) { for (let code in dict) {
if (__isActive(dict[code][0])) { if (__isActive(dict[code][0])) {
self.emit(code, false); self.emitByCode(code, false);
} }
} }
} }
}; };
self.emit = function(code, state, apply_fixes=true) { self.emitByKeyEvent = function(event, state) {
if (!event.repeat) {
self.emitByCode(event.code, state);
}
};
self.emitByCode = function(code, state, apply_fixes=true) {
if (code in __merged) { if (code in __merged) {
if (__fix_win_altgr && apply_fixes) { if (__fix_win_altgr && apply_fixes) {
if (!__fixWinAltgr(code, state)) { if (!__fixWinAltgr(code, state)) {
@@ -116,7 +122,7 @@ export function Keypad(__keys_parent, __sendKey, __apply_fixes) {
for (let code in __keys) { for (let code in __keys) {
setTimeout(function() { setTimeout(function() {
if (__isActive(__keys[code][0])) { if (__isActive(__keys[code][0])) {
self.emit(code, false, false); self.emitByCode(code, false, false);
} }
}, 100); }, 100);
} }
@@ -131,13 +137,13 @@ export function Keypad(__keys_parent, __sendKey, __apply_fixes) {
clearTimeout(__altgr_ctrl_timer); clearTimeout(__altgr_ctrl_timer);
__altgr_ctrl_timer = null; __altgr_ctrl_timer = null;
if (code !== "AltRight") { if (code !== "AltRight") {
self.emit("ControlLeft", true, false); self.emitByCode("ControlLeft", true, false);
} }
} }
if (code === "ControlLeft" && !__isActive(__modifiers["ControlLeft"][0])) { if (code === "ControlLeft" && !__isActive(__modifiers["ControlLeft"][0])) {
__altgr_ctrl_timer = setTimeout(function() { __altgr_ctrl_timer = setTimeout(function() {
__altgr_ctrl_timer = null; __altgr_ctrl_timer = null;
self.emit("ControlLeft", true, false); self.emitByCode("ControlLeft", true, false);
}, 50); }, 50);
return false; // Stop handling return false; // Stop handling
} }
@@ -145,7 +151,7 @@ export function Keypad(__keys_parent, __sendKey, __apply_fixes) {
if (__altgr_ctrl_timer) { if (__altgr_ctrl_timer) {
clearTimeout(__altgr_ctrl_timer); clearTimeout(__altgr_ctrl_timer);
__altgr_ctrl_timer = null; __altgr_ctrl_timer = null;
self.emit("ControlLeft", true, false); self.emitByCode("ControlLeft", true, false);
} }
} }
return true; // Continue handling return true; // Continue handling

6
web/share/js/kvm/keyboard.js
View File

@@ -89,7 +89,7 @@ export function Keyboard(__recordWsEvent) {
}; };
self.emit = function(code, state) { self.emit = function(code, state) {
__keyboardHandler({code: code}, state); __keypad.emitByCode(code, state);
}; };
var __updateOnlineLeds = function() { var __updateOnlineLeds = function() {
@@ -126,9 +126,7 @@ export function Keyboard(__recordWsEvent) {
if (event.preventDefault) { if (event.preventDefault) {
event.preventDefault(); event.preventDefault();
} }
if (!event.repeat) { __keypad.emitByKeyEvent(event, state);
__keypad.emit(event.code, state);
}
}; };
var __sendKey = function(code, state) { var __sendKey = function(code, state) {

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

@@ -168,11 +168,11 @@ export function Mouse(__getGeometry, __recordWsEvent) {
event.preventDefault(); event.preventDefault();
if (__absolute || __isRelativeCaptured()) { if (__absolute || __isRelativeCaptured()) {
switch (event.button) { switch (event.button) {
case 0: __keypad.emit("left", state); break; case 0: __keypad.emitByCode("left", state); break;
case 2: __keypad.emit("right", state); break; case 2: __keypad.emitByCode("right", state); break;
case 1: __keypad.emit("middle", state); break; case 1: __keypad.emitByCode("middle", state); break;
case 3: __keypad.emit("up", state); break; case 3: __keypad.emitByCode("up", state); break;
case 4: __keypad.emit("down", state); break; case 4: __keypad.emitByCode("down", state); break;
} }
} else if (!__absolute && !__isRelativeCaptured() && !state) { } else if (!__absolute && !__isRelativeCaptured() && !state) {
$("stream-box").requestPointerLock(); $("stream-box").requestPointerLock();