diff options
| author | emersion <contact@emersion.fr> | 2018-10-04 13:29:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 13:29:09 +0200 |
| commit | 192ec7d6c8843b18aafce70eefe322e6db11e5b9 (patch) | |
| tree | 0d4a9d77e5c3112cc9ba9494dd496a33beab1da2 /sway/input | |
| parent | 681ed1826ddb8e05daf0ab30575f4b1f8cd23239 (diff) | |
| parent | 4feedbf7cf5e90574953aea81f7a6583135246c4 (diff) | |
Merge pull request #2761 from RyanDwyer/seat-op-ignore-buttons
Ignore unrelated cursor buttons while doing seat operations
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 3c62acb9..331c6c7e 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -754,11 +754,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor, } struct sway_seat *seat = cursor->seat; - // Handle ending seat operation - if (cursor->seat->operation != OP_NONE && - button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) { - seat_end_mouse_operation(seat); - seat_pointer_notify_button(seat, time_msec, button, state); + // Handle existing seat operation + if (cursor->seat->operation != OP_NONE) { + if (button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) { + seat_end_mouse_operation(seat); + seat_pointer_notify_button(seat, time_msec, button, state); + } return; } |