isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/pointer-constraints: Maybe constrain on pointer focus change

Browse Source 
Since Xwayland surface constraints might need to enable not only
because the constrained window appears focused, add a pointer focus
listener and try constrain whenever the pointer focus changes. It's
still required that a Xwayland window is focused to activate.

https://bugzilla.gnome.org/show_bug.cgi?id=771050
This commit is contained in:
Jonas Ådahl 2016-09-06 13:14:44 +08:00
parent 33ba06504b
commit abee020f71
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ struct _MetaWaylandPointerConstraint
MetaWaylandPointerGrab grab; MetaWaylandPointerGrab grab;
MetaWaylandSeat *seat; MetaWaylandSeat *seat;
enum zwp_pointer_constraints_v1_lifetime lifetime; enum zwp_pointer_constraints_v1_lifetime lifetime;
gulong pointer_focus_surface_handler_id;
gboolean hint_set; gboolean hint_set;
wl_fixed_t x_hint; wl_fixed_t x_hint;
@ -277,6 +278,13 @@ surface_remove_pointer_constraints (MetaWaylandSurface *surface,
} }
} }
static void
pointer_focus_surface_changed (MetaWaylandPointer *pointer,
MetaWaylandPointerConstraint *constraint)
{
meta_wayland_pointer_constraint_maybe_enable (constraint);
}
static MetaWaylandPointerConstraint * static MetaWaylandPointerConstraint *
meta_wayland_pointer_constraint_new (MetaWaylandSurface *surface, meta_wayland_pointer_constraint_new (MetaWaylandSurface *surface,
MetaWaylandSeat *seat, MetaWaylandSeat *seat,
@ -307,6 +315,11 @@ meta_wayland_pointer_constraint_new (MetaWaylandSurface *su
constraint->region = NULL; constraint->region = NULL;
} }
constraint->pointer_focus_surface_handler_id =
g_signal_connect (seat->pointer, "focus-surface-changed",
G_CALLBACK (pointer_focus_surface_changed),
constraint);
return constraint; return constraint;
} }
@ -1056,6 +1069,18 @@ bind_pointer_constraints (struct wl_client *client,
NULL); NULL);
} }
static void
meta_wayland_pointer_constraint_finalize (GObject *object)
{
MetaWaylandPointerConstraint *constraint =
META_WAYLAND_POINTER_CONSTRAINT (object);
g_signal_handler_disconnect (constraint->seat->pointer,
constraint->pointer_focus_surface_handler_id);
G_OBJECT_CLASS (meta_wayland_pointer_constraint_parent_class)->finalize (object);
}
void void
meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor) meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor)
{ {
@ -1073,6 +1098,11 @@ meta_wayland_pointer_constraint_init (MetaWaylandPointerConstraint *constraint)
static void static void
meta_wayland_pointer_constraint_class_init (MetaWaylandPointerConstraintClass *klass) meta_wayland_pointer_constraint_class_init (MetaWaylandPointerConstraintClass *klass)
{ {
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = meta_wayland_pointer_constraint_finalize;
quark_pending_constraint_state = quark_pending_constraint_state =
g_quark_from_static_string ("-meta-wayland-pointer-constraint-pending_state"); g_quark_from_static_string ("-meta-wayland-pointer-constraint-pending_state");
quark_surface_pointer_constraints_data = quark_surface_pointer_constraints_data =