mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-09 08:21:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: button: button events aren't passed to clients, when cursor is outside grid

Browse source 
Don't send mouse button escapes to a mouse grabbing client when the
cursor is outside the grid (i.e. when it is inside the margins).

Also don't do *any* kind of selection when the cursor is outside the
grid. Previously, we only checked this for selection_start(), but
e.g. double clicking would run selection_extend(), or
selection_mark_word() etc.
This commit is contained in:
Daniel Eklöf 2020-08-07 19:59:03 +02:00
parent 721ca80abe
commit 4178418010
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
input.c
View file

@ -1410,19 +1410,19 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
case TERM_SURF_GRID: { case TERM_SURF_GRID: {
search_cancel(term); search_cancel(term);
bool cursor_is_on_grid = seat->mouse.col >= 0 && seat->mouse.row >= 0;
switch (state) { switch (state) {
case WL_POINTER_BUTTON_STATE_PRESSED: { case WL_POINTER_BUTTON_STATE_PRESSED: {
if (button == BTN_LEFT && seat->mouse.count <= 3) { if (button == BTN_LEFT && seat->mouse.count <= 3) {
selection_cancel(term); selection_cancel(term);
if (selection_enabled(term, seat)) { if (selection_enabled(term, seat) && cursor_is_on_grid) {
switch (seat->mouse.count) { switch (seat->mouse.count) {
case 1: case 1:
if (seat->mouse.col >= 0 && seat->mouse.row >= 0) { selection_start(
selection_start( term, seat->mouse.col, seat->mouse.row,
term, seat->mouse.col, seat->mouse.row, seat->kbd.ctrl ? SELECTION_BLOCK : SELECTION_NORMAL);
seat->kbd.ctrl ? SELECTION_BLOCK : SELECTION_NORMAL);
}
break; break;
case 2: case 2:
@ -1439,7 +1439,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
} }
else if (button == BTN_RIGHT && seat->mouse.count == 1) { else if (button == BTN_RIGHT && seat->mouse.count == 1) {
if (selection_enabled(term, seat)) { if (selection_enabled(term, seat) && cursor_is_on_grid) {
selection_extend( selection_extend(
seat, term, seat->mouse.col, seat->mouse.row, serial); seat, term, seat->mouse.col, seat->mouse.row, serial);
} }
@ -1464,7 +1464,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
} }
} }
if (!term_mouse_grabbed(term, seat)) { if (!term_mouse_grabbed(term, seat) && cursor_is_on_grid) {
term_mouse_down( term_mouse_down(
term, button, seat->mouse.row, seat->mouse.col, term, button, seat->mouse.row, seat->mouse.col,
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
@ -1476,7 +1476,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
if (button == BTN_LEFT && term->selection.end.col != -1) if (button == BTN_LEFT && term->selection.end.col != -1)
selection_finalize(seat, term, serial); selection_finalize(seat, term, serial);
if (!term_mouse_grabbed(term, seat)) { if (!term_mouse_grabbed(term, seat) && cursor_is_on_grid) {
term_mouse_up( term_mouse_up(
term, button, seat->mouse.row, seat->mouse.col, term, button, seat->mouse.row, seat->mouse.col,
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);