WIP wl_fixes

Cargo.toml

@@ -118,4 +118,16 @@ inherits = "release"
 lto = "fat"
 
 [patch."https://github.com/Smithay/smithay.git"]
-smithay = {git = "https://github.com/smithay//smithay", rev = "64356be"}
+# smithay = {git = "https://github.com/smithay//smithay", rev = "f7638e8"}
+smithay = {git = "https://github.com/ids1024/smithay", branch = "wl_fixes"}
+
+[patch.crates-io]
+wayland-egl = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-protocols = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-protocols-wlr = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-protocols-misc = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-server = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-client = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-sys = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-backend = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }
+wayland-scanner = { git = "https://github.com/ids1024/wayland-rs", branch = "wl-fixes" }

src/state.rs

@@ -65,6 +65,7 @@ use smithay::{
     wayland::{
         compositor::{CompositorClientState, CompositorState},
         dmabuf::{DmabufFeedback, DmabufGlobal, DmabufState},
+        fixes::FixesState,
         fractional_scale::{with_fractional_scale, FractionalScaleManagerState},
         idle_inhibit::IdleInhibitManagerState,
         idle_notify::IdleNotifierState,
@@ -93,6 +94,7 @@ use smithay::{
         virtual_keyboard::VirtualKeyboardManagerState,
         xdg_activation::XdgActivationState,
         xwayland_keyboard_grab::XWaylandKeyboardGrabState,
+        xwayland_shell::XWaylandShellState,
     },
     xwayland::XWaylandClientData,
 };
@@ -219,6 +221,7 @@ pub struct Common {
     pub xdg_activation_state: XdgActivationState,
     pub workspace_state: WorkspaceState<State>,
     pub xwayland_state: Option<XWaylandState>,
+    pub xwayland_shell_state: XWaylandShellState,
 }
 
 #[derive(Debug)]
@@ -427,13 +430,15 @@ impl State {
         let session_lock_manager_state =
             SessionLockManagerState::new::<Self, _>(&dh, client_is_privileged);
         XWaylandKeyboardGrabState::new::<Self>(&dh);
+        let xwayland_shell_state = XWaylandShellState::new::<Self>(&dh);
         PointerConstraintsState::new::<Self>(&dh);
         PointerGesturesState::new::<Self>(&dh);
         TabletManagerState::new::<Self>(&dh);
         SecurityContextState::new::<Self, _>(&dh, client_has_no_security_context);
         InputMethodManagerState::new::<Self, _>(&dh, client_is_privileged);
         TextInputManagerState::new::<Self>(&dh);
         VirtualKeyboardManagerState::new::<State, _>(&dh, client_is_privileged);
+        FixesState::new::<Self>(&dh);
 
         let idle_notifier_state = IdleNotifierState::<Self>::new(&dh, handle.clone());
         let idle_inhibit_manager_state = IdleInhibitManagerState::new::<State>(&dh);
@@ -533,6 +538,7 @@ impl State {
                 xdg_activation_state,
                 workspace_state,
                 xwayland_state: None,
+                xwayland_shell_state,
             },
             backend: BackendData::Unset,
             ready: Once::new(),

src/wayland/handlers/compositor.rs

@@ -134,7 +134,7 @@ impl CompositorHandler for State {
     }
 
     fn commit(&mut self, surface: &WlSurface) {
-        X11Wm::commit_hook::<State>(surface);
+        X11Wm::commit_hook::<State>(self, surface);
         // first load the buffer for various smithay helper functions (which also initializes the RendererSurfaceState)
         on_commit_buffer_handler::<Self>(surface);
 

src/wayland/handlers/fixes.rs

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::state::State;
+use smithay::delegate_fixes;
+
+delegate_fixes!(State);

src/wayland/handlers/mod.rs

@@ -8,6 +8,7 @@ pub mod decoration;
 pub mod dmabuf;
 pub mod drm;
 pub mod drm_lease;
+pub mod fixes;
 pub mod fractional_scale;
 pub mod idle_inhibit;
 pub mod idle_notify;
@@ -38,3 +39,4 @@ pub mod workspace;
 pub mod xdg_activation;
 pub mod xdg_shell;
 pub mod xwayland_keyboard_grab;
+pub mod xwayland_shell;

src/wayland/handlers/xwayland_shell.rs

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::state::State;
+use smithay::{
+    delegate_xwayland_shell,
+    wayland::xwayland_shell::{XWaylandShellHandler, XWaylandShellState},
+};
+
+impl XWaylandShellHandler for State {
+    fn xwayland_shell_state(&mut self) -> &mut XWaylandShellState {
+        &mut self.common.xwayland_shell_state
+    }
+}
+
+delegate_xwayland_shell!(State);

src/xwayland.rs

@@ -83,7 +83,6 @@ impl State {
 
                     let mut wm = match X11Wm::start_wm(
                         data.common.event_loop_handle.clone(),
-                        data.common.display_handle.clone(),
                         x11_socket,
                         client.clone(),
                     ) {