s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xkbcommon-0.7' into 'main'

Browse Source 
Port to crate xkbcommon 0.7

See merge request World/Phosh/squeekboard!656
This commit is contained in:
Marge Bot
2024-08-14 15:29:10 +00:00
parent a267f6c742 34564edf32
commit 8c6c66e867
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -30,11 +30,11 @@ maplit = "1.0.*"
serde = { version = "1.0.*", features = ["derive"] } serde = { version = "1.0.*", features = ["derive"] }
serde_yaml = "0.9.*" serde_yaml = "0.9.*"
bitflags = "1.3.*" bitflags = "1.3.*"
clap = { version = "4.4.*", features=["std"], default-features = false } clap = { version = ">=4.4", features=["std"], default-features = false }
zbus = "1.9.*" zbus = "1.9.*"
zvariant = "2.10.*" zvariant = "2.10.*"
zvariant_derive = "2.10.*" zvariant_derive = "2.10.*"
xkbcommon = { version = "0.5.*", features = ["wayland"] } xkbcommon = { version = "0.7.*", features = ["wayland"] }
[dependencies.cairo-rs] [dependencies.cairo-rs]
version = "0.18.*" version = "0.18.*"

2
src/data/parsing.rs
View File

@ -299,7 +299,7 @@ fn create_action<H: logging::Handler>(
.unwrap_or(&default_meta); .unwrap_or(&default_meta);
fn keysym_valid(name: &str) -> bool { fn keysym_valid(name: &str) -> bool {
xkb::keysym_from_name(name, xkb::KEYSYM_NO_FLAGS) != xkb::KEY_NoSymbol xkb::keysym_from_name(name, xkb::KEYSYM_NO_FLAGS).raw() != xkb::keysyms::KEY_NoSymbol
} }
enum SubmitData { enum SubmitData {

6
src/keyboard.rs
View File

@ -300,8 +300,8 @@ mod tests {
let state = xkb::State::new(&keymap); let state = xkb::State::new(&keymap);
assert_eq!(state.key_get_one_sym(9), xkb::KEY_a); assert_eq!(state.key_get_one_sym(9u32.into()), xkb::keysyms::KEY_a.into());
assert_eq!(state.key_get_one_sym(10), xkb::KEY_c); assert_eq!(state.key_get_one_sym(10u32.into()), xkb::keysyms::KEY_c.into());
} }
#[test] #[test]
@ -321,7 +321,7 @@ mod tests {
let state = xkb::State::new(&keymap); let state = xkb::State::new(&keymap);
assert_eq!(state.key_get_one_sym(9), xkb::KEY_a); assert_eq!(state.key_get_one_sym(9u32.into()), xkb::keysyms::KEY_a.into());
} }
#[test] #[test]

10
src/tests.rs
View File

@ -42,12 +42,12 @@ pub fn check_layout_file(path: &str) {
fn check_sym_in_keymap(state: &xkb::State, sym_name: &str) -> bool { fn check_sym_in_keymap(state: &xkb::State, sym_name: &str) -> bool {
let sym = xkb::keysym_from_name(sym_name, xkb::KEYSYM_NO_FLAGS); let sym = xkb::keysym_from_name(sym_name, xkb::KEYSYM_NO_FLAGS);
if sym == xkb::KEY_NoSymbol { if sym.raw() == xkb::keysyms::KEY_NoSymbol {
panic!("Entered invalid keysym: {}", sym_name); panic!("Entered invalid keysym: {}", sym_name);
} }
let map = state.get_keymap(); let map = state.get_keymap();
let range = map.min_keycode()..=map.max_keycode(); let range = map.min_keycode().raw()..=map.max_keycode().raw();
range.flat_map(|code| state.key_get_syms(code)) range.flat_map(|code| state.key_get_syms(code.into()))
.find(|s| **s == sym) .find(|s| **s == sym)
.is_some() .is_some()
} }
@ -110,8 +110,8 @@ fn check_layout(layout: Layout, allow_missing_return: bool) {
for (_y, row) in view.get_rows() { for (_y, row) in view.get_rows() {
for (_x, button) in row.get_buttons() { for (_x, button) in row.get_buttons() {
for keycode in &button.keycodes { for keycode in &button.keycodes {
match xkb_states[keycode.keymap_idx].key_get_one_sym(keycode.code) { match xkb_states[keycode.keymap_idx].key_get_one_sym(keycode.code.into()).raw() {
xkb::KEY_NoSymbol => { xkb::keysyms::KEY_NoSymbol => {
eprintln!( eprintln!(
"keymap {}: {}", "keymap {}: {}",
keycode.keymap_idx, keycode.keymap_idx,