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

separate keyboard and mouse output handling

Browse Source
This commit is contained in:
Maxim Devaev
2021-07-23 22:38:01 +03:00
parent 189ff59379
commit 11bf43de92
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/share/js/kvm/hid.js
View File

@@ -112,10 +112,8 @@ export function Hid(__getResolution) {
if (state && state.online) {
let keyboard_outputs = state.keyboard.outputs.available;
let mouse_outputs = state.mouse.outputs.available;
let has_outputs = (keyboard_outputs.length || mouse_outputs.length);
let has_relative = false;
if (has_outputs) {
if ($("hid-outputs-keyboard").outputs !== keyboard_outputs) {
if (keyboard_outputs.length) {
if ($("hid-outputs-keyboard-box").outputs !== keyboard_outputs) {
let html = "";
for (let args of [
["USB", "usb"],
@@ -126,11 +124,15 @@ export function Hid(__getResolution) {
html += tools.radioMakeItem("hid-outputs-keyboard-radio", args[0], args[1]);
}
}
$("hid-outputs-keyboard").innerHTML = html;
$("hid-outputs-keyboard").outputs = keyboard_outputs;
$("hid-outputs-keyboard-box").innerHTML = html;
$("hid-outputs-keyboard-box").outputs = keyboard_outputs;
tools.radioSetOnClick("hid-outputs-keyboard-radio", () => __clickOutputsRadio("keyboard"));
}
if ($("hid-outputs-mouse").outputs !== mouse_outputs) {
tools.radioSetValue("hid-outputs-keyboard-radio", state.keyboard.outputs.active);
}
let has_relative = false;
if (mouse_outputs.length) {
if ($("hid-outputs-mouse-box").outputs !== mouse_outputs) {
let html = "";
for (let args of [
["USB", "usb", false],
@@ -143,18 +145,19 @@ export function Hid(__getResolution) {
has_relative = (has_relative || args[2]);
}
}
$("hid-outputs-mouse").innerHTML = html;
$("hid-outputs-mouse").outputs = mouse_outputs;
$("hid-outputs-mouse-box").innerHTML = html;
$("hid-outputs-mouse-box").outputs = mouse_outputs;
tools.radioSetOnClick("hid-outputs-mouse-radio", () => __clickOutputsRadio("mouse"));
}
tools.radioSetValue("hid-outputs-keyboard-radio", state.keyboard.outputs.active);
tools.radioSetValue("hid-outputs-mouse-radio", state.mouse.outputs.active);
has_relative_squash = ["usb_rel", "ps2"].includes(state.mouse.outputs.active);
} else {
has_relative = !state.mouse.absolute;
has_relative_squash = has_relative;
}
tools.featureSetEnabled($("hid-outputs"), has_outputs);
tools.featureSetEnabled($("hid-outputs"), (keyboard_outputs.length || mouse_outputs.length));
tools.featureSetEnabled($("hid-outputs-keyboard"), keyboard_outputs.length);
tools.featureSetEnabled($("hid-outputs-mouse"), mouse_outputs.length);
tools.featureSetEnabled($("hid-mouse-squash"), has_relative);
tools.featureSetEnabled($("hid-connect"), (state.connected !== null));
$("hid-connect-switch").checked = !!state.connected;