From 6dea594380d2f320d604c9b776f4521d57ab0b7a Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Sat, 3 May 2025 05:03:48 +0300 Subject: [PATCH] pikvm/pikvm#1500: web: Paste hotkey --- web/kvm/index.html | 13 ++++++------- web/kvm/index.pug | 2 +- web/kvm/navbar-macro.pug | 2 +- web/kvm/navbar-text.pug | 10 +++++----- web/share/css/kvm/hid.css | 29 ----------------------------- web/share/js/kvm/paste.js | 9 +++++++++ 6 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 web/share/css/kvm/hid.css diff --git a/web/kvm/index.html b/web/kvm/index.html index 99c23dbb..a862cfea 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -46,7 +46,6 @@ - @@ -763,7 +762,7 @@
- +
@@ -771,7 +770,7 @@
  • Text -
    +
    Paste text as keypress sequence
    Please note that PiKVM cannot switch the keyboard layout
    @@ -780,9 +779,9 @@ - + @@ -839,10 +838,10 @@
    - + using host keymapusing a host keymap
    - + - + diff --git a/web/kvm/index.pug b/web/kvm/index.pug index d202ada4..2ec76cb3 100644 --- a/web/kvm/index.pug +++ b/web/kvm/index.pug @@ -10,7 +10,7 @@ append vars css_list.push( "navbar", "window", "modal", "led", "slider", "switch", "radio", "progress", "keypad", "tabs", - "kvm/stream", "kvm/hid", "kvm/msd", + "kvm/stream", "kvm/msd", "kvm/system", "kvm/keyboard", "kvm/about" ) diff --git a/web/kvm/navbar-macro.pug b/web/kvm/navbar-macro.pug index d4240a5f..1ee0ed31 100644 --- a/web/kvm/navbar-macro.pug +++ b/web/kvm/navbar-macro.pug @@ -29,7 +29,7 @@ li.right#macro-dropdown +menu_switch_table("hid-recorder-loop-switch", false, false) Infinite loop playback: hr - input#hid-recorder-new-script-file(type="file") + input#hid-recorder-new-script-file(type="file" style="display: none") .buttons.buttons-row button.row50#hid-recorder-upload(disabled) Upload script diff --git a/web/kvm/navbar-text.pug b/web/kvm/navbar-text.pug index 499072eb..4677fc26 100644 --- a/web/kvm/navbar-text.pug +++ b/web/kvm/navbar-text.pug @@ -3,7 +3,7 @@ li.right#text-dropdown +navbar_led("stream-ocr-led", "led-gear", "feature-disabled") span Text - .menu#text-menu + .menu#text-menu(style="width: 360px") .text b Paste text as keypress sequence#[br] sub Please note that PiKVM cannot switch the keyboard layout @@ -12,8 +12,8 @@ li.right#text-dropdown textarea#hid-pak-text(data-focus placeholder="Enter your text here") table.kv tr - td #[button#hid-pak-button(disabled data-force-hide-menu) • Paste] - td using host keymap + td #[button#hid-pak-button(disabled data-force-hide-menu title="Ctrl+Enter when the text is focused") • Paste] + td using a host keymap td #[select#hid-pak-keymap-selector] table.kv tr @@ -39,8 +39,8 @@ li.right#text-dropdown td text recognition table.kv tr - td(colspan="4") • Press #[b Enter] to recognize and copy text to clipboard + td(colspan="4") • Next hit the #[b Enter] to recognize and copy text to clipboard... tr - td(colspan="4") • Press #[b Esc] to cancel selection + td(colspan="4") • Or hit the #[b Escape] to cancel a selection tr td diff --git a/web/share/css/kvm/hid.css b/web/share/css/kvm/hid.css deleted file mode 100644 index 32a92e0f..00000000 --- a/web/share/css/kvm/hid.css +++ /dev/null @@ -1,29 +0,0 @@ -/***************************************************************************** -# # -# KVMD - The main PiKVM daemon. # -# # -# Copyright (C) 2018-2024 Maxim Devaev # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -*****************************************************************************/ - - -div#text-menu { - width: 340px; -} - -input#hid-recorder-new-script-file { - display: none; -} diff --git a/web/share/js/kvm/paste.js b/web/share/js/kvm/paste.js index b34d805b..3065916a 100644 --- a/web/share/js/kvm/paste.js +++ b/web/share/js/kvm/paste.js @@ -33,14 +33,23 @@ export function Paste(__recorder) { /************************************************************************/ var __init__ = function() { + $("hid-pak-text").addEventListener("keyup", function(event) { + if (event.ctrlKey && event.code == "Enter") { + $("hid-pak-button").click(); + } + }); + tools.storage.bindSimpleSwitch($("hid-pak-ask-switch"), "hid.pak.ask", true); tools.storage.bindSimpleSwitch($("hid-pak-slow-switch"), "hid.pak.slow", false); + tools.storage.bindSimpleSwitch($("hid-pak-secure-switch"), "hid.pak.secure", false, function(value) { $("hid-pak-text").style.setProperty("-webkit-text-security", (value ? "disc" : "none")); }); + $("hid-pak-keymap-selector").addEventListener("change", function() { tools.storage.set("hid.pak.keymap", $("hid-pak-keymap-selector").value); }); + tools.el.setOnClick($("hid-pak-button"), __clickPasteAsKeysButton); };
    • Press Enter to recognize and copy text to clipboard• Next hit the Enter to recognize and copy text to clipboard...
    • Press Esc to cancel selection• Or hit the Escape to cancel a selection