Update egui, smithay-egui, smithay

This commit is contained in:
Ian Douglas Scott 2024-09-26 13:43:01 -07:00 committed by Victoria Brekenfeld
parent afdb656778
commit a96394f7a6
7 changed files with 131 additions and 245 deletions

338
Cargo.lock generated
View file

@ -18,16 +18,6 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
dependencies = [
"enumn",
"serde",
]
[[package]] [[package]]
name = "addr2line" name = "addr2line"
version = "0.22.0" version = "0.22.0"
@ -52,7 +42,6 @@ dependencies = [
"cfg-if", "cfg-if",
"getrandom", "getrandom",
"once_cell", "once_cell",
"serde",
"version_check", "version_check",
"zerocopy 0.7.35", "zerocopy 0.7.35",
] ]
@ -388,12 +377,6 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
] ]
[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.21.7" version = "0.21.7"
@ -861,7 +844,7 @@ dependencies = [
"smithay-egui", "smithay-egui",
"thiserror", "thiserror",
"time", "time",
"tiny-skia 0.11.4", "tiny-skia",
"tracing", "tracing",
"tracing-journald", "tracing-journald",
"tracing-subscriber", "tracing-subscriber",
@ -1131,12 +1114,6 @@ dependencies = [
"parking_lot_core 0.9.10", "parking_lot_core 0.9.10",
] ]
[[package]]
name = "data-url"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
[[package]] [[package]]
name = "data-url" name = "data-url"
version = "0.3.1" version = "0.3.1"
@ -1271,13 +1248,13 @@ dependencies = [
[[package]] [[package]]
name = "drm" name = "drm"
version = "0.12.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" checksum = "d000ffcf7a146ee52444a31b78ac82f981ebba5de6fb19f0b1052d98c8e5f308"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bytemuck", "bytemuck",
"drm-ffi 0.8.0", "drm-ffi 0.9.0",
"drm-fourcc", "drm-fourcc",
"rustix", "rustix",
] ]
@ -1294,11 +1271,11 @@ dependencies = [
[[package]] [[package]]
name = "drm-ffi" name = "drm-ffi"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
dependencies = [ dependencies = [
"drm-sys 0.7.0", "drm-sys 0.8.0",
"rustix", "rustix",
] ]
@ -1320,9 +1297,9 @@ dependencies = [
[[package]] [[package]]
name = "drm-sys" name = "drm-sys"
version = "0.7.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
dependencies = [ dependencies = [
"libc", "libc",
"linux-raw-sys 0.6.4", "linux-raw-sys 0.6.4",
@ -1330,12 +1307,12 @@ dependencies = [
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" checksum = "5629649a8ae57c73f175f4a96419905a8102cfbfcbce96ea25a826bbf468e990"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "emath",
] ]
[[package]] [[package]]
@ -1346,55 +1323,55 @@ checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c"
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" checksum = "26bab3b3572566257a497b5f87d2cccaf7f7f122d4b8b620cba0493becc7955e"
dependencies = [ dependencies = [
"accesskit",
"ahash", "ahash",
"emath",
"epaint", "epaint",
"nohash-hasher", "nohash-hasher",
"serde",
] ]
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" checksum = "d9f1beb57a3c942fac2f058655188c79ac1cd200555e4f3684cd0c965ceb3a67"
dependencies = [ dependencies = [
"ahash",
"egui", "egui",
"enum-map", "enum-map",
"log", "log",
"mime_guess", "mime_guess2",
"resvg 0.28.0", "resvg",
"serde",
"tiny-skia 0.8.4",
"usvg 0.28.0",
] ]
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" checksum = "ea182206896187f7a2fcc207a1573785fc31330cb245f6cebcf663ea933f8d20"
dependencies = [ dependencies = [
"ahash",
"bytemuck", "bytemuck",
"egui", "egui",
"glow 0.12.3", "glow 0.14.1",
"log", "log",
"memoffset 0.6.5", "memoffset",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
] ]
[[package]] [[package]]
name = "egui_plot" name = "egui_plot"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" checksum = "d8dca4871c15d51aadb79534dcf51a8189e5de3426ee7b465eb7db9a0a81ea67"
dependencies = [ dependencies = [
"ahash",
"egui", "egui",
"emath",
] ]
[[package]] [[package]]
@ -1405,12 +1382,11 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" checksum = "af86c4efae11da2a3dcbb4afebd0e9ed1916345e8d187b4051d443c8bd79af93"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde",
] ]
[[package]] [[package]]
@ -1470,33 +1446,28 @@ dependencies = [
"syn 2.0.72", "syn 2.0.72",
] ]
[[package]]
name = "enumn"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.72",
]
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.23.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" checksum = "445e11ec86a4d85e1350578ba20b2d89977ed937f3faab32e1c3ec81d20c1842"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
"bytemuck", "bytemuck",
"ecolor", "ecolor",
"emath", "emath",
"epaint_default_fonts",
"nohash-hasher", "nohash-hasher",
"parking_lot 0.12.3", "parking_lot 0.12.3",
"serde",
] ]
[[package]]
name = "epaint_default_fonts"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5202b64bef2b2c42a7f6e2e5b40fa83dd04aa61fdb08bfd116553adc149fe47a"
[[package]] [[package]]
name = "equivalent" name = "equivalent"
version = "1.0.1" version = "1.0.1"
@ -1903,12 +1874,12 @@ dependencies = [
[[package]] [[package]]
name = "gbm" name = "gbm"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" checksum = "c724107aa10444b1d2709aae4727c18a33c16b3e15ea8a46cc4ae226c084c88a"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"drm 0.12.0", "drm 0.14.0",
"drm-fourcc", "drm-fourcc",
"gbm-sys", "gbm-sys",
"libc", "libc",
@ -1916,9 +1887,9 @@ dependencies = [
[[package]] [[package]]
name = "gbm-sys" name = "gbm-sys"
version = "0.3.0" 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 = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -2034,6 +2005,18 @@ dependencies = [
"web-sys", "web-sys",
] ]
[[package]]
name = "glow"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f4a888dbe8181a7535853469c21c67ca9a1cea9460b16808fc018ea9e55d248"
dependencies = [
"js-sys",
"slotmap",
"wasm-bindgen",
"web-sys",
]
[[package]] [[package]]
name = "glutin_wgl_sys" name = "glutin_wgl_sys"
version = "0.5.0" version = "0.5.0"
@ -2418,12 +2401,12 @@ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
"iced_graphics", "iced_graphics",
"kurbo 0.9.5", "kurbo",
"log", "log",
"resvg 0.37.0", "resvg",
"rustc-hash", "rustc-hash",
"softbuffer", "softbuffer",
"tiny-skia 0.11.4", "tiny-skia",
"xxhash-rust", "xxhash-rust",
] ]
@ -2444,7 +2427,7 @@ dependencies = [
"lyon", "lyon",
"once_cell", "once_cell",
"raw-window-handle", "raw-window-handle",
"resvg 0.37.0", "resvg",
"rustix", "rustix",
"smithay-client-toolkit", "smithay-client-toolkit",
"tiny-xlib", "tiny-xlib",
@ -2514,12 +2497,6 @@ dependencies = [
"tiff", "tiff",
] ]
[[package]]
name = "imagesize"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951"
[[package]] [[package]]
name = "imagesize" name = "imagesize"
version = "0.12.0" version = "0.12.0"
@ -2570,13 +2547,12 @@ dependencies = [
[[package]] [[package]]
name = "input" name = "input"
version = "0.9.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0" checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"input-sys", "input-sys",
"io-lifetimes 1.0.11",
"libc", "libc",
"log", "log",
"udev", "udev",
@ -2681,9 +2657,9 @@ dependencies = [
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.69" version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
@ -2753,15 +2729,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "kurbo"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449"
dependencies = [
"arrayvec",
]
[[package]] [[package]]
name = "kurbo" name = "kurbo"
version = "0.9.5" version = "0.9.5"
@ -2838,7 +2805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.48.5", "windows-targets 0.52.6",
] ]
[[package]] [[package]]
@ -3083,15 +3050,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "memoffset"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "memoffset" name = "memoffset"
version = "0.9.1" version = "0.9.1"
@ -3131,10 +3089,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]] [[package]]
name = "mime_guess" name = "mime_guess2"
version = "2.0.5" version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41"
dependencies = [ dependencies = [
"mime 0.3.17", "mime 0.3.17",
"unicase", "unicase",
@ -3239,7 +3197,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cfg-if", "cfg-if",
"libc", "libc",
"memoffset 0.9.1", "memoffset",
] ]
[[package]] [[package]]
@ -3252,7 +3210,7 @@ dependencies = [
"cfg-if", "cfg-if",
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"libc", "libc",
"memoffset 0.9.1", "memoffset",
] ]
[[package]] [[package]]
@ -4276,20 +4234,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "resvg"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c115863f2d3621999cf187e318bc92b16402dfeff6a48c74df700d77381394c1"
dependencies = [
"log",
"pico-args",
"rgb",
"svgtypes 0.8.2",
"tiny-skia 0.8.4",
"usvg 0.28.0",
]
[[package]] [[package]]
name = "resvg" name = "resvg"
version = "0.37.0" version = "0.37.0"
@ -4302,9 +4246,9 @@ dependencies = [
"pico-args", "pico-args",
"png", "png",
"rgb", "rgb",
"svgtypes 0.13.0", "svgtypes",
"tiny-skia 0.11.4", "tiny-skia",
"usvg 0.37.0", "usvg",
] ]
[[package]] [[package]]
@ -4328,15 +4272,6 @@ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]]
name = "roxmltree"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b9de9831a129b122e7e61f242db509fa9d0838008bf0b29bb0624669edfe48a"
dependencies = [
"xmlparser",
]
[[package]] [[package]]
name = "roxmltree" name = "roxmltree"
version = "0.19.0" version = "0.19.0"
@ -4699,7 +4634,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/smithay//smithay?rev=08d31e1#08d31e17ea4ac47cddeb56e2ac18ee50b331911b" source = "git+https://github.com/smithay//smithay?rev=df79eeb#df79eeba63a8e9c2d33b9be2418aee6a940135e7"
dependencies = [ dependencies = [
"appendlist", "appendlist",
"ash 0.38.0+1.3.281", "ash 0.38.0+1.3.281",
@ -4709,14 +4644,14 @@ dependencies = [
"cgmath", "cgmath",
"cursor-icon", "cursor-icon",
"downcast-rs", "downcast-rs",
"drm 0.12.0", "drm 0.14.0",
"drm-ffi 0.8.0", "drm-ffi 0.9.0",
"drm-fourcc", "drm-fourcc",
"encoding_rs", "encoding_rs",
"errno", "errno",
"gbm", "gbm",
"gl_generator", "gl_generator",
"glow 0.12.3", "glow 0.14.1",
"indexmap 2.3.0", "indexmap 2.3.0",
"input", "input",
"libc", "libc",
@ -4788,7 +4723,7 @@ dependencies = [
[[package]] [[package]]
name = "smithay-egui" name = "smithay-egui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/Smithay/smithay-egui.git?rev=0d0b4ca0#0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5" source = "git+https://github.com/Smithay/smithay-egui.git?rev=6118550#61185502f32c2d944fcf36e5edcb014fe0a8b8ac"
dependencies = [ dependencies = [
"cgmath", "cgmath",
"egui", "egui",
@ -4796,7 +4731,7 @@ dependencies = [
"egui_glow", "egui_glow",
"image", "image",
"log", "log",
"memoffset 0.9.1", "memoffset",
"smithay", "smithay",
"xkbcommon 0.7.0", "xkbcommon 0.7.0",
] ]
@ -4903,22 +4838,13 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
[[package]]
name = "svgtypes"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564"
dependencies = [
"siphasher",
]
[[package]] [[package]]
name = "svgtypes" name = "svgtypes"
version = "0.13.0" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
dependencies = [ dependencies = [
"kurbo 0.9.5", "kurbo",
"siphasher", "siphasher",
] ]
@ -5079,20 +5005,6 @@ dependencies = [
"crunchy", "crunchy",
] ]
[[package]]
name = "tiny-skia"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
dependencies = [
"arrayref",
"arrayvec",
"bytemuck",
"cfg-if",
"png",
"tiny-skia-path 0.8.4",
]
[[package]] [[package]]
name = "tiny-skia" name = "tiny-skia"
version = "0.11.4" version = "0.11.4"
@ -5105,18 +5017,7 @@ dependencies = [
"cfg-if", "cfg-if",
"log", "log",
"png", "png",
"tiny-skia-path 0.11.4", "tiny-skia-path",
]
[[package]]
name = "tiny-skia-path"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
dependencies = [
"arrayref",
"bytemuck",
"strict-num",
] ]
[[package]] [[package]]
@ -5349,9 +5250,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]] [[package]]
name = "udev" name = "udev"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" checksum = "8ba005bcd5b1158ae3cd815905990e8b6ee4ba9ee7adbab6d7b58d389ad09c93"
dependencies = [ dependencies = [
"io-lifetimes 1.0.11", "io-lifetimes 1.0.11",
"libc", "libc",
@ -5365,7 +5266,7 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
dependencies = [ dependencies = [
"memoffset 0.9.1", "memoffset",
"tempfile", "tempfile",
"winapi", "winapi",
] ]
@ -5496,26 +5397,6 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "usvg"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b5b7c2b30845b3348c067ca3d09e20cc6e327c288f0ca4c48698712abf432e9"
dependencies = [
"base64 0.13.1",
"data-url 0.2.0",
"flate2",
"imagesize 0.10.1",
"kurbo 0.8.3",
"log",
"rctree",
"roxmltree 0.15.1",
"simplecss",
"siphasher",
"strict-num",
"svgtypes 0.8.2",
]
[[package]] [[package]]
name = "usvg" name = "usvg"
version = "0.37.0" version = "0.37.0"
@ -5537,15 +5418,15 @@ version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
dependencies = [ dependencies = [
"data-url 0.3.1", "data-url",
"flate2", "flate2",
"imagesize 0.12.0", "imagesize",
"kurbo 0.9.5", "kurbo",
"log", "log",
"roxmltree 0.19.0", "roxmltree 0.19.0",
"simplecss", "simplecss",
"siphasher", "siphasher",
"svgtypes 0.13.0", "svgtypes",
"usvg-tree", "usvg-tree",
] ]
@ -5556,7 +5437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c"
dependencies = [ dependencies = [
"fontdb", "fontdb",
"kurbo 0.9.5", "kurbo",
"log", "log",
"rustybuzz 0.12.1", "rustybuzz 0.12.1",
"unicode-bidi", "unicode-bidi",
@ -5573,8 +5454,8 @@ checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
dependencies = [ dependencies = [
"rctree", "rctree",
"strict-num", "strict-num",
"svgtypes 0.13.0", "svgtypes",
"tiny-skia-path 0.11.4", "tiny-skia-path",
] ]
[[package]] [[package]]
@ -5616,19 +5497,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell",
"wasm-bindgen-macro", "wasm-bindgen-macro",
] ]
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
@ -5653,9 +5535,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -5663,9 +5545,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -5676,9 +5558,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]] [[package]]
name = "wasm-timer" name = "wasm-timer"
@ -5845,9 +5727,9 @@ dependencies = [
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.69" version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@ -5890,7 +5772,7 @@ dependencies = [
"js-sys", "js-sys",
"log", "log",
"naga", "naga",
"parking_lot 0.12.3", "parking_lot 0.11.2",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
"smallvec", "smallvec",
@ -5917,7 +5799,7 @@ dependencies = [
"log", "log",
"naga", "naga",
"once_cell", "once_cell",
"parking_lot 0.12.3", "parking_lot 0.11.2",
"profiling", "profiling",
"raw-window-handle", "raw-window-handle",
"rustc-hash", "rustc-hash",
@ -5957,7 +5839,7 @@ dependencies = [
"naga", "naga",
"objc", "objc",
"once_cell", "once_cell",
"parking_lot 0.12.3", "parking_lot 0.11.2",
"profiling", "profiling",
"range-alloc", "range-alloc",
"raw-window-handle", "raw-window-handle",
@ -6504,12 +6386,6 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
[[package]]
name = "xmlparser"
version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
[[package]] [[package]]
name = "xmlwriter" name = "xmlwriter"
version = "0.1.0" version = "0.1.0"

View file

@ -20,8 +20,8 @@ cosmic-config = {git = "https://github.com/pop-os/libcosmic/", features = ["call
cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"]} cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"]}
cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" } cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" }
edid-rs = {version = "0.1"} edid-rs = {version = "0.1"}
egui = {version = "0.23.0", optional = true} egui = {version = "0.29.0", optional = true}
egui_plot = {version = "0.23.0", optional = true} egui_plot = {version = "0.29.0", optional = true}
glow = "0.12.0" glow = "0.12.0"
i18n-embed = {version = "0.14", features = ["fluent-system", "desktop-requester"]} i18n-embed = {version = "0.14", features = ["fluent-system", "desktop-requester"]}
i18n-embed-fl = "0.8" i18n-embed-fl = "0.8"
@ -85,14 +85,14 @@ features = [
"xwayland", "xwayland",
] ]
git = "https://github.com/smithay/smithay.git" git = "https://github.com/smithay/smithay.git"
rev = "e7f0857" rev = "3b0ecce"
version = "0.3" version = "0.3"
[dependencies.smithay-egui] [dependencies.smithay-egui]
features = ["svg"] features = ["svg"]
git = "https://github.com/Smithay/smithay-egui.git" git = "https://github.com/Smithay/smithay-egui.git"
optional = true optional = true
rev = "0d0b4ca0" rev = "6118550"
[features] [features]
debug = ["egui", "egui_plot", "smithay-egui", "anyhow/backtrace"] debug = ["egui", "egui_plot", "smithay-egui", "anyhow/backtrace"]
@ -117,4 +117,4 @@ inherits = "release"
lto = "fat" lto = "fat"
[patch."https://github.com/Smithay/smithay.git"] [patch."https://github.com/Smithay/smithay.git"]
smithay = { git = "https://github.com/smithay//smithay", rev = "08d31e1" } smithay = { git = "https://github.com/smithay//smithay", rev = "df79eeb" }

View file

@ -470,7 +470,7 @@ fn surface_thread(
(400, 800), (400, 800),
)); ));
let mut visuals: egui::style::Visuals = Default::default(); let mut visuals: egui::style::Visuals = Default::default();
visuals.window_shadow.extrusion = 0.0; visuals.window_shadow = egui::Shadow::NONE;
state.context().set_visuals(visuals); state.context().set_visuals(visuals);
state state
}; };

