hotkey fixes (#1013)

terminus-core/src/configDefaults.linux.yaml

@@ -11,10 +11,10 @@ hotkeys:
   rename-tab:
     - 'Ctrl-Shift-R'
   next-tab:
-    - 'Ctrl-Shift-ArrowRight'
+    - 'Ctrl-Shift-Right'
     - 'Ctrl-Tab'
   previous-tab:
-    - 'Ctrl-Shift-ArrowLeft'
+    - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
@@ -43,12 +43,12 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - 'Ctrl-Alt-ArrowRight'
+    - 'Ctrl-Alt-Right'
   pane-nav-down:
-    - 'Ctrl-Alt-ArrowDown'
+    - 'Ctrl-Alt-Down'
   pane-nav-up:
-    - 'Ctrl-Alt-ArrowUp'
+    - 'Ctrl-Alt-Up'
   pane-nav-left:
-    - 'Ctrl-Alt-ArrowLeft'
+    - 'Ctrl-Alt-Left'
   close-pane: []
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -41,13 +41,13 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - '⌘-⌥-ArrowRight'
+    - '⌘-⌥-Right'
   pane-nav-down:
-    - '⌘-⌥-ArrowDown'
+    - '⌘-⌥-Down'
   pane-nav-up:
-    - '⌘-⌥-ArrowUp'
+    - '⌘-⌥-Up'
   pane-nav-left:
-    - '⌘-⌥-ArrowLeft'
+    - '⌘-⌥-Left'
   close-pane:
     - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -11,10 +11,10 @@ hotkeys:
   rename-tab:
     - 'Ctrl-Shift-R'
   next-tab:
-    - 'Ctrl-Shift-ArrowRight'
+    - 'Ctrl-Shift-Right'
     - 'Ctrl-Tab'
   previous-tab:
-    - 'Ctrl-Shift-ArrowLeft'
+    - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
@@ -43,12 +43,12 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - 'Ctrl-Alt-ArrowRight'
+    - 'Ctrl-Alt-Right'
   pane-nav-down:
-    - 'Ctrl-Alt-ArrowDown'
+    - 'Ctrl-Alt-Down'
   pane-nav-up:
-    - 'Ctrl-Alt-ArrowUp'
+    - 'Ctrl-Alt-Up'
   pane-nav-left:
-    - 'Ctrl-Alt-ArrowLeft'
+    - 'Ctrl-Alt-Left'
   close-pane: []
 pluginBlacklist: []

terminus-core/src/services/hotkeys.util.ts

@@ -50,6 +50,20 @@ export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
             key = key.replace('Key', '')
             key = key.replace('Arrow', '')
             key = key.replace('Digit', '')
+            key = {
+                Comma: ',',
+                Period: '.',
+                Slash: '/',
+                Backslash: '\\',
+                IntlBackslash: '\\',
+                Backquote: '`',
+                Minus: '-',
+                Equal: '=',
+                Semicolon: ';',
+                Quote: '\'',
+                BracketLeft: '[',
+                BracketRight: ']',
+            }[key] || key
             itemKeys.push(key)
             items.push(itemKeys.join('-'))
         }

terminus-terminal/src/config.ts

@@ -79,11 +79,11 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 'zoom-in': [
                     '⌘-=',
-                    '⌘-Shift-+',
+                    '⌘-Shift-=',
                 ],
                 'zoom-out': [
                     '⌘--',
-                    '⌘-Shift-_',
+                    '⌘-Shift--',
                 ],
                 'reset-zoom': [
                     '⌘-0',
@@ -92,10 +92,10 @@ export class TerminalConfigProvider extends ConfigProvider {
                     '⌘-T',
                     '⌘-N',
                 ],
-                'home': ['⌘-ArrowLeft', 'Home'],
-                'end': ['⌘-ArrowRight', 'End'],
-                'previous-word': ['⌥-ArrowLeft'],
-                'next-word': ['⌥-ArrowRight'],
+                'home': ['⌘-Left', 'Home'],
+                'end': ['⌘-Right', 'End'],
+                'previous-word': ['⌥-Left'],
+                'next-word': ['⌥-Right'],
                 'delete-previous-word': ['⌥-Backspace'],
                 'delete-next-word': ['⌥-Delete'],
                 'search': [
@@ -124,11 +124,11 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 'zoom-in': [
                     'Ctrl-=',
-                    'Ctrl-Shift-+',
+                    'Ctrl-Shift-=',
                 ],
                 'zoom-out': [
                     'Ctrl--',
-                    'Ctrl-Shift-_',
+                    'Ctrl-Shift--',
                 ],
                 'reset-zoom': [
                     'Ctrl-0',
@@ -138,8 +138,8 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 'home': ['Home'],
                 'end': ['End'],
-                'previous-word': ['Ctrl-ArrowLeft'],
-                'next-word': ['Ctrl-ArrowRight'],
+                'previous-word': ['Ctrl-Left'],
+                'next-word': ['Ctrl-Right'],
                 'delete-previous-word': ['Ctrl-Backspace'],
                 'delete-next-word': ['Ctrl-Delete'],
                 'search': [
@@ -166,11 +166,11 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 'zoom-in': [
                     'Ctrl-=',
-                    'Ctrl-Shift-+',
+                    'Ctrl-Shift-=',
                 ],
                 'zoom-out': [
                     'Ctrl--',
-                    'Ctrl-Shift-_',
+                    'Ctrl-Shift--',
                 ],
                 'reset-zoom': [
                     'Ctrl-0',
@@ -180,8 +180,8 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 'home': ['Home'],
                 'end': ['End'],
-                'previous-word': ['Ctrl-ArrowLeft'],
-                'next-word': ['Ctrl-ArrowRight'],
+                'previous-word': ['Ctrl-Left'],
+                'next-word': ['Ctrl-Right'],
                 'delete-previous-word': ['Ctrl-Backspace'],
                 'delete-next-word': ['Ctrl-Delete'],
                 'search': [