X11 implementation of druid-shell

.github/workflows/ci.yml

@@ -55,40 +55,47 @@ jobs:
           profile: minimal
           override: true
 
-      - name: cargo clippy (no-svg)
+      - name: cargo clippy (druid)
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all -- -D warnings
-        if: contains(matrix.os, 'ubuntu') != true
+          args: --manifest-path=druid/Cargo.toml --features=svg,image -- -D warnings
 
-      - name: cargo clippy (svg)
+      - name: cargo clippy (druid-shell)
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all --all-features -- -D warnings
-        if: contains(matrix.os, 'ubuntu')
+          args: --manifest-path=druid-shell/Cargo.toml -- -D warnings
 
+      - name: cargo clippy (druid-derive)
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --manifest-path=druid-derive/Cargo.toml -- -D warnings
 
-      - name: cargo test --all
+      - name: cargo test (druid)
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all
-        if: contains(matrix.os, 'ubuntu') != true
+          args: --manifest-path=druid/Cargo.toml --features=svg,image
 
-      - name: cargo test --all --all-features
+      - name: cargo test (druid-shell)
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all --all-features
-        if: contains(matrix.os, 'ubuntu')
+          args: --manifest-path=druid-shell/Cargo.toml
+
+      - name: cargo test (druid-derive)
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path=druid-shell/Cargo.toml
 
       - name: Run rustc -D warnings in druid/
         uses: actions-rs/cargo@v1
         with:
           command: rustc
-          args: --manifest-path=druid/Cargo.toml -- -D warnings
+          args: --manifest-path=druid/Cargo.toml --features=svg,image -- -D warnings
 
       - name: Run rustc -d warnings in druid/druid-shell
         uses: actions-rs/cargo@v1
@@ -165,3 +172,47 @@ jobs:
         with:
           command: doc
           args: --document-private-items
+
+  # by default on linux we test gtk; to test x11 we need a separate job.
+  test-stable-x11:
+    runs-on: ubuntu-latest
+    name: cargo test stable (x11)
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: install deps
+        run: |
+          sudo apt update
+          sudo apt install libx11-dev libgtk-3-dev
+
+      - name: install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+          profile: minimal
+          override: true
+
+      - name: cargo clippy (x11)
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --manifest-path=druid-shell/Cargo.toml --features=use_x11 -- -D warnings
+
+      - name: cargo test druid-shell
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path=druid-shell/Cargo.toml --features=use_x11
+
+      - name: cargo test druid
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path=druid/Cargo.toml --features=use_x11
+
+      - name: Run rustc -d warnings in druid/druid-shell
+        uses: actions-rs/cargo@v1
+        with:
+          command: rustc
+          args: --manifest-path=druid-shell/Cargo.toml  --features=use_x11 -- -D warnings

Cargo.toml

@@ -4,4 +4,3 @@ members = [
     "druid-shell",
     "druid-derive",
 ]
-

druid-shell/Cargo.toml

@@ -11,6 +11,7 @@ edition = "2018"
 
 [features]
 use_gtk = ["gtk", "gtk-sys", "gio", "gdk", "gdk-sys", "glib", "glib-sys", "cairo-rs"]
+use_x11 = ["xcb", "cairo-sys-rs"]
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"
@@ -22,14 +23,16 @@ lazy_static = "1.0"
 time = "0.2.4"
 cfg-if = "0.1.10"
 
-cairo-rs = {  version = "0.8.0", default_features = false, optional = true }
+cairo-rs = { version = "0.8.0", default_features = false, optional = true }
+cairo-sys-rs = { version = "0.9.2", default_features = false, optional = true }
 gio = { version = "0.8.0", optional = true }
 gdk = { version = "0.12.0", optional = true }
 gdk-sys = { version = "0.9.0", optional = true }
 gtk = { version = "0.8.0", optional = true }
 glib = { version = "0.9.1", optional = true }
 glib-sys = { version = "0.9.0", optional = true }
 gtk-sys = { version = "0.9.0", optional = true }
