Merge branch 'releases/1.5' into master

This commit is contained in:
Daniel Eklöf 2020-10-13 08:06:56 +02:00
commit 8b06a55cb0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 20 additions and 9 deletions

16
input.c
View file

@ -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;
}