leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use updated screencopy abstraction

Browse source
This commit is contained in:
Ian Douglas Scott 2025-01-30 15:53:50 -08:00 • committed by Ian Douglas Scott
parent a3be974f81
commit 4dc6f8b99f
5 changed files with 127 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

227
Cargo.lock generated
View file

@ -249,8 +249,6 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
dependencies = [ dependencies = [
"async-fs",
"async-net",
"enumflags2", "enumflags2",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -399,17 +397,6 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "async-net"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
dependencies = [
"async-io 2.4.0",
"blocking",
"futures-lite 2.5.0",
]
[[package]] [[package]]
name = "async-process" name = "async-process"
version = "1.8.1" version = "1.8.1"
@ -613,12 +600,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -869,7 +850,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_macos" name = "clipboard_macos"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"objc", "objc",
"objc-foundation", "objc-foundation",
@ -879,7 +860,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_wayland" name = "clipboard_wayland"
version = "0.2.2" version = "0.2.2"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"dnd", "dnd",
"mime 0.1.0", "mime 0.1.0",
@ -889,7 +870,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_x11" name = "clipboard_x11"
version = "0.4.2" version = "0.4.2"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"thiserror", "thiserror",
"x11rb", "x11rb",
@ -1052,7 +1033,7 @@ dependencies = [
"futures", "futures",
"i18n-embed 0.14.1", "i18n-embed 0.14.1",
"i18n-embed-fl 0.8.0", "i18n-embed-fl 0.8.0",
"image 0.25.5", "image",
"itertools 0.13.0", "itertools 0.13.0",
"libcosmic", "libcosmic",
"memmap2 0.9.5", "memmap2 0.9.5",
@ -1185,7 +1166,7 @@ dependencies = [
"anyhow", "anyhow",
"i18n-embed 0.14.1", "i18n-embed 0.14.1",
"i18n-embed-fl 0.8.0", "i18n-embed-fl 0.8.0",
"image 0.25.5", "image",
"libcosmic", "libcosmic",
"memmap2 0.9.5", "memmap2 0.9.5",
"once_cell", "once_cell",
@ -1230,7 +1211,7 @@ dependencies = [
"i18n-embed 0.13.9", "i18n-embed 0.13.9",
"i18n-embed-fl 0.6.7", "i18n-embed-fl 0.6.7",
"libcosmic", "libcosmic",
"ron", "ron 0.8.1",
"rust-embed 6.8.1", "rust-embed 6.8.1",
"rust-embed-utils 7.8.1", "rust-embed-utils 7.8.1",
"sendfd", "sendfd",
@ -1363,7 +1344,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-client-toolkit" name = "cosmic-client-toolkit"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" source = "git+https://github.com/pop-os/cosmic-protocols?rev=29ab323#29ab32305c6457fccf0728caaaf79fcac4cca665"
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"libc", "libc",
@ -1385,7 +1366,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1396,7 +1377,7 @@ dependencies = [
"known-folders", "known-folders",
"notify", "notify",
"once_cell", "once_cell",
"ron", "ron 0.9.0-alpha.1",
"serde", "serde",
"tokio", "tokio",
"tracing", "tracing",
@ -1407,7 +1388,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1437,8 +1418,8 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-freedesktop-icons" name = "cosmic-freedesktop-icons"
version = "0.2.6" version = "0.3.0"
source = "git+https://github.com/pop-os/freedesktop-icons#bfc22d531596b57646dc47bcd70b2eb6f3152cd4" source = "git+https://github.com/pop-os/freedesktop-icons#6bf0b5794b8aa37703c382c7586a5c799bad228c"
dependencies = [ dependencies = [
"dirs 5.0.1", "dirs 5.0.1",
"ini_core", "ini_core",
@ -1487,11 +1468,11 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#4a777bc4f6c77b409d1fd3aa5b09ecfb1c25ded1" source = "git+https://github.com/pop-os/cosmic-panel#dc5c75b460c77d9be283ba14bc1023797b24361e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
"ron", "ron 0.8.1",
"serde", "serde",
"smithay-client-toolkit", "smithay-client-toolkit",
"tracing", "tracing",
@ -1502,7 +1483,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-protocols" name = "cosmic-protocols"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d218c76#d218c76b58c7a3b20dd5e7943f93fc306a1b81b8" source = "git+https://github.com/pop-os/cosmic-protocols?rev=29ab323#29ab32305c6457fccf0728caaaf79fcac4cca665"
dependencies = [ dependencies = [
"bitflags 2.7.0", "bitflags 2.7.0",
"wayland-backend", "wayland-backend",
@ -1545,7 +1526,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/pop-os/cosmic-text.git#166b59f560c551dab391a864f7c1f503c1e18446" source = "git+https://github.com/pop-os/cosmic-text.git#9125dd48b771e9aa7833d106a9850e935f71eaa6"
dependencies = [ dependencies = [
"bitflags 2.7.0", "bitflags 2.7.0",
"fontdb 0.16.2", "fontdb 0.16.2",
@ -1567,7 +1548,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -1575,7 +1556,7 @@ dependencies = [
"dirs 5.0.1", "dirs 5.0.1",
"lazy_static", "lazy_static",
"palette", "palette",
"ron", "ron 0.9.0-alpha.1",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
@ -1618,25 +1599,6 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-deque"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.21" version = "0.8.21"
@ -1985,7 +1947,7 @@ dependencies = [
[[package]] [[package]]
name = "dnd" name = "dnd"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"bitflags 2.7.0", "bitflags 2.7.0",
"mime 0.1.0", "mime 0.1.0",
@ -2165,21 +2127,6 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "exr"
version = "1.73.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
dependencies = [
"bit_field",
"half",
"lebe",
"miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
]
[[package]] [[package]]
name = "fast-srgb8" name = "fast-srgb8"
version = "1.0.0" version = "1.0.0"
@ -2959,7 +2906,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2968,7 +2915,7 @@ dependencies = [
"iced_renderer", "iced_renderer",
"iced_widget", "iced_widget",
"iced_winit", "iced_winit",
"image 0.24.9", "image",
"mime 0.1.0", "mime 0.1.0",
"thiserror", "thiserror",
"window_clipboard", "window_clipboard",
@ -2977,7 +2924,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2986,7 +2933,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"bitflags 2.7.0", "bitflags 2.7.0",
"bytes", "bytes",
@ -3010,7 +2957,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -3036,7 +2983,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"bitflags 2.7.0", "bitflags 2.7.0",
"bytemuck", "bytemuck",
@ -3044,7 +2991,7 @@ dependencies = [
"half", "half",
"iced_core", "iced_core",
"iced_futures", "iced_futures",
"image 0.24.9", "image",
"kamadak-exif", "kamadak-exif",
"log", "log",
"lyon_path", "lyon_path",
@ -3058,7 +3005,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -3070,7 +3017,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -3085,7 +3032,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -3101,7 +3048,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.7.0", "bitflags 2.7.0",
@ -3132,7 +3079,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3150,7 +3097,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3160,10 +3107,12 @@ dependencies = [
"log", "log",
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustix 0.38.43",
"thiserror", "thiserror",
"tracing", "tracing",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wayland-backend", "wayland-backend",
"wayland-client",
"wayland-protocols", "wayland-protocols",
"web-sys", "web-sys",
"winapi", "winapi",
@ -3595,24 +3544,6 @@ dependencies = [
"icu_properties", "icu_properties",
] ]
[[package]]
name = "image"
version = "0.24.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
"exr",
"gif",
"jpeg-decoder",
"num-traits",
"png",
"qoi",
"tiff",
]
[[package]] [[package]]
name = "image" name = "image"
version = "0.25.5" version = "0.25.5"
@ -3622,6 +3553,9 @@ dependencies = [
"bytemuck", "bytemuck",
"byteorder-lite", "byteorder-lite",
"num-traits", "num-traits",
"png",
"zune-core",
"zune-jpeg",
] ]
[[package]] [[package]]
@ -3802,9 +3736,6 @@ name = "jpeg-decoder"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
dependencies = [
"rayon",
]
[[package]] [[package]]
name = "js-sys" name = "js-sys"
@ -3897,12 +3828,6 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.169" version = "0.2.169"
@ -3912,7 +3837,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#aaa2ba3ad4239cb44ba01c10cbca57174d52a7da" source = "git+https://github.com/pop-os/libcosmic#9426a985c62288e996827a3560770c19271b337a"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.9.2", "ashpd 0.9.2",
@ -3934,12 +3859,13 @@ dependencies = [
"iced_tiny_skia", "iced_tiny_skia",
"iced_widget", "iced_widget",
"iced_winit", "iced_winit",
"image",
"lazy_static", "lazy_static",
"libc", "libc",
"mime 0.3.17", "mime 0.3.17",
"palette", "palette",
"rfd", "rfd",
"ron", "ron 0.8.1",
"rustix 0.38.43", "rustix 0.38.43",
"serde", "serde",
"shlex", "shlex",
@ -4237,7 +4163,7 @@ dependencies = [
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"smithay-clipboard", "smithay-clipboard",
] ]
@ -5197,15 +5123,6 @@ version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
[[package]]
name = "qoi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
dependencies = [
"bytemuck",
]
[[package]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.36.2" version = "0.36.2"
@ -5272,26 +5189,6 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "rayon"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]] [[package]]
name = "read-fonts" name = "read-fonts"
version = "0.25.3" version = "0.25.3"
@ -5459,6 +5356,19 @@ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]]
name = "ron"
version = "0.9.0-alpha.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7644a2a539ff7fa991c8f4652373cd722d387e39229415103243914249730836"
dependencies = [
"base64 0.22.1",
"bitflags 2.7.0",
"serde",
"serde_derive",
"unicode-ident",
]
[[package]] [[package]]
name = "roxmltree" name = "roxmltree"
version = "0.20.0" version = "0.20.0"
@ -6148,17 +6058,6 @@ dependencies = [
"once_cell", "once_cell",
] ]
[[package]]
name = "tiff"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
dependencies = [
"flate2",
"jpeg-decoder",
"weezl",
]
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.37" version = "0.3.37"
@ -7042,7 +6941,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "window_clipboard" name = "window_clipboard"
version = "0.4.1" version = "0.4.1"
source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2#6b9faab87bea9cebec6ae036906fd67fed254f5f"
dependencies = [ dependencies = [
"clipboard-win", "clipboard-win",
"clipboard_macos", "clipboard_macos",
@ -7481,7 +7380,7 @@ dependencies = [
[[package]] [[package]]
name = "xdg-shell-wrapper-config" name = "xdg-shell-wrapper-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#4a777bc4f6c77b409d1fd3aa5b09ecfb1c25ded1" source = "git+https://github.com/pop-os/cosmic-panel#dc5c75b460c77d9be283ba14bc1023797b24361e"
dependencies = [ dependencies = [
"serde", "serde",
"wayland-protocols-wlr", "wayland-protocols-wlr",
@ -7790,12 +7689,18 @@ dependencies = [
] ]
[[package]] [[package]]
name = "zune-inflate" name = "zune-core"
version = "0.2.54" version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
[[package]]
name = "zune-jpeg"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
dependencies = [ dependencies = [
"simd-adler32", "zune-core",
] ]
[[package]] [[package]]

7
Cargo.toml
View file

@ -24,10 +24,10 @@ resolver = "2"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.81" anyhow = "1.0.81"
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "d218c76" } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "29ab323" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
"client", "client",
], rev = "c8d3a1c" } ], rev = "29ab323" }
cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" } cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" }
# cosmic-settings-subscriptions = { path = "../cosmic-settings-subscriptions" } # cosmic-settings-subscriptions = { path = "../cosmic-settings-subscriptions" }
@ -83,6 +83,3 @@ ignored = ["libcosmic"]
# winit = { path = "../winit" } # winit = { path = "../winit" }
[patch."https://github.com/smithay/client-toolkit.git"] [patch."https://github.com/smithay/client-toolkit.git"]
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" } sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }
[patch.'https://github.com/pop-os/cosmic-protocols']
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }

3
cosmic-app-list/src/app.rs
View file

@ -269,10 +269,11 @@ impl DockItem {
let icon_button = if dnd_source_enabled && interaction_enabled { let icon_button = if dnd_source_enabled && interaction_enabled {
dnd_source(icon_button) dnd_source(icon_button)
.window(window_id) .window(window_id)
.drag_icon(move || { .drag_icon(move |_| {
( (
cosmic_icon.clone().into(), cosmic_icon.clone().into(),
iced::core::widget::tree::State::None, iced::core::widget::tree::State::None,
iced::Vector::ZERO,
) )
}) })
.drag_threshold(16.) .drag_threshold(16.)

75
cosmic-app-list/src/wayland_handler.rs
View file

@ -14,7 +14,8 @@ use std::{
use cctk::{ use cctk::{
screencopy::{ screencopy::{
capture, Formats, Frame, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler, CaptureFrame, CaptureOptions, CaptureSession, CaptureSource, Capturer, FailureReason,
Formats, Frame, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler,
ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState, ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState,
}, },
sctk::{ sctk::{
@ -36,15 +37,11 @@ use cctk::{
wl_shm_pool, wl_shm_pool,
wl_surface::WlSurface, wl_surface::WlSurface,
}, },
Connection, Dispatch, Proxy, QueueHandle, WEnum, Connection, Dispatch, QueueHandle, WEnum,
}, },
workspace::{WorkspaceHandler, WorkspaceState}, workspace::{WorkspaceHandler, WorkspaceState},
}; };
use cosmic_protocols::{ use cosmic_protocols::{
image_source::v1::client::zcosmic_toplevel_image_source_manager_v1::ZcosmicToplevelImageSourceManagerV1,
screencopy::v2::client::{
zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2, zcosmic_screencopy_session_v2,
},
toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1}, toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1},
toplevel_management::v1::client::zcosmic_toplevel_manager_v1, toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
workspace::v1::client::zcosmic_workspace_handle_v1::State as WorkspaceUpdateState, workspace::v1::client::zcosmic_workspace_handle_v1::State as WorkspaceUpdateState,
@ -285,7 +282,7 @@ impl ToplevelInfoHandler for AppData {
#[derive(Default)] #[derive(Default)]
struct SessionInner { struct SessionInner {
formats: Option<Formats>, formats: Option<Formats>,
res: Option<Result<(), WEnum<zcosmic_screencopy_frame_v2::FailureReason>>>, res: Option<Result<(), WEnum<FailureReason>>>,
} }
// TODO: dmabuf? need to handle modifier negotation // TODO: dmabuf? need to handle modifier negotation
@ -303,13 +300,11 @@ struct SessionData {
struct FrameData { struct FrameData {
frame_data: ScreencopyFrameData, frame_data: ScreencopyFrameData,
session: zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2, session: CaptureSession,
} }
impl Session { impl Session {
pub fn for_session( pub fn for_session(session: &CaptureSession) -> Option<&Self> {
session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2,
) -> Option<&Self> {
Some(&session.data::<SessionData>()?.session) Some(&session.data::<SessionData>()?.session)
} }
@ -365,8 +360,7 @@ struct CaptureData {
qh: QueueHandle<AppData>, qh: QueueHandle<AppData>,
conn: Connection, conn: Connection,
wl_shm: WlShm, wl_shm: WlShm,
screencopy_manager: zcosmic_screencopy_manager_v2::ZcosmicScreencopyManagerV2, capturer: Capturer,
toplevel_source_manager: ZcosmicToplevelImageSourceManagerV1,
} }
impl CaptureData { impl CaptureData {
@ -384,18 +378,19 @@ impl CaptureData {
let overlay_cursor = if overlay_cursor { 1 } else { 0 }; let overlay_cursor = if overlay_cursor { 1 } else { 0 };
let session = Arc::new(Session::default()); let session = Arc::new(Session::default());
let image_source = self // Unwrap assumes compositor supports this capture type
.toplevel_source_manager let capture_session = self
.create_source(&source, &self.qh, ()); .capturer
let screencopy_session = self.screencopy_manager.create_session( .create_session(
&image_source, &CaptureSource::CosmicToplevel(source),
zcosmic_screencopy_manager_v2::Options::empty(), CaptureOptions::empty(),
&self.qh, &self.qh,
SessionData { SessionData {
session: session.clone(), session: session.clone(),
session_data: Default::default(), session_data: Default::default(),
}, },
); )
.unwrap();
self.conn.flush().unwrap(); self.conn.flush().unwrap();
let formats = session let formats = session
@ -439,14 +434,13 @@ impl CaptureData {
(), (),
); );
capture( capture_session.capture(
&screencopy_session,
&buffer, &buffer,
&[], &[],
&self.qh, &self.qh,
FrameData { FrameData {
frame_data: Default::default(), frame_data: Default::default(),
session: screencopy_session.clone(), session: capture_session.clone(),
}, },
); );
self.conn.flush().unwrap(); self.conn.flush().unwrap();
@ -491,12 +485,7 @@ impl AppData {
qh: self.queue_handle.clone(), qh: self.queue_handle.clone(),
conn: self.conn.clone(), conn: self.conn.clone(),
wl_shm: self.shm_state.wl_shm().clone(), wl_shm: self.shm_state.wl_shm().clone(),
screencopy_manager: self.screencopy_state.screencopy_manager.clone(), capturer: self.screencopy_state.capturer().clone(),
toplevel_source_manager: self
.screencopy_state
.toplevel_source_manager
.clone()
.unwrap(),
}; };
std::thread::spawn(move || { std::thread::spawn(move || {
use std::ffi::CStr; use std::ffi::CStr;
@ -559,7 +548,7 @@ impl ScreencopyHandler for AppData {
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2, session: &CaptureSession,
formats: &Formats, formats: &Formats,
) { ) {
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
@ -571,38 +560,30 @@ impl ScreencopyHandler for AppData {
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
screencopy_frame: &zcosmic_screencopy_frame_v2::ZcosmicScreencopyFrameV2, screencopy_frame: &CaptureFrame,
_frame: Frame, _frame: Frame,
) { ) {
let session = &screencopy_frame.data::<FrameData>().unwrap().session; let session = &screencopy_frame.data::<FrameData>().unwrap().session;
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
data.res = Some(Ok(())); data.res = Some(Ok(()));
}); });
session.destroy();
} }
fn failed( fn failed(
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
screencopy_frame: &zcosmic_screencopy_frame_v2::ZcosmicScreencopyFrameV2, screencopy_frame: &CaptureFrame,
reason: WEnum<zcosmic_screencopy_frame_v2::FailureReason>, reason: WEnum<FailureReason>,
) { ) {
// TODO send message to thread // TODO send message to thread
let session = &screencopy_frame.data::<FrameData>().unwrap().session; let session = &screencopy_frame.data::<FrameData>().unwrap().session;
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
data.res = Some(Err(reason)); data.res = Some(Err(reason));
}); });
session.destroy();
} }
fn stopped( fn stopped(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _session: &CaptureSession) {}
&mut self,
_conn: &Connection,
_qh: &QueueHandle<Self>,
_session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2,
) {
}
} }
pub(crate) fn wayland_handler( pub(crate) fn wayland_handler(

80
cosmic-applet-minimize/src/wayland_handler.rs
View file

@ -26,17 +26,12 @@ use cosmic::{
cctk::{ cctk::{
self, self,
cosmic_protocols::{ cosmic_protocols::{
self, self, toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
image_source::v1::client::zcosmic_toplevel_image_source_manager_v1::ZcosmicToplevelImageSourceManagerV1,
screencopy::v2::client::{
zcosmic_screencopy_frame_v2, zcosmic_screencopy_manager_v2,
zcosmic_screencopy_session_v2,
},
toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
}, },
screencopy::{ screencopy::{
capture, Formats, Frame, ScreencopyFrameData, ScreencopyFrameDataExt, CaptureFrame, CaptureOptions, CaptureSession, CaptureSource, Capturer, FailureReason,
ScreencopyHandler, ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState, Formats, Frame, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler,
ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState,
}, },
sctk::shm::{Shm, ShmHandler}, sctk::shm::{Shm, ShmHandler},
wayland_client::{ wayland_client::{
@ -45,7 +40,7 @@ use cosmic::{
wl_shm::{self, WlShm}, wl_shm::{self, WlShm},
wl_shm_pool, wl_shm_pool,
}, },
Dispatch, Proxy, Dispatch,
}, },
}, },
iced_futures::futures, iced_futures::futures,
@ -61,7 +56,7 @@ use wayland_client::{globals::registry_queue_init, Connection, QueueHandle};
#[derive(Default)] #[derive(Default)]
struct SessionInner { struct SessionInner {
formats: Option<Formats>, formats: Option<Formats>,
res: Option<Result<(), WEnum<zcosmic_screencopy_frame_v2::FailureReason>>>, res: Option<Result<(), WEnum<FailureReason>>>,
} }
// TODO: dmabuf? need to handle modifier negotation // TODO: dmabuf? need to handle modifier negotation
@ -79,13 +74,11 @@ struct SessionData {
struct FrameData { struct FrameData {
frame_data: ScreencopyFrameData, frame_data: ScreencopyFrameData,
session: zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2, session: CaptureSession,
} }
impl Session { impl Session {
pub fn for_session( pub fn for_session(session: &CaptureSession) -> Option<&Self> {
session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2,
) -> Option<&Self> {
Some(&session.data::<SessionData>()?.session) Some(&session.data::<SessionData>()?.session)
} }
@ -130,8 +123,7 @@ struct CaptureData {
qh: QueueHandle<AppData>, qh: QueueHandle<AppData>,
conn: Connection, conn: Connection,
wl_shm: WlShm, wl_shm: WlShm,
screencopy_manager: zcosmic_screencopy_manager_v2::ZcosmicScreencopyManagerV2, capturer: Capturer,
toplevel_source_manager: ZcosmicToplevelImageSourceManagerV1,
} }
impl CaptureData { impl CaptureData {
@ -149,18 +141,18 @@ impl CaptureData {
let overlay_cursor = if overlay_cursor { 1 } else { 0 }; let overlay_cursor = if overlay_cursor { 1 } else { 0 };
let session = Arc::new(Session::default()); let session = Arc::new(Session::default());
let image_source = self let capture_session = self
.toplevel_source_manager .capturer
.create_source(&source, &self.qh, ()); .create_session(
let screencopy_session = self.screencopy_manager.create_session( &CaptureSource::CosmicToplevel(source),
&image_source, CaptureOptions::empty(),
zcosmic_screencopy_manager_v2::Options::empty(), &self.qh,
&self.qh, SessionData {
SessionData { session: session.clone(),
session: session.clone(), session_data: Default::default(),
session_data: Default::default(), },
}, )
); .unwrap();
self.conn.flush().unwrap(); self.conn.flush().unwrap();
let formats = session let formats = session
@ -204,14 +196,13 @@ impl CaptureData {
(), (),
); );
capture( capture_session.capture(
&screencopy_session,
&buffer, &buffer,
&[], &[],
&self.qh, &self.qh,
FrameData { FrameData {
frame_data: Default::default(), frame_data: Default::default(),
session: screencopy_session.clone(), session: capture_session.clone(),
}, },
); );
self.conn.flush().unwrap(); self.conn.flush().unwrap();
@ -306,12 +297,7 @@ impl AppData {
qh: self.queue_handle.clone(), qh: self.queue_handle.clone(),
conn: self.conn.clone(), conn: self.conn.clone(),
wl_shm: self.shm_state.wl_shm().clone(), wl_shm: self.shm_state.wl_shm().clone(),
screencopy_manager: self.screencopy_state.screencopy_manager.clone(), capturer: self.screencopy_state.capturer().clone(),
toplevel_source_manager: self
.screencopy_state
.toplevel_source_manager
.clone()
.unwrap(),
}; };
std::thread::spawn(move || { std::thread::spawn(move || {
use std::ffi::CStr; use std::ffi::CStr;
@ -509,7 +495,7 @@ impl ScreencopyHandler for AppData {
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2, session: &CaptureSession,
formats: &Formats, formats: &Formats,
) { ) {
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
@ -521,38 +507,30 @@ impl ScreencopyHandler for AppData {
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
screencopy_frame: &zcosmic_screencopy_frame_v2::ZcosmicScreencopyFrameV2, screencopy_frame: &CaptureFrame,
_frame: Frame, _frame: Frame,
) { ) {
let session = &screencopy_frame.data::<FrameData>().unwrap().session; let session = &screencopy_frame.data::<FrameData>().unwrap().session;
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
data.res = Some(Ok(())); data.res = Some(Ok(()));
}); });
session.destroy();
} }
fn failed( fn failed(
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
screencopy_frame: &zcosmic_screencopy_frame_v2::ZcosmicScreencopyFrameV2, screencopy_frame: &CaptureFrame,
reason: WEnum<zcosmic_screencopy_frame_v2::FailureReason>, reason: WEnum<FailureReason>,
) { ) {
// TODO send message to thread // TODO send message to thread
let session = &screencopy_frame.data::<FrameData>().unwrap().session; let session = &screencopy_frame.data::<FrameData>().unwrap().session;
Session::for_session(session).unwrap().update(|data| { Session::for_session(session).unwrap().update(|data| {
data.res = Some(Err(reason)); data.res = Some(Err(reason));
}); });
session.destroy();
} }
fn stopped( fn stopped(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _session: &CaptureSession) {}
&mut self,
_conn: &Connection,
_qh: &QueueHandle<Self>,
_session: &zcosmic_screencopy_session_v2::ZcosmicScreencopySessionV2,
) {
}
} }
impl Dispatch<wl_shm_pool::WlShmPool, ()> for AppData { impl Dispatch<wl_shm_pool::WlShmPool, ()> for AppData {