isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Do a small code cleanup

Browse Source 
Pass the surface rather than the resource / client. This will become
a lot more helpful in the next commit.
This commit is contained in:
Jasper St. Pierre 2014-02-28 08:39:06 -05:00
parent 674bcef6da
commit a27fb19473
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wayland/meta-wayland-surface.c
View File

@ -668,23 +668,25 @@ get_resource_version (struct wl_resource *master_resource,
static gboolean static gboolean
create_surface_extension (MetaWaylandSurfaceExtension *extension, create_surface_extension (MetaWaylandSurfaceExtension *extension,
struct wl_client *client, MetaWaylandSurface *surface,
struct wl_resource *master_resource, struct wl_resource *master_resource,
struct wl_resource *surface_resource,
guint32 id, guint32 id,
int max_version, int max_version,
const struct wl_interface *interface, const struct wl_interface *interface,
const void *implementation, const void *implementation,
wl_resource_destroy_func_t destructor) wl_resource_destroy_func_t destructor)
{ {
struct wl_client *client;
if (extension->resource != NULL) if (extension->resource != NULL)
return FALSE; return FALSE;
client = wl_resource_get_client (surface->resource);
extension->resource = wl_resource_create (client, interface, get_resource_version (master_resource, max_version), id); extension->resource = wl_resource_create (client, interface, get_resource_version (master_resource, max_version), id);
wl_resource_set_implementation (extension->resource, implementation, extension, destructor); wl_resource_set_implementation (extension->resource, implementation, extension, destructor);
extension->surface_destroy_listener.notify = extension_handle_surface_destroy; extension->surface_destroy_listener.notify = extension_handle_surface_destroy;
wl_resource_add_destroy_listener (surface_resource, &extension->surface_destroy_listener); wl_resource_add_destroy_listener (surface->resource, &extension->surface_destroy_listener);
return TRUE; return TRUE;
} }
@ -956,7 +958,7 @@ xdg_shell_get_xdg_surface (struct wl_client *client,
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
if (!create_surface_extension (&surface->xdg_surface, client, surface_resource, resource, id, if (!create_surface_extension (&surface->xdg_surface, surface, resource, id,
META_XDG_SURFACE_VERSION, META_XDG_SURFACE_VERSION,
&xdg_surface_interface, &xdg_surface_interface,
&meta_wayland_xdg_surface_interface, &meta_wayland_xdg_surface_interface,
@ -1012,7 +1014,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
if (parent_surf == NULL || parent_surf->window == NULL) if (parent_surf == NULL || parent_surf->window == NULL)
return; return;
if (!create_surface_extension (&surface->xdg_popup, client, surface_resource, resource, id, if (!create_surface_extension (&surface->xdg_popup, surface, resource, id,
META_XDG_POPUP_VERSION, META_XDG_POPUP_VERSION,
&xdg_popup_interface, &xdg_popup_interface,
&meta_wayland_xdg_popup_interface, &meta_wayland_xdg_popup_interface,
@ -1327,7 +1329,7 @@ wl_shell_get_shell_surface (struct wl_client *client,
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
if (!create_surface_extension (&surface->wl_shell_surface, client, surface_resource, resource, id, if (!create_surface_extension (&surface->wl_shell_surface, surface, resource, id,
META_WL_SHELL_SURFACE_VERSION, META_WL_SHELL_SURFACE_VERSION,
&wl_shell_surface_interface, &wl_shell_surface_interface,
&meta_wayland_wl_shell_surface_interface, &meta_wayland_wl_shell_surface_interface,
@ -1410,7 +1412,7 @@ get_gtk_surface (struct wl_client *client,
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
if (!create_surface_extension (&surface->gtk_surface, client, surface_resource, resource, id, if (!create_surface_extension (&surface->gtk_surface, surface, resource, id,
META_GTK_SURFACE_VERSION, META_GTK_SURFACE_VERSION,
&gtk_surface_interface, &gtk_surface_interface,
&meta_wayland_gtk_surface_interface, &meta_wayland_gtk_surface_interface,
@ -1697,7 +1699,7 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandSurface *parent = wl_resource_get_user_data (parent_resource); MetaWaylandSurface *parent = wl_resource_get_user_data (parent_resource);
if (!create_surface_extension (&surface->subsurface, client, surface_resource, resource, id, if (!create_surface_extension (&surface->subsurface, surface, resource, id,
META_GTK_SURFACE_VERSION, META_GTK_SURFACE_VERSION,
&wl_subsurface_interface, &wl_subsurface_interface,
&meta_wayland_subsurface_interface, &meta_wayland_subsurface_interface,