From a6c8b0084f703782e46821f91373f830930b61a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 13 Apr 2012 12:55:45 -0400 Subject: [PATCH] window.c: Drop the toolkit grab when we start a compositor grab We do this right for move and resize, but dnd and popups need the same treatment. --- clients/dnd.c | 2 ++ clients/window.c | 1 + 2 files changed, 3 insertions(+) diff --git a/clients/dnd.c b/clients/dnd.c index c540eb4..a7ac66f 100644 --- a/clients/dnd.c +++ b/clients/dnd.c @@ -402,6 +402,8 @@ dnd_button_handler(struct widget *widget, dnd_drag->drag_surface = wl_compositor_create_surface(compositor); + input_ungrab(input); + dnd_drag->data_source = display_create_data_source(dnd->display); wl_data_source_add_listener(dnd_drag->data_source, diff --git a/clients/window.c b/clients/window.c index 08f510f..a033130 100644 --- a/clients/window.c +++ b/clients/window.c @@ -2391,6 +2391,7 @@ window_show_menu(struct display *display, window->x = x; window->y = y; + input_ungrab(input); wl_shell_surface_set_popup(window->shell_surface, input->input_device, display_get_serial(window->display), window->parent->shell_surface, -- 2.7.4