fc2b781673
* Made unoccupied workspaces setting more compaitble with # of workspaces assigned. * Updated monitor listings * Fix scenario where workspace rules aren't defined. * Refactor for clean up and use workspace names instead of loop index.
273 lines
13 KiB
TypeScript
273 lines
13 KiB
TypeScript
const hyprland = await Service.import("hyprland");
|
|
import options from "options";
|
|
import { createThrottledScrollHandlers, getCurrentMonitorWorkspaces, getWorkspaceRules, getWorkspacesForMonitor } from "./helpers";
|
|
import { Workspace } from "types/service/hyprland";
|
|
|
|
const {
|
|
workspaces,
|
|
monitorSpecific,
|
|
workspaceMask,
|
|
scroll_speed,
|
|
spacing
|
|
} = options.bar.workspaces;
|
|
|
|
function range(length: number, start = 1) {
|
|
return Array.from({ length }, (_, i) => i + start);
|
|
}
|
|
|
|
const Workspaces = (monitor = -1) => {
|
|
const currentMonitorWorkspaces = Variable(getCurrentMonitorWorkspaces(monitor));
|
|
|
|
workspaces.connect("changed", () => {
|
|
currentMonitorWorkspaces.value = getCurrentMonitorWorkspaces(monitor)
|
|
})
|
|
|
|
const renderClassnames = (showIcons: boolean, showNumbered: boolean, numberedActiveIndicator: string, i: number) => {
|
|
if (showIcons) {
|
|
return `workspace-icon txt-icon bar`;
|
|
}
|
|
if (showNumbered) {
|
|
const numActiveInd = hyprland.active.workspace.id === i
|
|
? numberedActiveIndicator
|
|
: "";
|
|
|
|
return `workspace-number can_${numberedActiveIndicator} ${numActiveInd}`;
|
|
}
|
|
return "default";
|
|
}
|
|
|
|
const renderLabel = (showIcons: boolean, available: string, active: string, occupied: string, workspaceMask: boolean, i: number, index: number) => {
|
|
if (showIcons) {
|
|
if (hyprland.active.workspace.id === i) {
|
|
return active;
|
|
}
|
|
if ((hyprland.getWorkspace(i)?.windows || 0) > 0) {
|
|
return occupied;
|
|
}
|
|
if (
|
|
monitor !== -1
|
|
) {
|
|
return available;
|
|
}
|
|
}
|
|
return workspaceMask
|
|
? `${index + 1}`
|
|
: `${i}`;
|
|
}
|
|
const defaultWses = () => {
|
|
return Widget.Box({
|
|
children: Utils.merge(
|
|
[workspaces.bind("value"), monitorSpecific.bind()],
|
|
(workspaces: number, monitorSpecific: boolean) => {
|
|
return range(workspaces || 8)
|
|
.filter((i) => {
|
|
if (!monitorSpecific) {
|
|
return true;
|
|
}
|
|
const workspaceRules = getWorkspaceRules();
|
|
return getWorkspacesForMonitor(i, workspaceRules, monitor);
|
|
})
|
|
.sort((a, b) => {
|
|
return a - b;
|
|
})
|
|
.map((i, index) => {
|
|
return Widget.Button({
|
|
class_name: "workspace-button",
|
|
on_primary_click: () => {
|
|
hyprland.messageAsync(`dispatch workspace ${i}`)
|
|
|
|
},
|
|
child: Widget.Label({
|
|
attribute: i,
|
|
vpack: "center",
|
|
css: spacing.bind("value").as(sp => `margin: 0rem ${0.375 * sp}rem;`),
|
|
class_name: Utils.merge(
|
|
[
|
|
options.bar.workspaces.show_icons.bind("value"),
|
|
options.bar.workspaces.show_numbered.bind("value"),
|
|
options.bar.workspaces.numbered_active_indicator.bind("value"),
|
|
options.bar.workspaces.icons.available.bind("value"),
|
|
options.bar.workspaces.icons.active.bind("value"),
|
|
options.bar.workspaces.icons.occupied.bind("value"),
|
|
hyprland.active.workspace.bind("id")
|
|
],
|
|
(showIcons: boolean, showNumbered: boolean, numberedActiveIndicator: string) => {
|
|
if (showIcons) {
|
|
return `workspace-icon txt-icon bar`;
|
|
}
|
|
if (showNumbered) {
|
|
const numActiveInd = hyprland.active.workspace.id === i
|
|
? numberedActiveIndicator
|
|
: "";
|
|
|
|
return `workspace-number can_${numberedActiveIndicator} ${numActiveInd}`;
|
|
}
|
|
return "default";
|
|
},
|
|
),
|
|
label: Utils.merge(
|
|
[
|
|
options.bar.workspaces.show_icons.bind("value"),
|
|
options.bar.workspaces.icons.available.bind("value"),
|
|
options.bar.workspaces.icons.active.bind("value"),
|
|
options.bar.workspaces.icons.occupied.bind("value"),
|
|
workspaceMask.bind("value"),
|
|
hyprland.active.workspace.bind("id")
|
|
],
|
|
(showIcons: boolean, available: string, active: string, occupied: string, workspaceMask: boolean, _: number) => {
|
|
if (showIcons) {
|
|
if (hyprland.active.workspace.id === i) {
|
|
return active;
|
|
}
|
|
if ((hyprland.getWorkspace(i)?.windows || 0) > 0) {
|
|
return occupied;
|
|
}
|
|
if (
|
|
monitor !== -1
|
|
) {
|
|
return available;
|
|
}
|
|
}
|
|
return workspaceMask
|
|
? `${index + 1}`
|
|
: `${i}`;
|
|
},
|
|
),
|
|
setup: (self) => {
|
|
self.hook(hyprland, () => {
|
|
self.toggleClassName(
|
|
"active",
|
|
hyprland.active.workspace.id === i,
|
|
);
|
|
self.toggleClassName(
|
|
"occupied",
|
|
(hyprland.getWorkspace(i)?.windows || 0) > 0,
|
|
);
|
|
});
|
|
},
|
|
})
|
|
});
|
|
});
|
|
},
|
|
)
|
|
})
|
|
}
|
|
const occupiedWses = () => {
|
|
return Widget.Box({
|
|
children: Utils.merge(
|
|
[
|
|
monitorSpecific.bind("value"),
|
|
hyprland.bind("workspaces"),
|
|
workspaceMask.bind("value"),
|
|
workspaces.bind("value"),
|
|
options.bar.workspaces.show_icons.bind("value"),
|
|
options.bar.workspaces.icons.available.bind("value"),
|
|
options.bar.workspaces.icons.active.bind("value"),
|
|
options.bar.workspaces.icons.occupied.bind("value"),
|
|
options.bar.workspaces.show_numbered.bind("value"),
|
|
options.bar.workspaces.numbered_active_indicator.bind("value"),
|
|
spacing.bind("value"),
|
|
hyprland.active.workspace.bind("id"),
|
|
],
|
|
(
|
|
monitorSpecific: boolean,
|
|
wkSpaces: Workspace[],
|
|
workspaceMask: boolean,
|
|
totalWkspcs: number,
|
|
showIcons: boolean,
|
|
available: string,
|
|
active: string,
|
|
occupied: string,
|
|
showNumbered: boolean,
|
|
numberedActiveIndicator: string,
|
|
spacing: number,
|
|
activeId: number,
|
|
) => {
|
|
let allWkspcs = range(totalWkspcs || 8);
|
|
|
|
const activeWorkspaces = wkSpaces.map(w => w.id);
|
|
const workspaceRules = getWorkspaceRules();
|
|
|
|
// Sometimes hyprland doesn't have all the monitors in the list
|
|
// so we complement it with monitors from the workspace list
|
|
const workspaceMonitorList = hyprland?.workspaces?.map(m => ({ id: m.monitorID, name: m.monitor }));
|
|
const curMonitor = hyprland.monitors.find(m => m.id === monitor)
|
|
|| workspaceMonitorList.find(m => m.id === monitor);
|
|
|
|
// go through each key in workspaceRules and flatten the array
|
|
const workspacesWithRules = Object.keys(workspaceRules).reduce((acc: number[], k: string) => {
|
|
return [...acc, ...workspaceRules[k]];
|
|
}, [] as number[]);
|
|
|
|
const activesForMonitor = activeWorkspaces.filter(w => {
|
|
if (curMonitor && Object.hasOwnProperty.call(workspaceRules, curMonitor.name) && workspacesWithRules.includes(w)) {
|
|
return workspaceRules[curMonitor.name].includes(w);
|
|
}
|
|
return true;
|
|
});
|
|
|
|
if (monitorSpecific) {
|
|
const wrkspcsInRange = range(totalWkspcs).filter(w => {
|
|
return getWorkspacesForMonitor(w, workspaceRules, monitor);
|
|
});
|
|
allWkspcs = [...new Set([...activesForMonitor, ...wrkspcsInRange])];
|
|
} else {
|
|
allWkspcs = [...new Set([...allWkspcs, ...activeWorkspaces])];
|
|
}
|
|
|
|
return allWkspcs
|
|
.sort((a, b) => {
|
|
return a - b;
|
|
})
|
|
.map((i, index) => {
|
|
return Widget.Button({
|
|
class_name: "workspace-button",
|
|
on_primary_click: () => {
|
|
hyprland.messageAsync(`dispatch workspace ${i}`)
|
|
|
|
},
|
|
child: Widget.Label({
|
|
attribute: i,
|
|
vpack: "center",
|
|
css: `margin: 0rem ${0.375 * spacing}rem;`,
|
|
class_name: renderClassnames(showIcons, showNumbered, numberedActiveIndicator, i),
|
|
label: renderLabel(showIcons, available, active, occupied, workspaceMask, i, index),
|
|
setup: (self) => {
|
|
self.toggleClassName(
|
|
"active",
|
|
activeId === i,
|
|
);
|
|
self.toggleClassName(
|
|
"occupied",
|
|
(hyprland.getWorkspace(i)?.windows || 0) > 0,
|
|
);
|
|
},
|
|
})
|
|
});
|
|
});
|
|
},
|
|
)
|
|
})
|
|
}
|
|
|
|
return {
|
|
component: Widget.Box({
|
|
class_name: "workspaces",
|
|
child: options.bar.workspaces.hideUnoccupied.bind("value").as(hideUnoccupied => hideUnoccupied ? occupiedWses() : defaultWses()),
|
|
}),
|
|
isVisible: true,
|
|
boxClass: "workspaces",
|
|
props: {
|
|
setup: (self: any) => {
|
|
Utils.merge([scroll_speed.bind("value"), options.bar.workspaces.hideUnoccupied.bind("value")], (scroll_speed, hideUnoccupied) => {
|
|
const { throttledScrollUp, throttledScrollDown } = createThrottledScrollHandlers(scroll_speed, currentMonitorWorkspaces, hideUnoccupied)
|
|
self.on_scroll_up = throttledScrollUp;
|
|
self.on_scroll_down = throttledScrollDown;
|
|
});
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
export { Workspaces };
|