Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 71 additions & 91 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ linearize = { version = "0.1.3", features = ["derive"] }
png = "0.18.0"
rustc-demangle = { version = "0.1.24", optional = true }
tracy-client-sys = { version = "0.24.1", features = ["ondemand", "manual-lifetime", "debuginfod", "demangle"], optional = true }
kbvm = { version = "0.1.6", features = ["compose"] }
kbvm = { version = "0.1.7", features = ["compose"] }
tiny-skia = { version = "0.12.0", default-features = false, features = ["std"] }
regex = "1.11.1"
opera = "1.0.1"
Expand Down
1 change: 1 addition & 0 deletions codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ anyhow = { version = "1.0.103", default-features = false, features = ["std"] }
indexmap = { version = "2.14.0", default-features = false, features = ["std"] }
regex = { version = "1.12.4", default-features = false, features = ["std", "unicode-perl"] }
linearize = { version = "0.1.7", default-features = false, features = ["derive"] }
kbvm = { version = "0.1.7", default-features = false }
27 changes: 27 additions & 0 deletions codegen/src/keysyms.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
use {anyhow::Result, kbvm::Keysym, std::fmt::Write};

pub fn main() -> Result<()> {
let mut syms = vec![];
for sym in Keysym::all() {
syms.push((sym.name().unwrap(), sym));
}
syms.sort_by_key(|s| s.0);
let mut res = String::new();
writeln!(res, r#"use super::KeySym;"#)?;
writeln!(res)?;
for (name, sym) in syms {
writeln!(
res,
r#"pub const SYM_{name}: KeySym = KeySym(0x{:x});"#,
sym.0
)?;
}
std::fs::write(
concat!(
env!("CARGO_MANIFEST_DIR"),
"/../jay-config/src/keyboard/syms/generated.rs",
),
res,
)?;
Ok(())
}
2 changes: 2 additions & 0 deletions codegen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
use {crate::phf::PhfHash, anyhow::Result, permutation::Permutation, std::fmt::Debug};

mod input_event_codes;
mod keysyms;
#[path = "../../toml-config/src/phf.rs"]
mod phf;
mod phf_generator;

fn main() -> Result<()> {
input_event_codes::main()?;
keysyms::main()?;
Ok(())
}

Expand Down
2,594 changes: 52 additions & 2,542 deletions jay-config/src/keyboard/syms.rs

Large diffs are not rendered by default.

2,507 changes: 2,507 additions & 0 deletions jay-config/src/keyboard/syms/generated.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion toml-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bstr = { version = "1.9.1", default-features = false }
ahash = "0.8.11"
run-on-drop = "1.0.0"
uapi = "0.2.13"
kbvm = "0.1.6"
kbvm = "0.1.7"
derivative = "2.2.0"

[dev-dependencies]
Expand Down
Loading