Added MacOS support; added support for overriding copy keys

hsource · Dec 3, 2023 · f162e6f · f162e6f
1 parent 18d079b
commit f162e6f
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 19 deletions.
diff --git a/ipc/KeyToCode.ts b/ipc/KeyToCode.ts
@@ -217,7 +217,9 @@ export const KeyToElectron = {
   Backslash: '\\',
   BracketRight: ']',
   Quote: "'",
-  Ctrl: 'CmdOrCtrl',
+  // Do not change Ctrl to CmdOrCtrl. It causes registered shortcuts to
+  // often not work on Mac for unknown reasons.
+  Ctrl: 'Ctrl',
   Alt: 'Alt',
   Shift: 'Shift'
 }

diff --git a/ipc/types.ts b/ipc/types.ts
@@ -1,13 +1,13 @@
 export interface HostConfig {
-  shortcuts: ShortcutAction[]
-  restoreClipboard: boolean
-  clientLog: string | null
-  gameConfig: string | null
-  stashScroll: boolean
-  overlayKey: string
-  logKeys: boolean
-  windowTitle: string
-  language: string
+    shortcuts: ShortcutAction[]
+    restoreClipboard: boolean
+    clientLog: string | null
+    gameConfig: string | null
+    stashScroll: boolean
+    overlayKey: string
+    logKeys: boolean
+    windowTitle: string
+    language: string
 }
 
 export interface ShortcutAction {

diff --git a/main/src/AppTray.ts b/main/src/AppTray.ts
@@ -8,9 +8,21 @@ export class AppTray {
   serverPort = 0
 
   constructor (server: ServerEvents) {
-    this.tray = new Tray(
-      nativeImage.createFromPath(path.join(__dirname, process.env.STATIC!, process.platform === 'win32' ? 'icon.ico' : 'icon.png'))
+    let trayImage = nativeImage.createFromPath(
+      path.join(
+        __dirname,
+        process.env.STATIC!,
+        process.platform === "win32" ? "icon.ico" : "icon.png"
+      )
     )
+
+    if (process.platform === 'darwin') {
+      // Mac image size needs to be smaller, or else it looks huge. Size
+      // guideline is from https://iconhandbook.co.uk/reference/chart/osx/
+      trayImage = trayImage.resize({ width: 22, height: 22 })
+    }
+
+    this.tray = new Tray(trayImage)
     this.tray.setToolTip(`Awakened PoE Trade v${app.getVersion()}`)
     this.rebuildMenu()
 

diff --git a/main/src/host-files/GameConfig.ts b/main/src/host-files/GameConfig.ts
@@ -2,6 +2,7 @@ import fs from 'fs/promises'
 import path from 'path'
 import ini from 'ini'
 import { app } from 'electron'
+import process from 'process';
 import { hotkeyToString, CodeToKey } from '../../../ipc/KeyToCode'
 import type { Logger } from '../RemoteLogger'
 import type { ServerEvents } from '../server'
@@ -21,7 +22,12 @@ export class GameConfig {
     if (this.filePath === filePath) return
 
     if (!filePath) {
-      filePath = path.join(app.getPath('documents'), 'My Games', 'Path of Exile', 'production_Config.ini')
+      if (process.platform === 'darwin') {
+        filePath = path.join(app.getPath('appData'), 'Path of Exile', 'Preferences', 'production_Config.ini')
+      } else {
+        filePath = path.join(app.getPath('documents'), 'My Games', 'Path of Exile', 'production_Config.ini')
+      }
+
       try {
         await fs.access(filePath)
         // this.server.sendEventTo('any', {

diff --git a/main/src/shortcuts/Shortcuts.ts b/main/src/shortcuts/Shortcuts.ts
@@ -230,8 +230,18 @@ function pressKeysToCopyItemText (pressedModKeys: string[] = [], showModsKey: st
     uIOhook.keyToggle(UiohookKey[key as UiohookKeyT], 'down')
   }
 
+  const allowedModifierKeys: Set<UiohookKeyT> = new Set(["Ctrl", "Alt", "Shift"]);
+  const modifierKeys: number[] = keys
+      .filter((key) => allowedModifierKeys.has(key as UiohookKeyT))
+      .map((key) => UiohookKey[key as UiohookKeyT])
+
   // finally press `C` to copy text
-  uIOhook.keyTap(UiohookKey.C)
+  uIOhook.keyTap(
+    UiohookKey.C,
+    // On Mac, robotjs requires the modifiers to be specified in this way to
+    // register. See https://github.com/octalmage/robotjs/issues/208#issuecomment-223828356
+    process.platform === 'darwin' ? modifierKeys : undefined
+  )
 
   keys.reverse()
   for (const key of keys) {

diff --git a/main/src/shortcuts/text-box.ts b/main/src/shortcuts/text-box.ts
@@ -1,4 +1,5 @@
 import { uIOhook, UiohookKey as Key } from 'uiohook-napi'
+import process from 'process';
 import type { HostClipboard } from './HostClipboard'
 import type { OverlayWindow } from '../windowing/OverlayWindow'
 
@@ -14,14 +15,16 @@ const AUTO_CLEAR = [
 
 export function typeInChat (text: string, send: boolean, clipboard: HostClipboard) {
   clipboard.restoreShortly((clipboard) => {
+    const modifiers = process.platform === 'darwin' ? [Key.Meta] : [Key.Ctrl]
+
     if (text.startsWith(PLACEHOLDER_LAST)) {
       text = text.slice(`${PLACEHOLDER_LAST} `.length)
       clipboard.writeText(text)
-      uIOhook.keyTap(Key.Enter, [Key.Ctrl])
+      uIOhook.keyTap(Key.Enter, modifiers)
     } else if (text.endsWith(PLACEHOLDER_LAST)) {
       text = text.slice(0, -PLACEHOLDER_LAST.length)
       clipboard.writeText(text)
-      uIOhook.keyTap(Key.Enter, [Key.Ctrl])
+      uIOhook.keyTap(Key.Enter, modifiers)
       uIOhook.keyTap(Key.Home)
       // press twice to focus input when using controller
       uIOhook.keyTap(Key.Home)
@@ -30,11 +33,11 @@ export function typeInChat (text: string, send: boolean, clipboard: HostClipboar
       clipboard.writeText(text)
       uIOhook.keyTap(Key.Enter)
       if (!AUTO_CLEAR.includes(text[0])) {
-        uIOhook.keyTap(Key.A, [Key.Ctrl])
+        uIOhook.keyTap(Key.A, modifiers)
       }
     }
 
-    uIOhook.keyTap(Key.V, [Key.Ctrl])
+    uIOhook.keyTap(Key.V, modifiers)
 
     if (send) {
       uIOhook.keyTap(Key.Enter)

diff --git a/main/src/windowing/GameWindow.ts b/main/src/windowing/GameWindow.ts
@@ -34,7 +34,7 @@ export class GameWindow extends EventEmitter {
     if (!this._isTracking) {
       OverlayController.events.on('focus', () => { this.isActive = true })
       OverlayController.events.on('blur', () => { this.isActive = false })
-      OverlayController.attachByTitle(window, title)
+      OverlayController.attachByTitle(window, title, { hasTitleBarOnMac: true })
       this._isTracking = true
     }
   }