hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 04:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

tinywl: handle view unmap while grabbed

Browse source 
Fixes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3372
This commit is contained in:
Kirill Primak 2022-11-07 19:55:40 +03:00
parent ea68506b73
commit b7623694ac
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tinywl/tinywl.c
View file

@ -363,6 +363,12 @@ static struct tinywl_view *desktop_view_at(
return tree->node.data; return tree->node.data;
} }
static void reset_cursor_mode(struct tinywl_server *server) {
/* Reset the cursor mode to passthrough. */
server->cursor_mode = TINYWL_CURSOR_PASSTHROUGH;
server->grabbed_view = NULL;
}
static void process_cursor_move(struct tinywl_server *server, uint32_t time) { static void process_cursor_move(struct tinywl_server *server, uint32_t time) {
/* Move the grabbed view to the new position. */ /* Move the grabbed view to the new position. */
struct tinywl_view *view = server->grabbed_view; struct tinywl_view *view = server->grabbed_view;
@ -515,7 +521,7 @@ static void server_cursor_button(struct wl_listener *listener, void *data) {
server->cursor->x, server->cursor->y, &surface, &sx, &sy); server->cursor->x, server->cursor->y, &surface, &sx, &sy);
if (event->state == WLR_BUTTON_RELEASED) { if (event->state == WLR_BUTTON_RELEASED) {
/* If you released any buttons, we exit interactive move/resize mode. */ /* If you released any buttons, we exit interactive move/resize mode. */
server->cursor_mode = TINYWL_CURSOR_PASSTHROUGH; reset_cursor_mode(server);
} else { } else {
/* Focus that client if the button was _pressed_ */ /* Focus that client if the button was _pressed_ */
focus_view(view, surface); focus_view(view, surface);
@ -636,6 +642,11 @@ static void xdg_toplevel_unmap(struct wl_listener *listener, void *data) {
/* Called when the surface is unmapped, and should no longer be shown. */ /* Called when the surface is unmapped, and should no longer be shown. */
struct tinywl_view *view = wl_container_of(listener, view, unmap); struct tinywl_view *view = wl_container_of(listener, view, unmap);
/* Reset the cursor mode if the grabbed view was unmapped. */
if (view == view->server->grabbed_view) {
reset_cursor_mode(view->server);
}
wl_list_remove(&view->link); wl_list_remove(&view->link);
} }