Skip to content

Add distinction between movement and letter keys #733

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

Merged
phase1geo merged 1 commit into from
Jul 10, 2026
+14 −3
Merged

Add distinction between movement and letter keys #733

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
17 changes: 14 additions & 3 deletions src/Shortcuts.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,23 @@ public class Shortcut {

//-------------------------------------------------------------
// Returns true if this shortcut matches the given match values
public bool matches_keypress( bool control, bool shift, bool alt, uint[] kvs, MapState state ) {
public bool matches_keypress( bool control, bool shift, bool alt, uint keyval, uint[] kvs, MapState state ) {
var match = false;
if( _keycode >= 0xff00 && _keycode <= 0xffff ) {
var event_keyval = keyval;
if( event_keyval == Key.ISO_Left_Tab ) {
event_keyval = Key.Tab;
}
match = (event_keyval == _keycode);
} else {
match = has_key( kvs );
}

return(
(_control == control) &&
(_shift == shift) &&
(_alt == alt) &&
has_key( kvs ) &&
match &&
MapState.matches( state, _command )
);
}
Expand Down Expand Up @@ -386,7 +397,7 @@ public class Shortcuts {
Display.get_default().map_keycode( keycode, out ks, out kvs );

for( int i=0; i<_shortcuts.length; i++ ) {
if( _shortcuts.index( i ).matches_keypress( control, shift, alt, kvs, state ) ) {
if( _shortcuts.index( i ).matches_keypress( control, shift, alt, keyval, kvs, state ) ) {
_shortcuts.index( i ).execute( map );
return( true );
}
Expand Down
Loading