feat: niri msg pick-window

Fixes #589.

[skip ci]

niri-ipc/src/lib.rs

@@ -132,8 +132,6 @@ pub enum Response {
     /// Information about the focused window.
     FocusedWindow(Option<Window>),
     /// Information about the picked window.
-    ///
-    /// `None` if the request was cancelled by the user.
     PickedWindow(Option<Window>),
     /// Output configuration change result.
     OutputConfigChanged(OutputConfigChanged),

src/cli.rs

@@ -72,7 +72,7 @@ pub enum Msg {
     FocusedOutput,
     /// Print information about the focused window.
     FocusedWindow,
-    /// Request picking a window.
+    /// Pick a window with the mouse and print information about it.
     PickWindow,
     /// Perform an action.
     Action {

src/handlers/mod.rs

@@ -107,6 +107,11 @@ impl SeatHandler for State {
     }
 
     fn cursor_image(&mut self, _seat: &Seat<Self>, mut image: CursorImageStatus) {
+        // FIXME: this discards the cursor image so we cannot twice back to it once we
+        // exit window picking mode
+        if self.niri.pick_window.is_some() {
+            image = CursorImageStatus::Named(CursorIcon::Crosshair);
+        }
         // FIXME: this hack should be removable once the screenshot UI is tracked with a
         // PointerFocus properly.
         if self.niri.screenshot_ui.is_open() {

src/input/mod.rs

@@ -45,6 +45,7 @@ use crate::niri::State;
 use crate::ui::screenshot_ui::ScreenshotUi;
 use crate::utils::spawning::spawn;
 use crate::utils::{center, get_monotonic_time, ResizeEdge};
+use crate::window::Mapped;
 
 pub mod backend_ext;
 pub mod move_grab;
@@ -391,8 +392,9 @@ impl State {
                 if let Some(tx) = this
                     .niri
                     .pick_window
-                    .take_if(move |_| raw == Some(Keysym::Escape))
+                    .take_if(|_| pressed && raw == Some(Keysym::Escape))
                 {
+                    this.niri.suppressed_keys.insert(key_code);
                     let _ = tx.send_blocking(None);
                     return FilterResult::Intercept(None);
                 }
@@ -2036,11 +2038,8 @@ impl State {
             self.niri.tablet_cursor_location = None;
 
             if let Some(tx) = self.niri.pick_window.take() {
-                if let Some(mapped_id) = self.niri.window_under_cursor().map(|mapped| mapped.id()) {
-                    let _ = tx.send_blocking(Some(mapped_id));
-                    return;
-                }
-                self.niri.pick_window = Some(tx);
+                let _ = tx.send_blocking(self.niri.window_under_cursor().map(Mapped::id));
+                return;
             }
 
             if let Some(mapped) = self.niri.window_under_cursor() {

src/ipc/client.rs

@@ -267,7 +267,7 @@ pub fn handle_msg(msg: Msg, json: bool) -> anyhow::Result<()> {
             if let Some(window) = window {
                 print_window(&window);
             } else {
-                println!("Picking window was cancelled.");
+                println!("No window selected.");
             }
         }
         Msg::Action { .. } => {

src/ipc/server.rs

@@ -325,7 +325,9 @@ async fn process(ctx: &ClientCtx, request: Request) -> Reply {
         Request::PickWindow => {
             let (tx, rx) = async_channel::bounded(1);
             ctx.event_loop.insert_idle(move |state| {
-                state.niri.pick_window = Some(tx);
+                if let Some(tx) = state.niri.pick_window.replace(tx) {
+                    let _ = tx.send_blocking(None);
+                }
             });
             let result = rx.recv().await;
             let id = result.map_err(|_| String::from("error getting picked window info"))?;

src/niri.rs

@@ -2996,7 +2996,23 @@ impl Niri {
 
         // Get the render cursor to draw.
         let cursor_scale = output_scale.integer_scale();
-        let render_cursor = self.cursor_manager.get_render_cursor(cursor_scale);
+        let render_cursor = if self.pick_window.is_some() {
+            // FIXME: override the cursor without repeating the logic of `get_render_cursor`
+            self.cursor_manager
+                .get_cursor_with_name(CursorIcon::Crosshair, cursor_scale)
+                .map(|cursor| RenderCursor::Named {
+                    icon: CursorIcon::Crosshair,
+                    scale: cursor_scale,
+                    cursor,
+                })
+                .unwrap_or_else(|| RenderCursor::Named {
+                    icon: Default::default(),
+                    scale: cursor_scale,
+                    cursor: self.cursor_manager.get_default_cursor(cursor_scale),
+                })
+        } else {
+            self.cursor_manager.get_render_cursor(cursor_scale)
+        };
 
         let output_scale = Scale::from(output.current_scale().fractional_scale());