Remove workspace tracking from HideTracker

Author: lenemter

src/ShellClients/HideTracker.vala

@@ -15,25 +15,19 @@ public class Gala.HideTracker : Object {
 
     public Meta.Display display { get; construct; }
     public unowned PanelWindow panel { get; construct; }
-    public Pantheon.Desktop.HideMode hide_mode { get; set; }
 
     private static GLib.Settings behavior_settings;
 
     private Clutter.PanAction pan_action;
 
     private bool hovered = false;
 
-    private bool overlap = false;
-    private bool focus_overlap = false;
-    private bool focus_maximized_overlap = false;
-    private bool fullscreen_overlap = false;
-
-    private Meta.Window current_focus_window;
+    private uint num_transients = 0;
+    private bool has_transients { get { return num_transients > 0; } }
 
     private Barrier? barrier;
 
     private uint hide_timeout_id = 0;
-    private uint update_timeout_id = 0;
 
     public HideTracker (Meta.Display display, PanelWindow panel) {
         Object (display: display, panel: panel);
@@ -49,22 +43,6 @@ public class Gala.HideTracker : Object {
             // access the panel which was already freed. To prevent that make sure we reset
             // the timeouts so that we get freed immediately
             reset_hide_timeout ();
-            reset_update_timeout ();
-        });
-
-        // Can't be local otherwise we get a memory leak :(
-        // See https://gitlab.gnome.org/GNOME/vala/-/issues/1548
-        current_focus_window = display.focus_window;
-        track_focus_window (current_focus_window);
-        display.notify["focus-window"].connect (() => {
-            untrack_focus_window (current_focus_window);
-            current_focus_window = display.focus_window;
-            track_focus_window (current_focus_window);
-        });
-
-        display.window_created.connect ((window) => {
-            schedule_update ();
-            window.unmanaged.connect (schedule_update);
         });
 
 #if HAS_MUTTER48
@@ -77,11 +55,11 @@ public class Gala.HideTracker : Object {
 
             if (hovered != has_pointer) {
                 hovered = has_pointer;
-                schedule_update ();
+                check_trigger_conditions ();
             }
         });
 
