Basic Xwayland support for anvil

Cargo.toml

@@ -31,7 +31,7 @@ udev = { version = "0.5", optional = true }
 wayland-commons = { version = "0.28", optional = true }
 wayland-egl = { version = "0.28", optional = true }
 wayland-protocols = { version = "0.28", features = ["unstable_protocols", "server"], optional = true }
-wayland-server = { version = "0.28", optional = true }
+wayland-server = { version = "0.28.3", optional = true }
 wayland-sys = { version = "0.28", optional = true }
 winit = { version = "0.23.0", optional = true }
 xkbcommon = "0.4.0"

anvil/Cargo.toml

@@ -21,14 +21,21 @@ path = ".."
 default-features = false
 features = [ "renderer_glium", "backend_egl", "wayland_frontend" ]
 
+[dependencies.x11rb]
+optional = true
+version = "0.7"
+default-features = false
+features = [ "composite" ]
+
 [build-dependencies]
 gl_generator = "0.14"
 
 [features]
-default = [ "winit", "egl", "udev", "logind" ]
+default = [ "winit", "egl", "udev", "logind", "xwayland" ]
 egl = [ "smithay/use_system_lib" ]
 winit = [ "smithay/backend_winit" ]
 udev = [ "smithay/backend_libinput", "smithay/backend_udev", "smithay/backend_drm_atomic", "smithay/backend_drm_legacy", "smithay/backend_drm_gbm", "smithay/backend_drm_eglstream", "smithay/backend_drm_egl", "smithay/backend_session", "input" ]
 logind = [ "smithay/backend_session_logind" ]
 elogind = ["logind", "smithay/backend_session_elogind" ]
+xwayland = [ "smithay/xwayland", "x11rb" ]
 test_all_features = ["default"]

anvil/src/main.rs

@@ -25,6 +25,8 @@ mod udev;
 mod window_map;
 #[cfg(feature = "winit")]
 mod winit;
+#[cfg(feature = "xwayland")]
+mod xwayland;
 
 use state::AnvilState;
 

anvil/src/shell.rs

@@ -38,12 +38,25 @@ use crate::{
     window_map::{Kind as SurfaceKind, WindowMap},
 };
 
+#[cfg(feature = "xwayland")]
+use crate::xwayland::X11SurfaceRole;
+
+// The xwayland feature only adds a X11Surface role, but the macro does not support #[cfg]
+#[cfg(not(feature = "xwayland"))]
 define_roles!(Roles =>
     [ XdgSurface, XdgSurfaceRole ]
     [ ShellSurface, ShellSurfaceRole]
     [ DnDIcon, DnDIconRole ]
     [ CursorImage, CursorImageRole ]
 );
+#[cfg(feature = "xwayland")]
+define_roles!(Roles =>
+    [ XdgSurface, XdgSurfaceRole ]
+    [ ShellSurface, ShellSurfaceRole]
+    [ X11Surface, X11SurfaceRole ]
+    [ DnDIcon, DnDIconRole ]
+    [ CursorImage, CursorImageRole ]
+);
 
 pub type MyWindowMap = WindowMap<Roles>;
 
@@ -219,6 +232,10 @@ impl PointerGrab for ResizeSurfaceGrab {
                 (self.last_window_size.0 as u32, self.last_window_size.1 as u32),
                 self.edges.into(),
             ),
+            #[cfg(feature = "xwayland")]
+            SurfaceKind::X11(_) => {
+                // TODO: What to do here? Send the update via X11?
+            }
         }
     }
 
@@ -768,6 +785,9 @@ fn surface_commit(
     buffer_utils: &BufferUtils,
     window_map: &RefCell<MyWindowMap>,
 ) {
+    #[cfg(feature = "xwayland")]
+    super::xwayland::commit_hook(surface);
+
     let mut geometry = None;
     let mut min_size = (0, 0);
     let mut max_size = (0, 0);

anvil/src/state.rs

@@ -25,9 +25,13 @@ use smithay::{
 
 #[cfg(feature = "udev")]
 use smithay::backend::session::{auto::AutoSession, Session};
+#[cfg(feature = "xwayland")]
+use smithay::xwayland::XWayland;
 
 #[cfg(feature = "udev")]
 use crate::udev::MyOutput;
+#[cfg(feature = "xwayland")]
+use crate::xwayland::XWm;
 use crate::{buffer_utils::BufferUtils, shell::init_shell};
 
 pub struct AnvilState {
@@ -51,6 +55,8 @@ pub struct AnvilState {
     pub session: Option<AutoSession>,
     // things we must keep alive
     _wayland_event_source: Source<Generic<Fd>>,
+    #[cfg(feature = "xwayland")]
+    _xwayland: XWayland<XWm>,
 }
 
 impl AnvilState {
@@ -153,6 +159,17 @@ impl AnvilState {
             })
             .expect("Failed to initialize the keyboard");
 
+        #[cfg(feature = "xwayland")]
+        let _xwayland = {
+            let xwm = XWm::new(
+                handle.clone(),
+                shell_handles.token,
+                shell_handles.window_map.clone(),
+                log.clone(),
+            );
+            XWayland::init(xwm, handle.clone(), display.clone(), &mut (), log.clone()).unwrap()
+        };
+
         AnvilState {
             running: Arc::new(AtomicBool::new(true)),
             display,
@@ -172,6 +189,8 @@ impl AnvilState {
             #[cfg(feature = "udev")]
             session,
             _wayland_event_source,
+            #[cfg(feature = "xwayland")]
+            _xwayland,
         }
     }
 }

anvil/src/window_map.rs

@@ -13,10 +13,14 @@ use smithay::{
 };
 
 use crate::shell::SurfaceData;
+#[cfg(feature = "xwayland")]
+use crate::xwayland::X11Surface;
 
 pub enum Kind<R> {
     Xdg(ToplevelSurface<R>),
     Wl(ShellSurface<R>),
+    #[cfg(feature = "xwayland")]
+    X11(X11Surface),
 }
 
 // We implement Clone manually because #[derive(..)] would require R: Clone.
@@ -25,6 +29,8 @@ impl<R> Clone for Kind<R> {
         match self {
             Kind::Xdg(xdg) => Kind::Xdg(xdg.clone()),
             Kind::Wl(wl) => Kind::Wl(wl.clone()),
+            #[cfg(feature = "xwayland")]
+            Kind::X11(x11) => Kind::X11(x11.clone()),
         }
     }
 }
@@ -37,12 +43,16 @@ where
         match *self {
             Kind::Xdg(ref t) => t.alive(),
             Kind::Wl(ref t) => t.alive(),
+            #[cfg(feature = "xwayland")]
+            Kind::X11(ref t) => t.alive(),
         }
     }
     pub fn get_surface(&self) -> Option<&wl_surface::WlSurface> {
         match *self {
             Kind::Xdg(ref t) => t.get_surface(),
             Kind::Wl(ref t) => t.get_surface(),
+            #[cfg(feature = "xwayland")]
+            Kind::X11(ref t) => t.get_surface(),
         }
     }
 
@@ -51,6 +61,8 @@ where
         match (self, other) {
             (Kind::Xdg(a), Kind::Xdg(b)) => a.equals(b),
             (Kind::Wl(a), Kind::Wl(b)) => a.equals(b),
+            #[cfg(feature = "xwayland")]
+            (Kind::X11(a), Kind::X11(b)) => a.equals(b),
             _ => false,
         }
     }