autocommit 2022-02-24 18:24:14 CET

src/ifs/wl_compositor.rs

@@ -8,9 +8,9 @@ use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::wire::wl_compositor::*;
 use crate::wire::WlCompositorId;
+use crate::xwayland::XWaylandEvent;
 use std::rc::Rc;
 use thiserror::Error;
-use crate::xwayland::XWaylandEvent;
 
 pub struct WlCompositorGlobal {
     name: GlobalName,

src/ifs/wl_drm.rs

@@ -1,19 +1,19 @@
 use crate::client::{Client, ClientError};
+use crate::drm::dma::{DmaBuf, DmaBufPlane};
+use crate::drm::INVALID_MODIFIER;
 use crate::globals::{Global, GlobalName};
+use crate::ifs::wl_buffer::WlBuffer;
 use crate::leaks::Tracker;
 use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::wire::wl_drm::*;
 use crate::wire::WlDrmId;
+use crate::RenderError;
 use bstr::ByteSlice;
 use std::ffi::CString;
 use std::rc::Rc;
 use thiserror::Error;
-use crate::drm::dma::{DmaBuf, DmaBufPlane};
-use crate::drm::INVALID_MODIFIER;
-use crate::ifs::wl_buffer::WlBuffer;
-use crate::RenderError;
 
 const PRIME: u32 = 1;
 
@@ -150,12 +150,7 @@ impl WlDrm {
             }
         }
         let img = ctx.dmabuf_img(&dmabuf)?;
-        let buffer = Rc::new(WlBuffer::new_dmabuf(
-            req.id,
-            &self.client,
-            format,
-            &img,
-        ));
+        let buffer = Rc::new(WlBuffer::new_dmabuf(req.id, &self.client, format, &img));
         track!(self.client, buffer);
         self.client.add_client_obj(&buffer)?;
         Ok(())

src/ifs/wl_seat.rs

@@ -25,6 +25,7 @@ use crate::ifs::wl_seat::wl_touch::WlTouch;
 use crate::ifs::wl_surface::WlSurface;
 use crate::leaks::Tracker;
 use crate::object::{Object, ObjectId};
+use crate::tree::toplevel::ToplevelNode;
 use crate::tree::{ContainerSplit, FloatNode, FoundNode, Node};
 use crate::utils::asyncevent::AsyncEvent;
 use crate::utils::buffd::MsgParser;
@@ -49,7 +50,6 @@ use std::ops::{Deref, DerefMut};
 use std::rc::Rc;
 use thiserror::Error;
 use uapi::{c, Errno, OwnedFd};
-use crate::tree::toplevel::ToplevelNode;
 
 const POINTER: u32 = 1;
 const KEYBOARD: u32 = 2;

src/ifs/wl_seat/event_handling.rs

