feat: alt navigation by default

CyanSalt · Jun 19, 2024 · 54c8f64 · 54c8f64
1 parent 49d1a32
commit 54c8f64
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/resources/examples/keybindings.yaml b/resources/examples/keybindings.yaml
@@ -6,9 +6,3 @@
 # - label: Open User Directory
 #   accelerator: CmdOrCtrl+Shift+,
 #   command: open-user-directory
-
-# - label: Go to Previous Word
-#   accelerator: Alt+Left
-#   command: xterm:input
-#   args:
-#     - "\eb"
diff --git a/src/renderer/assets/keybindings.ts b/src/renderer/assets/keybindings.ts
@@ -1,6 +1,18 @@
 import type { KeyBinding } from '../../typings/menu'
 
 export default [
+  {
+    label: 'Go to Previous Word',
+    accelerator: 'Alt+Left',
+    command: 'xterm:input',
+    args: ['\u001bb'],
+  },
+  {
+    label: 'Go to Next Word',
+    accelerator: 'Alt+Right',
+    command: 'xterm:input',
+    args: ['\u001bf'],
+  },
   {
     label: 'Delete the whole line',
     accelerator: 'CmdOrCtrl+Backspace',

diff --git a/src/renderer/compositions/terminal.ts b/src/renderer/compositions/terminal.ts
@@ -179,14 +179,20 @@ interface RendererKeyBinding extends KeyBindingCommand {
 
 const keybindings = $(useKeyBindings())
 const rendererKeybindings = $computed(() => {
-  return keybindings.map<RendererKeyBinding>(binding => ({
-    pattern: {
-      ...toKeyEvent(binding.accelerator),
-      type: binding.when ?? 'keydown',
-    },
-    command: binding.command!,
-    args: binding.args,
-  }))
+  return keybindings.map<RendererKeyBinding>(binding => {
+    const pattern = toKeyEvent(binding.accelerator)
+    if (pattern.code) {
+      delete pattern.key
+    }
+    return {
+      pattern: {
+        ...pattern,
+        type: binding.when ?? 'keydown',
+      },
+      command: binding.command!,
+      args: binding.args,
+    }
+  })
 })
 
 export interface CreateTerminalTabOptions {