autocommit 2022-04-07 23:21:31 CEST

src/ifs/wl_surface/cursor.rs

@@ -46,7 +46,7 @@ impl CursorSurface {
     }
 
     pub fn handle_surface_destroy(&self) {
-        self.seat.set_cursor(None);
+        self.seat.set_app_cursor(None);
     }
 
     pub fn handle_buffer_change(&self) {

src/ifs/wl_surface/xwindow.rs

@@ -26,7 +26,7 @@ use {
     jay_config::Direction,
     std::{
         cell::{Cell, RefCell},
-        ops::{Deref, Not},
+        ops::{Deref},
         rc::Rc,
     },
     thiserror::Error,
@@ -273,7 +273,7 @@ impl Xwindow {
 
     pub fn map_status_changed(self: &Rc<Self>) {
         match self.map_change() {
-            Change::None => {}
+            Change::None => return,
             Change::Unmap => self.destroy_node(true),
             Change::Map if self.data.info.override_redirect.get() => {
                 *self.display_link.borrow_mut() =
@@ -304,6 +304,7 @@ impl Xwindow {
                 self.data.title_changed();
             }
         }
+        self.data.state.tree_changed();
     }
 }
 
@@ -447,7 +448,7 @@ impl ToplevelNode for Xwindow {
     }
 
     fn accepts_keyboard_focus(&self) -> bool {
-        self.data.info.never_focus.get().not() && self.data.info.icccm_hints.input.get()
+        self.data.info.input_model.get() != XInputModel::None
     }
 
     fn default_surface(&self) -> Rc<WlSurface> {

src/ifs/wl_surface/zwlr_layer_surface_v1.rs

@@ -375,11 +375,6 @@ impl Node for ZwlrLayerSurfaceV1 {
     }
 
     fn find_tree_at(&self, x: i32, y: i32, tree: &mut Vec<FoundNode>) -> FindTreeResult {
-        tree.push(FoundNode {
-            node: self.surface.clone(),
-            x,
-            y,
-        });
         self.surface.find_tree_at_(x, y, tree)
     }