qdesk 1.0.12 → 1.0.14

package/dist/bank/key-bindings.js

@@ -18,6 +18,12 @@ export class KeyBindings {
         console.log(`[add] Bound ${chord} -> "${info.name}"`);
         save(this.bindings);
     }
+    reportMissing(chord) {
+        const info = this.bindings.get(chord);
+        if (info) {
+            info.missing = true;
+        }
+    }
     delete(chord) {
         const output = this.bindings.delete(chord);
         if (output) {
@@ -33,7 +39,7 @@ export class KeyBindings {
         return this.bindings.size;
     }
     entries() {
-        return this.bindings.entries();
+        return [...this.bindings.entries()].sort(([chordA], [chordB]) => chordA.localeCompare(chordB));
     }
 }
 function load() {

package/dist/index.js

@@ -93,7 +93,11 @@ startListening({
                     name: binding.name,
                     type: "missing",
                 });
-                bindings.delete(chord);
+                bindings.reportMissing(chord);
+                setScreenHue("remove");
+                setTimeout(() => {
+                    setScreenHue("off");
+                }, 50);
             }
             else if (result === "activated") {
                 logSwitch({
@@ -119,8 +123,9 @@ function printBindings() {
         console.log("  (none)");
     }
     else {
+        const maxBindingLength = Math.max(...Array.from(bindings.entries()).map(([chord]) => chord.length));
         for (const [chord, window] of bindings.entries()) {
-            console.log(`  ${chord} -> "${window.name}"`);
+            console.log(`  ${chord.padEnd(maxBindingLength)} ->${window.missing ? "❓" : "  "} "${window.name}"`);
         }
     }
     console.log("");
@@ -131,7 +136,7 @@ console.log(`  Dropping a chord: ${DROP_CHORD}`);
 console.log("  CLI overrides: -a <combo>, -d <combo>");
 for (const [chord, window] of bindings.entries()) {
     if (!checkIfWindowExists(window.handle)) {
-        bindings.delete(chord);
+        bindings.reportMissing(chord);
     }
 }
 if (bindings.size > 0) {

package/dist/koffi/chord-utils.js

@@ -14,22 +14,104 @@ export const WH_KEYBOARD_LL = 13;
 export const WM_KEYDOWN = 0x0100;
 export const WM_SYSKEYDOWN = 0x0104;
 export const PM_REMOVE = 0x0001;
+const VK_TOKEN_TO_CODE = {
+    backspace: 0x08,
+    tab: 0x09,
+    clear: 0x0c,
+    enter: 0x0d,
+    return: 0x0d,
+    pause: 0x13,
+    capslock: 0x14,
+    esc: VK_ESCAPE,
+    escape: VK_ESCAPE,
+    space: 0x20,
+    pageup: 0x21,
+    pagedown: 0x22,
+    end: 0x23,
+    home: 0x24,
+    left: 0x25,
+    up: 0x26,
+    right: 0x27,
+    down: 0x28,
+    printscreen: 0x2c,
+    prtsc: 0x2c,
+    snapshot: 0x2c,
+    insert: 0x2d,
+    delete: 0x2e,
+    num0: 0x60,
+    num1: 0x61,
+    num2: 0x62,
+    num3: 0x63,
+    num4: 0x64,
+    num5: 0x65,
+    num6: 0x66,
+    num7: 0x67,
+    num8: 0x68,
+    num9: 0x69,
+    num_mul: 0x6a,
+    num_add: 0x6b,
+    num_sub: 0x6d,
+    num_dec: 0x6e,
+    num_div: 0x6f,
+};
+const VK_CODE_TO_TOKEN = new Map(Object.entries(VK_TOKEN_TO_CODE).map(([token, code]) => [code, token]));
+VK_CODE_TO_TOKEN.set(VK_ESCAPE, "esc");
+VK_CODE_TO_TOKEN.set(0x0d, "enter");
+VK_CODE_TO_TOKEN.set(0x2c, "printscreen");
+const MODIFIER_TOKENS = new Set([
+    "ctrl",
+    "control",
+    "alt",
+    "shift",
+    "win",
+    "meta",
+]);
+function normalizeKeyToken(rawKey) {
+    const key = rawKey.trim().toLowerCase();
+    if (!key) {
+        return null;
+    }
+    if (/^[0-9a-z]$/.test(key)) {
+        return key;
+    }
+    if (/^f([1-9]|1[0-9]|2[0-4])$/.test(key)) {
+        return key;
+    }
+    if (VK_TOKEN_TO_CODE[key] !== undefined) {
+        return VK_CODE_TO_TOKEN.get(VK_TOKEN_TO_CODE[key]) ?? key;
+    }
+    return null;
+}
+function keyTokenToVk(key) {
+    if (/^[0-9]$/.test(key)) {
+        return key.charCodeAt(0);
+    }
+    if (/^[a-z]$/.test(key)) {
+        return key.toUpperCase().charCodeAt(0);
+    }
+    const functionMatch = /^f([1-9]|1[0-9]|2[0-4])$/.exec(key);
+    if (functionMatch) {
+        const fn = Number(functionMatch[1]);
+        return 0x70 + (fn - 1);
+    }
+    return VK_TOKEN_TO_CODE[key] ?? -1;
+}
 export function normalizeChord(chord) {
     chord = chord.trim().toLowerCase();
     const parts = chord
         .split("+")
         .map((part) => part.trim().toLowerCase())
         .filter(Boolean);
-    if (parts.length < 2) {
+    if (parts.length === 0) {
         return null;
     }
-    const key = parts[parts.length - 1];
-    if (!/^[0-9a-z]$/.test(key) && !/^f([1-9]|1[0-9]|2[0-4])$/.test(key)) {
+    const key = normalizeKeyToken(parts[parts.length - 1]);
+    if (!key) {
         return null;
     }
     const modifiers = new Set(parts.slice(0, -1));
     for (const mod of modifiers) {
-        if (!["ctrl", "control", "alt", "shift", "win", "meta"].includes(mod)) {
+        if (!MODIFIER_TOKENS.has(mod)) {
             return null;
         }
     }
@@ -46,20 +128,20 @@ export function normalizeChord(chord) {
     if (modifiers.has("win") || modifiers.has("meta")) {
         normalizedMods.push("win");
     }
-    if (normalizedMods.length === 0) {
-        return null;
-    }
-    return `${normalizedMods.join("+")}+${key}`;
+    return normalizedMods.length > 0 ? `${normalizedMods.join("+")}+${key}` : key;
 }
 export function parseHotkeyCombo(combo) {
     const parts = combo
         .split("+")
         .map((part) => part.trim().toLowerCase())
         .filter(Boolean);
-    if (parts.length < 2) {
+    if (parts.length === 0) {
+        return null;
+    }
+    const key = normalizeKeyToken(parts[parts.length - 1]);
+    if (!key) {
         return null;
     }
-    const key = parts[parts.length - 1];
     const modifiers = parts.slice(0, -1);
     let modMask = 0;
     const normalizedModifiers = [];
@@ -84,21 +166,8 @@ export function parseHotkeyCombo(combo) {
             return null;
         }
     }
-    let vk = -1;
-    if (/^[0-9]$/.test(key)) {
-        vk = key.charCodeAt(0);
-    }
-    else if (/^[a-z]$/.test(key)) {
-        vk = key.toUpperCase().charCodeAt(0);
-    }
-    else {
-        const functionMatch = /^f([1-9]|1[0-9]|2[0-4])$/.exec(key);
-        if (functionMatch) {
-            const fn = Number(functionMatch[1]);
-            vk = 0x70 + (fn - 1);
-        }
-    }
-    if (vk < 0 || modMask === 0) {
+    const vk = keyTokenToVk(key);
+    if (vk < 0) {
         return null;
     }
     const canonicalModifiers = ["ctrl", "alt", "shift", "win"].filter((mod) => normalizedModifiers.includes(mod));
@@ -121,6 +190,10 @@ function vkToKeyToken(vkCode) {
     if (vkCode >= 0x70 && vkCode <= 0x87) {
         return `f${vkCode - 0x6f}`;
     }
+    const named = VK_CODE_TO_TOKEN.get(vkCode);
+    if (named) {
+        return named;
+    }
     return null;
 }
 export function buildCurrentChord(vkCode) {
@@ -141,8 +214,5 @@ export function buildCurrentChord(vkCode) {
     if (isPressed(VK_LWIN) || isPressed(VK_RWIN)) {
         parts.push("win");
     }
-    if (parts.length === 0) {
-        return null;
-    }
-    return `${parts.join("+")}+${key}`;
+    return parts.length > 0 ? `${parts.join("+")}+${key}` : key;
 }

package/dist/process/cli.js

@@ -17,7 +17,7 @@ function hasCliFlag(flag) {
 }
 function getPackageVersion() {
     try {
-        const packageJson = readFileSync(new URL("../package.json", import.meta.url), "utf8");
+        const packageJson = readFileSync(new URL("../../package.json", import.meta.url), "utf8");
         const parsed = JSON.parse(packageJson);
         return parsed.version ?? "unknown";
     }

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "qdesk",
-  "version": "1.0.12",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/JakeBeaver/qdesk.git"
-  },
-  "bugs": {
-    "url": "https://github.com/JakeBeaver/qdesk/issues"
-  },
-  "homepage": "https://github.com/JakeBeaver/qdesk#readme",
-  "bin": {
-    "qdesk": "dist/index.js"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\"",
-    "build": "pnpm clean && tsc -p tsconfig.json",
-    "start": "node dist/index.js",
-    "prepack": "pnpm build"
-  },
-  "dependencies": {
-    "koffi": "^3.0.2"
-  },
-  "devDependencies": {
-    "@types/node": "^22.15.30",
-    "tsx": "^4.19.4",
-    "typescript": "^5.8.3"
-  }
-}
+{
+  "name": "qdesk",
+  "version": "1.0.14",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/JakeBeaver/qdesk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/JakeBeaver/qdesk/issues"
+  },
+  "homepage": "https://github.com/JakeBeaver/qdesk#readme",
+  "bin": {
+    "qdesk": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\"",
+    "build": "pnpm clean && tsc -p tsconfig.json",
+    "start": "node dist/index.js",
+    "prepack": "pnpm build"
+  },
+  "dependencies": {
+    "koffi": "^3.0.2"
+  },
+  "devDependencies": {
+    "@types/node": "^22.15.30",
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3"
+  }
+}