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

wayland: Make the MetaWaylandRegion type opaque

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-10-07 20:23:55 -07:00
parent ead0e902ed
commit 9f5c38d121
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wayland/meta-wayland-region.c
View File

@ -26,6 +26,12 @@
#include "meta-wayland-region.h" #include "meta-wayland-region.h"
struct _MetaWaylandRegion
{
struct wl_resource *resource;
cairo_region_t *region;
};
static void static void
wl_region_destroy (struct wl_client *client, wl_region_destroy (struct wl_client *client,
struct wl_resource *resource) struct wl_resource *resource)
@ -91,3 +97,9 @@ meta_wayland_region_create (MetaWaylandCompositor *compositor,
return region; return region;
} }
cairo_region_t *
meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region)
{
return region->region;
}

8
src/wayland/meta-wayland-region.h
View File

@ -30,15 +30,11 @@
#include <wayland-server.h> #include <wayland-server.h>
#include "meta-wayland-types.h" #include "meta-wayland-types.h"
typedef struct
{
struct wl_resource *resource;
cairo_region_t *region;
} MetaWaylandRegion;
MetaWaylandRegion * meta_wayland_region_create (MetaWaylandCompositor *compositor, MetaWaylandRegion * meta_wayland_region_create (MetaWaylandCompositor *compositor,
struct wl_client *client, struct wl_client *client,
struct wl_resource *compositor_resource, struct wl_resource *compositor_resource,
guint32 id); guint32 id);
cairo_region_t * meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region);
#endif /* META_WAYLAND_REGION_H */ #endif /* META_WAYLAND_REGION_H */

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

@ -540,7 +540,8 @@ wl_surface_set_opaque_region (struct wl_client *client,
if (region_resource) if (region_resource)
{ {
MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
surface->pending.opaque_region = cairo_region_copy (region->region); cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
surface->pending.opaque_region = cairo_region_copy (cr_region);
} }
} }
@ -559,7 +560,8 @@ wl_surface_set_input_region (struct wl_client *client,
if (region_resource) if (region_resource)
{ {
MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
surface->pending.input_region = cairo_region_copy (region->region); cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
surface->pending.input_region = cairo_region_copy (cr_region);
} }
} }

1
src/wayland/meta-wayland-types.h
View File

@ -32,6 +32,7 @@ typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
typedef struct _MetaWaylandDataDevice MetaWaylandDataDevice; typedef struct _MetaWaylandDataDevice MetaWaylandDataDevice;
typedef struct _MetaWaylandBuffer MetaWaylandBuffer; typedef struct _MetaWaylandBuffer MetaWaylandBuffer;
typedef struct _MetaWaylandRegion MetaWaylandRegion;
typedef struct _MetaWaylandSurface MetaWaylandSurface; typedef struct _MetaWaylandSurface MetaWaylandSurface;