wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-25 14:22:37 +03:00
Code Issues Projects Releases Wiki Activity

x11: remove diagnostic print of kbd layouts

Browse Source 
It seems that the library is a bit wonky; see:
https://github.com/wez/wezterm/issues/3882#issuecomment-1628359441
for an example of a segv around this
This commit is contained in:
Wez Furlong 2023-07-10 07:37:02 -07:00
parent 046443c107
commit 2035ad4de3
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
window/src/os/x11/keyboard.rs
View File

@ -135,7 +135,7 @@ fn default_keymap(context: &xkb::Context) -> Option<xkb::Keymap> {
// use $XKB_DEFAULT_VARIANT or system default
let system_default_variant = "";
let map = xkb::Keymap::new_from_names(
xkb::Keymap::new_from_names(
context,
system_default_rules,
system_default_model,
@ -143,15 +143,7 @@ fn default_keymap(context: &xkb::Context) -> Option<xkb::Keymap> {
system_default_variant,
None,
xkb::KEYMAP_COMPILE_NO_FLAGS,
);
if let Some(map) = &map {
for layout in map.layouts() {
log::debug!("default_keymap layout {layout}");
}
}
map
)
}
impl KeyboardWithFallback {
@ -465,10 +457,6 @@ impl Keyboard {
let keymap = default_keymap(&context)
.ok_or_else(|| anyhow!("Failed to load system default keymap"))?;
for layout in keymap.layouts() {
log::debug!("loaded default keymap with layout: {layout}");
}
let state = xkb::State::new(&keymap);
let locale = query_lc_ctype()?;
@ -503,10 +491,6 @@ impl Keyboard {
)
.ok_or_else(|| anyhow!("Failed to parse keymap state from file"))?;
for layout in keymap.layouts() {
log::debug!("loaded new keymap with layout: {layout}");
}
let state = xkb::State::new(&keymap);
let locale = query_lc_ctype()?;
@ -547,10 +531,6 @@ impl Keyboard {
xkb::KEYMAP_COMPILE_NO_FLAGS,
);
for layout in keymap.layouts() {
log::debug!("loaded initial keymap with layout: {layout}");
}
let state = xkb::x11::state_new_from_device(&keymap, connection, device_id);
let locale = query_lc_ctype()?;
@ -663,9 +643,6 @@ impl Keyboard {
!new_keymap.get_raw_ptr().is_null(),
"problem with new keymap"
);
for layout in new_keymap.layouts() {
log::debug!("loaded changed keymap with layout: {layout}");
}
let new_state = xkb::x11::state_new_from_device(&new_keymap, connection, self.device_id);
ensure!(!new_state.get_raw_ptr().is_null(), "problem with new state");