Skip to content

Commit 64959eb

Browse files
fix(web): terminal Ctrl+Shift+C copies on non-Latin keyboard layouts (#35210)
1 parent d412871 commit 64959eb

2 files changed

Lines changed: 27 additions & 9 deletions

File tree

‎apps/web/src/terminal/ghostty/surface.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,21 @@ describe("GhosttyTerminalSurface visibility", () => {
286286
expect(surface.hasSelection()).toBe(false);
287287
});
288288

289+
it("copies on Ctrl+Shift+C when a non-Latin layout reports another letter on KeyC", async () => {
290+
vi.stubGlobal("navigator", { platform: "Linux x86_64" });
291+
const harness = createHarness();
292+
const surface = await harness.create({ beforeKey: () => true });
293+
Object.assign(surface.input, { select() {} });
294+
const execCommand = vi.fn(() => true);
295+
Object.assign(document, { execCommand });
296+
surface.write("SELECTED_OUTPUT");
297+
surface.selectAll();
298+
// Russian layout: Cyrillic Es (U+0421) on the physical C key.
299+
key(surface, "С", "KeyC", { ctrlKey: true, shiftKey: true });
300+
expect(execCommand).toHaveBeenCalledWith("copy");
301+
expect(harness.onData).not.toHaveBeenCalled();
302+
});
303+
289304
it("skips middle-click selection paste when the desktop turned primary paste off", async () => {
290305
vi.stubGlobal("navigator", { platform: "Linux x86_64" });
291306
const harness = createHarness();
@@ -918,6 +933,8 @@ describe("terminalLinkAtPositionWithRange", () => {
918933

919934
describe("isTerminalCopyShortcut", () => {
920935
const event = (overrides: Partial<Parameters<typeof isTerminalCopyShortcut>[0]> = {}) => ({
936+
altKey: false,
937+
code: "KeyC",
921938
ctrlKey: false,
922939
key: "c",
923940
metaKey: false,

‎apps/web/src/terminal/ghostty/surface.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { resolveEventKeys } from "@t3tools/shared/keybindingMatching";
12
import { isMacPlatform } from "../../lib/utils";
23
import { SELECTION_MULTI_CLICK_INTERVAL_MS } from "../../lib/selectionActions";
34
import { collectWrappedTerminalLinkLine, extractTerminalLinks } from "../../terminal-links";
@@ -313,14 +314,14 @@ export function terminalLinkAtPositionWithRange(
313314
}
314315

315316
export function isTerminalCopyShortcut(
316-
event: Pick<KeyboardEvent, "ctrlKey" | "key" | "metaKey" | "shiftKey">,
317+
event: Pick<KeyboardEvent, "altKey" | "code" | "ctrlKey" | "key" | "metaKey" | "shiftKey">,
317318
platform = navigator.platform,
318319
) {
319-
const key = event.key.toLowerCase();
320-
if (key === "insert" && !isMacPlatform(platform)) {
320+
const keys = resolveEventKeys(event);
321+
if (keys.has("insert") && !isMacPlatform(platform)) {
321322
return event.ctrlKey && !event.shiftKey && !event.metaKey;
322323
}
323-
if (key !== "c") return false;
324+
if (!keys.has("c")) return false;
324325
return isMacPlatform(platform) ? event.metaKey : event.ctrlKey;
325326
}
326327

@@ -355,14 +356,14 @@ export function applyTerminalCopyEvent(
355356
}
356357

357358
function isTerminalPasteShortcut(
358-
event: Pick<KeyboardEvent, "ctrlKey" | "key" | "metaKey" | "shiftKey">,
359+
event: Pick<KeyboardEvent, "altKey" | "code" | "ctrlKey" | "key" | "metaKey" | "shiftKey">,
359360
platform = navigator.platform,
360361
) {
361-
const key = event.key.toLowerCase();
362-
if (key === "insert" && !isMacPlatform(platform)) {
362+
const keys = resolveEventKeys(event);
363+
if (keys.has("insert") && !isMacPlatform(platform)) {
363364
return event.shiftKey && !event.ctrlKey && !event.metaKey;
364365
}
365-
if (key !== "v") return false;
366+
if (!keys.has("v")) return false;
366367
return isMacPlatform(platform) ? event.metaKey : event.ctrlKey && event.shiftKey;
367368
}
368369

@@ -1119,7 +1120,7 @@ export class GhosttyTerminalSurface {
11191120
const mac = isMacPlatform(navigator.platform);
11201121
const primaryModifier = mac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey;
11211122
const selectAllShortcut =
1122-
event.key.toLowerCase() === "a" &&
1123+
resolveEventKeys(event).has("a") &&
11231124
primaryModifier &&
11241125
!event.altKey &&
11251126
(mac ? !event.shiftKey : event.shiftKey);

0 commit comments

Comments
 (0)