`ce429d4`

Fix focus tracking and cross-monitor moves for window operations

- Set target workspace focus before switch_workspace in move_to_workspace
- Add set_focus after swap and cross-monitor fallback in swap_direction
- Call set_focus after move_to_monitor to update X11 focus

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

SHA: ce429d442364cbaeac60686ae487711aeab16d2a
Parents: f6d02e8
Tree: 8380e31

1 changed file

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

gar/src/x11/events.rsmodified

              // Re-apply layout
              self.apply_layout()?;
 +            // Keep focus on the original window (now in swapped position)
 +            self.set_focus(focused, true)?;
++
              tracing::debug!("Swapped with window {} in direction {:?}", target, direction);
 +        } else if self.monitors.len() > 1 {
 +            // No adjacent window - try moving to adjacent monitor
 +            let target_monitor = match direction {
 +                Direction::Left => Some("prev"),
 +                Direction::Right => Some("next"),
 +                // For up/down with horizontal monitor arrangement, could also try prev/next
 +                // but typically vertical movement doesn't cross monitors
 +                Direction::Up | Direction::Down => None,
 +            };
++
 +            if let Some(target) = target_monitor {
 +                tracing::debug!("No adjacent window, moving to {} monitor", target);
 +                self.move_to_monitor(target)?;
 +            }
+         }
          Ok(())
                  .insert_with_rect(window, target_focused, screen);
+         }
 +        // Set target workspace focus to the moved window so switch_workspace will focus it
 +        self.workspaces[idx].focused = Some(window);
++
          // If target workspace is visible, map the window; otherwise hide it
          if target_visible_on.is_some() {
              // Target is visible - map the window
          // Apply layouts on both monitors
          self.apply_layout()?;
 +        // Set X11 focus on the moved window (updates focused_window, button grabs, EWMH)
 +        self.set_focus(window, true)?;
++
          self.conn.flush()?;
          Ok(())
+     }