Root instead of focuscontroller

Author: leolost2605

lib/Widget/FocusController.vala

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2025 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Authored by: Leonhard Kargl <leo.kargl@proton.me>
+ */
+
+public class Gala.Root : Widget {
+    private bool _focus_visible = false;
+    internal bool focus_visible {
+        get { return _focus_visible; }
+        set {
+            _focus_visible = value;
+            (get_stage ().key_focus as Widget)?.focus_changed ();
+        }
+    }
+
+    private uint timeout_id = 0;
+
+    public override void map () {
+        base.map ();
+        // In the case the key focus moves out of our widget tree by some other means
+        // make sure we can recapture it
+        get_stage ().key_press_event.connect (check_focus);
+    }
+
+    public override void unmap () {
+        base.unmap ();
+        get_stage ().key_press_event.disconnect (check_focus);
+    }
+
+    public override bool key_press_event (Clutter.Event event) {
+        return check_focus (event);
+    }
+
+    private bool check_focus (Clutter.Event event) {
+        var direction = FocusDirection.get_for_event (event);
+
+        if (direction == null) {
+            return Clutter.EVENT_PROPAGATE;
+        }
+
+        if (!focus (direction)) {
+#if HAS_MUTTER47
+            get_stage ().context.get_backend ().get_default_seat ().bell_notify ();
+#else
+            Clutter.get_default_backend ().get_default_seat ().bell_notify ();
+#endif
+
+            if (!(get_stage ().key_focus in this)) {
+                get_stage ().key_focus = this;
+            }
+        }
+
+        show_focus ();
+
+        return Clutter.EVENT_STOP;
+    }
+
+    private void show_focus () {
+        if (timeout_id != 0) {
+            Source.remove (timeout_id);
+        } else {
+            focus_visible = true;
+        }
+
+        timeout_id = Timeout.add_seconds (5, () => {
+            focus_visible = false;
+            timeout_id = 0;
+            return Source.REMOVE;
+        });
+    }
+}

lib/Widget/Root.vala

@@ -15,16 +15,17 @@ public class Gala.Widget : ActorTarget {
     }
 
     internal void focus_changed () {
-        has_visible_focus = has_key_focus () && get_root ().get_qdata<bool> (FocusController.focus_visible_quark);
+        has_visible_focus = has_key_focus () && get_root ().focus_visible;
     }
 
-    private Widget get_root () {
-        var parent = get_parent ();
-        if (parent is Widget) {
-            return parent.get_root ();
+    private Root? get_root () {
+        for (Clutter.Actor? actor = this; actor is Widget; actor = actor.get_parent ()) {
+            if (actor is Root) {
+                return (Root) actor;
+            }
         }
 
-        return this;
+        return null;
     }
 
     public bool focus (FocusDirection direction) {

lib/Widget/Widget.vala

@@ -44,8 +44,8 @@ gala_lib_sources = files(
     'Gestures/ToucheggBackend.vala',
     'Gestures/TouchpadBackend.vala',
     'Gestures/WorkspaceHideTracker.vala',
-    'Widget/FocusController.vala',
     'Widget/FocusUtils.vala',
+    'Widget/Root.vala',
     'Widget/Widget.vala',
 ) + gala_common_enums
 

lib/meson.build

@@ -20,7 +20,7 @@
  * preparing the wm, opening the components and holds containers for
  * the icon groups, the WorkspaceClones and the MonitorClones.
  */
-public class Gala.MultitaskingView : Widget, RootTarget, ActivatableComponent {
+public class Gala.MultitaskingView : Root, RootTarget, ActivatableComponent {
     public const int ANIMATION_DURATION = 250;
 
     private GestureController workspaces_gesture_controller;
@@ -59,8 +59,6 @@ public class Gala.MultitaskingView : Widget, RootTarget, ActivatableComponent {
         opened = false;
         display = wm.get_display ();
 
-        add_action (new FocusController (wm.stage));
-
         multitasking_gesture_controller = new GestureController (MULTITASKING_VIEW);
         multitasking_gesture_controller.add_trigger (new GlobalTrigger (MULTITASKING_VIEW, wm));
         add_gesture_controller (multitasking_gesture_controller);

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-public class Gala.WindowOverview : Widget, RootTarget, ActivatableComponent {
+public class Gala.WindowOverview : Root, RootTarget, ActivatableComponent {
     private const int BORDER = 10;
     private const int TOP_GAP = 30;
     private const int BOTTOM_GAP = 100;
@@ -33,8 +33,6 @@ public class Gala.WindowOverview : Widget, RootTarget, ActivatableComponent {
             enabled = false
         };
         add_gesture_controller (gesture_controller);
-
-        add_action (new FocusController (wm.stage));
     }
 
     public override bool key_press_event (Clutter.Event event) {
@@ -45,7 +43,7 @@ public class Gala.WindowOverview : Widget, RootTarget, ActivatableComponent {
                 close ();
                 return Clutter.EVENT_STOP;
             default:
-                return Clutter.EVENT_PROPAGATE;
+                return base.key_press_event (event);
         }
     }