remove linux altGr detection, replace windows altGr with Control + Alt (

#1548) Co-authored-by: goosewobbler <goosewobbler@pm.me>
floating · May 9, 2023 · b087f15 · b087f15
1 parent 3484d4b
commit b087f15
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 326 deletions.
diff --git a/main/keyboardShortcuts/index.ts b/main/keyboardShortcuts/index.ts
@@ -1,7 +1,6 @@
 import { globalShortcut } from 'electron'
 import log from 'electron-log'
 
-import store from '../store'
 import { shortcutKeyMap } from '../../resources/keyboard/mappings'
 import type { Shortcut } from '../store/state/types/shortcuts'
 
@@ -10,9 +9,6 @@ const stringifyShortcut = ({ modifierKeys, shortcutKey }: Shortcut) => ({
   accelerator: [...modifierKeys.slice().sort(), shortcutKeyMap[shortcutKey] || shortcutKey].join('+')
 })
 
-const equivalentShortcuts = (shortcut1: Shortcut, shortcut2: Shortcut) =>
-  shortcut1.modifierKeys === shortcut2.modifierKeys && shortcut1.shortcutKey === shortcut2.shortcutKey
-
 function unregister(shortcut: Shortcut) {
   const { shortcutString, accelerator } = stringifyShortcut(shortcut)
 
@@ -41,50 +37,6 @@ function register(shortcut: Shortcut, shortcutHandler: (accelerator: string) =>
 }
 
 export const registerShortcut = (shortcut: Shortcut, shortcutHandler: (accelerator: string) => void) => {
-  const isWindows = process.platform === 'win32'
-  const isMacOS = process.platform === 'darwin'
-  const keyboardLayout = store('keyboardLayout')
-  const createAltGrShortcut = () => {
-    // remove AltGr and Alt from modifiers (Linux)
-    // remove AltGr, Alt and Control from modifiers (Windows)
-    const modifierKeys = shortcut.modifierKeys.filter((modifier) =>
-      isWindows ? !modifier.startsWith('Alt') && modifier !== 'Control' : !modifier.startsWith('Alt')
-    )
-
-    // return new modifiers depending on OS + rest of shortcut - so that AltGr / Right Alt triggers in the same way as Left Alt
-    return {
-      ...shortcut,
-      modifierKeys: (isWindows
-        ? [...modifierKeys, 'Control', 'Alt']
-        : [...modifierKeys, 'AltGr']) as typeof shortcut.modifierKeys
-    }
-  }
-
-  // Windows & Linux Non-US key layout AltGr / Right Alt fix
-  if (!isMacOS) {
-    const altGrShortcut = createAltGrShortcut()
-
-    // unregister any existing AltGr shortcut - unless it matches the one we are about to register
-    if (!keyboardLayout.isUS && !equivalentShortcuts(shortcut, altGrShortcut)) {
-      unregister(altGrShortcut)
-    }
-
-    if (
-      shortcut.modifierKeys.includes('AltGr') ||
-      (shortcut.modifierKeys.includes('Alt') && !keyboardLayout.isUS)
-    ) {
-      // register the AltGr shortcut
-      register(altGrShortcut, shortcutHandler)
-
-      // replace AltGr with Alt in the main shortcut
-      shortcut = {
-        ...shortcut,
-        modifierKeys: shortcut.modifierKeys.map((key) => (key === 'AltGr' ? 'Alt' : key))
-      }
-    }
-  }
-
-  // register the shortcut
   unregister(shortcut)
   register(shortcut, shortcutHandler)
 }
diff --git a/main/store/migrations/index.js b/main/store/migrations/index.js
@@ -927,6 +927,17 @@ const migrations = {
       initial.main.shortcuts.summon.enabled = true
     }
 
+    return initial
+  },
+  37: (initial) => {
+    const isWindows = process.platform === 'win32'
+    const { shortcuts } = initial.main || {}
+    const altGrIndex = shortcuts.summon.modifierKeys.indexOf('AltGr')
+    if (altGrIndex > -1) {
+      const altGrReplacement = isWindows ? ['Alt', 'Control'] : ['Alt']
+      initial.main.shortcuts.summon.modifierKeys.splice(altGrIndex, 1, ...altGrReplacement)
+    }
+
     return initial
   }
 }

diff --git a/main/store/state/types/shortcuts.ts b/main/store/state/types/shortcuts.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-const supportedModifierKey = z.enum(['Alt', 'AltGr', 'Control', 'Meta', 'Super', 'CommandOrCtrl'])
+const supportedModifierKey = z.enum(['Alt', 'Control', 'Meta', 'Super', 'CommandOrCtrl'])
 
 const supportedShortcutKey = z.enum([
   'Comma',

diff --git a/resources/Components/KeyboardShortcutConfigurator/index.js b/resources/Components/KeyboardShortcutConfigurator/index.js
@@ -12,7 +12,7 @@ const KeyboardShortcutConfigurator = ({ actionText = '', platform, shortcut, sho
       hotkeys('*', { capture: true }, (event) => {
         event.preventDefault()
 
-        const allowedModifierKeys = ['Meta', 'Alt', 'AltGr', 'Control', 'Command']
+        const allowedModifierKeys = ['Meta', 'Alt', 'Control', 'Command']
         const isModifierKey = allowedModifierKeys.includes(event.key)
 
         // ignore modifier key solo keypresses and disabled keys

diff --git a/resources/keyboard/index.ts b/resources/keyboard/index.ts
@@ -31,10 +31,6 @@ function getModifierKey(key: ModifierKey, platform: Platform) {
     return isMacOS ? 'Option' : 'Alt'
   }
 
-  if (key === 'AltGr') {
-    return 'Alt'
-  }
-
   if (key === 'Control' || key === 'CommandOrCtrl') {
     return isMacOS ? 'Control' : 'Ctrl'
   }
@@ -60,13 +56,11 @@ export const getDisplayShortcut = (platform: Platform, shortcut: Shortcut) => {
 
 export const getShortcutFromKeyEvent = (e: KeyboardEvent, pressedKeyCodes: number[], platform: Platform) => {
   const isWindows = platform === 'win32'
-  const isLinux = platform === 'linux'
-  const altGrPressed = !e.altKey &&
-    ((pressedKeyCodes.includes(17) && pressedKeyCodes.includes(18) && isWindows) || (pressedKeyCodes.includes(18) && isLinux))
+  const altGrPressed = !e.altKey && pressedKeyCodes.includes(17) && pressedKeyCodes.includes(18)
   const modifierKeys = []
 
-  if (altGrPressed) {
-    modifierKeys.push('AltGr')
+  if (isWindows && altGrPressed) {
+    modifierKeys.push('Alt', 'Control')
   }
   if (e.altKey) {
     modifierKeys.push('Alt')