-        display.get_workspace_manager ().active_workspace_changed.connect (schedule_update);
+        display.window_created.connect (on_window_created);
 
         pan_action = new Clutter.PanAction () {
             n_touch_points = 1,
@@ -100,147 +78,38 @@ public class Gala.HideTracker : Object {
 
         var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
         monitor_manager.monitors_changed.connect (() => {
-            setup_barrier (); //Make sure barriers are still on the primary monitor
-            schedule_update ();
+            setup_barrier (); // Make sure barriers are still on the primary monitor
         });
 
         setup_barrier ();
     }
 
-
-    private void track_focus_window (Meta.Window? window) {
-        if (window == null) {
-            return;
-        }
-
-        window.position_changed.connect (schedule_update);
-        window.size_changed.connect (schedule_update);
-        schedule_update ();
-    }
-
-    private void untrack_focus_window (Meta.Window? window) {
-        if (window == null) {
-            return;
-        }
-
-        window.position_changed.disconnect (schedule_update);
-        window.size_changed.disconnect (schedule_update);
-        schedule_update ();
-    }
-
-    public void schedule_update () {
-        if (update_timeout_id != 0) {
-            return;
-        }
-
-        update_timeout_id = Timeout.add (UPDATE_TIMEOUT, () => {
-            update_overlap ();
-            update_timeout_id = 0;
-            return Source.REMOVE;
-        });
-    }
-
-    private void reset_update_timeout () {
-        if (update_timeout_id != 0) {
-            Source.remove (update_timeout_id);
-            update_timeout_id = 0;
-        }
-    }
-
-    public void update_overlap () {
-        overlap = false;
-        focus_overlap = false;
-        focus_maximized_overlap = false;
-        fullscreen_overlap = display.get_monitor_in_fullscreen (panel.window.get_monitor ());
-
-        unowned var active_workspace = display.get_workspace_manager ().get_active_workspace ();
-
-        Meta.Window? normal_mru_window, any_mru_window;
-        normal_mru_window = InternalUtils.get_mru_window (active_workspace, out any_mru_window);
-
-        foreach (var window in active_workspace.list_windows ()) {
-            if (window == panel.window) {
-                continue;
-            }
-
-            if (window.minimized) {
-                continue;
-            }
-
-            var type = window.get_window_type ();
-            if (type == DESKTOP || type == DOCK || type == MENU || type == SPLASHSCREEN) {
-                continue;
-            }
-
-            if (!panel.get_custom_window_rect ().overlap (window.get_frame_rect ())) {
-                continue;
+    private void on_window_created (Meta.Window new_window) {
+        InternalUtils.wait_for_window_actor (new_window, (new_window_actor) => {
+            if (!panel.window.is_ancestor_of_transient (new_window_actor.meta_window)) {
+                return;
             }
 
-            overlap = true;
+            num_transients++;
+            check_trigger_conditions ();
 
-            if (window != normal_mru_window && window != any_mru_window) {
-                continue;
-            }
-
-            focus_overlap = true;
-            focus_maximized_overlap = window.maximized_vertically;
-        }
-
-        update_hidden ();
-    }
-
-    private void update_hidden () {
-        switch (hide_mode) {
-            case MAXIMIZED_FOCUS_WINDOW:
-                toggle_display (focus_maximized_overlap);
-                break;
-
-            case OVERLAPPING_FOCUS_WINDOW:
-                toggle_display (focus_overlap);
-                break;
-
-            case OVERLAPPING_WINDOW:
-                toggle_display (overlap);
-                break;
-
-            case ALWAYS:
-                toggle_display (true);
-                break;
-
-            case NEVER:
-                toggle_display (fullscreen_overlap);
-                break;
-        }
+            new_window_actor.meta_window.unmanaged.connect (() => {
+                num_transients--;
+                check_trigger_conditions ();
+            });
+        });
     }
 
-    private void toggle_display (bool should_hide) {
-        hovered = panel.window.has_pointer ();
-
-        // Showing panels in fullscreen is broken in X11
-        if (should_hide && !hovered && !panel.window.has_focus () || InternalUtils.get_x11_in_fullscreen (display)) {
-            trigger_hide ();
-        } else {
+    private void check_trigger_conditions () {
+        if (hovered || has_transients) {
             trigger_show ();
+        } else {
+            trigger_hide ();
         }
     }
 
     private void trigger_hide () {
-        if (hide_timeout_id != 0) {
-            return;
-        }
-
-        // Don't hide if we have transients, e.g. an open popover, dialog, etc.
-        var has_transients = false;
-        panel.window.foreach_transient (() => {
-            has_transients = true;
-            return false;
-        });
-
-        if (has_transients) {
-            reset_hide_timeout ();
-
-            return;
-        }
+        reset_hide_timeout ();
 
         hide_timeout_id = Timeout.add_once (HIDE_DELAY, () => {
             hide ();
@@ -349,9 +218,10 @@ public class Gala.HideTracker : Object {
             return;
         }
 
-        if (hide_mode != NEVER || behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")) {
+        if (!display.get_monitor_in_fullscreen (panel.window.get_monitor ()) ||
+            behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
+        ) {
             trigger_show ();
-            schedule_update ();
         }
     }
 }

src/ShellClients/PanelWindow.vala

@@ -12,12 +12,13 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
     public WindowManager wm { get; construct; }
     public Pantheon.Desktop.Anchor anchor { get; construct set; }
 
+    private Pantheon.Desktop.HideMode _hide_mode;
     public Pantheon.Desktop.HideMode hide_mode {
         get {
-            return hide_tracker.hide_mode;
+            return _hide_mode;
         }
         set {
-            hide_tracker.hide_mode = value;
+            _hide_mode = value;
 
             if (value == NEVER) {
                 make_exclusive ();