Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(input): binds not working on non-Latin layouts #813

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(input): binds not working on non-Latin layouts #813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/input/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ use smithay::{
},
xwayland::X11Surface,
};
use tracing::{error, trace};
use tracing::{error, trace, warn};
use xkbcommon::xkb::{Keycode, Keysym};

use std::{
Expand Down Expand Up @@ -483,7 +483,14 @@ impl State {
// is this a normal binding?
if binding.key.is_some()
&& state == KeyState::Pressed
&& handle.raw_syms().contains(&binding.key.unwrap())
&& (handle.raw_syms().contains(&binding.key.unwrap()) ||
// fallback to the Latin or current layout symbol
// if no binding is found for the current layout's key
handle.raw_latin_sym_or_raw_current_sym()
.unwrap_or_else(|| {
warn!("No keysym found for keypress {:?}: passing NoSymbol", handle);
Keysym::NoSymbol
}) == binding.key.unwrap())
&& cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers)
{
modifiers_queue.clear();
Expand Down