From 04218ac2b5734309a2b49d4c53cb6cf54d65971b Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Fri, 13 Dec 2024 12:28:45 +0100
Subject: [PATCH] clutter: Handle accessible focus state change on Actor side

That is where it belongs anyways and would handle some missing branches
where we wouldn't update the focus state.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4089>
---
 clutter/clutter/clutter-actor.c | 13 ++++++++-----
 clutter/clutter/clutter-stage.c | 27 ---------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 32806c63e..06b84715c 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -1539,7 +1539,6 @@ maybe_unset_key_focus (ClutterActor *self)
     return;
 
   clutter_stage_set_key_focus (CLUTTER_STAGE (stage), NULL);
-  clutter_actor_remove_accessible_state (self, ATK_STATE_FOCUSED);
 }
 
 static void
@@ -12991,10 +12990,7 @@ clutter_actor_grab_key_focus (ClutterActor *self)
 
   stage = _clutter_actor_get_stage_internal (self);
   if (stage != NULL)
-    {
-      clutter_stage_set_key_focus (CLUTTER_STAGE (stage), self);
-      clutter_actor_add_accessible_state (self, ATK_STATE_FOCUSED);
-    }
+    clutter_stage_set_key_focus (CLUTTER_STAGE (stage), self);
 }
 
 #ifdef HAVE_FONTS
@@ -13528,6 +13524,13 @@ _clutter_actor_set_has_key_focus (ClutterActor *self,
       if (CLUTTER_ACTOR_IN_DESTRUCTION (self))
         return;
 
+      if (has_key_focus)
+        clutter_actor_add_accessible_state (self,
+                                            ATK_STATE_FOCUSED);
+      else
+        clutter_actor_remove_accessible_state (self,
+                                               ATK_STATE_FOCUSED);
+
       if (has_key_focus)
         g_signal_emit (self, actor_signals[KEY_FOCUS_IN], 0);
       else
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index c75e6fe9a..fa6d8a515 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -643,24 +643,12 @@ clutter_stage_emit_key_focus_event (ClutterStage *stage,
                                     gboolean      focus_in)
 {
   ClutterStagePrivate *priv = clutter_stage_get_instance_private (stage);
-  AtkObject *old_accessible, *new_accessible = NULL;
 
   if (priv->key_focused_actor == NULL)
     return;
 
-  old_accessible = clutter_actor_get_accessible (priv->key_focused_actor);
-  new_accessible = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
-
   _clutter_actor_set_has_key_focus (CLUTTER_ACTOR (stage), focus_in);
 
-  if (old_accessible)
-    atk_object_notify_state_change (old_accessible,
-                                    ATK_STATE_FOCUSED,
-                                    !focus_in);
-  if (new_accessible)
-    atk_object_notify_state_change (new_accessible,
-                                    ATK_STATE_FOCUSED,
-                                    focus_in);
   g_object_notify_by_pspec (G_OBJECT (stage), obj_props[PROP_KEY_FOCUS]);
 }
 
@@ -2114,7 +2102,6 @@ clutter_stage_set_key_focus (ClutterStage *stage,
                              ClutterActor *actor)
 {
   ClutterStagePrivate *priv;
-  AtkObject *old_accessible, *new_accessible = NULL;
 
   g_return_if_fail (CLUTTER_IS_STAGE (stage));
   g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor));
@@ -2136,7 +2123,6 @@ clutter_stage_set_key_focus (ClutterStage *stage,
       ClutterActor *old_focused_actor;
 
       old_focused_actor = priv->key_focused_actor;
-      old_accessible = clutter_actor_get_accessible (old_focused_actor);
 
       /* set key_focused_actor to NULL before emitting the signal or someone
        * might hide the previously focused actor in the signal handler
@@ -2147,7 +2133,6 @@ clutter_stage_set_key_focus (ClutterStage *stage,
     }
   else
     {
-      old_accessible = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
       _clutter_actor_set_has_key_focus (CLUTTER_ACTOR (stage), FALSE);
     }
   /* Note, if someone changes key focus in focus-out signal handler we'd be
@@ -2169,26 +2154,14 @@ clutter_stage_set_key_focus (ClutterStage *stage,
     {
       if (actor != NULL)
         {
-          new_accessible = clutter_actor_get_accessible (actor);
           _clutter_actor_set_has_key_focus (actor, TRUE);
         }
       else
         {
-          new_accessible = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
           _clutter_actor_set_has_key_focus (CLUTTER_ACTOR (stage), TRUE);
         }
     }
 
-  if (old_accessible)
-    atk_object_notify_state_change (old_accessible,
-                                    ATK_STATE_FOCUSED,
-                                    FALSE);
-  if (new_accessible)
-    atk_object_notify_state_change (new_accessible,
-                                    ATK_STATE_FOCUSED,
-                                    TRUE);
-
-
   g_object_notify_by_pspec (G_OBJECT (stage), obj_props[PROP_KEY_FOCUS]);
 }