diff --git a/Cargo.lock b/Cargo.lock index 4ee9b27..fef9f55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,6 +264,9 @@ dependencies = [ "serde_repr", "tokio", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus 5.14.0", ] @@ -908,6 +911,19 @@ dependencies = [ "libm", ] +[[package]] +name = "cosmic-client-toolkit" +version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38" +dependencies = [ + "bitflags 2.11.0", + "cosmic-protocols", + "libc", + "smithay-client-toolkit", + "wayland-client", + "wayland-protocols", +] + [[package]] name = "cosmic-config" version = "1.0.0" @@ -946,7 +962,7 @@ dependencies = [ "bstr", "btoi", "memchr", - "memmap2", + "memmap2 0.9.10", "thiserror 2.0.18", "tracing", "xdg", @@ -978,6 +994,20 @@ dependencies = [ "vergen", ] +[[package]] +name = "cosmic-protocols" +version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=160b086#160b086abe03cd34a8a375d7fbe47b24308d1f38" +dependencies = [ + "bitflags 2.11.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "wayland-server", +] + [[package]] name = "cosmic-settings-daemon" version = "0.1.0" @@ -1661,7 +1691,7 @@ checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" dependencies = [ "fontconfig-parser", "log", - "memmap2", + "memmap2 0.9.10", "slotmap", "tinyvec", "ttf-parser", @@ -2510,6 +2540,7 @@ source = "git+https://github.com/pop-os/libcosmic.git#8e3672a7dd6aa2fb8d663b1379 dependencies = [ "bitflags 2.11.0", "bytes", + "cosmic-client-toolkit", "dnd", "glam", "lilt", @@ -2598,6 +2629,7 @@ version = "0.14.0" source = "git+https://github.com/pop-os/libcosmic.git#8e3672a7dd6aa2fb8d663b1379fa80afdd1ab75b" dependencies = [ "bytes", + "cosmic-client-toolkit", "dnd", "iced_core", "iced_futures", @@ -2648,6 +2680,7 @@ dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.0", "bytemuck", + "cosmic-client-toolkit", "cryoglyph", "futures", "glam", @@ -2675,6 +2708,7 @@ name = "iced_widget" version = "0.14.2" source = "git+https://github.com/pop-os/libcosmic.git#8e3672a7dd6aa2fb8d663b1379fa80afdd1ab75b" dependencies = [ + "cosmic-client-toolkit", "dnd", "iced_renderer", "iced_runtime", @@ -2692,6 +2726,7 @@ name = "iced_winit" version = "0.14.0" source = "git+https://github.com/pop-os/libcosmic.git#8e3672a7dd6aa2fb8d663b1379fa80afdd1ab75b" dependencies = [ + "cosmic-client-toolkit", "cursor-icon", "dnd", "iced_debug", @@ -2700,16 +2735,22 @@ dependencies = [ "iced_program", "iced_runtime", "log", + "raw-window-handle", "rustc-hash 2.1.2", "rustix 0.38.44", "thiserror 2.0.18", "wasm-bindgen-futures", + "wayland-backend", "wayland-client", + "wayland-protocols", "web-sys", "winapi", "window_clipboard", "winit", "winit-core", + "xkbcommon 0.7.0", + "xkbcommon-dl", + "xkeysym", ] [[package]] @@ -3344,6 +3385,7 @@ dependencies = [ "apply", "ashpd 0.12.3", "auto_enums", + "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", "cosmic-settings-daemon", @@ -3561,6 +3603,15 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +[[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.10" @@ -4947,7 +4998,7 @@ checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b" dependencies = [ "ab_glyph", "log", - "memmap2", + "memmap2 0.9.10", "smithay-client-toolkit", "tiny-skia", ] @@ -5150,12 +5201,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" dependencies = [ "bitflags 2.11.0", + "bytemuck", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2", + "memmap2 0.9.10", + "pkg-config", "rustix 1.1.4", "thiserror 2.0.18", "wayland-backend", @@ -5167,6 +5220,7 @@ dependencies = [ "wayland-protocols-misc", "wayland-protocols-wlr", "wayland-scanner", + "xkbcommon 0.8.0", "xkeysym", ] @@ -5216,7 +5270,7 @@ dependencies = [ "foreign-types", "js-sys", "log", - "memmap2", + "memmap2 0.9.10", "objc", "raw-window-handle", "redox_syscall 0.5.18", @@ -6124,6 +6178,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-scanner", + "wayland-server", ] [[package]] @@ -6176,6 +6231,7 @@ dependencies = [ "wayland-client", "wayland-protocols", "wayland-scanner", + "wayland-server", ] [[package]] @@ -6189,6 +6245,19 @@ dependencies = [ "quote", ] +[[package]] +name = "wayland-server" +version = "0.31.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0" +dependencies = [ + "bitflags 2.11.0", + "downcast-rs", + "rustix 1.1.4", + "wayland-backend", + "wayland-scanner", +] + [[package]] name = "wayland-sys" version = "0.31.11" @@ -6904,7 +6973,7 @@ name = "winit-common" version = "0.31.0-beta.2" source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#a610ac9c7a72b39ff102ed4d946291618dc725b6" dependencies = [ - "memmap2", + "memmap2 0.9.10", "objc2 0.6.4", "objc2-core-foundation", "smol_str", @@ -6975,7 +7044,7 @@ dependencies = [ "cursor-icon", "dpi", "libc", - "memmap2", + "memmap2 0.9.10", "raw-window-handle", "rustix 1.1.4", "sctk-adwaita", @@ -7230,6 +7299,28 @@ dependencies = [ "windows-sys 0.59.0", ] +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" +dependencies = [ + "libc", + "memmap2 0.9.10", + "xkeysym", +] + [[package]] name = "xkbcommon-dl" version = "0.4.2" @@ -7248,6 +7339,9 @@ name = "xkeysym" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" +dependencies = [ + "bytemuck", +] [[package]] name = "xml-rs" diff --git a/Cargo.toml b/Cargo.toml index b6994d0..ff0809a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,9 +47,10 @@ optional = true fork = "0.2" [features] -default = ["mpris-server", "xdg-portal", "wgpu"] +default = ["mpris-server", "xdg-portal", "wgpu", "wayland"] xdg-portal = ["ashpd", "libcosmic/xdg-portal"] wgpu = ["iced_video_player/wgpu", "libcosmic/wgpu"] +wayland = ["libcosmic/wayland"] [profile.release-with-debug] inherits = "release"