feat: update system

home/desktops/hyprland/ags/js/overview/Client.js

@@ -2,9 +2,10 @@ import Widget from "resource:///com/github/Aylur/ags/widget.js";
 import App from "resource:///com/github/Aylur/ags/app.js";
 import { createSurfaceFromWidget, substitute } from "../utils.js";
 import Gdk from "gi://Gdk";
-import Gtk from "gi://Gtk";
+import Gtk from "gi://Gtk?version=3.0";
 import options from "../options.js";
 import Hyprland from "resource:///com/github/Aylur/ags/service/hyprland.js";
+import icons from "../icons.js";
 
 const SCALE = 0.08;
 const TARGET = [Gtk.TargetEntry.new("text/plain", Gtk.TargetFlags.SAME_APP, 0)];
@@ -13,7 +14,13 @@ const TARGET = [Gtk.TargetEntry.new("text/plain", Gtk.TargetFlags.SAME_APP, 0)];
 const dispatch = (args) => Hyprland.sendMessage(`dispatch ${args}`);
 
 /** @param {string} str */
-const icon = (str) => substitute(options.substitutions.icons, str);
+const icon = (str) => {
+  const icon = substitute(options.substitutions.icons, str);
+  if (Utils.lookUpIcon(icon)) return icon;
+
+  console.warn("no icon", icon);
+  return icons.fallback.executable;
+};
 
 export default ({ address, size: [w, h], class: c, title }) =>
   Widget.Button({
@@ -32,19 +39,19 @@ export default ({ address, size: [w, h], class: c, title }) =>
         App.closeWindow("overview"),
       ),
 
-    setup: (btn) => {
-      btn.drag_source_set(
-        Gdk.ModifierType.BUTTON1_MASK,
-        TARGET,
-        Gdk.DragAction.COPY,
-      );
-      btn.connect("drag-data-get", (_w, _c, data) =>
-        data.set_text(address, address.length),
-      );
-      btn.connect("drag-begin", (_, context) => {
-        Gtk.drag_set_icon_surface(context, createSurfaceFromWidget(btn));
-        btn.toggleClassName("hidden", true);
-      });
-      btn.connect("drag-end", () => btn.toggleClassName("hidden", false));
-    },
+    setup: (btn) =>
+      btn
+        .on("drag-data-get", (_w, _c, data) =>
+          data.set_text(address, address.length),
+        )
+        .on("drag-begin", (_, context) => {
+          Gtk.drag_set_icon_surface(context, createSurfaceFromWidget(btn));
+          btn.toggleClassName("hidden", true);
+        })
+        .on("drag-end", () => btn.toggleClassName("hidden", false))
+        .drag_source_set(
+          Gdk.ModifierType.BUTTON1_MASK,
+          TARGET,
+          Gdk.DragAction.COPY,
+        ),
   });

home/desktops/hyprland/ags/js/overview/Overview.js

@@ -1,5 +1,3 @@
-import Widget from "resource:///com/github/Aylur/ags/widget.js";
-import App from "resource:///com/github/Aylur/ags/app.js";
 import Hyprland from "resource:///com/github/Aylur/ags/service/hyprland.js";
 import PopupWindow from "../misc/PopupWindow.js";
 import Workspace from "./Workspace.js";
@@ -8,15 +6,30 @@ import { range } from "../utils.js";
 
 const ws = options.workspaces;
 
-/** @param {import('types/widgets/box').default} box */
+const Overview = () =>
+  Widget.Box({
+    children: [Workspace(0)], // for type infer
+    setup: (self) =>
+      Utils.idle(() => {
+        self.hook(ws, () => {
+          self.children = range(ws.value).map(Workspace);
+          update(self);
+          children(self);
+        });
+        self.hook(Hyprland, update);
+        self.hook(Hyprland, children, "notify::workspaces");
+        update(self);
+        children(self);
+      }),
+  });
+
+/** @param {ReturnType<typeof Overview>} box */
 const update = (box) => {
-  if (App.windows.has("overview") && !App.getWindow("overview")?.visible)
-    return;
+  if (!box.get_parent()?.visible) return;
 
   Hyprland.sendMessage("j/clients")
     .then((clients) => {
       box.children.forEach((ws) => {
-        // @ts-expect-error
         ws.attribute(JSON.parse(clients));
       });
     })
@@ -35,19 +48,5 @@ const children = (box) => {
 export default () =>
   PopupWindow({
     name: "overview",
-    child: Widget.Box({
-      setup: update,
-      connections: [
-        [
-          ws,
-          (box) => {
-            box.children = range(ws.value).map(Workspace);
-            update(box);
-            children(box);
-          },
-        ],
-        [Hyprland, update],
-        [Hyprland, children, "notify::workspaces"],
-      ],
-    }),
+    child: Overview(),
   });

home/desktops/hyprland/ags/js/overview/Workspace.js

@@ -2,7 +2,7 @@ import Hyprland from "resource:///com/github/Aylur/ags/service/hyprland.js";
 import Widget from "resource:///com/github/Aylur/ags/widget.js";
 import * as Utils from "resource:///com/github/Aylur/ags/utils.js";
 import Gdk from "gi://Gdk";
-import Gtk from "gi://Gtk";
+import Gtk from "gi://Gtk?version=3.0";
 import Client from "./Client.js";
 
 const SCALE = 0.08;
@@ -22,14 +22,10 @@ export default (index) => {
             min-width: ${3840 * SCALE}px;
             min-height: ${2160 * SCALE}px;
         `,
-    connections: [
-      [
-        Hyprland,
-        (box) => {
-          box.toggleClassName("active", Hyprland.active.workspace.id === index);
-        },
-      ],
-    ],
+    setup: (box) =>
+      box.hook(Hyprland, () => {
+        box.toggleClassName("active", Hyprland.active.workspace.id === index);
+      }),
     child: Widget.EventBox({
       hexpand: true,
       vexpand: true,