karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix astal client monitoring

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-02-16 21:45:23 +00:00
parent c1ad0974f1
commit e631eab4dd
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx
View File

@@ -6,16 +6,13 @@ const hyprland = Hyprland.get_default();
const BLOCK_SIZE = 10; const BLOCK_SIZE = 10;
const Workspace = ({ id }: { id: number }) => { const Workspace = ({ id }: { id: number }) => {
let maybeWorkspace: Variable<Hyprland.Workspace | undefined>; let clients: Variable<string[]>;
let occupied: Variable<boolean>;
try { try {
const workspace = hyprland.get_workspace(id); const workspace = hyprland.get_workspace(id);
maybeWorkspace = Variable(workspace); clients = Variable(workspace.clients.map((client) => client.address));
occupied = Variable(workspace.clients.length > 0);
} catch (_) { } catch (_) {
maybeWorkspace = Variable(undefined); clients = Variable([]);
occupied = Variable(false);
} }
const active = Variable.derive( const active = Variable.derive(
@@ -25,20 +22,38 @@ const Workspace = ({ id }: { id: number }) => {
hyprland.connect("workspace-added", (_, workspace) => { hyprland.connect("workspace-added", (_, workspace) => {
if (workspace.id != id) return; if (workspace.id != id) return;
maybeWorkspace.set(workspace); clients.set(workspace.clients.map((client) => client.address));
occupied.set(workspace.clients.length > 0);
workspace.connect("clients", (clients) => occupied.set(clients.length > 0));
}); });
hyprland.connect("workspace-removed", (_, workspaceId) => { hyprland.connect("workspace-removed", (_, workspaceId) => {
if (workspaceId != id) return; if (workspaceId != id) return;
maybeWorkspace.set(undefined); clients.set([]);
occupied.set(false);
}); });
const className = Variable.derive([active, occupied], (active, occupied) => { hyprland.connect("client-added", (_hyprland, client) => {
if (client.workspace.id != id) return;
clients.set([...clients.get(), client.address]);
});
// Explicit separate event handling instead of Variable.derive(workspaces, clients)
// because client-moved events appear to be broken if done that way.
hyprland.connect("client-moved", (_hyprland, client, workspace) => {
if (workspace.id == id) {
clients.set([...clients.get(), client.address]);
} else {
clients.set(
clients.get().filter((oldClient) => oldClient != client.address),
);
}
});
hyprland.connect("client-removed", (_hyprland, address) => {
clients.set(clients.get().filter((oldClient) => oldClient != address));
});
const className = Variable.derive([active, clients], (active, clients) => {
if (active) return "button active"; if (active) return "button active";
if (occupied) return "button occupied"; if (clients.length > 0) return "button occupied";
return "button"; return "button";
}); });