`34fe404`

Fix i3 IPC workspace list to only include active workspaces

Only report workspaces that are visible or have windows to polybar,
matching i3 behavior. Empty invisible workspaces are now filtered out.

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 4 months ago

SHA: 34fe4046a5e60eb565cfadcead83ff0d239f8f7a
Parents: 59cb2b5
Tree: 50ba5a0

1 changed file

Status	File	+	-
M	`gar/src/x11/events.rs`	20	11

gar/src/x11/events.rsmodified

+     }
      /// Build i3-compatible workspace list
 +    /// Only includes workspaces that are visible or have windows (like i3)
      fn build_i3_workspaces(&self) -> Vec<crate::ipc::I3WorkspaceInfo> {
          use crate::ipc::{I3WorkspaceInfo, I3Rect};
 -        self.workspaces.iter().enumerate().map(|(i, ws)| {
 +        self.workspaces.iter().enumerate().filter_map(|(i, ws)| {
              // Find which monitor this workspace is on (if visible)
              let monitor = self.monitors.iter().find(|m| m.active_workspace == i);
              let visible = monitor.is_some();
 +            let has_windows = ws.has_windows();
++
 +            // Only include workspaces that are visible OR have windows
 +            if !visible && !has_windows {
 +                return None;
 +            }
++
              let focused = self.focused_monitor < self.monitors.len()
                  && self.monitors[self.focused_monitor].active_workspace == i;
                  .filter(|w| w.workspace == i)
                  .any(|w| w.urgent);
 -            // Get geometry from monitor if visible, else use first monitor's geometry
 +            // Get geometry and output from monitor
 +            // For non-visible workspaces with windows, assign to focused monitor
              let (rect, output) = if let Some(mon) = monitor {
+                 (
                      I3Rect {
                      mon.name.clone(),
+                 )
              } else {
 -                // Not visible - use first monitor as fallback
 -                let fallback = &self.monitors[0];
 +                // Not visible but has windows - assign to focused monitor
 +                let mon = &self.monitors[self.focused_monitor];
+                 (
                      I3Rect {
 -                        x: fallback.geometry.x as i32,
 -                        y: fallback.geometry.y as i32,
 -                        width: fallback.geometry.width as i32,
 -                        height: fallback.geometry.height as i32,
 +                        x: mon.geometry.x as i32,
 +                        y: mon.geometry.y as i32,
 +                        width: mon.geometry.width as i32,
 +                        height: mon.geometry.height as i32,
                      },
 -                    fallback.name.clone(),
 +                    mon.name.clone(),
+                 )
              };
 -            I3WorkspaceInfo {
 +            Some(I3WorkspaceInfo {
                  id: (i + 1) as i64 * 1000000, // Generate unique ID
                  num: (i + 1) as i32,
                  name: ws.name.clone(),
                  urgent,
                  rect,
                  output,
 -            }
 +            })
          }).collect()
+     }