From e18daf49928102f86d51cf4b51b46f80ffbc515c Mon Sep 17 00:00:00 2001 From: Matt White Date: Sat, 11 Jan 2025 20:26:22 -0700 Subject: [PATCH] chore: hyprland-rs 0.4.0-beta.2 --- Cargo.lock | 135 ++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- src/renamer/mod.rs | 20 +++---- 3 files changed, 139 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 057337d9..d537a011 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,6 +88,28 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "autocfg" version = "1.3.0" @@ -184,15 +206,31 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", "syn", + "unicode-xid", ] +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + [[package]] name = "equivalent" version = "1.0.1" @@ -205,6 +243,16 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +[[package]] +name = "futures-lite" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "gimli" version = "0.29.0" @@ -231,17 +279,20 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hyprland" -version = "0.4.0-alpha.3" +version = "0.4.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de3f836e02af5a12f374d3a986867c1dc487a63a6d19477d66c7de50f715895" +checksum = "dc9c1413b6f0fd10b2e4463479490e30b2497ae4449f044da16053f5f2cb03b8" dependencies = [ "ahash", + "async-stream", "derive_more", + "either", + "futures-lite", "hyprland-macros", "num-traits", "once_cell", "paste", - "regex", + "phf", "serde", "serde_json", "serde_repr", @@ -268,10 +319,11 @@ dependencies = [ [[package]] name = "hyprland-macros" -version = "0.4.0-alpha.1" +version = "0.4.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd8ce4c182ce77e485918f49262425ee51a2746fe97f14084869aeff2fbc38e" +checksum = "69e3cbed6e560408051175d29a9ed6ad1e64a7ff443836addf797b0479f58983" dependencies = [ + "proc-macro2", "quote", "syn", ] @@ -405,6 +457,48 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -429,6 +523,21 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + [[package]] name = "regex" version = "1.10.6" @@ -566,6 +675,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "socket2" version = "0.5.7" @@ -687,6 +802,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "utf8parse" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 4bfbe23d..d8f46d70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ repository = "https://github.com/hyprland-community/hyprland-autoname-workspaces [dependencies] regex = "1" clap = { version = "4.3.19", features = ["derive"] } -hyprland = { version = "=0.4.0-alpha.3" , features = ["silent"] } +hyprland = { version = "=0.4.0-beta.2" } signal-hook = "0.3.17" toml = { version = "0.7.6", features = ["indexmap", "preserve_order"] } xdg = "2.5.2" diff --git a/src/renamer/mod.rs b/src/renamer/mod.rs index aa6d1505..9603232e 100644 --- a/src/renamer/mod.rs +++ b/src/renamer/mod.rs @@ -9,7 +9,7 @@ use crate::params::Args; use formatter::*; use hyprland::data::{Client, Clients, FullscreenMode, Workspace}; use hyprland::dispatch::*; -use hyprland::event_listener::{EventListener, WorkspaceDestroyedEventData}; +use hyprland::event_listener::{EventListener, WorkspaceEventData}; use hyprland::prelude::*; use hyprland::shared::Address; use icon::{IconConfig, IconStatus}; @@ -163,19 +163,19 @@ impl Renamer { rename_workspace_if!( self, event_listener, - add_window_open_handler, - add_window_close_handler, + add_window_opened_handler, + add_window_closed_handler, add_window_moved_handler, - add_active_window_change_handler, + add_active_window_changed_handler, add_workspace_added_handler, add_workspace_moved_handler, - add_workspace_change_handler, - add_fullscreen_state_change_handler, - add_window_title_change_handler + add_workspace_changed_handler, + add_fullscreen_state_changed_handler, + add_window_title_changed_handler ); let this = self.clone(); - event_listener.add_workspace_destroy_handler(move |wt| { + event_listener.add_workspace_deleted_handler(move |wt| { _ = this.rename_workspace(); _ = this.remove_workspace(wt); }); @@ -217,9 +217,9 @@ impl Renamer { fn remove_workspace( &self, - wt: WorkspaceDestroyedEventData, + wt: WorkspaceEventData, ) -> Result> { - Ok(self.known_workspaces.lock()?.remove(&wt.workspace_id)) + Ok(self.known_workspaces.lock()?.remove(&wt.id)) } }