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

shell: Just use surface->private for shell_surface

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-06-21 12:49:02 -04:00
parent ae9e073ac5
commit d813445f16
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+7 -11
View File
@@ -1743,23 +1743,18 @@ shell_handle_surface_destroy(struct wl_listener *listener, void *data)
} }
} }
static void
shell_surface_configure(struct weston_surface *, int32_t, int32_t);
static struct shell_surface * static struct shell_surface *
get_shell_surface(struct weston_surface *surface) get_shell_surface(struct weston_surface *surface)
{ {
struct wl_listener *listener; if (surface->configure == shell_surface_configure)
return surface->private;
listener = wl_signal_get(&surface->surface.resource.destroy_signal, else
shell_handle_surface_destroy);
if (listener)
return container_of(listener, struct shell_surface,
surface_destroy_listener);
return NULL; return NULL;
} }
static void
shell_surface_configure(struct weston_surface *, int32_t, int32_t);
static struct shell_surface * static struct shell_surface *
create_shell_surface(void *shell, struct weston_surface *surface, create_shell_surface(void *shell, struct weston_surface *surface,
const struct weston_shell_client *client) const struct weston_shell_client *client)
@@ -1778,6 +1773,7 @@ create_shell_surface(void *shell, struct weston_surface *surface,
} }
surface->configure = shell_surface_configure; surface->configure = shell_surface_configure;
surface->private = shsurf;
surface->compositor->shell_interface.shell = shell; surface->compositor->shell_interface.shell = shell;
shsurf->shell = (struct desktop_shell *) shell; shsurf->shell = (struct desktop_shell *) shell;