window.c: Drop the toolkit grab when we start a compositor grab
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 13 Apr 2012 16:55:45 +0000 (12:55 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 13 Apr 2012 16:55:45 +0000 (12:55 -0400)
We do this right for move and resize, but dnd and popups need the same
treatment.

clients/dnd.c
clients/window.c

index c540eb4..a7ac66f 100644 (file)
@@ -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,
index 08f510f..a033130 100644 (file)
@@ -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,