diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-13 06:02:09 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-13 06:02:09 +0000 |
| commit | fdb7e403555df5fdcb7daf23f665bdec13b02500 (patch) | |
| tree | 622c95ee103d7f9636d13af9cb47a448b636450a /input.c | |
| parent | meson/pkgbuild: bump version to 1.5.1 (diff) | |
input: regression: don’t pass on mouse click to application if we consumed it
When we ‘consume’ a mouse button event (i.e. when we have a shortcut
mapped to it), the event should *not* be passed on to the client
application.
In 5f64c5c33590a41afd3f621870c6abd89b859073, button handling was
refactored and unfortunately introduced a regression where we once
again started passing consumed button presses to the client
application.
Fixes #168
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -1589,13 +1589,15 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer, } } - if (!term_mouse_grabbed(term, seat) && - cursor_is_on_grid) - { - term_mouse_down( - term, button, seat->mouse.row, seat->mouse.col, - seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); - } + } + + if (!seat->mouse.consumed && + !term_mouse_grabbed(term, seat) && + cursor_is_on_grid) + { + term_mouse_down( + term, button, seat->mouse.row, seat->mouse.col, + seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); } break; } |
