autocommit 2022-04-20 20:20:36 CEST

src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs

@@ -299,6 +299,7 @@ impl XdgToplevel {
     ) -> Result<(), SetFullscreenError> {
         let client = &self.xdg.surface.client;
         let req: SetFullscreen = client.parse(self.deref(), parser)?;
+        self.states.borrow_mut().insert(STATE_FULLSCREEN);
         'set_fullscreen: {
             let output = if req.output.is_some() {
                 match client.lookup(req.output)?.global.node.get() {
@@ -636,7 +637,7 @@ impl XdgSurfaceExt for XdgToplevel {
 
 impl SizedFullscreenNode for XdgToplevel {
     fn on_set_fullscreen(&self, _workspace: &Rc<WorkspaceNode>) {
-        self.states.borrow_mut().insert(STATE_FULLSCREEN);
+        // nothing
     }
 
     fn on_unset_fullscreen(&self) {

src/ifs/wl_surface/zwp_idle_inhibitor_v1.rs

@@ -23,7 +23,6 @@ pub struct ZwpIdleInhibitorV1 {
 
 impl ZwpIdleInhibitorV1 {
     fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), ZwpIdleInhibitorV1Error> {
-        log::info!("destroy {}", self.id);
         let _req: Destroy = self.client.parse(self, parser)?;
         self.client.remove_obj(self)?;
         if self.surface.idle_inhibitors.remove(&self.id).is_some() {

src/ifs/zwp_idle_inhibit_manager_v1.rs

@@ -80,7 +80,6 @@ impl ZwpIdleInhibitManagerV1 {
     ) -> Result<(), ZwpIdleInhibitManagerV1Error> {
         let req: CreateInhibitor = self.client.parse(self, parser)?;
         let surface = self.client.lookup(req.surface)?;
-        log::info!("create {}", req.id);
         let inhibit = Rc::new(ZwpIdleInhibitorV1 {
             id: req.id,
             inhibit_id: self.client.state.idle_inhibitor_ids.next(),

src/tree.rs

@@ -73,6 +73,12 @@ pub enum FindTreeResult {
     Other,
 }
 
+impl FindTreeResult {
+    pub fn accepts_input(self) -> bool {
+        self == Self::AcceptsInput
+    }
+}
+
 pub trait SizedNode: Sized + 'static {
     fn id(&self) -> NodeId;
     fn seat_state(&self) -> &NodeSeatState;

src/tree/output.rs

@@ -342,15 +342,14 @@ impl SizedNode for OutputNode {
                 return fs.as_node().node_find_tree_at(x, y, tree);
             }
         }
-        let (x_abs, y_abs) = self.global.pos.get().translate_inv(x, y);
         {
-            if self.find_layer_surface_at(x_abs, y_abs, &[OVERLAY, TOP], tree)
-                == FindTreeResult::AcceptsInput
-            {
-                return FindTreeResult::AcceptsInput;
+            let res = self.find_layer_surface_at(x, y, &[OVERLAY, TOP], tree);
+            if res.accepts_input() {
+                return res;
             }
         }
         {
+            let (x_abs, y_abs) = self.global.pos.get().translate_inv(x, y);
             for stacked in self.state.root.stacked.rev_iter() {
                 let ext = stacked.node_absolute_position();
                 if stacked.node_absolute_position_constrains_input() && !ext.contains(x_abs, y_abs)

src/xwayland/xwm.rs

@@ -417,8 +417,13 @@ impl Wm {
     }
 
     async fn set_fullscreen(&self, data: &Rc<XwindowData>, fullscreen: bool) {
-        data.info.fullscreen.set(fullscreen);
-        self.set_net_wm_state(data).await;
+        if false {
+            // NOTE: We do not want to inform the program if the user changes the fullscreen
+            // status of the window. Programs usually provide an in-program way to enter/exit
+            // fullscreen mode.
+            data.info.fullscreen.set(fullscreen);
+            self.set_net_wm_state(data).await;
+        }
     }
 
     async fn send_wm_message(&self, window: &Rc<XwindowData>, event_mask: u32, data: &[u32]) {