Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions src/ui/features/guacamole/GuacamoleApp.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import React, { useState, useEffect, useCallback } from "react";
import { GuacamoleDisplay } from "@/features/guacamole/GuacamoleDisplay.tsx";
import React, { useState, useEffect, useRef, useCallback } from "react";
import {
GuacamoleDisplay,
type GuacamoleDisplayHandle,
} from "@/features/guacamole/GuacamoleDisplay.tsx";
import { FullScreenAppWrapper } from "@/features/FullScreenAppWrapper.tsx";
import { getGuacamoleTokenFromHost } from "@/main-axios.ts";
import { useTranslation } from "react-i18next";
import { AlertCircle, RefreshCw } from "lucide-react";
import { AlertCircle, RefreshCw, Keyboard } from "lucide-react";
import { Button } from "@/components/button.tsx";
import { SimpleLoader } from "@/lib/SimpleLoader.tsx";
import type { SSHHost } from "@/types";
Expand Down Expand Up @@ -71,6 +74,7 @@ const GuacamoleAppInner: React.FC<GuacamoleAppInnerProps> = ({
const [error, setError] = useState<string | null>(null);
const [connectionError, setConnectionError] = useState<string | null>(null);
const [retryCount, setRetryCount] = useState(0);
const displayRef = useRef<GuacamoleDisplayHandle>(null);

useEffect(() => {
setToken(null);
Expand All @@ -87,6 +91,18 @@ const GuacamoleAppInner: React.FC<GuacamoleAppInnerProps> = ({
setRetryCount((c) => c + 1);
}, []);

const sendCtrlAltDelete = useCallback(() => {
const display = displayRef.current;
if (!display) return;
// keysyms: Control_L=0xffe3, Alt_L=0xffe9, Delete=0xffff
display.sendKey(0xffe3, true);
display.sendKey(0xffe9, true);
display.sendKey(0xffff, true);
display.sendKey(0xffff, false);
display.sendKey(0xffe9, false);
display.sendKey(0xffe3, false);
}, []);

if (error) {
return (
<div
Expand Down Expand Up @@ -162,10 +178,21 @@ const GuacamoleAppInner: React.FC<GuacamoleAppInnerProps> = ({
</div>
)}
<GuacamoleDisplay
ref={displayRef}
connectionConfig={{ token, protocol, type: protocol }}
isVisible={true}
onError={(err) => setConnectionError(err)}
/>
{(protocol === "rdp" || protocol === "vnc") && (
<button
onClick={sendCtrlAltDelete}
title="Ctrl+Alt+Delete"
className="absolute top-3 right-3 z-10 flex items-center gap-1.5 px-2.5 py-1.5 text-[10px] font-semibold uppercase tracking-wider bg-background/80 backdrop-blur border border-border rounded hover:bg-muted transition-colors opacity-60 hover:opacity-100"
>
<Keyboard className="size-3" />
Ctrl+Alt+Del
</button>
)}
</div>
);
};
Expand Down
Loading