From 0ebf46a22cbc4d3ca2b70bcc943eea377edac277 Mon Sep 17 00:00:00 2001 From: ShootingStarDragons Date: Sat, 12 Oct 2024 10:42:42 +0900 Subject: [PATCH] chore: remove sctk I have not directly used it --- Cargo.lock | 162 +++++++++++---------------------------- Cargo.toml | 25 +++--- layershellev/Cargo.toml | 3 +- layershellev/src/lib.rs | 17 ++-- sessionlockev/Cargo.toml | 3 +- sessionlockev/src/lib.rs | 12 +-- 6 files changed, 74 insertions(+), 148 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a08ef5..f15ec4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "application-launcher" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "gio", "iced", @@ -411,7 +411,7 @@ dependencies = [ [[package]] name = "bottom_panel" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "gio", "iced", @@ -491,9 +491,9 @@ dependencies = [ [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", @@ -505,25 +505,24 @@ dependencies = [ [[package]] name = "calloop" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7" dependencies = [ "bitflags 2.6.0", - "log", "polling", "rustix", "slab", - "thiserror", + "tracing", ] [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.12.4", + "calloop 0.13.0", "rustix", "wayland-backend", "wayland-client", @@ -531,11 +530,11 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +checksum = "876a7a1dbbe026a55ef47a500b123af5a9a0914520f061d467914cf21be95daf" dependencies = [ - "calloop 0.13.0", + "calloop 0.14.1", "rustix", "wayland-backend", "wayland-client", @@ -790,7 +789,7 @@ dependencies = [ [[package]] name = "counter" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "iced", "iced_layershell", @@ -799,7 +798,7 @@ dependencies = [ [[package]] name = "counter_lock" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "iced", "iced_runtime", @@ -808,7 +807,7 @@ dependencies = [ [[package]] name = "counter_multi" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "iced", "iced_layershell", @@ -1807,7 +1806,7 @@ dependencies = [ [[package]] name = "iced_layershell" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "futures", "iced", @@ -1826,7 +1825,7 @@ dependencies = [ [[package]] name = "iced_layershell_macros" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "darling", "manyhow", @@ -1863,7 +1862,7 @@ dependencies = [ [[package]] name = "iced_sessionlock" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "futures", "iced", @@ -1882,7 +1881,7 @@ dependencies = [ [[package]] name = "iced_sessionlock_macros" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "darling", "manyhow", @@ -1910,7 +1909,7 @@ dependencies = [ [[package]] name = "iced_virtualkeyboard" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "iced", "iced_layershell", @@ -2128,21 +2127,22 @@ dependencies = [ [[package]] name = "layershellev" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "bitflags 2.6.0", + "calloop 0.14.1", + "calloop-wayland-source 0.4.0", "log", "raw-window-handle", - "smithay-client-toolkit 0.18.1", "tempfile", "thiserror", "waycrate_xkbkeycode", "wayland-backend", "wayland-client", "wayland-cursor", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-protocols-misc", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols-wlr", ] [[package]] @@ -2338,15 +2338,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.5" @@ -3423,7 +3414,7 @@ dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "tiny-skia", ] @@ -3487,21 +3478,22 @@ dependencies = [ [[package]] name = "sessionlockev" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "bitflags 2.6.0", + "calloop 0.14.1", + "calloop-wayland-source 0.4.0", "log", "raw-window-handle", - "smithay-client-toolkit 0.18.1", "tempfile", "thiserror", "waycrate_xkbkeycode", "wayland-backend", "wayland-client", "wayland-cursor", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-protocols-misc", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols-wlr", ] [[package]] @@ -3591,34 +3583,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.5", - "pkg-config", - "rustix", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkbcommon 0.7.0", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -3638,8 +3602,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkeysym", ] @@ -3651,7 +3615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -3726,7 +3690,7 @@ dependencies = [ [[package]] name = "starcolorkeyboard" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "bitflags 2.6.0", "cairo-rs", @@ -4002,6 +3966,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4267,7 +4232,7 @@ dependencies = [ [[package]] name = "waycrate_xkbkeycode" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "bitflags 2.6.0", "log", @@ -4326,18 +4291,6 @@ dependencies = [ "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - [[package]] name = "wayland-protocols" version = "0.32.4" @@ -4359,7 +4312,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -4372,20 +4325,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -4398,7 +4338,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -4867,7 +4807,7 @@ dependencies = [ "redox_syscall 0.4.1", "rustix", "sctk-adwaita", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", @@ -4875,7 +4815,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", @@ -4968,17 +4908,6 @@ dependencies = [ "xkeysym", ] -[[package]] -name = "xkbcommon" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" -dependencies = [ - "libc", - "memmap2 0.8.0", - "xkeysym", -] - [[package]] name = "xkbcommon" version = "0.8.0" @@ -5008,9 +4937,6 @@ name = "xkeysym" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" -dependencies = [ - "bytemuck", -] [[package]] name = "xml-rs" @@ -5071,7 +4997,7 @@ dependencies = [ [[package]] name = "zbus_invoked_widget" -version = "0.9.0-rc1" +version = "0.9.0" dependencies = [ "futures", "iced", diff --git a/Cargo.toml b/Cargo.toml index 5ef5e2a..aef0d4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ authors = [ "Aakash Sen Sharma ", ] edition = "2021" -version = "0.9.0" +version = "0.9.1" license = "MIT" repository = "https://github.com/waycrate/exwlshelleventloop" description = "Wayland extra shell lib" @@ -26,14 +26,14 @@ keywords = ["wayland", "wlroots"] readme = "README.md" [workspace.dependencies] -layershellev = { version = "0.9.0", path = "./layershellev" } -sessionlockev = { version = "0.9.0", path = "./sessionlockev" } +layershellev = { version = "0.9.1", path = "./layershellev" } +sessionlockev = { version = "0.9.1", path = "./sessionlockev" } -iced_layershell = { version = "0.9.0", path = "./iced_layershell" } -iced_layershell_macros = { version = "0.9.0", path = "./iced_layershell_macros" } -iced_sessionlock = { version = "0.9.0", path = "./iced_sessionlock" } -iced_sessionlock_macros = { version = "0.9.0", path = "./iced_sessionlock_macros" } -waycrate_xkbkeycode = { version = "0.9.0", path = "./waycrate_xkbkeycode" } +iced_layershell = { version = "0.9.1", path = "./iced_layershell" } +iced_layershell_macros = { version = "0.9.1", path = "./iced_layershell_macros" } +iced_sessionlock = { version = "0.9.1", path = "./iced_sessionlock" } +iced_sessionlock_macros = { version = "0.9.1", path = "./iced_sessionlock_macros" } +waycrate_xkbkeycode = { version = "0.9.1", path = "./waycrate_xkbkeycode" } tempfile = "3.13.0" thiserror = "1.0.63" @@ -54,11 +54,12 @@ wayland-protocols-wlr = { version = "0.3.3", default-features = false, features wayland-protocols-misc = { version = "0.3.3", features = ["client"] } wayland-backend = { version = "0.3.6", features = ["client_system"] } -sctk = { package = "smithay-client-toolkit", version = "0.18.1", features = [ - "calloop", -] } +#sctk = { package = "smithay-client-toolkit", version = "0.19.2", features = [ +# "calloop", +#] } -calloop = "0.14.0" +calloop = "0.14.1" +calloop-wayland-source = "0.4.0" rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [ "std", diff --git a/layershellev/Cargo.toml b/layershellev/Cargo.toml index d363736..ed3c46c 100644 --- a/layershellev/Cargo.toml +++ b/layershellev/Cargo.toml @@ -30,7 +30,8 @@ rwh_06.workspace = true bitflags.workspace = true -sctk.workspace = true +calloop.workspace = true +calloop-wayland-source.workspace = true log.workspace = true diff --git a/layershellev/src/lib.rs b/layershellev/src/lib.rs index 179592f..e71ae0c 100644 --- a/layershellev/src/lib.rs +++ b/layershellev/src/lib.rs @@ -116,8 +116,6 @@ pub use events::NewPopUpSettings; pub use waycrate_xkbkeycode::keyboard; pub use waycrate_xkbkeycode::xkb_keyboard; -pub use sctk::reexports::calloop; - mod events; mod strtoshape; @@ -190,16 +188,15 @@ use wayland_protocols_misc::zwp_virtual_keyboard_v1::client::{ zwp_virtual_keyboard_v1::ZwpVirtualKeyboardV1, }; -use std::f64; -use std::time::Duration; +pub use calloop; -use sctk::reexports::{ - calloop::{ - timer::{TimeoutAction, Timer}, - Error as CallLoopError, EventLoop, LoopHandle, - }, - calloop_wayland_source::WaylandSource, +use calloop::{ + timer::{TimeoutAction, Timer}, + Error as CallLoopError, EventLoop, LoopHandle, }; +use calloop_wayland_source::WaylandSource; +use std::f64; +use std::time::Duration; #[derive(Debug, thiserror::Error)] pub enum LayerEventError { diff --git a/sessionlockev/Cargo.toml b/sessionlockev/Cargo.toml index c5bcbb8..31f26f2 100644 --- a/sessionlockev/Cargo.toml +++ b/sessionlockev/Cargo.toml @@ -30,7 +30,8 @@ bitflags.workspace = true rwh_06.workspace = true -sctk.workspace = true +calloop.workspace = true +calloop-wayland-source.workspace = true log.workspace = true waycrate_xkbkeycode.workspace = true diff --git a/sessionlockev/src/lib.rs b/sessionlockev/src/lib.rs index b86d947..b28641f 100644 --- a/sessionlockev/src/lib.rs +++ b/sessionlockev/src/lib.rs @@ -161,13 +161,13 @@ use wayland_protocols::wp::fractional_scale::v1::client::{ use std::time::Duration; -use sctk::reexports::{ - calloop::{ - timer::{TimeoutAction, Timer}, - Error as CallLoopError, EventLoop, LoopHandle, - }, - calloop_wayland_source::WaylandSource, +pub use calloop; + +use calloop::{ + timer::{TimeoutAction, Timer}, + Error as CallLoopError, EventLoop, LoopHandle, }; +use calloop_wayland_source::WaylandSource; use wayland_client::backend::WaylandError;