Let Neovim determine the mouse grid when composition is supported

Author: fredizzimo

src/window/mouse_manager.rs

@@ -17,7 +17,7 @@ use crate::{
     bridge::{send_ui, SerialCommand},
     renderer::{Renderer, WindowDrawDetails},
     settings::Settings,
-    units::{GridPos, GridScale, GridVec, PixelPos, PixelRect, PixelSize, PixelVec},
+    units::{GridPos, GridScale, GridSize, GridVec, PixelPos, PixelRect, PixelSize, PixelVec},
     window::keyboard_manager::KeyboardManager,
     window::WindowSettings,
 };
@@ -41,6 +41,7 @@ struct DragDetails {
 struct EditorState<'a> {
     grid_scale: &'a GridScale,
     window_regions: &'a Vec<WindowDrawDetails>,
+    full_region: WindowDrawDetails,
     window: &'a Window,
     keyboard_manager: &'a KeyboardManager,
 }
@@ -97,14 +98,17 @@ impl MouseManager {
         editor_state: &'b EditorState<'b>,
     ) -> Option<&'b WindowDrawDetails> {
         let position = self.window_position;
-
-        // the rendered window regions are sorted by draw order, so the earlier windows in the
-        // list are drawn under the later ones
-        editor_state
-            .window_regions
-            .iter()
-            .filter(|details| details.region.contains(&position))
-            .last()
+        if self.use_composition {
+            Some(&editor_state.full_region)
+        } else {
+            // the rendered window regions are sorted by draw order, so the earlier windows in the
+            // list are drawn under the later ones
+            editor_state
+                .window_regions
+                .iter()
+                .filter(|details| details.region.contains(&position))
+                .last()
+        }
     }
 
     fn get_relative_position(
@@ -137,10 +141,14 @@ impl MouseManager {
         // If dragging, the relevant window (the one which we send all commands to) is the one
         // which the mouse drag started on. Otherwise its the top rendered window
         let window_details = if let Some(drag_details) = &self.drag_details {
-            editor_state
-                .window_regions
-                .iter()
-                .find(|details| details.id == drag_details.draw_details.id)
+            if self.use_composition {
+                Some(&editor_state.full_region)
+            } else {
+                editor_state
+                    .window_regions
+                    .iter()
+                    .find(|details| details.id == drag_details.draw_details.id)
+            }
         } else {
             self.get_window_details_under_mouse(editor_state)
         };
@@ -385,9 +393,21 @@ impl MouseManager {
         renderer: &Renderer,
         window: &Window,
     ) {
+        let full_region = WindowDrawDetails {
+            id: 0,
+            region: renderer
+                .window_regions
+                .first()
+                .map_or(PixelRect::ZERO, |v| v.region),
+            grid_size: renderer
+                .window_regions
+                .first()
+                .map_or(GridSize::ZERO, |v| v.grid_size),
+        };
         let editor_state = EditorState {
             grid_scale: &renderer.grid_renderer.grid_scale,
             window_regions: &renderer.window_regions,
+            full_region,
             window,
             keyboard_manager,
         };