No more xcb, support XInput2 raw events

Closes #17
arcnmx · Sep 9, 2021 · 62011fd · 62011fd
1 parent af5a08b
commit 62011fd
Show file tree

Hide file tree

Showing 6 changed files with 659 additions and 380 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,6 @@ addons:
   apt:
     packages:
     - libudev-dev
-    - libxcb1-dev
-    - libxcb-dpms0-dev
-    - libxcb-xtest0-dev
-    - libxcb-xkb-dev
 cache:
   directories:
   - "$HOME/.cargo"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -37,8 +37,6 @@ and can be installed and run like so:
 ### Dependencies
 
 - udev (Debian: libudev-dev)
-- libxcb (Debian: libxcb1-dev libxcb-dpms0-dev libxcb-xtest0-dev libxcb-xkb-dev)
-- python (build-time only to generate xcb bindings)
 
 ### Packages
 

diff --git a/src/main.rs b/src/main.rs
@@ -115,32 +115,13 @@ async fn main_result(spawner: &Arc<Spawner>) -> Result<i32, Error> {
 
     match matches.subcommand() {
         ("x", Some(..)) => {
+            let (x_sender, mut x_receiver) = mpsc::channel(0x20);
+            let (mut xreq_sender, xreq_receiver) = mpsc::channel(0x08);
             let xinstance = screen.x_instance.unwrap_or("auto".into());
-
-            let (mut x_sender, mut x_receiver) = mpsc::channel(0x20);
-            let (mut xreq_sender, mut xreq_receiver) = mpsc::channel(0x08);
-            let x = x::XContext::xmain("screenstub", &xinstance, "screenstub")?;
             let xmain = tokio::spawn(async move {
-                let mut x = x.fuse();
-                loop {
-                    futures::select! {
-                        req = xreq_receiver.next() => if let Some(req) = req {
-                            let _ = x.send(req).await;
-                        },
-                        event = x.next() => match event {
-                            Some(Ok(event)) => {
-                                let _ = x_sender.send(event).await;
-                            },
-                            Some(Err(e)) => {
-                                error!("X Error: {}: {:?}", e, e);
-                                break
-                            },
-                            None => {
-                                break
-                            },
-                        },
-                        complete => break,
-                    }
+                let x = x::XContext::xmain("screenstub", &xinstance, "screenstub", xreq_receiver, x_sender);
+                if let Err(e) = x.await {
+                    error!("X Error: {}: {:?}", e, e);
                 }
             }).map_err(From::from);
 

diff --git a/x/Cargo.toml b/x/Cargo.toml
@@ -8,6 +8,8 @@ screenstub-fd = { version = "^0.0.1", path = "../fd" }
 futures = { version = "^0.3.4", features = ["bilock", "unstable"] }
 tokio = { version = "^1.0.0", default-features = false, features = ["rt-multi-thread"] }
 anyhow = "^1.0.42"
-xcb = { version = "^0.9.0", features = ["xtest", "xkb", "dpms"] }
+xproto = { version = "^0.1.0", features = ["xtest", "xkb", "xinput", "dpms"], git = "https://github.com/arcnmx/xproto-rs", branch = "wip" }
+xserver = { version = "^0.1.0", git = "https://github.com/arcnmx/xproto-rs", branch = "wip" }
+enumflags2 = "^0.6.4"
 input-linux = "^0.5.0"
 log = "^0.4.1"