feat: runtime configurable keybindings

2024-04-03 16:02:27 +02:00 · 2024-04-03 16:02:27 +02:00 · 553c49b42b
commit 553c49b42b
parent 62afa4cf61
25 changed files with 674 additions and 829 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -425,6 +425,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"

+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@ -663,6 +669,7 @@ dependencies = [
 "iana-time-zone",
 "js-sys",
 "num-traits",
+ "serde",
 "wasm-bindgen",
 "windows-targets 0.52.5",
 ]
@ -872,6 +879,7 @@ dependencies = [
 "cosmic-comp-config",
 "cosmic-config",
 "cosmic-protocols",
+ "cosmic-settings-config",
 "edid-rs",
 "egui",
 "egui_plot",
@ -880,7 +888,7 @@ dependencies = [
 "i18n-embed-fl",
 "iced_tiny_skia",
 "id_tree",
- "indexmap",
+ "indexmap 2.2.6",
 "keyframe",
 "lazy_static",
 "libc",
@ -967,6 +975,20 @@ dependencies = [
 "wayland-server",
 ]

+[[package]]
+name = "cosmic-settings-config"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#ad0e0703549f7b135746d0429c6408cc8a7cc037"
+dependencies = [
+ "cosmic-config",
+ "heck 0.5.0",
+ "serde",
+ "serde_with",
+ "thiserror",
+ "tracing",
+ "xkbcommon",
+]
+
 [[package]]
 name = "cosmic-text"
 version = "0.12.0"
@ -1154,7 +1176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
 "cfg-if",
- "hashbrown",
+ "hashbrown 0.14.5",
 "lock_api",
 "once_cell",
 "parking_lot_core 0.9.10",
@ -1179,6 +1201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
 "powerfmt",
+ "serde",
 ]

 [[package]]
@ -2190,7 +2213,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
 "bitflags 2.5.0",
 "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]

 [[package]]
@ -2228,6 +2251,12 @@ dependencies = [
 "crunchy",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@ -2259,6 +2288,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@ -2607,6 +2642,17 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"

+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@ -2614,7 +2660,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
 "equivalent",
- "hashbrown",
+ "hashbrown 0.14.5",
+ "serde",
 ]

 [[package]]
@ -3061,7 +3108,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
 ]

 [[package]]
@ -3274,7 +3321,7 @@ dependencies = [
 "bitflags 2.5.0",
 "codespan-reporting",
 "hexf-parse",
- "indexmap",
+ "indexmap 2.2.6",
 "log",
 "num-traits",
 "rustc-hash",
@ -3791,7 +3838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
 dependencies = [
 "dlv-list",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]

 [[package]]
@ -3821,7 +3868,7 @@ version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
 dependencies = [
- "heck",
+ "heck 0.4.1",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@ -4655,7 +4702,7 @@ version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.6",
 "itoa",
 "ryu",
 "serde",
@ -4681,6 +4728,36 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "serde_with"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.6",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@ -4797,7 +4874,7 @@ dependencies = [
 "gbm",
 "gl_generator",
 "glow 0.12.3",
- "indexmap",
+ "indexmap 2.2.6",
 "input",
 "lazy_static",
 "libc",
@ -5320,7 +5397,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.6",
 "toml_datetime",
 "winnow 0.5.40",
 ]
@ -5331,7 +5408,7 @@ version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.6",
 "serde",
 "serde_spanned",
 "toml_datetime",
@ -6054,7 +6131,7 @@ dependencies = [
 "bitflags 2.5.0",
 "cfg_aliases 0.1.1",
 "codespan-reporting",
- "indexmap",
+ "indexmap 2.2.6",
 "log",
 "naga",
 "once_cell",