diff --git a/jsonrpc.go b/jsonrpc.go
index 711edeb0..47cc7960 100644
--- a/jsonrpc.go
+++ b/jsonrpc.go
@@ -1062,21 +1062,26 @@ func cancelKeyboardReportMulti() {
}
}
-func rpcKeyboardReportMultiWrapper(macro []map[string]any) (usbgadget.KeysDownState, error) {
+func setKeyboardReportMultiCancel(cancel context.CancelFunc) {
keyboardReportMultiLock.Lock()
defer keyboardReportMultiLock.Unlock()
- if keyboardReportMultiCancel != nil {
- keyboardReportMultiCancel()
- logger.Info().Msg("canceled previous keyboard report multi")
- }
+ keyboardReportMultiCancel = cancel
+}
+
+func rpcKeyboardReportMultiWrapper(macro []map[string]any) (usbgadget.KeysDownState, error) {
+ cancelKeyboardReportMulti()
ctx, cancel := context.WithCancel(context.Background())
- keyboardReportMultiCancel = cancel
+ setKeyboardReportMultiCancel(cancel)
+
+ writeJSONRPCEvent("keyboardReportMultiState", true, currentSession)
result, err := rpcKeyboardReportMulti(ctx, macro)
- keyboardReportMultiCancel = nil
+ setKeyboardReportMultiCancel(nil)
+
+ writeJSONRPCEvent("keyboardReportMultiState", false, currentSession)
return result, err
}
@@ -1086,6 +1091,10 @@ var (
keyboardReportMultiLock sync.Mutex
)
+func rpcCancelKeyboardReportMulti() {
+ cancelKeyboardReportMulti()
+}
+
func rpcKeyboardReportMulti(ctx context.Context, macro []map[string]any) (usbgadget.KeysDownState, error) {
var last usbgadget.KeysDownState
var err error
@@ -1146,88 +1155,89 @@ func rpcKeyboardReportMulti(ctx context.Context, macro []map[string]any) (usbgad
}
var rpcHandlers = map[string]RPCHandler{
- "ping": {Func: rpcPing},
- "reboot": {Func: rpcReboot, Params: []string{"force"}},
- "getDeviceID": {Func: rpcGetDeviceID},
- "deregisterDevice": {Func: rpcDeregisterDevice},
- "getCloudState": {Func: rpcGetCloudState},
- "getNetworkState": {Func: rpcGetNetworkState},
- "getNetworkSettings": {Func: rpcGetNetworkSettings},
- "setNetworkSettings": {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
- "renewDHCPLease": {Func: rpcRenewDHCPLease},
- "keyboardReport": {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
- "keyboardReportMulti": {Func: rpcKeyboardReportMultiWrapper, Params: []string{"macro"}},
- "getKeyboardLedState": {Func: rpcGetKeyboardLedState},
- "keypressReport": {Func: rpcKeypressReport, Params: []string{"key", "press"}},
- "getKeyDownState": {Func: rpcGetKeysDownState},
- "absMouseReport": {Func: rpcAbsMouseReport, Params: []string{"x", "y", "buttons"}},
- "relMouseReport": {Func: rpcRelMouseReport, Params: []string{"dx", "dy", "buttons"}},
- "wheelReport": {Func: rpcWheelReport, Params: []string{"wheelY"}},
- "getVideoState": {Func: rpcGetVideoState},
- "getUSBState": {Func: rpcGetUSBState},
- "unmountImage": {Func: rpcUnmountImage},
- "rpcMountBuiltInImage": {Func: rpcMountBuiltInImage, Params: []string{"filename"}},
- "setJigglerState": {Func: rpcSetJigglerState, Params: []string{"enabled"}},
- "getJigglerState": {Func: rpcGetJigglerState},
- "setJigglerConfig": {Func: rpcSetJigglerConfig, Params: []string{"jigglerConfig"}},
- "getJigglerConfig": {Func: rpcGetJigglerConfig},
- "getTimezones": {Func: rpcGetTimezones},
- "sendWOLMagicPacket": {Func: rpcSendWOLMagicPacket, Params: []string{"macAddress"}},
- "getStreamQualityFactor": {Func: rpcGetStreamQualityFactor},
- "setStreamQualityFactor": {Func: rpcSetStreamQualityFactor, Params: []string{"factor"}},
- "getAutoUpdateState": {Func: rpcGetAutoUpdateState},
- "setAutoUpdateState": {Func: rpcSetAutoUpdateState, Params: []string{"enabled"}},
- "getEDID": {Func: rpcGetEDID},
- "setEDID": {Func: rpcSetEDID, Params: []string{"edid"}},
- "getDevChannelState": {Func: rpcGetDevChannelState},
- "setDevChannelState": {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
- "getUpdateStatus": {Func: rpcGetUpdateStatus},
- "tryUpdate": {Func: rpcTryUpdate},
- "getDevModeState": {Func: rpcGetDevModeState},
- "setDevModeState": {Func: rpcSetDevModeState, Params: []string{"enabled"}},
- "getSSHKeyState": {Func: rpcGetSSHKeyState},
- "setSSHKeyState": {Func: rpcSetSSHKeyState, Params: []string{"sshKey"}},
- "getTLSState": {Func: rpcGetTLSState},
- "setTLSState": {Func: rpcSetTLSState, Params: []string{"state"}},
- "setMassStorageMode": {Func: rpcSetMassStorageMode, Params: []string{"mode"}},
- "getMassStorageMode": {Func: rpcGetMassStorageMode},
- "isUpdatePending": {Func: rpcIsUpdatePending},
- "getUsbEmulationState": {Func: rpcGetUsbEmulationState},
- "setUsbEmulationState": {Func: rpcSetUsbEmulationState, Params: []string{"enabled"}},
- "getUsbConfig": {Func: rpcGetUsbConfig},
- "setUsbConfig": {Func: rpcSetUsbConfig, Params: []string{"usbConfig"}},
- "checkMountUrl": {Func: rpcCheckMountUrl, Params: []string{"url"}},
- "getVirtualMediaState": {Func: rpcGetVirtualMediaState},
- "getStorageSpace": {Func: rpcGetStorageSpace},
- "mountWithHTTP": {Func: rpcMountWithHTTP, Params: []string{"url", "mode"}},
- "mountWithStorage": {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
- "listStorageFiles": {Func: rpcListStorageFiles},
- "deleteStorageFile": {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
- "startStorageFileUpload": {Func: rpcStartStorageFileUpload, Params: []string{"filename", "size"}},
- "getWakeOnLanDevices": {Func: rpcGetWakeOnLanDevices},
- "setWakeOnLanDevices": {Func: rpcSetWakeOnLanDevices, Params: []string{"params"}},
- "resetConfig": {Func: rpcResetConfig},
- "setDisplayRotation": {Func: rpcSetDisplayRotation, Params: []string{"params"}},
- "getDisplayRotation": {Func: rpcGetDisplayRotation},
- "setBacklightSettings": {Func: rpcSetBacklightSettings, Params: []string{"params"}},
- "getBacklightSettings": {Func: rpcGetBacklightSettings},
- "getDCPowerState": {Func: rpcGetDCPowerState},
- "setDCPowerState": {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
- "setDCRestoreState": {Func: rpcSetDCRestoreState, Params: []string{"state"}},
- "getActiveExtension": {Func: rpcGetActiveExtension},
- "setActiveExtension": {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
- "getATXState": {Func: rpcGetATXState},
- "setATXPowerAction": {Func: rpcSetATXPowerAction, Params: []string{"action"}},
- "getSerialSettings": {Func: rpcGetSerialSettings},
- "setSerialSettings": {Func: rpcSetSerialSettings, Params: []string{"settings"}},
- "getUsbDevices": {Func: rpcGetUsbDevices},
- "setUsbDevices": {Func: rpcSetUsbDevices, Params: []string{"devices"}},
- "setUsbDeviceState": {Func: rpcSetUsbDeviceState, Params: []string{"device", "enabled"}},
- "setCloudUrl": {Func: rpcSetCloudUrl, Params: []string{"apiUrl", "appUrl"}},
- "getKeyboardLayout": {Func: rpcGetKeyboardLayout},
- "setKeyboardLayout": {Func: rpcSetKeyboardLayout, Params: []string{"layout"}},
- "getKeyboardMacros": {Func: getKeyboardMacros},
- "setKeyboardMacros": {Func: setKeyboardMacros, Params: []string{"params"}},
- "getLocalLoopbackOnly": {Func: rpcGetLocalLoopbackOnly},
- "setLocalLoopbackOnly": {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
+ "ping": {Func: rpcPing},
+ "reboot": {Func: rpcReboot, Params: []string{"force"}},
+ "getDeviceID": {Func: rpcGetDeviceID},
+ "deregisterDevice": {Func: rpcDeregisterDevice},
+ "getCloudState": {Func: rpcGetCloudState},
+ "getNetworkState": {Func: rpcGetNetworkState},
+ "getNetworkSettings": {Func: rpcGetNetworkSettings},
+ "setNetworkSettings": {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
+ "renewDHCPLease": {Func: rpcRenewDHCPLease},
+ "keyboardReport": {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
+ "keyboardReportMulti": {Func: rpcKeyboardReportMultiWrapper, Params: []string{"macro"}},
+ "cancelKeyboardReportMulti": {Func: rpcCancelKeyboardReportMulti},
+ "getKeyboardLedState": {Func: rpcGetKeyboardLedState},
+ "keypressReport": {Func: rpcKeypressReport, Params: []string{"key", "press"}},
+ "getKeyDownState": {Func: rpcGetKeysDownState},
+ "absMouseReport": {Func: rpcAbsMouseReport, Params: []string{"x", "y", "buttons"}},
+ "relMouseReport": {Func: rpcRelMouseReport, Params: []string{"dx", "dy", "buttons"}},
+ "wheelReport": {Func: rpcWheelReport, Params: []string{"wheelY"}},
+ "getVideoState": {Func: rpcGetVideoState},
+ "getUSBState": {Func: rpcGetUSBState},
+ "unmountImage": {Func: rpcUnmountImage},
+ "rpcMountBuiltInImage": {Func: rpcMountBuiltInImage, Params: []string{"filename"}},
+ "setJigglerState": {Func: rpcSetJigglerState, Params: []string{"enabled"}},
+ "getJigglerState": {Func: rpcGetJigglerState},
+ "setJigglerConfig": {Func: rpcSetJigglerConfig, Params: []string{"jigglerConfig"}},
+ "getJigglerConfig": {Func: rpcGetJigglerConfig},
+ "getTimezones": {Func: rpcGetTimezones},
+ "sendWOLMagicPacket": {Func: rpcSendWOLMagicPacket, Params: []string{"macAddress"}},
+ "getStreamQualityFactor": {Func: rpcGetStreamQualityFactor},
+ "setStreamQualityFactor": {Func: rpcSetStreamQualityFactor, Params: []string{"factor"}},
+ "getAutoUpdateState": {Func: rpcGetAutoUpdateState},
+ "setAutoUpdateState": {Func: rpcSetAutoUpdateState, Params: []string{"enabled"}},
+ "getEDID": {Func: rpcGetEDID},
+ "setEDID": {Func: rpcSetEDID, Params: []string{"edid"}},
+ "getDevChannelState": {Func: rpcGetDevChannelState},
+ "setDevChannelState": {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
+ "getUpdateStatus": {Func: rpcGetUpdateStatus},
+ "tryUpdate": {Func: rpcTryUpdate},
+ "getDevModeState": {Func: rpcGetDevModeState},
+ "setDevModeState": {Func: rpcSetDevModeState, Params: []string{"enabled"}},
+ "getSSHKeyState": {Func: rpcGetSSHKeyState},
+ "setSSHKeyState": {Func: rpcSetSSHKeyState, Params: []string{"sshKey"}},
+ "getTLSState": {Func: rpcGetTLSState},
+ "setTLSState": {Func: rpcSetTLSState, Params: []string{"state"}},
+ "setMassStorageMode": {Func: rpcSetMassStorageMode, Params: []string{"mode"}},
+ "getMassStorageMode": {Func: rpcGetMassStorageMode},
+ "isUpdatePending": {Func: rpcIsUpdatePending},
+ "getUsbEmulationState": {Func: rpcGetUsbEmulationState},
+ "setUsbEmulationState": {Func: rpcSetUsbEmulationState, Params: []string{"enabled"}},
+ "getUsbConfig": {Func: rpcGetUsbConfig},
+ "setUsbConfig": {Func: rpcSetUsbConfig, Params: []string{"usbConfig"}},
+ "checkMountUrl": {Func: rpcCheckMountUrl, Params: []string{"url"}},
+ "getVirtualMediaState": {Func: rpcGetVirtualMediaState},
+ "getStorageSpace": {Func: rpcGetStorageSpace},
+ "mountWithHTTP": {Func: rpcMountWithHTTP, Params: []string{"url", "mode"}},
+ "mountWithStorage": {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
+ "listStorageFiles": {Func: rpcListStorageFiles},
+ "deleteStorageFile": {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
+ "startStorageFileUpload": {Func: rpcStartStorageFileUpload, Params: []string{"filename", "size"}},
+ "getWakeOnLanDevices": {Func: rpcGetWakeOnLanDevices},
+ "setWakeOnLanDevices": {Func: rpcSetWakeOnLanDevices, Params: []string{"params"}},
+ "resetConfig": {Func: rpcResetConfig},
+ "setDisplayRotation": {Func: rpcSetDisplayRotation, Params: []string{"params"}},
+ "getDisplayRotation": {Func: rpcGetDisplayRotation},
+ "setBacklightSettings": {Func: rpcSetBacklightSettings, Params: []string{"params"}},
+ "getBacklightSettings": {Func: rpcGetBacklightSettings},
+ "getDCPowerState": {Func: rpcGetDCPowerState},
+ "setDCPowerState": {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
+ "setDCRestoreState": {Func: rpcSetDCRestoreState, Params: []string{"state"}},
+ "getActiveExtension": {Func: rpcGetActiveExtension},
+ "setActiveExtension": {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
+ "getATXState": {Func: rpcGetATXState},
+ "setATXPowerAction": {Func: rpcSetATXPowerAction, Params: []string{"action"}},
+ "getSerialSettings": {Func: rpcGetSerialSettings},
+ "setSerialSettings": {Func: rpcSetSerialSettings, Params: []string{"settings"}},
+ "getUsbDevices": {Func: rpcGetUsbDevices},
+ "setUsbDevices": {Func: rpcSetUsbDevices, Params: []string{"devices"}},
+ "setUsbDeviceState": {Func: rpcSetUsbDeviceState, Params: []string{"device", "enabled"}},
+ "setCloudUrl": {Func: rpcSetCloudUrl, Params: []string{"apiUrl", "appUrl"}},
+ "getKeyboardLayout": {Func: rpcGetKeyboardLayout},
+ "setKeyboardLayout": {Func: rpcSetKeyboardLayout, Params: []string{"layout"}},
+ "getKeyboardMacros": {Func: getKeyboardMacros},
+ "setKeyboardMacros": {Func: setKeyboardMacros, Params: []string{"params"}},
+ "getLocalLoopbackOnly": {Func: rpcGetLocalLoopbackOnly},
+ "setLocalLoopbackOnly": {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
}
diff --git a/ui/src/components/InfoBar.tsx b/ui/src/components/InfoBar.tsx
index 8d0b2822..62759d17 100644
--- a/ui/src/components/InfoBar.tsx
+++ b/ui/src/components/InfoBar.tsx
@@ -27,6 +27,7 @@ export default function InfoBar() {
const { rpcDataChannel } = useRTCStore();
const { debugMode, mouseMode, showPressedKeys } = useSettingsStore();
+ const { isPasteModeEnabled } = useHidStore();
useEffect(() => {
if (!rpcDataChannel) return;
@@ -108,7 +109,12 @@ export default function InfoBar() {
{rpcHidStatus}
)}
-
+ {isPasteModeEnabled && (
+
+ Paste Mode:
+ Enabled
+
+ )}
{showPressedKeys && (
Keys:
diff --git a/ui/src/components/popovers/PasteModal.tsx b/ui/src/components/popovers/PasteModal.tsx
index ee17842c..30744fd6 100644
--- a/ui/src/components/popovers/PasteModal.tsx
+++ b/ui/src/components/popovers/PasteModal.tsx
@@ -15,11 +15,11 @@ import notifications from "@/notifications";
export default function PasteModal() {
const TextAreaRef = useRef(null);
- const { setPasteModeEnabled } = useHidStore();
+ const { isPasteModeEnabled } = useHidStore();
const { setDisableVideoFocusTrap } = useUiStore();
const { send } = useJsonRpc();
- const { executeMacro } = useKeyboard();
+ const { executeMacro, cancelExecuteMacro } = useKeyboard();
const [invalidChars, setInvalidChars] = useState([]);
const close = useClose();
@@ -35,10 +35,10 @@ export default function PasteModal() {
}, [send, setKeyboardLayout]);
const onCancelPasteMode = useCallback(() => {
- setPasteModeEnabled(false);
+ cancelExecuteMacro();
setDisableVideoFocusTrap(false);
setInvalidChars([]);
- }, [setDisableVideoFocusTrap, setPasteModeEnabled]);
+ }, [setDisableVideoFocusTrap, cancelExecuteMacro]);
const onConfirmPaste = useCallback(async () => {
// setPasteModeEnabled(false);
@@ -201,6 +201,7 @@ export default function PasteModal() {
size="SM"
theme="primary"
text="Confirm Paste"
+ disabled={isPasteModeEnabled}
onClick={onConfirmPaste}
LeadingIcon={LuCornerDownLeft}
/>
diff --git a/ui/src/hooks/useKeyboard.ts b/ui/src/hooks/useKeyboard.ts
index 46a1a4bb..bdc9fa69 100644
--- a/ui/src/hooks/useKeyboard.ts
+++ b/ui/src/hooks/useKeyboard.ts
@@ -122,6 +122,14 @@ export default function useKeyboard() {
});
};
+ const cancelExecuteMacro = useCallback(async () => {
+ send("cancelKeyboardReportMulti", {}, (resp: JsonRpcResponse) => {
+ if ("error" in resp) {
+ console.error(`Failed to cancel keyboard report multi`, resp.error);
+ }
+ });
+ }, [send]);
+
// handleKeyPress is used to handle a key press or release event.
// This function handle both key press and key release events.
// It checks if the keyPressReport API is available and sends the key press event.
@@ -231,5 +239,5 @@ export default function useKeyboard() {
return { modifier: modifiers, keys };
}
- return { handleKeyPress, resetKeyboardState, executeMacro };
+ return { handleKeyPress, resetKeyboardState, executeMacro, cancelExecuteMacro };
}
diff --git a/ui/src/routes/devices.$id.tsx b/ui/src/routes/devices.$id.tsx
index 4318447e..9445e9fd 100644
--- a/ui/src/routes/devices.$id.tsx
+++ b/ui/src/routes/devices.$id.tsx
@@ -580,7 +580,7 @@ export default function KvmIdRoute() {
const { setNetworkState} = useNetworkStateStore();
const { setHdmiState } = useVideoStore();
const {
- keyboardLedState, setKeyboardLedState,
+ keyboardLedState, setKeyboardLedState, setPasteModeEnabled,
keysDownState, setKeysDownState, setUsbState,
} = useHidStore();
@@ -598,6 +598,12 @@ export default function KvmIdRoute() {
setUsbState(usbState);
}
+ if (resp.method === "keyboardReportMultiState") {
+ const reportMultiState = resp.params as unknown as boolean;
+ console.debug("Setting keyboard report multi state", reportMultiState);
+ setPasteModeEnabled(reportMultiState);
+ }
+
if (resp.method === "videoInputState") {
const hdmiState = resp.params as Parameters[0];
console.debug("Setting HDMI state", hdmiState);