nat/ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: nat:v3
Branches Tags
nat:v3
nat:hyprland
nat:niri
nat:v2
nat:main
...
pull from: nat:hyprland
Branches Tags
nat:hyprland
nat:v3
nat:niri
nat:v2
nat:main

1 Commits
v3 ... hyprland

Author SHA1 Message Date
nat
60257e5c54 Revert "migrate workspace indicator to niri" 
This reverts commit dd8fc68c626f80f6a9c90dc7702bd027403b64f1.
 2025-03-26 05:45:31 -07:00
1 changed files with 14 additions and 21 deletions
Show Stats Expand all files Collapse all files

35
widgets/bar/workspaces.hy
View File

@ -1,41 +1,34 @@
(import astal *) (import astal *)
(import astal.gtk3 *) (import astal.gtk3 *)
(.require-version gi "AstalNiri" "0.1") (.require-version gi "AstalHyprland" "0.1")
(import gi.repository [AstalHyprland :as Hyprland])
(import gi.repository [AstalNiri :as Niri])
(let [ (let [
Niri (.get-default Niri) hyprland (.get-default Hyprland)
workspace-row (fn [start stop] workspace-row (fn [start stop]
(Widget.Box (Widget.Box
:children (lfor i (range start stop) :children (lfor i (range start stop)
(Widget.Button (Widget.Button
:class-name "workspace" :class-name "workspace"
:attribute (+ i 1) :attribute (+ i 1)
:on-clicked (fn [self] (exec-async f"niri msg action focus-workspace {self.attribute}")) :on-clicked (fn [self] (.message-async hyprland f"dispatch workspace {self.attribute}"))
:setup (fn [self] :setup (fn [self]
(.hook self hyprland "notify::focused-workspace" (fn [self, w] (.toggle-class-name self "focused" (= (.get-id w) self.attribute))))
(.hook self Niri "workspace-activated" (fn [_ w __]
(when w
(.toggle-class-name self "focused" (= (.get-id (. Niri (get-workspace w))) self.attribute)))))
(defn update [#* _] (defn update [#* _]
(let [workspace (.get-workspace Niri self.attribute)] (let [workspace (.get-workspace hyprland self.attribute)]
(when (!= workspace None) (when (!= workspace None)
(.toggle-class-name self "occupied" (< 0 (len (lfor window (. Niri (get-windows)) (.toggle-class-name self "occupied" (< 0 (len (.get-clients workspace)))))))
:if (= (.get-workspace-id window) (.get-id workspace))
window)))))))
(.hook self Niri "workspaces-changed" update) (.hook self hyprland "notify::workspaces" update)
(.hook self Niri "window-opened" update) (.hook self hyprland "notify::clients" update)
(.hook self Niri "window-changed" update) (.hook self hyprland "client-moved" update)
(.hook self Niri "window-closed" update) (update)
(idle update)
(idle (fn [] (when (= (.get-id (.get-focused-workspace Niri)) self.attribute) (when (= (.get-id (.get-focused-workspace hyprland)) self.attribute)
(.toggle-class-name self "focused")))))))))] (.toggle-class-name self "focused")))))))]
(setv workspaces (Widget.Box (setv workspaces (Widget.Box
:class_name "workspaces" :class_name "workspaces"