Added the options to allow workspaces to be indicated as active on multiple monitors. (#289)

* Added the options to allow workspaces to be indicated as active on multiple monitors.

* Add subtitle

modules/bar/workspaces/utils.ts

@@ -1,13 +1,18 @@
 import { WorkspaceIconMap } from 'lib/types/workspace';
 import { isValidGjsColor } from 'lib/utils';
 import options from 'options';
+import { Monitor } from 'types/service/hyprland';
 
 const hyprland = await Service.import('hyprland');
 
 const { monochrome, background } = options.theme.bar.buttons;
 const { background: wsBackground, active } = options.theme.bar.buttons.workspaces;
 
-const { showWsIcons } = options.bar.workspaces;
+const { showWsIcons, showAllActive, numbered_active_indicator: activeIndicator } = options.bar.workspaces;
+
+const isWorkspaceActiveOnMonitor = (monitor: number, monitors: Monitor[], i: number): boolean => {
+    return showAllActive.value && monitors[monitor]?.activeWorkspace?.id === i;
+};
 
 const getWsIcon = (wsIconMap: WorkspaceIconMap, i: number): string => {
     const iconEntry = wsIconMap[i];
@@ -29,14 +34,25 @@ const getWsIcon = (wsIconMap: WorkspaceIconMap, i: number): string => {
     return `${i}`;
 };
 
-export const getWsColor = (wsIconMap: WorkspaceIconMap, i: number, smartHighlight: boolean): string => {
+export const getWsColor = (
+    wsIconMap: WorkspaceIconMap,
+    i: number,
+    smartHighlight: boolean,
+    monitor: number,
+    monitors: Monitor[],
+): string => {
     const iconEntry = wsIconMap[i];
     const hasColor = typeof iconEntry === 'object' && 'color' in iconEntry && isValidGjsColor(iconEntry.color);
     if (!iconEntry) {
         return '';
     }
 
-    if (showWsIcons.value && smartHighlight && hyprland.active.workspace.id === i) {
+    if (
+        showWsIcons.value &&
+        smartHighlight &&
+        activeIndicator.value === 'highlight' &&
+        (hyprland.active.workspace.id === i || isWorkspaceActiveOnMonitor(monitor, monitors, i))
+    ) {
         const iconColor = monochrome.value ? background : wsBackground;
         const iconBackground = hasColor && isValidGjsColor(iconEntry.color) ? iconEntry.color : active.value;
         const colorCss = `color: ${iconColor};`;
@@ -58,6 +74,8 @@ export const renderClassnames = (
     numberedActiveIndicator: string,
     showWsIcons: boolean,
     smartHighlight: boolean,
+    monitor: number,
+    monitors: Monitor[],
     i: number,
 ): string => {
     if (showIcons) {
@@ -65,7 +83,11 @@ export const renderClassnames = (
     }
 
     if (showNumbered || showWsIcons) {
-        const numActiveInd = hyprland.active.workspace.id === i ? numberedActiveIndicator : '';
+        const numActiveInd =
+            hyprland.active.workspace.id === i || isWorkspaceActiveOnMonitor(monitor, monitors, i)
+                ? numberedActiveIndicator
+                : '';
+
         const wsIconClass = showWsIcons ? 'txt-icon' : '';
         const smartHighlightClass = smartHighlight ? 'smart-highlight' : '';
 
@@ -88,9 +110,10 @@ export const renderLabel = (
     i: number,
     index: number,
     monitor: number,
+    monitors: Monitor[],
 ): string => {
     if (showIcons) {
-        if (hyprland.active.workspace.id === i) {
+        if (hyprland.active.workspace.id === i || isWorkspaceActiveOnMonitor(monitor, monitors, i)) {
             return active;
         }
         if ((hyprland.getWorkspace(i)?.windows || 0) > 0) {

modules/bar/workspaces/variants/default.ts

@@ -5,6 +5,7 @@ import { range } from 'lib/utils';
 import { BoxWidget } from 'lib/types/widget';
 import { getWsColor, renderClassnames, renderLabel } from '../utils';
 import { WorkspaceIconMap } from 'lib/types/workspace';
+import { Monitor } from 'types/service/hyprland';
 
 const { workspaces, monitorSpecific, workspaceMask, spacing, ignored } = options.bar.workspaces;
 export const defaultWses = (monitor: number): BoxWidget => {
@@ -42,6 +43,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         options.bar.workspaces.workspaceIconMap.bind('value'),
                                         options.theme.matugen.bind('value'),
                                         options.theme.bar.buttons.workspaces.smartHighlight.bind('value'),
+                                        hyprland.bind('monitors'),
                                         hyprland.active.workspace.bind('id'),
                                     ],
                                     (
@@ -50,10 +52,11 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         workspaceIconMap: WorkspaceIconMap,
                                         matugen: boolean,
                                         smartHighlight: boolean,
+                                        monitors: Monitor[],
                                     ) => {
                                         return (
                                             `margin: 0rem ${0.375 * sp}rem;` +
-                                            `${showWsIcons && !matugen ? getWsColor(workspaceIconMap, i, smartHighlight) : ''}`
+                                            `${showWsIcons && !matugen ? getWsColor(workspaceIconMap, i, smartHighlight, monitor, monitors) : ''}`
                                         );
                                     },
                                 ),
@@ -64,6 +67,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         options.bar.workspaces.numbered_active_indicator.bind('value'),
                                         options.bar.workspaces.showWsIcons.bind('value'),
                                         options.theme.bar.buttons.workspaces.smartHighlight.bind('value'),
+                                        hyprland.bind('monitors'),
                                         options.bar.workspaces.icons.available.bind('value'),
                                         options.bar.workspaces.icons.active.bind('value'),
                                         hyprland.active.workspace.bind('id'),
@@ -74,6 +78,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         numberedActiveIndicator: string,
                                         showWsIcons: boolean,
                                         smartHighlight: boolean,
+                                        monitors: Monitor[],
                                     ) => {
                                         return renderClassnames(
                                             showIcons,
@@ -81,6 +86,8 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                             numberedActiveIndicator,
                                             showWsIcons,
                                             smartHighlight,
+                                            monitor,
+                                            monitors,
                                             i,
                                         );
                                     },
@@ -94,6 +101,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         options.bar.workspaces.workspaceIconMap.bind('value'),
                                         options.bar.workspaces.showWsIcons.bind('value'),
                                         workspaceMask.bind('value'),
+                                        hyprland.bind('monitors'),
                                         hyprland.active.workspace.bind('id'),
                                     ],
                                     (
@@ -104,6 +112,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                         wsIconMap: WorkspaceIconMap,
                                         showWsIcons: boolean,
                                         workspaceMask: boolean,
+                                        monitors: Monitor[],
                                     ) => {
                                         return renderLabel(
                                             showIcons,
@@ -116,6 +125,7 @@ export const defaultWses = (monitor: number): BoxWidget => {
                                             i,
                                             index,
                                             monitor,
+                                            monitors,
                                         );
                                     },
                                 ),

modules/bar/workspaces/variants/occupied.ts

@@ -1,13 +1,13 @@
 const hyprland = await Service.import('hyprland');
 import options from 'options';
 import { getWorkspaceRules, getWorkspacesForMonitor, isWorkspaceIgnored } from '../helpers';
-import { Workspace } from 'types/service/hyprland';
+import { Monitor, Workspace } from 'types/service/hyprland';
 import { getWsColor, renderClassnames, renderLabel } from '../utils';
 import { range } from 'lib/utils';
 import { BoxWidget } from 'lib/types/widget';
 import { WorkspaceIconMap } from 'lib/types/workspace';
 
-const { workspaces, monitorSpecific, workspaceMask, spacing, ignored } = options.bar.workspaces;
+const { workspaces, monitorSpecific, workspaceMask, spacing, ignored, showAllActive } = options.bar.workspaces;
 
 export const occupiedWses = (monitor: number): BoxWidget => {
     return Widget.Box({
@@ -29,7 +29,9 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                 options.bar.workspaces.showWsIcons.bind('value'),
                 options.theme.matugen.bind('value'),
                 options.theme.bar.buttons.workspaces.smartHighlight.bind('value'),
+                hyprland.bind('monitors'),
                 ignored.bind('value'),
+                showAllActive.bind('value'),
             ],
             (
                 monitorSpecific: boolean,
@@ -48,6 +50,7 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                 showWsIcons: boolean,
                 matugen: boolean,
                 smartHighlight: boolean,
+                monitors: Monitor[],
             ) => {
                 let allWkspcs = range(totalWkspcs || 8);
 
@@ -106,13 +109,15 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                                 vpack: 'center',
                                 css:
                                     `margin: 0rem ${0.375 * spacing}rem;` +
-                                    `${showWsIcons && !matugen ? getWsColor(wsIconMap, i, smartHighlight) : ''}`,
+                                    `${showWsIcons && !matugen ? getWsColor(wsIconMap, i, smartHighlight, monitor, monitors) : ''}`,
                                 class_name: renderClassnames(
                                     showIcons,
                                     showNumbered,
                                     numberedActiveIndicator,
                                     showWsIcons,
                                     smartHighlight,
+                                    monitor,
+                                    monitors,
                                     i,
                                 ),
                                 label: renderLabel(
@@ -126,6 +131,7 @@ export const occupiedWses = (monitor: number): BoxWidget => {
                                     i,
                                     index,
                                     monitor,
+                                    monitors,
                                 ),
                                 setup: (self) => {
                                     self.toggleClassName('active', activeId === i);