aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-13 06:06:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-13 06:06:56 +0000
commit8b06a55cb01c74a3639eadf9d85aadd213bfd0a5 (patch)
treefeb31b4cd22f3136fb909397372f803841eae8d7 /input.c
parentMerge branch 'scroll-up-down-while-selecting' into master (diff)
parentmeson/pkgbuild: bump version to 1.5.2 (diff)
Merge branch 'releases/1.5' into master
Diffstat (limited to 'input.c')
-rw-r--r--input.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/input.c b/input.c
index f3993978..76357850 100644
--- a/input.c
+++ b/input.c
@@ -1625,13 +1625,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;
}