koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: compare all resolved modifier masks

Browse Source 
Before this commit, i3 only compared the user-specified modifiers and
incorrectly ignored the resolved modifiers (such as the numlock
fallback).

While at it, also fix the testcase which treated numlock as a momentary
modifier, whereas it really is a latched modifier.

fixes #2418
This commit is contained in:
Michael Stapelberg
2016-09-12 12:05:38 +02:00
parent 5ca7d4b222
commit 0469716fd6
2 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
testcases/t/264-keypress-numlock.t
View File

@ -35,6 +35,9 @@ bindsym KP_End nop KP_End
# Binding which should work with numlock and without.
bindsym Mod4+a nop a
# Binding which should work with numlock and without, see issue #2418.
bindsym Escape nop Escape
EOT
my $pid = launch_with_config($config);
@ -52,10 +55,12 @@ is(listen_for_binding(
is(listen_for_binding(
sub {
xtest_key_press(77); # Num_Lock
xtest_key_press(77); # enable Num_Lock
xtest_key_release(77); # enable Num_Lock
xtest_key_press(87); # KP_1
xtest_key_release(87); # KP_1
xtest_key_release(77); # Num_Lock
xtest_key_press(77); # disable Num_Lock
xtest_key_release(77); # disable Num_Lock
},
),
'KP_1',
@ -74,20 +79,43 @@ is(listen_for_binding(
is(listen_for_binding(
sub {
xtest_key_press(77); # Num_Lock
xtest_key_press(77); # enable Num_Lock
xtest_key_release(77); # enable Num_Lock
xtest_key_press(133); # Super_L
xtest_key_press(38); # a
xtest_key_release(38); # a
xtest_key_release(133); # Super_L
xtest_key_release(77); # Num_Lock
xtest_key_press(77); # disable Num_Lock
xtest_key_release(77); # disable Num_Lock
},
),
'a',
'triggered the "a" keybinding');
is(listen_for_binding(
sub {
xtest_key_press(9); # Escape
xtest_key_release(9); # Escape
},
),
'Escape',
'triggered the "Escape" keybinding');
is(listen_for_binding(
sub {
xtest_key_press(77); # enable Num_Lock
xtest_key_release(77); # enable Num_Lock
xtest_key_press(9); # Escape
xtest_key_release(9); # Escape
xtest_key_press(77); # disable Num_Lock
xtest_key_release(77); # disable Num_Lock
},
),
'Escape',
'triggered the "Escape" keybinding');
sync_with_i3;
is(scalar @i3test::XTEST::binding_events, 4, 'Received exactly 4 binding events');
is(scalar @i3test::XTEST::binding_events, 6, 'Received exactly 4 binding events');
exit_gracefully($pid);
@ -117,10 +145,12 @@ is(listen_for_binding(
is(listen_for_binding(
sub {
xtest_key_press(77); # Num_Lock
xtest_key_press(77); # enable Num_Lock
xtest_key_release(77); # enable Num_Lock
xtest_key_press(87); # KP_1
xtest_key_release(87); # KP_1
xtest_key_release(77); # Num_Lock
xtest_key_press(77); # disable Num_Lock
xtest_key_release(77); # disable Num_Lock
},
),
'timeout',
@ -129,7 +159,7 @@ is(listen_for_binding(
# TODO: This test does not verify that i3 does _NOT_ grab keycode 87 with Mod2.
sync_with_i3;
is(scalar @i3test::XTEST::binding_events, 5, 'Received exactly 5 binding events');
is(scalar @i3test::XTEST::binding_events, 7, 'Received exactly 5 binding events');
exit_gracefully($pid);