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

wayland: Rename peek_cairo_region to peek_region

Browse Source 
So that grep 'cairo_' won't show these false positives and it is no longer
a cairo_region anymore.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3292>
This commit is contained in:
Bilal Elmoussaoui 2023-09-20 14:33:13 +02:00 committed by Marge Bot
parent 156fe0fdd8
commit 9f58fb121f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland-pointer-constraints.c
View File

@ -322,7 +322,7 @@ meta_wayland_pointer_constraint_new (MetaWaylandSurface *su
if (region) if (region)
{ {
constraint->region = constraint->region =
mtk_region_copy (meta_wayland_region_peek_cairo_region (region)); mtk_region_copy (meta_wayland_region_peek_region (region));
} }
else else
{ {
@ -816,7 +816,7 @@ meta_wayland_pointer_constraint_set_pending_region (MetaWaylandPointerConstraint
if (region) if (region)
{ {
constraint_pending->region = constraint_pending->region =
mtk_region_copy (meta_wayland_region_peek_cairo_region (region)); mtk_region_copy (meta_wayland_region_peek_region (region));
} }
} }

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

@ -98,7 +98,7 @@ meta_wayland_region_create (MetaWaylandCompositor *compositor,
} }
MtkRegion * MtkRegion *
meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region) meta_wayland_region_peek_region (MetaWaylandRegion *region)
{ {
return region->region; return region->region;
} }

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

@ -32,4 +32,4 @@ MetaWaylandRegion * meta_wayland_region_create (MetaWaylandCompositor *composito
struct wl_resource *compositor_resource, struct wl_resource *compositor_resource,
guint32 id); guint32 id);
MtkRegion * meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region); MtkRegion * meta_wayland_region_peek_region (MetaWaylandRegion *region);

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

@ -1108,8 +1108,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);
MtkRegion *cr_region = meta_wayland_region_peek_cairo_region (region); MtkRegion *mtk_region = meta_wayland_region_peek_region (region);
pending->opaque_region = mtk_region_copy (cr_region); pending->opaque_region = mtk_region_copy (mtk_region);
} }
pending->opaque_region_set = TRUE; pending->opaque_region_set = TRUE;
} }
@ -1126,8 +1126,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);
MtkRegion *cr_region = meta_wayland_region_peek_cairo_region (region); MtkRegion *mtk_region = meta_wayland_region_peek_region (region);
pending->input_region = mtk_region_copy (cr_region); pending->input_region = mtk_region_copy (mtk_region);
} }
pending->input_region_set = TRUE; pending->input_region_set = TRUE;
} }

2
src/wayland/meta-wayland-surface.h
View File

@ -345,7 +345,7 @@ void meta_wayland_surface_get_absolute_coordinates (MetaWaylandSu
MetaWaylandSurface * meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role); MetaWaylandSurface * meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role);
MtkRegion * meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface); MtkRegion * meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface);
gboolean meta_wayland_surface_begin_grab_op (MetaWaylandSurface *surface, gboolean meta_wayland_surface_begin_grab_op (MetaWaylandSurface *surface,