aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-04 20:57:03 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-04 20:57:03 +1000
commit4feedbf7cf5e90574953aea81f7a6583135246c4 (patch)
tree0d4a9d77e5c3112cc9ba9494dd496a33beab1da2 /sway
parent681ed1826ddb8e05daf0ab30575f4b1f8cd23239 (diff)
Ignore unrelated cursor buttons while doing seat operations
* Click and hold a scrollbar * Drag the cursor onto another surface * While still holding the original button, press and release another cursor button * Things get weird There's two ways to fix this. Either cancel the seat operation and do the other click, or continue the seat operation and ignore the other click. I opted for the latter (ignoring the click) because it's easier to implement, and I suspect a second click during a seat operation is probably unintentional anyway.
Diffstat (limited to 'sway')
-rw-r--r--sway/input/cursor.c11
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;
}