devices/wim/config/ags/config.js

@@ -21,6 +21,7 @@ exec(`sassc ${scss} ${css}`);
 Setup();
 
 
+// TODO: get rid of 'properties' and 'binds' prop
 export default {
     style: css,
     notificationPopupTimeout: 5000,

devices/wim/config/ags/js/on-screen-keyboard/keys.js

@@ -80,7 +80,6 @@ const ModKey = (key) => {
     const button = EventBox({
         cursor: 'pointer',
         class_name: 'key',
-
         on_primary_click_release: (self) => {
             console.log('mod toggled');
 
@@ -90,7 +89,6 @@ const ModKey = (key) => {
             self.child.toggleClassName('active', !Mod.value);
             Mod.value = !Mod.value;
         },
-
         setup: (self) => {
             self.hook(NormalClick, () => {
                 Mod.value = false;

devices/wim/config/ags/js/powermenu.js

@@ -7,13 +7,14 @@ import PopupWindow from './misc/popup.js';
 import CursorBox from './misc/cursorbox.js';
 
 
+// FIXME: eventboxes are the wrong size
 const PowermenuWidget = () => CenterBox({
     class_name: 'powermenu',
     // @ts-expect-error
     vertical: false,
 
     start_widget: CursorBox({
-        class_name: 'shutdown button',
+        class_name: 'shutdown',
         on_primary_click_release: () => execAsync(['systemctl', 'poweroff'])
             .catch(print),
 
@@ -23,7 +24,7 @@ const PowermenuWidget = () => CenterBox({
     }),
 
     center_widget: CursorBox({
-        class_name: 'reboot button',
+        class_name: 'reboot',
         on_primary_click_release: () => execAsync(['systemctl', 'reboot'])
             .catch(print),
 
@@ -33,7 +34,7 @@ const PowermenuWidget = () => CenterBox({
     }),
 
     end_widget: CursorBox({
-        class_name: 'logout button',
+        class_name: 'logout',
         on_primary_click_release: () => Hyprland.sendMessage('dispatch exit')
             .catch(print),
 

devices/wim/config/ags/js/quick-settings/slider-box.js

@@ -21,7 +21,7 @@ export default () => Box({
                 Icon({
                     size: 26,
                     class_name: 'slider-label',
-                    icon: SpeakerIcon.bind(),
+                    binds: [['icon', SpeakerIcon, 'value']],
                 }),
 
                 Slider({
@@ -62,7 +62,7 @@ export default () => Box({
             children: [
                 Icon({
                     class_name: 'slider-label',
-                    icon: Brightness.bind('screenIcon'),
+                    binds: [['icon', Brightness, 'screen-icon']],
                 }),
 
                 Slider({

devices/wim/config/ags/scss/widgets/powermenu.scss

@@ -14,7 +14,7 @@
     min-height: 130px;
   }
 
-  .button {
+  button {
     margin: 5px 10px;
     border-radius: 12px;
     min-width: 80px;

devices/wim/config/ags/services/pointers.js

@@ -1,10 +1,8 @@
 import App from 'resource:///com/github/Aylur/ags/app.js';
 import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js';
 import Service from 'resource:///com/github/Aylur/ags/service.js';
-
 import { subprocess } from 'resource:///com/github/Aylur/ags/utils.js';
-
+import GUdev from 'gi://GUdev';
-const { GUdev } = imports.gi;
 
 const UDEV_POINTERS = [
     'ID_INPUT_MOUSE',
@@ -36,10 +34,8 @@ class Pointers extends Service {
         });
     }
 
-    /** @type typeof imports.gi.Gio.Subprocess */
     #process;
     #lastLine = '';
-    /** @type Array<string> */
     #pointers = [];
     #udevClient = GUdev.Client.new(['input']);
 
@@ -64,12 +60,7 @@ class Pointers extends Service {
     // FIXME: logitech mouse screws everything up on disconnect
     #initUdevConnection() {
         this.#getDevices();
-        this.#udevClient.connect('uevent',
+        this.#udevClient.connect('uevent', (_, action) => {
-            /**
-             * @param {typeof imports.gi.GUdev.Client} _
-             * @param {string} action
-             */
-            (_, action) => {
             if (action === 'add' || action === 'remove') {
                 this.#getDevices();
                 if (this.#process) {
@@ -82,12 +73,8 @@ class Pointers extends Service {
 
     #getDevices() {
         this.#pointers = [];
-        this.#udevClient.query_by_subsystem('input').forEach(
+        this.#udevClient.query_by_subsystem('input').forEach((dev) => {
-            /** @param {typeof imports.gi.GUdev.Device} dev */
+            const isPointer = UDEV_POINTERS.some((p) => dev.has_property(p));
-            (dev) => {
-                const isPointer = UDEV_POINTERS.some(
-                    (p) => dev.has_property(p),
-                );
 
             if (isPointer) {
                 const hasEventFile = dev.has_property('DEVNAME') &&
@@ -98,8 +85,7 @@ class Pointers extends Service {
                     this.#pointers.push(dev.get_property('DEVNAME'));
                 }
             }
-            },
+        });
-        );
 
         this.emit('device-fetched', true);
     }
@@ -137,6 +123,7 @@ class Pointers extends Service {
                     this.emit('new-line', output);
                 }
             },
+            (err) => logError(err),
         );
         this.emit('proc-started', true);
     }
@@ -152,11 +139,8 @@ class Pointers extends Service {
     #initAppConnection() {
         App.connect('window-toggled', () => {
             const anyVisibleAndClosable = Array.from(App.windows).some((w) => {
-                // @ts-expect-error
                 const closable = w[1].attribute?.close_on_unfocus &&
-                                // @ts-expect-error
                                 !(w[1].attribute?.close_on_unfocus === 'none' ||
-                                // @ts-expect-error
                                     w[1].attribute?.close_on_unfocus === 'stay');
 
                 return w[1].visible && closable;
@@ -172,12 +156,9 @@ class Pointers extends Service {
         });
     }
 
-    /** @param {string} clickStage */
     static detectClickedOutside(clickStage) {
         const toClose = Array.from(App.windows).some((w) => {
-            // @ts-expect-error
             const closable = (w[1].attribute?.close_on_unfocus &&
-                              // @ts-expect-error
                               w[1].attribute?.close_on_unfocus === clickStage);
 
             return w[1].visible && closable;
@@ -187,31 +168,22 @@ class Pointers extends Service {
             return;
         }
 
-        Hyprland.sendMessage('j/layers').then((response) => {
+        Hyprland.sendMessage('j/layers').then((layers) => {
-            // /** @type import('types/service/hyprland').Layer */
+            layers = JSON.parse(layers);
-            const layers = JSON.parse(response);
 
-            Hyprland.sendMessage('j/cursorpos').then((res) => {
+            Hyprland.sendMessage('j/cursorpos').then((pos) => {
-                const pos = JSON.parse(res);
+                pos = JSON.parse(pos);
 
                 Object.values(layers).forEach((key) => {
-                    const bar = key.levels['3'].find(
+                    const bar = key.levels['3']
-                        /** @param {{ namespace: string }} n */
+                        .find((n) => n.namespace === 'bar');
-                        (n) => n.namespace === 'bar',
-                    );
 
-                    const widgets = key.levels['3'].filter(
+                    const widgets = key.levels['3'].filter((n) => {
-                        /** @param {{ namespace: string }} n */
-                        (n) => {
                         const window = App.getWindow(n.namespace);
 
-                        // @ts-expect-error
                         return window?.attribute?.close_on_unfocus &&
-                               // @ts-expect-error
+                               window?.attribute?.close_on_unfocus === clickStage;
-                               window?.attribute
+                    });
-                                   ?.close_on_unfocus === clickStage;
-                        },
-                    );
 
                     if (pos.x > bar?.x && pos.x < bar?.x + bar?.w &&
                         pos.y > bar?.y && pos.y < bar?.y + bar?.h) {
@@ -220,22 +192,12 @@ class Pointers extends Service {
                         // TODO: make this configurable
                     }
                     else {
-                        widgets.forEach(
+                        widgets.forEach((w) => {
-                            /** @param {{
-                             *      namespace: string
-                             *      x: number
-                             *      y: number
-                             *      h: number
-                             *      w: number
-                             * }} w
-                             */
-                            (w) => {
                             if (!(pos.x > w.x && pos.x < w.x + w.w &&
                                   pos.y > w.y && pos.y < w.y + w.h)) {
                                 App.closeWindow(w.namespace);
                             }
-                            },
+                        });
-                        );
                     }
                 });
             }).catch(print);

devices/wim/config/ags/services/tablet.js

@@ -2,6 +2,7 @@ import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js';
 import Service from 'resource:///com/github/Aylur/ags/service.js';
 import TouchGestures from './touch-gestures.js';
 import { execAsync, subprocess } from 'resource:///com/github/Aylur/ags/utils.js';
+import GUdev from 'gi://GUdev';
 
 const ROTATION_MAP = {
     'normal': 0,
@@ -10,10 +11,6 @@ const ROTATION_MAP = {
     'left-up': 1,
 };
 const SCREEN = 'desc:BOE 0x0964';
-const DEVICES = [
-    'wacom-hid-52eb-finger',
-    'wacom-hid-52eb-pen',
-];
 
 
 class Tablet extends Service {
@@ -33,10 +30,9 @@ class Tablet extends Service {
 
     #tabletMode = false;
     #oskState = false;
-    /** @type typeof imports.gi.Gio.Subprocess */
     #autorotate;
-    /** @type typeof imports.gi.Gio.Subprocess */
     #blockedInputs;
+    #udevClient = GUdev.Client.new(['input']);
 
     get tabletMode() {
         return this.#tabletMode;
@@ -48,6 +44,7 @@ class Tablet extends Service {
 
     constructor() {
         super();
+        this.#initUdevConnection();
         this.#listenOskState();
     }
 
@@ -62,7 +59,8 @@ class Tablet extends Service {
             '--device', '/dev/input/by-path/platform-AMDI0010:02-event-mouse',
             '--device', '/dev/input/by-path/platform-thinkpad_acpi-event',
             '--device', '/dev/video-bus'],
-        () => { /**/ });
+        () => { /**/ },
+        (err) => logError(err));
         this.emit('inputs-blocked', true);
     }
 
@@ -115,6 +113,31 @@ class Tablet extends Service {
         this.emit('mode-toggled', true);
     }
 
+    #initUdevConnection() {
+        this.#getDevices();
+        this.#udevClient.connect('uevent', (_, action) => {
+            if (action === 'add' || action === 'remove') {
+                this.#getDevices();
+            }
+        });
+    }
+
+    #getDevices() {
+        this.devices = [];
+        Hyprland.sendMessage('j/devices').then((out) => {
+            const devices = JSON.parse(out);
+
+            devices.touch.forEach((dev) => {
+                this.devices.push(dev.name);
+            });
+            devices.tablets.forEach((dev) => {
+                this.devices.push(dev.name);
+            });
+        }).catch(print);
+
+        this.emit('device-fetched', true);
+    }
+
     startAutorotate() {
         if (this.#autorotate) {
             return;
@@ -130,7 +153,7 @@ class Tablet extends Service {
                         `keyword monitor ${SCREEN},transform,${orientation}`,
                     ).catch(print);
 
-                    const batchRotate = DEVICES.map((dev) =>
+                    const batchRotate = this.devices.map((dev) =>
                         `keyword device:${dev}:transform ${orientation}; `);
 
                     Hyprland.sendMessage(`[[BATCH]] ${batchRotate.flat()}`);
@@ -141,6 +164,7 @@ class Tablet extends Service {
                     }
                 }
             },
+            (err) => logError(err),
         );
         this.emit('autorotate-started', true);
     }
@@ -158,14 +182,11 @@ class Tablet extends Service {
             ['bash', '-c', 'busctl monitor --user sm.puri.OSK0'],
             (output) => {
                 if (output.includes('BOOLEAN')) {
-                    const match = output.match('true|false');
+                    this.#oskState = output.match('true|false')[0] === 'true';
-
-                    if (match) {
-                        this.#oskState = match[0] === 'true';
                     this.emit('osk-toggled', this.#oskState);
                 }
-                }
             },
+            (err) => logError(err),
         );
     }
 

devices/wim/config/ags/services/touch-gestures.js

@@ -44,17 +44,12 @@ class TouchGestures extends Service {
     }
 
     #gestures = new Map();
-    /** @type typeof imports.gi.Gio.Subprocess */
     #gestureDaemon;
 
     get gestures() {
         return this.#gestures;
     }
 
-    get gestureDaemon() {
-        return this.#gestureDaemon;
-    }
-
     addGesture({
         name,
         nFingers = '1',
@@ -62,7 +57,7 @@ class TouchGestures extends Service {
         edge = '*',
         distance = '*',
         command,
-    }) {
+    } = {}) {
         gesture = String(gesture).toUpperCase();
         if (!GESTURE_VERIF.includes(gesture)) {
             logError('Wrong gesture id');
@@ -124,6 +119,7 @@ class TouchGestures extends Service {
         this.#gestureDaemon = subprocess(
             command,
             () => { /**/ },
+            (err) => logError(err),
         );
         this.emit('daemon-started', true);
     }