View file

@ -609,7 +609,7 @@ where
let fps_overlay = fps_ui( let fps_overlay = fps_ui(
_gpu, _gpu,
debug_active, debug_active,
seats.iter(), &seats,
renderer.glow_renderer_mut(), renderer.glow_renderer_mut(),
state, state,
timings, timings,

View file

@ -32,7 +32,7 @@ pub const DISPLAY_COLOR: Color32 = Color32::from_rgb(41, 184, 209);
pub fn fps_ui<'a>( pub fn fps_ui<'a>(
gpu: Option<&DrmNode>, gpu: Option<&DrmNode>,
debug_active: bool, debug_active: bool,
seats: impl Iterator<Item = &'a Seat<State>>, seats: &[Seat<State>],
renderer: &mut GlowRenderer, renderer: &mut GlowRenderer,
state: &EguiState, state: &EguiState,
timings: &Timings, timings: &Timings,
@ -126,7 +126,7 @@ pub fn fps_ui<'a>(
state.render( state.render(
|ctx| { |ctx| {
egui::Area::new("main") egui::Area::new("main".into())
.anchor(egui::Align2::LEFT_TOP, (10.0, 10.0)) .anchor(egui::Align2::LEFT_TOP, (10.0, 10.0))
.show(ctx, |ui| { .show(ctx, |ui| {
ui.label(format!( ui.label(format!(
@ -171,14 +171,14 @@ pub fn fps_ui<'a>(
ui.label(egui::RichText::new(format!("min: {:>7.6}", min_disp)).code()); ui.label(egui::RichText::new(format!("min: {:>7.6}", min_disp)).code());
ui.label(egui::RichText::new(format!("max: {:>7.6}", max_disp)).code()); ui.label(egui::RichText::new(format!("max: {:>7.6}", max_disp)).code());
let elements_chart = BarChart::new(bars_elements).vertical(); let elements_chart = BarChart::new(bars_elements.clone()).vertical();
let render_chart = BarChart::new(bars_render) let render_chart = BarChart::new(bars_render.clone())
.stack_on(&[&elements_chart]) .stack_on(&[&elements_chart])
.vertical(); .vertical();
let submitted_chart = BarChart::new(bars_submitted) let submitted_chart = BarChart::new(bars_submitted.clone())
.stack_on(&[&elements_chart, &render_chart]) .stack_on(&[&elements_chart, &render_chart])
.vertical(); .vertical();
let display_chart = BarChart::new(bars_displayed) let display_chart = BarChart::new(bars_displayed.clone())
.stack_on(&[&elements_chart, &render_chart, &submitted_chart]) .stack_on(&[&elements_chart, &render_chart, &submitted_chart])
.vertical(); .vertical();

View file

@ -685,7 +685,7 @@ impl CosmicMapped {
let glow_renderer = renderer.glow_renderer_mut(); let glow_renderer = renderer.glow_renderer_mut();
match debug.render( match debug.render(
|ctx| { |ctx| {
egui::Area::new("window") egui::Area::new("window".into())
.anchor( .anchor(
egui::Align2::RIGHT_TOP, egui::Align2::RIGHT_TOP,
[ [

View file

@ -5,6 +5,7 @@ use smithay::{
delegate_pointer_constraints, delegate_pointer_constraints,
input::pointer::PointerHandle, input::pointer::PointerHandle,
reexports::wayland_server::protocol::wl_surface::WlSurface, reexports::wayland_server::protocol::wl_surface::WlSurface,
utils::{Logical, Point},
wayland::{ wayland::{
pointer_constraints::{with_pointer_constraint, PointerConstraintsHandler}, pointer_constraints::{with_pointer_constraint, PointerConstraintsHandler},
seat::WaylandFocus, seat::WaylandFocus,
@ -23,5 +24,14 @@ impl PointerConstraintsHandler for State {
}); });
} }
} }
fn cursor_position_hint(
&mut self,
_surface: &WlSurface,
_pointer: &PointerHandle<Self>,
_location: Point<f64, Logical>,
) {
// TODO
}
} }
delegate_pointer_constraints!(State); delegate_pointer_constraints!(State);