xwayland: set output for override redirect windows

src/ifs/wl_surface/x_surface/xwindow.rs

@@ -423,6 +423,9 @@ impl ToplevelNodeBase for Xwindow {
             if self.data.info.override_redirect.get() {
                 self.data.state.damage(old);
                 self.data.state.damage(*rect);
+                let (x, y) = rect.center();
+                let output = self.data.state.find_closest_output(x, y).0;
+                self.x.surface.set_output(&output);
             } else {
                 self.data
                     .state

src/it/test_utils.rs

@@ -2,7 +2,6 @@ pub mod test_container_node_ext;
 pub mod test_expected_event;
 pub mod test_object_ext;
 pub mod test_ouput_node_ext;
-pub mod test_rect_ext;
 pub mod test_surface_ext;
 pub mod test_toplevel_node_ext;
 pub mod test_window;

src/it/test_utils/test_rect_ext.rs

@@ -1,11 +0,0 @@
-use crate::rect::Rect;
-
-pub trait TestRectExt {
-    fn center(&self) -> (i32, i32);
-}
-
-impl TestRectExt for Rect {
-    fn center(&self) -> (i32, i32) {
-        ((self.x1() + self.x2()) / 2, (self.y1() + self.y2()) / 2)
-    }
-}

src/it/test_utils/test_toplevel_node_ext.rs

@@ -1,4 +1,4 @@
-use crate::{it::test_utils::test_rect_ext::TestRectExt, tree::ToplevelNode};
+use crate::tree::ToplevelNode;
 
 pub trait TestToplevelNodeExt {
     fn center(&self) -> (i32, i32);

src/it/tests/t0025_dnd_focus_change.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         ifs::wl_seat::BTN_LEFT,
-        it::{test_error::TestResult, test_utils::test_rect_ext::TestRectExt, testrun::TestRun},
+        it::{test_error::TestResult, testrun::TestRun},
         tree::Node,
     },
     std::rc::Rc,

src/it/tests/t0027_input_region.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        it::{test_error::TestResult, test_utils::test_rect_ext::TestRectExt, testrun::TestRun},
+        it::{test_error::TestResult, testrun::TestRun},
         tree::Node,
     },
     std::rc::Rc,

src/rect.rs

@@ -236,4 +236,11 @@ impl Rect {
     pub fn size(&self) -> (i32, i32) {
         (self.width(), self.height())
     }
+
+    pub fn center(&self) -> (i32, i32) {
+        (
+            self.raw.x1 + self.width() / 2,
+            self.raw.y1 + self.height() / 2,
+        )
+    }
 }