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

clutter: Move ClutterClickAction to the handle_event vfunc

Browse Source 
This will not try the captured-event shenanigans to emulate grab
behavior, instead relying on event delivery being influenced by
other grab mechanisms.

While at it, improve handling of additional touchpoints by
cancelling the click action right away, as the differences in
event handling make this unwanted behavior surface.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2024>
This commit is contained in:
Carlos Garnacho 2021-08-17 15:39:49 +02:00
parent 7885f6dbcc
commit 5133815cc1
1 changed files with 34 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
clutter/clutter/clutter-click-action.c
View File

@ -105,8 +105,6 @@ struct _ClutterClickActionPrivate
{ {
ClutterActor *stage; ClutterActor *stage;
gulong event_id;
gulong capture_id;
guint long_press_id; guint long_press_id;
gint long_press_threshold; gint long_press_threshold;
@ -150,11 +148,6 @@ static guint click_signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE_WITH_PRIVATE (ClutterClickAction, clutter_click_action, CLUTTER_TYPE_ACTION) G_DEFINE_TYPE_WITH_PRIVATE (ClutterClickAction, clutter_click_action, CLUTTER_TYPE_ACTION)
/* forward declaration */
static gboolean on_captured_event (ClutterActor *stage,
ClutterEvent *event,
ClutterClickAction *action);
static inline void static inline void
click_action_set_pressed (ClutterClickAction *action, click_action_set_pressed (ClutterClickAction *action,
gboolean is_pressed) gboolean is_pressed)
@ -205,8 +198,6 @@ click_action_emit_long_press (gpointer data)
CLUTTER_LONG_PRESS_ACTIVATE, CLUTTER_LONG_PRESS_ACTIVATE,
&result); &result);
g_clear_signal_handler (&priv->capture_id, priv->stage);
click_action_set_pressed (action, FALSE); click_action_set_pressed (action, FALSE);
click_action_set_held (action, FALSE); click_action_set_held (action, FALSE);
@ -274,7 +265,7 @@ click_action_cancel_long_press (ClutterClickAction *action)
static inline gboolean static inline gboolean
event_within_drag_threshold (ClutterClickAction *click_action, event_within_drag_threshold (ClutterClickAction *click_action,
ClutterEvent *event) const ClutterEvent *event)
{ {
ClutterClickActionPrivate *priv = ClutterClickActionPrivate *priv =
clutter_click_action_get_instance_private (click_action); clutter_click_action_get_instance_private (click_action);
@ -290,17 +281,28 @@ event_within_drag_threshold (ClutterClickAction *click_action,
} }
static gboolean static gboolean
on_event (ClutterActor *actor, clutter_click_action_handle_event (ClutterAction *action,
ClutterEvent *event, const ClutterEvent *event)
ClutterClickAction *action)
{ {
ClutterClickAction *click_action = CLUTTER_CLICK_ACTION (action);
ClutterClickActionPrivate *priv = ClutterClickActionPrivate *priv =
clutter_click_action_get_instance_private (action); clutter_click_action_get_instance_private (click_action);
ClutterActor *actor =
clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
gboolean has_button = TRUE; gboolean has_button = TRUE;
ClutterModifierType modifier_state;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action))) if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
if (priv->press_sequence != NULL &&
clutter_event_get_event_sequence (event) != priv->press_sequence)
{
click_action_set_held (click_action, FALSE);
click_action_cancel_long_press (click_action);
return CLUTTER_EVENT_PROPAGATE;
}
switch (clutter_event_type (event)) switch (clutter_event_type (event))
{ {
case CLUTTER_TOUCH_BEGIN: case CLUTTER_TOUCH_BEGIN:
@ -335,48 +337,22 @@ on_event (ClutterActor *actor,
if (priv->stage == NULL) if (priv->stage == NULL)
priv->stage = clutter_actor_get_stage (actor); priv->stage = clutter_actor_get_stage (actor);
priv->capture_id = g_signal_connect_after (priv->stage, "captured-event", click_action_set_pressed (click_action, TRUE);
G_CALLBACK (on_captured_event), click_action_set_held (click_action, TRUE);
action); click_action_query_long_press (click_action);
click_action_set_pressed (action, TRUE);
click_action_set_held (action, TRUE);
click_action_query_long_press (action);
break; break;
case CLUTTER_ENTER: case CLUTTER_ENTER:
click_action_set_pressed (action, priv->is_held); click_action_set_pressed (click_action, priv->is_held);
break; break;
case CLUTTER_LEAVE: case CLUTTER_LEAVE:
click_action_set_pressed (action, priv->is_held); click_action_set_pressed (click_action, priv->is_held);
click_action_cancel_long_press (action); click_action_cancel_long_press (click_action);
break; break;
default:
break;
}
return CLUTTER_EVENT_PROPAGATE;
}
static gboolean
on_captured_event (ClutterActor *stage,
ClutterEvent *event,
ClutterClickAction *action)
{
ClutterClickActionPrivate *priv =
clutter_click_action_get_instance_private (action);
ClutterActor *actor;
ClutterModifierType modifier_state;
gboolean has_button = TRUE;
actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
switch (clutter_event_type (event))
{
case CLUTTER_TOUCH_CANCEL: case CLUTTER_TOUCH_CANCEL:
clutter_click_action_release (action); clutter_click_action_release (click_action);
break; break;
case CLUTTER_TOUCH_END: case CLUTTER_TOUCH_END:
@ -391,11 +367,8 @@ on_captured_event (ClutterActor *stage,
clutter_event_get_event_sequence (event) != priv->press_sequence) clutter_event_get_event_sequence (event) != priv->press_sequence)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
click_action_set_held (action, FALSE); click_action_set_held (click_action, FALSE);
click_action_cancel_long_press (action); click_action_cancel_long_press (click_action);
/* disconnect the capture */
g_clear_signal_handler (&priv->capture_id, priv->stage);
g_clear_handle_id (&priv->long_press_id, g_source_remove); g_clear_handle_id (&priv->long_press_id, g_source_remove);
@ -418,10 +391,10 @@ on_captured_event (ClutterActor *stage,
if (modifier_state != priv->modifier_state) if (modifier_state != priv->modifier_state)
priv->modifier_state = 0; priv->modifier_state = 0;
click_action_set_pressed (action, FALSE); click_action_set_pressed (click_action, FALSE);
if (event_within_drag_threshold (action, event)) if (event_within_drag_threshold (click_action, event))
g_signal_emit (action, click_signals[CLICKED], 0, actor); g_signal_emit (click_action, click_signals[CLICKED], 0, actor);
break; break;
case CLUTTER_MOTION: case CLUTTER_MOTION:
@ -434,8 +407,8 @@ on_captured_event (ClutterActor *stage,
if (!priv->is_held) if (!priv->is_held)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
if (!event_within_drag_threshold (action, event)) if (!event_within_drag_threshold (click_action, event))
clutter_click_action_release (action); clutter_click_action_release (click_action);
} }
break; break;
@ -443,7 +416,7 @@ on_captured_event (ClutterActor *stage,
break; break;
} }
return CLUTTER_EVENT_STOP; return priv->is_held ? CLUTTER_EVENT_STOP : CLUTTER_EVENT_PROPAGATE;
} }
static void static void
@ -454,35 +427,11 @@ clutter_click_action_set_actor (ClutterActorMeta *meta,
ClutterClickActionPrivate *priv = ClutterClickActionPrivate *priv =
clutter_click_action_get_instance_private (action); clutter_click_action_get_instance_private (action);
if (priv->event_id != 0)
{
ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
if (old_actor != NULL)
g_clear_signal_handler (&priv->event_id, old_actor);
priv->event_id = 0;
}
if (priv->capture_id != 0)
{
if (priv->stage != NULL)
g_clear_signal_handler (&priv->capture_id, priv->stage);
priv->capture_id = 0;
priv->stage = NULL;
}
g_clear_handle_id (&priv->long_press_id, g_source_remove); g_clear_handle_id (&priv->long_press_id, g_source_remove);
click_action_set_pressed (action, FALSE); click_action_set_pressed (action, FALSE);
click_action_set_held (action, FALSE); click_action_set_held (action, FALSE);
if (actor != NULL)
priv->event_id = g_signal_connect (actor, "event",
G_CALLBACK (on_event),
action);
CLUTTER_ACTOR_META_CLASS (clutter_click_action_parent_class)->set_actor (meta, actor); CLUTTER_ACTOR_META_CLASS (clutter_click_action_parent_class)->set_actor (meta, actor);
} }
@ -564,22 +513,19 @@ clutter_click_action_dispose (GObject *gobject)
ClutterClickActionPrivate *priv = ClutterClickActionPrivate *priv =
clutter_click_action_get_instance_private (CLUTTER_CLICK_ACTION (gobject)); clutter_click_action_get_instance_private (CLUTTER_CLICK_ACTION (gobject));
g_clear_signal_handler (&priv->event_id,
clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)));
g_clear_signal_handler (&priv->capture_id, priv->stage);
g_clear_handle_id (&priv->long_press_id, g_source_remove); g_clear_handle_id (&priv->long_press_id, g_source_remove);
G_OBJECT_CLASS (clutter_click_action_parent_class)->dispose (gobject); G_OBJECT_CLASS (clutter_click_action_parent_class)->dispose (gobject);
} }
static void static void
clutter_click_action_class_init (ClutterClickActionClass *klass) clutter_click_action_class_init (ClutterClickActionClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass); ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
ClutterActionClass *action_class = CLUTTER_ACTION_CLASS (klass);
action_class->handle_event = clutter_click_action_handle_event;
meta_class->set_actor = clutter_click_action_set_actor; meta_class->set_actor = clutter_click_action_set_actor;
meta_class->set_enabled = clutter_click_action_set_enabled; meta_class->set_enabled = clutter_click_action_set_enabled;
@ -769,9 +715,6 @@ clutter_click_action_release (ClutterClickAction *action)
if (!priv->is_held) if (!priv->is_held)
return; return;
/* disconnect the capture */
g_clear_signal_handler (&priv->capture_id, priv->stage);
click_action_cancel_long_press (action); click_action_cancel_long_press (action);
click_action_set_held (action, FALSE); click_action_set_held (action, FALSE);
click_action_set_pressed (action, FALSE); click_action_set_pressed (action, FALSE);