brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-surface: Remove create_surface_extension and friends

Browse Source 
This function has a lot of parameters, and doesn't do much in the way of
boilerplate. It's a lot simpler to hand-code.
This commit is contained in:
Jasper St. Pierre 2014-10-07 11:21:31 -07:00
parent bc81736e6b
commit 4ef2f2ce09
1 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,33 +734,6 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
return surface; return surface;
} }
static void
destroy_surface_extension (MetaWaylandSurfaceExtension *extension)
{
extension->resource = NULL;
}
static gboolean
create_surface_extension (MetaWaylandSurfaceExtension *extension,
const struct wl_interface *interface,
const void *implementation,
wl_resource_destroy_func_t destructor,
MetaWaylandSurface *surface,
struct wl_resource *master_resource,
guint32 id)
{
struct wl_client *client;
if (extension->resource != NULL)
return FALSE;
client = wl_resource_get_client (surface->resource);
extension->resource = wl_resource_create (client, interface, wl_resource_get_version (master_resource), id);
wl_resource_set_implementation (extension->resource, implementation, surface, destructor);
return TRUE;
}
static void static void
xdg_shell_use_unstable_version (struct wl_client *client, xdg_shell_use_unstable_version (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
@ -787,7 +760,7 @@ xdg_surface_destructor (struct wl_resource *resource)
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
destroy_window (surface); destroy_window (surface);
destroy_surface_extension (&surface->xdg_surface); surface->xdg_surface.resource = NULL;
} }
static void static void
@ -1025,11 +998,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);
MetaWindow *window; MetaWindow *window;
if (!create_surface_extension (&surface->xdg_surface, if (surface->xdg_surface.resource != NULL)
&xdg_surface_interface,
&meta_wayland_xdg_surface_interface,
xdg_surface_destructor,
surface, resource, id))
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1037,6 +1006,9 @@ xdg_shell_get_xdg_surface (struct wl_client *client,
return; return;
} }
surface->xdg_surface.resource = wl_resource_create (client, &xdg_surface_interface, wl_resource_get_version (resource), id);
wl_resource_set_implementation (surface->xdg_surface.resource, &meta_wayland_xdg_surface_interface, surface, xdg_surface_destructor);
surface->xdg_shell_resource = resource; surface->xdg_shell_resource = resource;
window = meta_window_wayland_new (meta_get_display (), surface); window = meta_window_wayland_new (meta_get_display (), surface);
@ -1049,7 +1021,7 @@ xdg_popup_destructor (struct wl_resource *resource)
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
destroy_window (surface); destroy_window (surface);
destroy_surface_extension (&surface->xdg_popup); surface->xdg_popup.resource = NULL;
} }
static void static void
@ -1084,11 +1056,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, if (surface->xdg_popup.resource != NULL)
&xdg_popup_interface,
&meta_wayland_xdg_popup_interface,
xdg_popup_destructor,
surface, resource, id))
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1096,6 +1064,9 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
return; return;
} }
surface->xdg_popup.resource = wl_resource_create (client, &xdg_popup_interface, wl_resource_get_version (resource), id);
wl_resource_set_implementation (surface->xdg_popup.resource, &meta_wayland_xdg_popup_interface, surface, xdg_popup_destructor);
surface->xdg_shell_resource = resource; surface->xdg_shell_resource = resource;
window = meta_window_wayland_new (display, surface); window = meta_window_wayland_new (display, surface);
@ -1143,7 +1114,7 @@ wl_shell_surface_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
destroy_surface_extension (&surface->wl_shell_surface); surface->wl_shell_surface.resource = NULL;
} }
static void static void
@ -1351,11 +1322,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);
MetaWindow *window; MetaWindow *window;
if (!create_surface_extension (&surface->wl_shell_surface, if (surface->wl_shell_surface.resource != NULL)
&wl_shell_surface_interface,
&meta_wayland_wl_shell_surface_interface,
wl_shell_surface_destructor,
surface, resource, id))
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1363,6 +1330,9 @@ wl_shell_get_shell_surface (struct wl_client *client,
return; return;
} }
surface->wl_shell_surface.resource = wl_resource_create (client, &wl_shell_surface_interface, wl_resource_get_version (resource), id);
wl_resource_set_implementation (surface->wl_shell_surface.resource, &meta_wayland_wl_shell_surface_interface, surface, wl_shell_surface_destructor);
window = meta_window_wayland_new (meta_get_display (), surface); window = meta_window_wayland_new (meta_get_display (), surface);
meta_wayland_surface_set_window (surface, window); meta_wayland_surface_set_window (surface, window);
} }
@ -1388,7 +1358,7 @@ gtk_surface_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
destroy_surface_extension (&surface->gtk_surface); surface->gtk_surface.resource = NULL;
} }
static void static void
@ -1431,17 +1401,16 @@ 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, if (surface->gtk_surface.resource != NULL)
&gtk_surface_interface,
&meta_wayland_gtk_surface_interface,
gtk_surface_destructor,
surface, resource, id))
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
"gtk_shell::get_gtk_surface already requested"); "gtk_shell::get_gtk_surface already requested");
return; return;
} }
surface->gtk_surface.resource = wl_resource_create (client, &gtk_surface_interface, wl_resource_get_version (resource), id);
wl_resource_set_implementation (surface->gtk_surface.resource, &meta_wayland_gtk_surface_interface, surface, gtk_surface_destructor);
} }
static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = { static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = {
@ -1542,7 +1511,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
} }
pending_state_destroy (&surface->sub.pending); pending_state_destroy (&surface->sub.pending);
destroy_surface_extension (&surface->wl_subsurface); surface->wl_subsurface.resource = NULL;
} }
static void static void
@ -1706,11 +1675,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->wl_subsurface, if (surface->wl_subsurface.resource != NULL)
&wl_subsurface_interface,
&meta_wayland_wl_subsurface_interface,
wl_subsurface_destructor,
surface, resource, id))
{ {
wl_resource_post_error (surface_resource, wl_resource_post_error (surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1718,6 +1683,9 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
return; return;
} }
surface->wl_subsurface.resource = wl_resource_create (client, &wl_subsurface_interface, wl_resource_get_version (resource), id);
wl_resource_set_implementation (surface->wl_subsurface.resource, &meta_wayland_subsurface_interface, surface, wl_subsurface_destructor);
pending_state_init (&surface->sub.pending); pending_state_init (&surface->sub.pending);
surface->sub.synchronous = TRUE; surface->sub.synchronous = TRUE;
surface->sub.parent = parent; surface->sub.parent = parent;