@@ -10,6 +10,7 @@ use crate::ifs::wl_seat::{wl_keyboard, wl_pointer, Dnd, SeatId, WlSeat, WlSeatGl
 use crate::ifs::wl_surface::xdg_surface::xdg_popup::XdgPopup;
 use crate::ifs::wl_surface::WlSurface;
 use crate::object::ObjectId;
+use crate::tree::toplevel::ToplevelNode;
 use crate::tree::{FloatNode, Node};
 use crate::utils::clonecell::CloneCell;
 use crate::utils::smallmap::SmallMap;
@@ -21,7 +22,6 @@ use i4config::keyboard::ModifiedKeySym;
 use smallvec::SmallVec;
 use std::ops::Deref;
 use std::rc::Rc;
-use crate::tree::toplevel::ToplevelNode;
 
 #[derive(Default)]
 pub struct NodeSeatState {

src/ifs/wl_surface.rs

@@ -1,8 +1,8 @@
 pub mod cursor;
 pub mod wl_subsurface;
 pub mod xdg_surface;
-pub mod zwlr_layer_surface_v1;
 pub mod xwindow;
+pub mod zwlr_layer_surface_v1;
 
 use crate::backend::{KeyState, ScrollAxis};
 use crate::client::{Client, ClientError, RequestParser};

src/ifs/wl_surface/xdg_surface/xdg_popup.rs

@@ -345,6 +345,8 @@ impl XdgSurfaceExt for XdgPopup {
             }
         } else {
             if wl.take().is_some() {
+                drop(wl);
+                drop(dl);
                 self.destroy_node(true);
                 self.send_popup_done();
             }

src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs

@@ -28,9 +28,9 @@ use std::mem;
 use std::ops::Deref;
 use std::rc::Rc;
 
-use thiserror::Error;
 use crate::ifs::wl_surface::WlSurface;
 use crate::tree::toplevel::ToplevelNode;
+use thiserror::Error;
 
 #[derive(Copy, Clone, Debug, FromPrimitive)]
 pub enum ResizeEdge {

src/ifs/wl_surface/xwindow.rs

@@ -1,27 +1,29 @@
-use std::cell::Cell;
-use std::rc::Rc;
-use thiserror::Error;
-use x11rb::protocol::xproto::Window;
-use i4config::Direction;
 use crate::client::Client;
-use crate::{AsyncQueue, CloneCell, State};
 use crate::cursor::KnownCursor;
 use crate::fixed::Fixed;
 use crate::ifs::wl_seat::{NodeSeatState, SeatId, WlSeatGlobal};
 use crate::ifs::wl_surface::{SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError};
 use crate::rect::Rect;
 use crate::render::Renderer;
-use crate::tree::{FindTreeResult, FoundNode, Node, NodeId, WorkspaceNode};
 use crate::tree::toplevel::ToplevelNode;
 use crate::tree::walker::NodeVisitor;
+use crate::tree::{FindTreeResult, FoundNode, Node, NodeId, WorkspaceNode};
 use crate::utils::linkedlist::LinkedNode;
 use crate::utils::smallmap::SmallMap;
 use crate::wire::WlSurfaceId;
 use crate::xwayland::XWaylandEvent;
+use crate::{AsyncQueue, CloneCell, State};
+use i4config::Direction;
+use std::cell::{Cell, RefCell};
+use std::rc::Rc;
+use thiserror::Error;
+use x11rb::protocol::xproto::{CreateNotifyEvent, Window};
 
 pub struct XwindowData {
     pub state: Rc<State>,
     pub window_id: Window,
+    pub override_redirect: bool,
+    pub extents: Cell<Rect>,
     pub client: Rc<Client>,
     pub surface_id: Cell<Option<WlSurfaceId>>,
     pub window: CloneCell<Option<Rc<Xwindow>>>,
@@ -36,15 +38,20 @@ pub struct Xwindow {
     pub parent: CloneCell<Option<Rc<dyn Node>>>,
     pub focus_history: SmallMap<SeatId, LinkedNode<Rc<dyn ToplevelNode>>, 1>,
     pub events: Rc<AsyncQueue<XWaylandEvent>>,
-    pub extents: Cell<Rect>,
     pub workspace: CloneCell<Option<Rc<WorkspaceNode>>>,
+    pub display_link: RefCell<Option<LinkedNode<Rc<dyn Node>>>>,
+    pub display_xlink: RefCell<Option<LinkedNode<Rc<Xwindow>>>>,
 }
 
 impl XwindowData {
-    pub fn new(state: &Rc<State>, window_id: Window, client: &Rc<Client>) -> Self {
+    pub fn new(state: &Rc<State>, event: &CreateNotifyEvent, client: &Rc<Client>) -> Self {
+        let extents = Rect::new_sized(event.x as _, event.y as _, event.width as _, event.height as _).unwrap();
+        log::info!("extents = {:?}", extents);
         Self {
             state: state.clone(),
-            window_id,
+            window_id: event.window,
+            override_redirect: event.override_redirect,
+            extents: Cell::new(extents),
             client: client.clone(),
             surface_id: Cell::new(None),
             window: Default::default(),
@@ -53,7 +60,11 @@ impl XwindowData {
 }
 
 impl Xwindow {
-    pub fn new(data: &Rc<XwindowData>, surface: &Rc<WlSurface>, events: &Rc<AsyncQueue<XWaylandEvent>>) -> Self {
+    pub fn new(
+        data: &Rc<XwindowData>,
+        surface: &Rc<WlSurface>,
+        events: &Rc<AsyncQueue<XWaylandEvent>>,
+    ) -> Self {
         Self {
             id: data.state.node_ids.next(),
             seat_state: Default::default(),
@@ -62,8 +73,9 @@ impl Xwindow {
             parent: Default::default(),
             focus_history: Default::default(),
             events: events.clone(),
-            extents: Default::default(),
             workspace: Default::default(),
+            display_link: Default::default(),
+            display_xlink: Default::default(),
         }
     }
 
@@ -96,10 +108,8 @@ impl Xwindow {
         parent.child_size_changed(self, extents.width(), extents.height());
         // parent.child_title_changed(self, self.title.borrow_mut().deref());
     }
-}
 
-impl SurfaceExt for Xwindow {
-    fn post_commit(self: Rc<Self>) {
+    fn managed_post_commit(self: &Rc<Self>) {
         let parent = self.parent.get();
         if self.surface.buffer.get().is_some() {
             if parent.is_none() {
@@ -107,17 +117,46 @@ impl SurfaceExt for Xwindow {
             }
         } else {
             if parent.is_some() {
-               self.destroy_node(true);
+                self.destroy_node(true);
             }
         }
     }
 
+    fn unmanaged_post_commit(self: &Rc<Self>) {
+        let mut dl = self.display_link.borrow_mut();
+        let mut dxl = self.display_xlink.borrow_mut();
+        if self.surface.buffer.get().is_some() {
+            if dl.is_none() {
+                *dl = Some(self.data.state.root.stacked.add_last(self.clone()));
+                *dxl = Some(self.data.state.root.xstacked.add_last(self.clone()));
+                self.data.state.tree_changed();
+            }
+        } else {
+            if dl.is_some() {
+                drop(dl);
+                drop(dxl);
+                self.destroy_node(true);
+            }
+        }
+    }
+}
+
+impl SurfaceExt for Xwindow {
+    fn post_commit(self: Rc<Self>) {
+        if self.data.override_redirect {
+            self.unmanaged_post_commit();
+        } else {
+            self.managed_post_commit();
+        }
+    }
+
     fn on_surface_destroy(&self) -> Result<(), WlSurfaceError> {
         self.destroy_node(true);
         self.surface.unset_ext();
         self.data.window.set(None);
         self.data.surface_id.set(None);
-        self.events.push(XWaylandEvent::SurfaceDestroyed(self.surface.id));
+        self.events
+            .push(XWaylandEvent::SurfaceDestroyed(self.surface.id));
         Ok(())
     }
 
@@ -136,6 +175,8 @@ impl Node for Xwindow {
     }
 
     fn destroy_node(&self, _detach: bool) {
+        self.display_xlink.borrow_mut().take();
+        self.display_link.borrow_mut().take();
         self.workspace.take();
         self.focus_history.clear();
         if let Some(parent) = self.parent.take() {
@@ -168,7 +209,7 @@ impl Node for Xwindow {
     }
 
     fn absolute_position(&self) -> Rect {
-        self.extents.get()
+        self.data.extents.get()
     }
 
     fn find_tree_at(&self, x: i32, y: i32, tree: &mut Vec<FoundNode>) -> FindTreeResult {
@@ -200,7 +241,7 @@ impl Node for Xwindow {
     fn change_extents(self: Rc<Self>, rect: &Rect) {
         let nw = rect.width();
         let nh = rect.height();
-        let de = self.extents.replace(*rect);
+        let de = self.data.extents.replace(*rect);
         if de.width() != nw || de.height() != nh {
             self.events.push(XWaylandEvent::Configure(self.clone()));
         }