me/unfettered-keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wayland: keyboard: use writeln! and write_all when generating keymap

Browse source 
Fix cargo clippy warnings about this.
This commit is contained in:
Richard Acayan 2024-07-24 22:07:11 -04:00
parent dd67676840
commit f282a741dd
1 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/wayland/keyboard.rs
View file

@ -60,21 +60,21 @@ impl VirtualKeyboard {
let lower = &sym.name().unwrap()[3..]; let lower = &sym.name().unwrap()[3..];
let upper = &Part::modify_shift(sym).name().unwrap()[3..]; let upper = &Part::modify_shift(sym).name().unwrap()[3..];
write!(self.keymap, " key <I{:03}> {{ [ {}, {} ] }};\n", writeln!(self.keymap, " key <I{:03}> {{ [ {}, {} ] }};",
keycode, lower, upper).unwrap(); keycode, lower, upper).unwrap();
if sym == Keysym::Shift_L { if sym == Keysym::Shift_L {
write!(self.keymap, writeln!(self.keymap,
" modifier_map Shift {{ <I{:03}> }};\n", " modifier_map Shift {{ <I{:03}> }};",
keycode).unwrap(); keycode).unwrap();
} else if sym == Keysym::Control_L { } else if sym == Keysym::Control_L {
write!(self.keymap, writeln!(self.keymap,
" modifier_map Control {{ <I{:03}> }};\n", " modifier_map Control {{ <I{:03}> }};",
keycode).unwrap(); keycode).unwrap();
} else if sym == Keysym::Alt_L { } else if sym == Keysym::Alt_L {
write!(self.keymap, writeln!(self.keymap,
" modifier_map Mod1 {{ <I{:03}> }};\n", " modifier_map Mod1 {{ <I{:03}> }};",
keycode).unwrap(); keycode).unwrap();
} }
} }
} }
@ -151,8 +151,8 @@ impl Keyboard for VirtualKeyboard {
.create(true).truncate(true) .create(true).truncate(true)
.open(path).unwrap(); .open(path).unwrap();
self.keymap.write(b"xkb_keymap {\n").unwrap(); self.keymap.write_all(b"xkb_keymap {\n").unwrap();
self.keymap.write(b" xkb_symbols \"ufkbd\" {\n").unwrap(); self.keymap.write_all(b" xkb_symbols \"ufkbd\" {\n").unwrap();
self.keycodes.clear(); self.keycodes.clear();
for row in layout.rows() { for row in layout.rows() {
@ -173,31 +173,31 @@ impl Keyboard for VirtualKeyboard {
} }
} }
self.keymap.write(b" };\n").unwrap(); self.keymap.write_all(b" };\n").unwrap();
self.keymap.write(b"\n").unwrap(); self.keymap.write_all(b"\n").unwrap();
self.keymap.write(b" xkb_keycodes \"ufkbd\" {\n").unwrap(); self.keymap.write_all(b" xkb_keycodes \"ufkbd\" {\n").unwrap();
self.keymap.write(b" minimum = 8;\n").unwrap(); self.keymap.write_all(b" minimum = 8;\n").unwrap();
self.keymap.write(b" maximum = 255;\n").unwrap(); self.keymap.write_all(b" maximum = 255;\n").unwrap();
for i in 8..keycode { for i in 8..keycode {
write!(self.keymap, " <I{:03}> = {};\n", i, i).unwrap(); writeln!(self.keymap, " <I{:03}> = {};", i, i).unwrap();
} }
self.keymap.write(b" indicator 1 = \"Caps Lock\";\n").unwrap(); self.keymap.write_all(b" indicator 1 = \"Caps Lock\";\n").unwrap();
self.keymap.write(b" };\n").unwrap(); self.keymap.write_all(b" };\n").unwrap();
self.keymap.write(b"\n").unwrap(); self.keymap.write_all(b"\n").unwrap();
self.keymap.write(b" xkb_types \"ufkbd\" {\n").unwrap(); self.keymap.write_all(b" xkb_types \"ufkbd\" {\n").unwrap();
self.keymap.write(b" type \"TWO_LEVEL\" {\n").unwrap(); self.keymap.write_all(b" type \"TWO_LEVEL\" {\n").unwrap();
self.keymap.write(b" modifiers = Shift;\n").unwrap(); self.keymap.write_all(b" modifiers = Shift;\n").unwrap();
self.keymap.write(b" map[Shift] = Level2;\n").unwrap(); self.keymap.write_all(b" map[Shift] = Level2;\n").unwrap();
self.keymap.write(b" level_name[Level1] = \"Base\";\n").unwrap(); self.keymap.write_all(b" level_name[Level1] = \"Base\";\n").unwrap();
self.keymap.write(b" level_name[Level2] = \"Shift\";\n").unwrap(); self.keymap.write_all(b" level_name[Level2] = \"Shift\";\n").unwrap();
self.keymap.write(b" };\n").unwrap(); self.keymap.write_all(b" };\n").unwrap();
self.keymap.write(b" };\n").unwrap(); self.keymap.write_all(b" };\n").unwrap();
self.keymap.write(b"\n").unwrap(); self.keymap.write_all(b"\n").unwrap();
self.keymap.write(b" xkb_compatibility \"ufkbd\" {\n").unwrap(); self.keymap.write_all(b" xkb_compatibility \"ufkbd\" {\n").unwrap();
self.keymap.write(b" };\n").unwrap(); self.keymap.write_all(b" };\n").unwrap();
self.keymap.write(b"};\n").unwrap(); self.keymap.write_all(b"};\n").unwrap();
if self.mod_state != 0 { if self.mod_state != 0 {
self.vk.modifiers(0, 0, 0, 0); self.vk.modifiers(0, 0, 0, 0);