+xcb = { version = "0.9.0", features = ["thread", "xlib_xcb", "randr"], optional = true }
 
 [target.'cfg(target_os="windows")'.dependencies]
 wio = "0.2"
@@ -43,8 +46,9 @@ cocoa = "0.20.0"
 objc = "0.2.5"
 cairo-rs = { version = "0.8.0", default_features = false }
 
+# TODO(x11/dependencies): only use feature "xcb" if using XCB
 [target.'cfg(target_os="linux")'.dependencies]
-cairo-rs = {  version = "0.8.0", default_features = false }
+cairo-rs = {  version = "0.8.0", default_features = false, features = ["xcb"] }
 gio = "0.8.0"
 gdk = "0.12.0"
 gdk-sys = "0.9.0"

druid-shell/examples/perftest.rs

@@ -118,7 +118,16 @@ fn main() {
     builder.set_handler(Box::new(perf_test));
     builder.set_title("Performance tester");
 
-    let window = builder.build().unwrap();
-    window.show();
+    // TODO(x11/architecture): super hacky way to connect the XWindow to the RunLoop. Better way to do it?
+    cfg_if::cfg_if! {
+        if #[cfg(all(target_os = "linux", feature = "use_x11"))] {
+            let window = builder.build(&mut run_loop).unwrap();
+            window.show();
+        } else {
+            let window = builder.build().unwrap();
+            window.show();
+        }
+    }
+
     app.run();
 }

druid-shell/examples/shello.rs

@@ -64,9 +64,17 @@ impl WinHandler for HelloState {
     }
 
     fn key_down(&mut self, event: KeyEvent) -> bool {
-        let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
-        let id = self.handle.request_timer(deadline);
-        println!("keydown: {:?}, timer id = {:?}", event, id);
+        // TODO(x11/timers): Timers not implemented yet on X11, so this won't work there.
+        cfg_if::cfg_if! {
+            if #[cfg(all(target_os = "linux", feature = "use_x11"))] {
+                println!("keydown: {:?}", event);
+            } else {
+                let deadline = std::time::Instant::now() + std::time::Duration::from_millis(500);
+                let id = self.handle.request_timer(deadline);
+                println!("keydown: {:?}, timer id = {:?}", event, id);
+            }
+        }
+
         false
     }
 
@@ -133,8 +141,17 @@ fn main() {
     builder.set_handler(Box::new(HelloState::default()));
     builder.set_title("Hello example");
     builder.set_menu(menubar);
-    let window = builder.build().unwrap();
 
-    window.show();
+    // TODO(x11/architecture): super hacky way to connect the XWindow to the RunLoop. Better way to do it?
+    cfg_if::cfg_if! {
+        if #[cfg(all(target_os = "linux", feature = "use_x11"))] {
+            let window = builder.build(&mut run_loop).unwrap();
+            window.show();
+        } else {
+            let window = builder.build().unwrap();
+            window.show();
+        }
+    }
+
     app.run();
 }

druid-shell/src/lib.rs

@@ -36,6 +36,10 @@ extern crate objc;
 #[macro_use]
 extern crate lazy_static;
 
+#[cfg(all(target_os = "linux", feature = "use_x11"))]
+#[macro_use]
+extern crate lazy_static;
+
 mod application;
 mod clipboard;
 mod common_util;

druid-shell/src/platform/mod.rs

@@ -21,6 +21,9 @@ cfg_if::cfg_if! {
     } else if #[cfg(all(target_os = "macos", not(feature = "use_gtk")))] {
         mod mac;
         pub use mac::*;
+    } else if #[cfg(all(feature = "use_x11", target_os = "linux"))] {
+        mod x11;
+        pub use x11::*;
     } else if #[cfg(any(feature = "use_gtk", target_os = "linux"))] {
         mod gtk;
         pub use self::gtk::*;