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

MetaWaylandPointerConstraint: Use NULL for infinite region

Browse Source 
Instead of having a very large region represent an infinitely large
region, use NULL, and use the calculated input region from the
MetaWaylandSurface if the constraint region was not set.

https://bugzilla.gnome.org/show_bug.cgi?id=762661
This commit is contained in:
Jonas Ådahl 2016-02-23 22:21:29 +08:00
parent 62ac9df43d
commit 4abfb299e2
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,17 +84,6 @@ static const struct zwp_confined_pointer_v1_interface confined_pointer_interface
static const MetaWaylandPointerGrabInterface locked_pointer_grab_interface; static const MetaWaylandPointerGrabInterface locked_pointer_grab_interface;
static const MetaWaylandPointerGrabInterface confined_pointer_grab_interface; static const MetaWaylandPointerGrabInterface confined_pointer_grab_interface;
static cairo_region_t *
create_infinite_constraint_region (void)
{
return cairo_region_create_rectangle (&(cairo_rectangle_int_t) {
.x = INT_MIN / 2,
.y = INT_MIN / 2,
.width = INT_MAX,
.height = INT_MAX,
});
}
static MetaWaylandPointerConstraint * static MetaWaylandPointerConstraint *
meta_wayland_pointer_constraint_new (MetaWaylandSurface *surface, meta_wayland_pointer_constraint_new (MetaWaylandSurface *surface,
MetaWaylandSeat *seat, MetaWaylandSeat *seat,
@ -122,7 +111,7 @@ meta_wayland_pointer_constraint_new (MetaWaylandSurface *su
} }
else else
{ {
constraint->region = create_infinite_constraint_region (); constraint->region = NULL;
} }
return constraint; return constraint;
@ -224,7 +213,7 @@ meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constrain
meta_wayland_pointer_constraint_disable (constraint); meta_wayland_pointer_constraint_disable (constraint);
wl_resource_set_user_data (constraint->resource, NULL); wl_resource_set_user_data (constraint->resource, NULL);
cairo_region_destroy (constraint->region); g_clear_pointer (&constraint->region, cairo_region_destroy);
g_object_unref (constraint); g_object_unref (constraint);
} }
@ -331,7 +320,8 @@ meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerCo
cairo_region_t *region; cairo_region_t *region;
region = meta_wayland_surface_calculate_input_region (constraint->surface); region = meta_wayland_surface_calculate_input_region (constraint->surface);
cairo_region_intersect (region, constraint->region); if (constraint->region)
cairo_region_intersect (region, constraint->region);
return region; return region;
} }
@ -454,7 +444,7 @@ pending_constraint_state_applied (MetaWaylandPendingState *pending,
} }
else else
{ {
constraint->region = create_infinite_constraint_region (); constraint->region = NULL;
} }
g_signal_handler_disconnect (pending, g_signal_handler_disconnect (pending,