|
| 1 | +import { resolveEventKeys } from "@t3tools/shared/keybindingMatching"; |
1 | 2 | import { isMacPlatform } from "../../lib/utils"; |
2 | 3 | import { SELECTION_MULTI_CLICK_INTERVAL_MS } from "../../lib/selectionActions"; |
3 | 4 | import { collectWrappedTerminalLinkLine, extractTerminalLinks } from "../../terminal-links"; |
@@ -313,14 +314,14 @@ export function terminalLinkAtPositionWithRange( |
313 | 314 | } |
314 | 315 |
|
315 | 316 | export function isTerminalCopyShortcut( |
316 | | - event: Pick<KeyboardEvent, "ctrlKey" | "key" | "metaKey" | "shiftKey">, |
| 317 | + event: Pick<KeyboardEvent, "altKey" | "code" | "ctrlKey" | "key" | "metaKey" | "shiftKey">, |
317 | 318 | platform = navigator.platform, |
318 | 319 | ) { |
319 | | - const key = event.key.toLowerCase(); |
320 | | - if (key === "insert" && !isMacPlatform(platform)) { |
| 320 | + const keys = resolveEventKeys(event); |
| 321 | + if (keys.has("insert") && !isMacPlatform(platform)) { |
321 | 322 | return event.ctrlKey && !event.shiftKey && !event.metaKey; |
322 | 323 | } |
323 | | - if (key !== "c") return false; |
| 324 | + if (!keys.has("c")) return false; |
324 | 325 | return isMacPlatform(platform) ? event.metaKey : event.ctrlKey; |
325 | 326 | } |
326 | 327 |
|
@@ -355,14 +356,14 @@ export function applyTerminalCopyEvent( |
355 | 356 | } |
356 | 357 |
|
357 | 358 | function isTerminalPasteShortcut( |
358 | | - event: Pick<KeyboardEvent, "ctrlKey" | "key" | "metaKey" | "shiftKey">, |
| 359 | + event: Pick<KeyboardEvent, "altKey" | "code" | "ctrlKey" | "key" | "metaKey" | "shiftKey">, |
359 | 360 | platform = navigator.platform, |
360 | 361 | ) { |
361 | | - const key = event.key.toLowerCase(); |
362 | | - if (key === "insert" && !isMacPlatform(platform)) { |
| 362 | + const keys = resolveEventKeys(event); |
| 363 | + if (keys.has("insert") && !isMacPlatform(platform)) { |
363 | 364 | return event.shiftKey && !event.ctrlKey && !event.metaKey; |
364 | 365 | } |
365 | | - if (key !== "v") return false; |
| 366 | + if (!keys.has("v")) return false; |
366 | 367 | return isMacPlatform(platform) ? event.metaKey : event.ctrlKey && event.shiftKey; |
367 | 368 | } |
368 | 369 |
|
@@ -1119,7 +1120,7 @@ export class GhosttyTerminalSurface { |
1119 | 1120 | const mac = isMacPlatform(navigator.platform); |
1120 | 1121 | const primaryModifier = mac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey; |
1121 | 1122 | const selectAllShortcut = |
1122 | | - event.key.toLowerCase() === "a" && |
| 1123 | + resolveEventKeys(event).has("a") && |
1123 | 1124 | primaryModifier && |
1124 | 1125 | !event.altKey && |
1125 | 1126 | (mac ? !event.shiftKey : event.shiftKey); |
|
0 commit comments