Add Sway support

swayipc which supports both Sway and i3
svenstaro · Jan 15, 2022 · 09f4f48 · 09f4f48
1 parent 2e47c15
commit 09f4f48
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 107 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,14 +15,14 @@ lto = true
 codegen-units = 1
 
 [features]
-i3 = ["i3ipc"]
+i3 = ["swayipc"]
 
 [dependencies]
 cairo-sys-rs = "0.14"
 css-color-parser = "0.1"
 font-loader = "0.11"
-i3ipc = { version = "0.10", optional = true }
 itertools = "0.10"
+swayipc = { version = "3.0.0", optional = true }
 log = "0.4"
 pretty_env_logger = "0.4"
 regex = "1.5"

diff --git a/src/main.rs b/src/main.rs
@@ -8,9 +8,6 @@ use xkbcommon::xkb;
 mod args;
 mod utils;
 
-#[cfg(feature = "i3")]
-extern crate i3ipc;
-
 #[cfg(feature = "i3")]
 mod wm_i3;
 
@@ -20,7 +17,7 @@ use crate::wm_i3 as wm;
 #[derive(Debug)]
 pub struct DesktopWindow {
     id: i64,
-    x_window_id: Option<i32>,
+    x_window_id: Option<i64>,
     pos: (i32, i32),
     size: (i32, i32),
     is_focused: bool,