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

clutter: Move ClutterGestureAction 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.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2024>
This commit is contained in:
Carlos Garnacho 2021-08-17 16:01:09 +02:00
parent 5133815cc1
commit 6d0b7381da
1 changed files with 60 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
clutter/clutter/clutter-gesture-action.c
View File

@ -118,9 +118,6 @@ struct _ClutterGestureActionPrivate
gint requested_nb_points; gint requested_nb_points;
GArray *points; GArray *points;
gulong actor_capture_id;
gulong stage_capture_id;
ClutterGestureTriggerEdge edge; ClutterGestureTriggerEdge edge;
float distance_x, distance_y; float distance_x, distance_y;
@ -155,7 +152,8 @@ static guint gesture_signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE_WITH_PRIVATE (ClutterGestureAction, clutter_gesture_action, CLUTTER_TYPE_ACTION) G_DEFINE_TYPE_WITH_PRIVATE (ClutterGestureAction, clutter_gesture_action, CLUTTER_TYPE_ACTION)
static GesturePoint * static GesturePoint *
gesture_register_point (ClutterGestureAction *action, ClutterEvent *event) gesture_register_point (ClutterGestureAction *action,
const ClutterEvent *event)
{ {
ClutterGestureActionPrivate *priv = ClutterGestureActionPrivate *priv =
clutter_gesture_action_get_instance_private (action); clutter_gesture_action_get_instance_private (action);
@ -188,8 +186,8 @@ gesture_register_point (ClutterGestureAction *action, ClutterEvent *event)
static GesturePoint * static GesturePoint *
gesture_find_point (ClutterGestureAction *action, gesture_find_point (ClutterGestureAction *action,
ClutterEvent *event, const ClutterEvent *event,
gint *position) int *position)
{ {
ClutterGestureActionPrivate *priv = ClutterGestureActionPrivate *priv =
clutter_gesture_action_get_instance_private (action); clutter_gesture_action_get_instance_private (action);
@ -232,8 +230,8 @@ gesture_unregister_point (ClutterGestureAction *action, gint position)
} }
static void static void
gesture_update_motion_point (GesturePoint *point, gesture_update_motion_point (GesturePoint *point,
ClutterEvent *event) const ClutterEvent *event)
{ {
gfloat motion_x, motion_y; gfloat motion_x, motion_y;
gint64 _time; gint64 _time;
@ -254,8 +252,8 @@ gesture_update_motion_point (GesturePoint *point,
} }
static void static void
gesture_update_release_point (GesturePoint *point, gesture_update_release_point (GesturePoint *point,
ClutterEvent *event) const ClutterEvent *event)
{ {
gint64 _time; gint64 _time;
@ -283,7 +281,7 @@ gesture_get_default_threshold (void)
static gboolean static gboolean
gesture_point_pass_threshold (ClutterGestureAction *action, gesture_point_pass_threshold (ClutterGestureAction *action,
GesturePoint *point, GesturePoint *point,
ClutterEvent *event) const ClutterEvent *event)
{ {
float threshold_x, threshold_y; float threshold_x, threshold_y;
gfloat motion_x, motion_y; gfloat motion_x, motion_y;
@ -312,8 +310,6 @@ cancel_gesture (ClutterGestureAction *action)
priv->in_gesture = FALSE; priv->in_gesture = FALSE;
g_clear_signal_handler (&priv->stage_capture_id, priv->stage);
actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action)); actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
g_signal_emit (action, gesture_signals[GESTURE_CANCEL], 0, actor); g_signal_emit (action, gesture_signals[GESTURE_CANCEL], 0, actor);
@ -354,34 +350,50 @@ begin_gesture (ClutterGestureAction *action,
} }
static gboolean static gboolean
stage_captured_event_cb (ClutterActor *stage, clutter_gesture_action_handle_event (ClutterAction *action,
ClutterEvent *event, const ClutterEvent *event)
ClutterGestureAction *action)
{ {
ClutterGestureAction *gesture_action = CLUTTER_GESTURE_ACTION (action);
ClutterGestureActionPrivate *priv = ClutterGestureActionPrivate *priv =
clutter_gesture_action_get_instance_private (action); clutter_gesture_action_get_instance_private (gesture_action);
ClutterActor *actor; ClutterActor *actor =
clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
gint position; gint position;
float threshold_x, threshold_y; float threshold_x, threshold_y;
gboolean return_value; gboolean return_value;
GesturePoint *point; GesturePoint *point;
ClutterEventType event_type; ClutterEventType event_type;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
return CLUTTER_EVENT_PROPAGATE;
event_type = clutter_event_type (event); event_type = clutter_event_type (event);
if (event_type != CLUTTER_TOUCH_CANCEL &&
event_type != CLUTTER_TOUCH_UPDATE &&
event_type != CLUTTER_TOUCH_END &&
event_type != CLUTTER_MOTION &&
event_type != CLUTTER_BUTTON_RELEASE)
return CLUTTER_EVENT_PROPAGATE;
if ((point = gesture_find_point (action, event, &position)) == NULL) if (event_type == CLUTTER_BUTTON_PRESS ||
return CLUTTER_EVENT_PROPAGATE; event_type == CLUTTER_TOUCH_BEGIN)
{
actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action)); point = gesture_register_point (gesture_action, event);
}
else
{
if ((point = gesture_find_point (gesture_action, event, &position)) == NULL)
return CLUTTER_EVENT_PROPAGATE;
}
switch (clutter_event_type (event)) switch (clutter_event_type (event))
{ {
case CLUTTER_BUTTON_PRESS:
case CLUTTER_TOUCH_BEGIN:
if (priv->stage == NULL)
priv->stage = clutter_actor_get_stage (actor);
/* Start the gesture immediately if the gesture has no
* _TRIGGER_EDGE_AFTER drag threshold. */
if ((priv->points->len >= priv->requested_nb_points) &&
(priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER))
begin_gesture (gesture_action, actor);
break;
case CLUTTER_MOTION: case CLUTTER_MOTION:
{ {
ClutterModifierType mods = clutter_event_get_state (event); ClutterModifierType mods = clutter_event_get_state (event);
@ -392,7 +404,7 @@ stage_captured_event_cb (ClutterActor *stage,
*/ */
if (!(mods & CLUTTER_BUTTON1_MASK)) if (!(mods & CLUTTER_BUTTON1_MASK))
{ {
cancel_gesture (action); cancel_gesture (gesture_action);
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }
} }
@ -410,7 +422,7 @@ stage_captured_event_cb (ClutterActor *stage,
/* Wait until the drag threshold has been exceeded /* Wait until the drag threshold has been exceeded
* before starting _TRIGGER_EDGE_AFTER gestures. */ * before starting _TRIGGER_EDGE_AFTER gestures. */
if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_AFTER && if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_AFTER &&
gesture_point_pass_threshold (action, point, event)) gesture_point_pass_threshold (gesture_action, point, event))
{ {
gesture_update_motion_point (point, event); gesture_update_motion_point (point, event);
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
@ -418,31 +430,33 @@ stage_captured_event_cb (ClutterActor *stage,
gesture_update_motion_point (point, event); gesture_update_motion_point (point, event);
if (!begin_gesture (action, actor)) if (!begin_gesture (gesture_action, actor))
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
if ((point = gesture_find_point (action, event, &position)) == NULL) if ((point = gesture_find_point (gesture_action, event, &position)) == NULL)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }
gesture_update_motion_point (point, event); gesture_update_motion_point (point, event);
g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor, g_signal_emit (gesture_action, gesture_signals[GESTURE_PROGRESS], 0, actor,
&return_value); &return_value);
if (!return_value) if (!return_value)
{ {
cancel_gesture (action); cancel_gesture (gesture_action);
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }
/* Check if a _TRIGGER_EDGE_BEFORE gesture needs to be cancelled because /* Check if a _TRIGGER_EDGE_BEFORE gesture needs to be cancelled because
* the drag threshold has been exceeded. */ * the drag threshold has been exceeded. */
clutter_gesture_action_get_threshold_trigger_distance (action, &threshold_x, &threshold_y); clutter_gesture_action_get_threshold_trigger_distance (gesture_action,
&threshold_x,
&threshold_y);
if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE && if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE &&
((fabsf (point->press_y - point->last_motion_y) > threshold_y) || ((fabsf (point->press_y - point->last_motion_y) > threshold_y) ||
(fabsf (point->press_x - point->last_motion_x) > threshold_x))) (fabsf (point->press_x - point->last_motion_x) > threshold_x)))
{ {
cancel_gesture (action); cancel_gesture (gesture_action);
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }
break; break;
@ -456,10 +470,10 @@ stage_captured_event_cb (ClutterActor *stage,
((priv->points->len - 1) < priv->requested_nb_points)) ((priv->points->len - 1) < priv->requested_nb_points))
{ {
priv->in_gesture = FALSE; priv->in_gesture = FALSE;
g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor); g_signal_emit (gesture_action, gesture_signals[GESTURE_END], 0, actor);
} }
gesture_unregister_point (action, position); gesture_unregister_point (gesture_action, position);
} }
break; break;
@ -470,10 +484,10 @@ stage_captured_event_cb (ClutterActor *stage,
if (priv->in_gesture) if (priv->in_gesture)
{ {
priv->in_gesture = FALSE; priv->in_gesture = FALSE;
cancel_gesture (action); cancel_gesture (gesture_action);
} }
gesture_unregister_point (action, position); gesture_unregister_point (gesture_action, position);
} }
break; break;
@ -481,85 +495,9 @@ stage_captured_event_cb (ClutterActor *stage,
break; break;
} }
if (priv->points->len == 0) return priv->in_gesture ?
g_clear_signal_handler (&priv->stage_capture_id, priv->stage); CLUTTER_EVENT_STOP :
CLUTTER_EVENT_PROPAGATE;
return CLUTTER_EVENT_PROPAGATE;
}
static gboolean
actor_captured_event_cb (ClutterActor *actor,
ClutterEvent *event,
ClutterGestureAction *action)
{
ClutterGestureActionPrivate *priv =
clutter_gesture_action_get_instance_private (action);
GesturePoint *point G_GNUC_UNUSED;
if ((clutter_event_type (event) != CLUTTER_BUTTON_PRESS) &&
(clutter_event_type (event) != CLUTTER_TOUCH_BEGIN))
return CLUTTER_EVENT_PROPAGATE;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
return CLUTTER_EVENT_PROPAGATE;
point = gesture_register_point (action, event);
if (priv->stage == NULL)
priv->stage = clutter_actor_get_stage (actor);
if (priv->stage_capture_id == 0)
priv->stage_capture_id =
g_signal_connect_after (priv->stage, "captured-event",
G_CALLBACK (stage_captured_event_cb),
action);
/* Start the gesture immediately if the gesture has no
* _TRIGGER_EDGE_AFTER drag threshold. */
if ((priv->points->len >= priv->requested_nb_points) &&
(priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER))
begin_gesture (action, actor);
return CLUTTER_EVENT_PROPAGATE;
}
static void
clutter_gesture_action_set_actor (ClutterActorMeta *meta,
ClutterActor *actor)
{
ClutterGestureActionPrivate *priv =
clutter_gesture_action_get_instance_private (CLUTTER_GESTURE_ACTION (meta));
ClutterActorMetaClass *meta_class =
CLUTTER_ACTOR_META_CLASS (clutter_gesture_action_parent_class);
if (priv->actor_capture_id != 0)
{
ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
if (old_actor != NULL)
g_clear_signal_handler (&priv->actor_capture_id, old_actor);
priv->actor_capture_id = 0;
}
if (priv->stage_capture_id != 0)
{
if (priv->stage != NULL)
g_clear_signal_handler (&priv->stage_capture_id, priv->stage);
priv->stage_capture_id = 0;
priv->stage = NULL;
}
if (actor != NULL)
{
priv->actor_capture_id =
g_signal_connect (actor, "captured-event",
G_CALLBACK (actor_captured_event_cb),
meta);
}
meta_class->set_actor (meta, actor);
} }
static void static void
@ -683,14 +621,16 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *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);
gobject_class->finalize = clutter_gesture_action_finalize; gobject_class->finalize = clutter_gesture_action_finalize;
gobject_class->set_property = clutter_gesture_action_set_property; gobject_class->set_property = clutter_gesture_action_set_property;
gobject_class->get_property = clutter_gesture_action_get_property; gobject_class->get_property = clutter_gesture_action_get_property;
meta_class->set_actor = clutter_gesture_action_set_actor;
meta_class->set_enabled = clutter_gesture_action_set_enabled; meta_class->set_enabled = clutter_gesture_action_set_enabled;
action_class->handle_event = clutter_gesture_action_handle_event;
klass->gesture_begin = default_event_handler; klass->gesture_begin = default_event_handler;
klass->gesture_progress = default_event_handler; klass->gesture_progress = default_event_handler;
klass->gesture_prepare = default_event_handler; klass->gesture_prepare = default_event_handler;