nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2782 from stapelberg/release-bindings 

Fix --release bindings broken by previous commit
This commit is contained in:
Ingo Bürk 2017-05-23 08:40:05 +02:00 committed by GitHub
parent 36f80f2de8 2bd3639fbb
commit 990100317a
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bindings.c
View File

@ -274,7 +274,9 @@ static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_releas
break; break;
} }
} }
if (!found_keycode) { if (!found_keycode &&
(bind->release != B_UPON_KEYRELEASE_IGNORE_MODS ||
!is_release)) {
continue; continue;
} }
} }

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

@ -206,6 +206,49 @@ is(scalar @i3test::XTEST::binding_events, 12, 'Received exactly 12 binding event
exit_gracefully($pid); exit_gracefully($pid);
################################################################################
# Verify bindings for modifiers work
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Binding which should work with numlock and without, see issue #2559.
bindcode --release 133 nop Super_L
EOT
$pid = launch_with_config($config);
start_binding_capture;
is(listen_for_binding(
sub {
xtest_key_press(133); # Super_L
xtest_key_release(133); # Super_L
},
),
'Super_L',
'triggered the "Super_L" keybinding without Num_Lock');
is(listen_for_binding(
sub {
xtest_key_press(77); # enable Num_Lock
xtest_key_release(77); # enable Num_Lock
xtest_key_press(133); # Super_L
xtest_key_release(133); # Super_L
xtest_key_press(77); # disable Num_Lock
xtest_key_release(77); # disable Num_Lock
},
),
'Super_L',
'triggered the "Super_L" keybinding with Num_Lock');
sync_with_i3;
is(scalar @i3test::XTEST::binding_events, 14, 'Received exactly 14 binding events');
exit_gracefully($pid);
################################################################################ ################################################################################
# Verify the binding is only triggered for KP_End, not KP_1 # Verify the binding is only triggered for KP_End, not KP_1
################################################################################ ################################################################################
@ -269,7 +312,7 @@ is(listen_for_binding(
# TODO: This test does not verify that i3 does _NOT_ grab keycode 87 with Mod2. # TODO: This test does not verify that i3 does _NOT_ grab keycode 87 with Mod2.
sync_with_i3; sync_with_i3;
is(scalar @i3test::XTEST::binding_events, 14, 'Received exactly 14 binding events'); is(scalar @i3test::XTEST::binding_events, 16, 'Received exactly 16 binding events');
exit_gracefully($pid); exit_gracefully($pid);