chore(release): v0.11.0

Merge pull request #95 from JakeStanger/feat/module-hover
feat: module hover options
2023-04-01 18:36:24 +01:00 · 2023-04-01 18:17:52 +01:00 · 2023-04-01 13:29:40 +01:00 · 2023-04-01 13:12:26 +01:00
5 changed files with 186 additions and 52 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -111,7 +111,7 @@ dependencies = [
 "slab",
 "socket2",
 "waker-fn",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -372,6 +372,12 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -562,6 +568,19 @@ dependencies = [
 "syn 0.11.11",
 ]

+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote 1.0.26",
+ "rustc_version 0.4.0",
+ "syn 1.0.105",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.6"
@@ -578,7 +597,16 @@ version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
+dependencies = [
+ "dirs-sys 0.4.0",
 ]

 [[package]]
@@ -592,6 +620,17 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "dirs-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
+dependencies = [
+ "libc",
+ "redox_users",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "dlib"
 version = "0.5.0"
@@ -692,7 +731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
 dependencies = [
 "memoffset 0.6.5",
- "rustc_version",
+ "rustc_version 0.3.3",
 ]

 [[package]]
@@ -704,7 +743,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -758,6 +797,21 @@ dependencies = [
 "syn 1.0.105",
 ]

+[[package]]
+name = "futures"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.25"
@@ -765,6 +819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
 "futures-core",
+ "futures-sink",
 ]

 [[package]]
@@ -834,10 +889,13 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
+ "futures-channel",
 "futures-core",
+ "futures-io",
 "futures-macro",
 "futures-sink",
 "futures-task",
+ "memchr",
 "pin-project-lite",
 "pin-utils",
 "slab",
@@ -1233,13 +1291,16 @@ dependencies = [

 [[package]]
 name = "hyprland"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f76d4dad14a688266c346a9233e8cc5cea0c31a489d8811e3d93176338bafc0"
+checksum = "19d341e36a776cd092622daf2439a484247f3dc7d25eab7b286cc88ac85120d3"
 dependencies = [
 "async-trait",
+ "derive_more",
 "doc-comment",
+ "futures",
 "hex",
+ "hyprland-macros",
 "lazy_static",
 "num-traits",
 "paste",
@@ -1248,10 +1309,19 @@ dependencies = [
 "serde_json",
 "serde_repr",
 "strum",
- "strum_macros",
 "tokio",
 ]

+[[package]]
+name = "hyprland-macros"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0088021091c08e29e9d1f735142ab811bd4d4d7f82fd4d4673407cb96fffb062"
+dependencies = [
+ "quote 1.0.26",
+ "syn 2.0.2",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.53"
@@ -1345,13 +1415,13 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"

 [[package]]
 name = "ironbar"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
 "async_once",
 "cfg-if",
 "chrono",
 "color-eyre",
- "dirs",
+ "dirs 5.0.0",
 "futures-util",
 "glib",
 "gtk",
@@ -1561,7 +1631,7 @@ dependencies = [
 "libc",
 "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -1880,7 +1950,7 @@ dependencies = [
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -1968,7 +2038,7 @@ dependencies = [
 "libc",
 "log",
 "wepoll-ffi",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -2192,7 +2262,16 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
 dependencies = [
- "semver",
+ "semver 0.11.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.17",
 ]

 [[package]]
@@ -2222,7 +2301,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -2269,6 +2348,12 @@ dependencies = [
 "semver-parser",
 ]

+[[package]]
+name = "semver"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+
 [[package]]
 name = "semver-parser"
 version = "0.10.2"
@@ -2495,6 +2580,9 @@ name = "strum"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]

 [[package]]
 name = "strum_macros"
@@ -2578,9 +2666,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.27.0"
+version = "0.28.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d08ba83d6dde63d053e42d7230f0dc7f8d8efeb8d30d3681580d158156461ba"
+checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
 dependencies = [
 "cfg-if",
 "core-foundation-sys",
@@ -2726,7 +2814,7 @@ dependencies = [
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -2976,11 +3064,11 @@ checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"

 [[package]]
 name = "universal-config"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ecee14b2d35eec5fb307ec7ff179389807b9b14e97a853e69ad3e3a732391f"
+checksum = "5dae262d0546bed6c0955faad12c07ec989768c2550643609410178fddb39909"
 dependencies = [
- "dirs",
+ "dirs 5.0.0",
 "libcorn",
 "serde",
 "serde_json",
@@ -3305,46 +3393,70 @@ dependencies = [
 ]

 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

 [[package]]
 name = "winnow"
@@ -3394,7 +3506,7 @@ dependencies = [
 "async-trait",
 "byteorder",
 "derivative",
- "dirs",
+ "dirs 4.0.0",
 "enumflags2",
 "event-listener",
 "futures-core",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ironbar"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2021"
 license = "MIT"
 description = "Customisable GTK Layer Shell wlroots/sway bar"
@@ -57,13 +57,13 @@ strip-ansi-escapes = "0.1.1"
 color-eyre = "0.6.2"
 serde = { version = "1.0.141", features = ["derive"] }
 indexmap = "1.9.1"
-dirs = "4.0.0"
+dirs = "5.0.0"
 walkdir = "2.3.2"
 notify = { version = "5.0.0", default-features = false }
 wayland-client = "0.29.5"
 wayland-protocols = { version = "0.29.5", features = ["unstable_protocols", "client"] }
 smithay-client-toolkit = { version = "0.16.0", default-features = false, features = ["calloop"] }
-universal-config = { version = "0.2.1", default_features = false }
+universal-config = { version = "0.3.0", default_features = false }

 lazy_static = "1.4.0"
 async_once = "0.2.6"
@@ -83,14 +83,14 @@ mpd_client = { version = "1.0.0", optional = true }
 mpris = { version = "2.0.0", optional = true }

 # sys_info
-sysinfo = { version = "0.27.0", optional = true }
+sysinfo = { version = "0.28.4", optional = true }

 # tray
 stray = { version = "0.1.3", optional = true }

 # workspaces
 swayipc-async = { version = "2.0.1", optional = true }
-hyprland = { version = "0.3.0", optional = true }
+hyprland = { version = "0.3.1", optional = true }
 futures-util = { version = "0.3.21", optional = true }

 # shared
--- a/docs/Configuration
+++ b/docs/Configuration
@@ -296,4 +296,6 @@ For information on the `Script` type, and embedding scripts in strings, see [her
 | `on_click_right`  | `Script [oneshot]` | `null`  | Runs the script when the module is right clicked.                                                                  |
 | `on_scroll_up`    | `Script [oneshot]` | `null`  | Runs the script when the module is scroll up on.                                                                   |
 | `on_scroll_down`  | `Script [oneshot]` | `null`  | Runs the script when the module is scrolled down on.                                                               |
+| `on_mouse_enter`  | `Script [oneshot]` | `null`  | Runs the script when the module is hovered over.                                                                   |
+| `on_mouse_exit`   | `Script [oneshot]` | `null`  | Runs the script when the module is no longer hovered over.                                                         |
 | `tooltip`         | `string`           | `null`  | Shows this text on hover. Supports embedding scripts between `{{double braces}}`.                                  |
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -397,12 +397,7 @@ fn setup_module_common_options(container: EventBox, common: CommonConfig) {

        if let Some(script) = script {
            trace!("Running on-click script: {}", event.button());
-
-            match await_sync(async { script.get_output().await }) {
-                Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
-                Err(err) => error!("{err:?}"),
-                _ => {}
-            }
+            run_script(script);
        }

        Inhibit(false)
@@ -420,12 +415,27 @@ fn setup_module_common_options(container: EventBox, common: CommonConfig) {

        if let Some(script) = script {
            trace!("Running on-scroll script: {}", event.direction());
+            run_script(script);
+        }

-            match await_sync(async { script.get_output().await }) {
-                Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
-                Err(err) => error!("{err:?}"),
-                _ => {}
-            }
+        Inhibit(false)
+    });
+
+    let mouse_enter_script = common.on_mouse_enter.map(Script::new_polling);
+    container.connect_enter_notify_event(move |_, _| {
+        if let Some(ref script) = mouse_enter_script {
+            trace!("Running enter script");
+            run_script(script);
+        }
+
+        Inhibit(false)
+    });
+
+    let mouse_exit_script = common.on_mouse_exit.map(Script::new_polling);
+    container.connect_leave_notify_event(move |_, _| {
+        if let Some(ref script) = mouse_exit_script {
+            trace!("Running exit script");
+            run_script(script);
        }

        Inhibit(false)
@@ -438,3 +448,11 @@ fn setup_module_common_options(container: EventBox, common: CommonConfig) {
        });
    }
 }
+
+fn run_script(script: &Script) {
+    match await_sync(async { script.get_output().await }) {
+        Ok((OutputStream::Stderr(out), _)) => error!("{out}"),
+        Err(err) => error!("{err:?}"),
+        _ => {}
+    }
+}
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -32,6 +32,8 @@ pub struct CommonConfig {
    pub on_click_middle: Option<ScriptInput>,
    pub on_scroll_up: Option<ScriptInput>,
    pub on_scroll_down: Option<ScriptInput>,
+    pub on_mouse_enter: Option<ScriptInput>,
+    pub on_mouse_exit: Option<ScriptInput>,

    pub tooltip: Option<String>,
 }
Author	SHA1	Message	Date
Jake Stanger	7bf44ca75d	chore(release): v0.11.0	2023-04-01 18:36:24 +01:00
Jake Stanger	fb04ceab7d	Merge pull request #95 from JakeStanger/feat/module-hover feat: module hover options	2023-04-01 18:17:52 +01:00
Jake Stanger	102d2478a9	feat: module hover options Resolves #70.	2023-04-01 13:29:40 +01:00
Jake Stanger	80a414ab67	build: update deps Resolves #93	2023-04-01 13:12:26 +01:00