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

clutter: Integrate ClutterSeat grabs into ClutterGrab

Browse Source 
As ClutterGrab is a stack, the backend only cares about some grab
existing currently or not. Make it sure that we grab whenever we
go to >=1 grabs, and ungrab whenever we go to <1.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2068>
This commit is contained in:
Carlos Garnacho 2021-10-28 17:05:44 +02:00 committed by Marge Bot
parent e9addb0ad7
commit eb3075074a
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter/clutter-grab.h
View File

@ -35,4 +35,7 @@ typedef struct _ClutterGrab ClutterGrab;
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_grab_dismiss (ClutterGrab *grab); void clutter_grab_dismiss (ClutterGrab *grab);
CLUTTER_EXPORT
ClutterGrabState clutter_grab_get_seat_state (ClutterGrab *grab);
#endif /* CLUTTER_GRAB_H */ #endif /* CLUTTER_GRAB_H */

34
clutter/clutter/clutter-stage.c
View File

@ -62,6 +62,7 @@
#include "clutter-paint-volume-private.h" #include "clutter-paint-volume-private.h"
#include "clutter-pick-context-private.h" #include "clutter-pick-context-private.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-seat-private.h"
#include "clutter-stage-manager-private.h" #include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-stage-view-private.h" #include "clutter-stage-view-private.h"
@ -115,6 +116,7 @@ struct _ClutterStagePrivate
ClutterActor *key_focused_actor; ClutterActor *key_focused_actor;
ClutterGrab *topmost_grab; ClutterGrab *topmost_grab;
ClutterGrabState grab_state;
GQueue *event_queue; GQueue *event_queue;
@ -3863,6 +3865,18 @@ clutter_stage_grab (ClutterStage *stage,
g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL); g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL); g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
if (!priv->topmost_grab)
{
ClutterMainContext *context;
ClutterSeat *seat;
/* First grab in the chain, trigger a backend grab too */
context = _clutter_context_get_default ();
seat = clutter_backend_get_default_seat (context->backend);
priv->grab_state =
clutter_seat_grab (seat, clutter_get_current_event_time ());
}
grab = g_new0 (ClutterGrab, 1); grab = g_new0 (ClutterGrab, 1);
grab->stage = stage; grab->stage = stage;
grab->actor = actor; grab->actor = actor;
@ -3908,6 +3922,18 @@ clutter_stage_unlink_grab (ClutterStage *stage,
clutter_actor_detach_grab (grab->actor, grab); clutter_actor_detach_grab (grab->actor, grab);
if (!priv->topmost_grab)
{
ClutterMainContext *context;
ClutterSeat *seat;
/* This was the last remaining grab, trigger a backend ungrab */
context = _clutter_context_get_default ();
seat = clutter_backend_get_default_seat (context->backend);
clutter_seat_ungrab (seat, clutter_get_current_event_time ());
priv->grab_state = CLUTTER_GRAB_STATE_NONE;
}
grab->next = NULL; grab->next = NULL;
grab->prev = NULL; grab->prev = NULL;
} }
@ -3921,6 +3947,14 @@ clutter_grab_dismiss (ClutterGrab *grab)
g_free (grab); g_free (grab);
} }
ClutterGrabState
clutter_grab_get_seat_state (ClutterGrab *grab)
{
g_return_val_if_fail (grab != NULL, CLUTTER_GRAB_STATE_NONE);
return grab->stage->priv->grab_state;
}
ClutterActor * ClutterActor *
clutter_stage_get_grab_actor (ClutterStage *stage) clutter_stage_get_grab_actor (ClutterStage *stage)
{ {