mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove surfaces when destroyed, refocus pointer

Browse source
This commit is contained in:
Kristian Høgsberg 2009-09-18 17:05:13 -04:00
parent dd73dd5c81
commit 3f8f39c019
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
wayland-system-compositor.c
View file

@ -369,6 +369,10 @@ wlsc_surface_destroy(struct wlsc_surface *surface,
{ {
struct wlsc_listener *l, *next; struct wlsc_listener *l, *next;
wl_list_remove(&surface->link);
glDeleteTextures(1, &surface->texture);
wl_client_remove_surface(surface->base.client, &surface->base);
l = container_of(compositor->surface_destroy_listener_list.next, l = container_of(compositor->surface_destroy_listener_list.next,
struct wlsc_listener, link); struct wlsc_listener, link);
while (&l->link != &compositor->surface_destroy_listener_list) { while (&l->link != &compositor->surface_destroy_listener_list) {
@ -377,9 +381,6 @@ wlsc_surface_destroy(struct wlsc_surface *surface,
l = next; l = next;
} }
wl_list_remove(&surface->link);
glDeleteTextures(1, &surface->texture);
free(surface); free(surface);
} }
@ -1037,15 +1038,20 @@ handle_surface_destroy(struct wlsc_listener *listener,
{ {
struct wlsc_input_device *device = struct wlsc_input_device *device =
container_of(listener, struct wlsc_input_device, listener); container_of(listener, struct wlsc_input_device, listener);
struct wlsc_surface *focus;
int32_t sx, sy;
if (device->grab_surface == surface) { if (device->grab_surface == surface) {
device->grab_surface = NULL; device->grab_surface = NULL;
device->grab = 0; device->grab = 0;
} }
if (device->keyboard_focus == surface) if (device->keyboard_focus == surface)
device->keyboard_focus = NULL; wlsc_input_device_set_keyboard_focus(device, NULL);
if (device->pointer_focus == surface) if (device->pointer_focus == surface) {
device->pointer_focus = NULL; focus = pick_surface(device, &sx, &sy);
wlsc_input_device_set_pointer_focus(device, focus);
fprintf(stderr, "lost pointer focus surface, reverting to %p\n", focus);
}
} }
static struct wlsc_input_device * static struct wlsc_input_device *