mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Add a destroy listener for X11 surfaces

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-10-11 22:44:23 -04:00
parent d2baf1fe5f
commit f0d9116fc8
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/shell.c
+1
View File
@@ -952,6 +952,7 @@ shell_init(struct wlsc_compositor *ec)
if (shell == NULL) if (shell == NULL)
return -1; return -1;
memset(shell, 0, sizeof *shell);
shell->compositor = ec; shell->compositor = ec;
shell->shell.activate = activate; shell->shell.activate = activate;
shell->shell.lock = lock; shell->shell.lock = lock;
compositor/xserver-launcher.c
+15 -1
View File
@@ -87,6 +87,7 @@ struct wlsc_wm {
struct wlsc_wm_window { struct wlsc_wm_window {
xcb_window_t id; xcb_window_t id;
struct wlsc_surface *surface; struct wlsc_surface *surface;
struct wl_listener surface_destroy_listener;
}; };
static void static void
@@ -567,6 +568,17 @@ wlsc_xserver_cleanup(struct wlsc_process *process, int status)
} }
} }
static void
surface_destroy(struct wl_listener *listener,
struct wl_resource *resource, uint32_t time)
{
struct wlsc_wm_window *window =
container_of(listener,
struct wlsc_wm_window, surface_destroy_listener);
fprintf(stderr, "surface for xid %d destroyed\n", window->id);
}
static void static void
xserver_set_window_id(struct wl_client *client, struct wl_resource *resource, xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
struct wl_resource *surface_resource, uint32_t id) struct wl_resource *surface_resource, uint32_t id)
@@ -588,7 +600,9 @@ xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
fprintf(stderr, "set_window_id %d for surface %p\n", id, surface); fprintf(stderr, "set_window_id %d for surface %p\n", id, surface);
window->surface = (struct wlsc_surface *) surface; window->surface = (struct wlsc_surface *) surface;
/* FIXME: Do we need a surface destroy listener? */ window->surface_destroy_listener.func = surface_destroy;
wl_list_insert(surface->resource.destroy_listener_list.prev,
&window->surface_destroy_listener.link);
} }
static const struct xserver_interface xserver_implementation = { static const struct xserver_interface xserver_implementation = {