`44630cf`

broadcast workspace event on all monitor focus changes

focus_monitor, focus_adjacent_monitor, and move_to_monitor now
set _NET_CURRENT_DESKTOP and broadcast i3 workspace events so
garbar updates the active workspace underline on monitor switches.

Authored by

espadonne 2 months ago

SHA: 44630cf8bf19be7e5c12bac9a9c7209dfa5506c3
Parents: c315c11
Tree: 88cd5b3

1 changed file

Status	File	+	-
M	`gar/src/x11/events.rs`	9	0

gar/src/x11/events.rsmodified

          };
          tracing::info!("Moving focus from monitor {} to {}", self.focused_monitor, target_idx);
 +        let old_workspace_idx = self.focused_workspace;
          self.focused_monitor = target_idx;
          // Focus the active workspace on that monitor
          let workspace_idx = self.monitors[target_idx].active_workspace;
          self.focused_workspace = workspace_idx;
 +        // Update EWMH
 +        self.conn.set_current_desktop(workspace_idx as u32)?;
++
          // Focus a window on that workspace if any, or just warp to monitor center
          if let Some(window) = self.workspaces[workspace_idx].focused
              .or_else(|| self.workspaces[workspace_idx].floating.last().copied())
              tracing::debug!("No windows on monitor {}, warped to center", target_idx);
+         }
 +        // Broadcast i3 workspace event so garbar updates
 +        if workspace_idx != old_workspace_idx {
 +            self.broadcast_i3_workspace_event("focus", workspace_idx, Some(old_workspace_idx));
 +        }
++
          self.conn.flush()?;
          Ok(())
+     }