sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

pointer-constraints/native: Consider origin when checking constraints

Browse source 
Since 07d24fe50 regions are not translated to their on-screen
coordinates anymore, but are relative to the origin stored in the
constraint. This origin however was not considered when checking whether
the pointer was within the constraint region. This meant that the
constraint region would appear to always be placed at 0,0 instead of on
the surface.

Fix this by using the cursor position relative to the origin.

Fixes: 07d24fe50 ("backends/native: Allow infinitely small pointer constraint regions")
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3409
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3749>
(cherry picked from commit c0537096c2)
This commit is contained in:
Sebastian Keller 2024-05-10 20:36:37 +02:00 committed by Jonas Ådahl
parent 9db8609623
commit 6a2e8e43a7
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/backends/native/meta-pointer-constraint-native.c
View file

@ -496,12 +496,12 @@ meta_pointer_constraint_impl_native_constraint (MetaPointerConstraintImpl *const
motion = (MetaLine2) {
.a = (MetaVector2) {
.x = prev_x,
.y = prev_y,
.x = prev_x - constraint_impl_native->origin.x,
.y = prev_y - constraint_impl_native->origin.y,
},
.b = (MetaVector2) {
.x = x,
.y = y,
.x = x - constraint_impl_native->origin.x,
.y = y - constraint_impl_native->origin.y,
},
};
directions = get_motion_directions (&motion);
@ -522,8 +522,8 @@ meta_pointer_constraint_impl_native_constraint (MetaPointerConstraintImpl *const
}
}
*x_inout = motion.b.x;
*y_inout = motion.b.y;
*x_inout = motion.b.x + constraint_impl_native->origin.x;
*y_inout = motion.b.y + constraint_impl_native->origin.y;
}
static float
@ -602,6 +602,8 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
g_autoptr (MtkRegion) region = NULL;
float x;
float y;
float rel_x;
float rel_y;
constraint_impl_native = META_POINTER_CONSTRAINT_IMPL_NATIVE (constraint_impl);
region = mtk_region_ref (constraint_impl_native->region);
@ -610,6 +612,8 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
clutter_seat_query_state (seat, device, NULL, &point, NULL);
x = point.x;
y = point.y;
rel_x = x - constraint_impl_native->origin.x;
rel_y = y - constraint_impl_native->origin.y;
if (mtk_region_is_empty (region))
{
@ -617,9 +621,7 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
y != constraint_impl_native->origin.y)
clutter_seat_warp_pointer (seat, x, y);
}
else if (!mtk_region_contains_point (region,
(int) x - constraint_impl_native->origin.x,
(int) y - constraint_impl_native->origin.y))
else if (!mtk_region_contains_point (region, (int) rel_x, (int) rel_y))
{
g_autoptr (GArray) borders = NULL;
float closest_distance_2 = FLT_MAX;
@ -635,7 +637,7 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
MetaBorder *border = &g_array_index (borders, MetaBorder, i);
float distance_2;
distance_2 = point_to_border_distance_2 (border, x, y);
distance_2 = point_to_border_distance_2 (border, rel_x, rel_y);
if (distance_2 < closest_distance_2)
{
closest_border = border;
@ -643,9 +645,11 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
}
}
closest_point_behind_border (closest_border, &x, &y);
closest_point_behind_border (closest_border, &rel_x, &rel_y);
clutter_seat_warp_pointer (seat, x, y);
clutter_seat_warp_pointer (seat,
rel_x + constraint_impl_native->origin.x,
rel_y + constraint_impl_native->origin.y);
}
}