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

compositor: eliminate wlsc_surface::shell_priv

Browse Source 
Remove shell_priv member from wlsc_surface, and replace it by a search
through the wl_surface destroy_listener_list.

This technique avoids any "extension" members in the wlsc_surface
structure.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2011-11-28 15:12:34 +02:00 committed by Kristian Høgsberg
parent 068ae944db
commit ec2b32f49b
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compositor/compositor.h
View File

@ -275,8 +275,6 @@ struct wlsc_surface {
struct wl_buffer *buffer;
struct wl_listener buffer_destroy_listener;
void *shell_priv;
};
void

25
compositor/shell.c
View File

@ -90,12 +90,6 @@ struct wlsc_move_grab {
int32_t dx, dy;
};
static struct shell_surface *
get_shell_surface(struct wlsc_surface *surface)
{
return surface->shell_priv;
}
static void
move_grab_motion(struct wl_grab *grab,
uint32_t time, int32_t x, int32_t y)
@ -390,6 +384,23 @@ shell_handle_surface_destroy(struct wl_listener *listener,
wl_resource_destroy(&shsurf->resource, time);
}
static struct shell_surface *
get_shell_surface(struct wlsc_surface *surface)
{
struct wl_list *lst = &surface->surface.resource.destroy_listener_list;
struct wl_listener *listener;
/* search the destroy listener list for our callback */
wl_list_for_each(listener, lst, link) {
if (listener->func == shell_handle_surface_destroy) {
return container_of(listener, struct shell_surface,
surface_destroy_listener);
}
}
return NULL;
}
static void
shell_create_shell_surface(struct wl_client *client,
struct wl_resource *resource,
@ -422,8 +433,6 @@ shell_create_shell_surface(struct wl_client *client,
shsurf->type = SHELL_SURFACE_NORMAL;
surface->shell_priv = shsurf;
wl_client_add_resource(client, &shsurf->resource);
}