[mutter/gnome-42] display: Add method to flush a single window from the queues

[Florian Müllner <fmuellner src gnome org>]

commit a28b9f86a288b28eb35b55de6b3ba2beccb0d217
Author: Sebastian Keller <skeller gnome org>
Date:   Fri May 13 23:04:56 2022 +0200

    display: Add method to flush a single window from the queues
    
    This can be used when a state change needs to be applied immediately for
    a specific window and will be used in the next commit.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2414>
    (cherry picked from commit 2a3c964e64dbcc9d097abbe98cf83809aeefe831)

 src/core/display-private.h |  4 ++
 src/core/display.c         | 92 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 68 insertions(+), 28 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index e91d730352..9725424e6f 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -440,4 +440,8 @@ void meta_display_unqueue_window (MetaDisplay   *display,
                                   MetaWindow    *window,
                                   MetaQueueType  queue_types);
 
+void meta_display_flush_queued_window (MetaDisplay   *display,
+                                       MetaWindow    *window,
+                                       MetaQueueType  queue_types);
+
 #endif
diff --git a/src/core/display.c b/src/core/display.c
index fdf6d31a84..590df83a1c 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -121,6 +121,12 @@ typedef struct
   guint       ping_timeout_id;
 } MetaPingData;
 
+typedef struct
+{
+  MetaDisplay *display;
+  int queue_idx;
+} MetaQueueRunData;
+
 typedef struct _MetaDisplayPrivate
 {
   MetaContext *context;
@@ -3974,13 +3980,10 @@ warn_on_incorrectly_unmanaged_window (MetaWindow *window)
   g_warn_if_fail (!window->unmanaging);
 }
 
-static gboolean
-update_window_visibilities_idle (gpointer user_data)
+static void
+update_window_visibilities (MetaDisplay *display,
+                            GList       *windows)
 {
-  MetaDisplay *display = META_DISPLAY (user_data);
-  MetaDisplayPrivate *priv = meta_display_get_instance_private (display);
-  int queue_idx;
-  g_autoptr (GList) windows = NULL;
   g_autoptr (GList) unplaced = NULL;
   g_autoptr (GList) should_show = NULL;
   g_autoptr (GList) should_hide = NULL;
@@ -3989,11 +3992,6 @@ update_window_visibilities_idle (gpointer user_data)
   COGL_TRACE_BEGIN_SCOPED (MetaDisplayUpdateVisibility,
                            "Display: Update visibility");
 
-  queue_idx = __builtin_ctz (META_QUEUE_CALC_SHOWING);
-
-  windows = g_steal_pointer (&priv->queue_windows[queue_idx]);
-  priv->queue_later_ids[queue_idx] = 0;
-
   for (l = windows; l; l = l->next)
     {
       MetaWindow *window = l->data;
@@ -4037,25 +4035,39 @@ update_window_visibilities_idle (gpointer user_data)
                  unplaced, should_show, should_hide);
 
   g_list_foreach (windows, (GFunc) warn_on_incorrectly_unmanaged_window, NULL);
+}
 
-  return G_SOURCE_REMOVE;
+static void
+move_resize (MetaDisplay *display,
+             GList       *windows)
+{
+  g_list_foreach (windows, (GFunc) meta_window_update_layout, NULL);
+  g_list_foreach (windows, (GFunc) warn_on_incorrectly_unmanaged_window, NULL);
 }
 
+typedef void (* WindowQueueFunc) (MetaDisplay *display,
+                                  GList       *windows);
+
+static const WindowQueueFunc window_queue_func[META_N_QUEUE_TYPES] =
+{
+  update_window_visibilities,
+  move_resize,
+};
+
 static gboolean
-move_resize_idle (gpointer user_data)
+window_queue_run_later_func (gpointer user_data)
 {
-  MetaDisplay *display = META_DISPLAY (user_data);
+  MetaQueueRunData *run_data = user_data;
+  MetaDisplay *display = run_data->display;
   MetaDisplayPrivate *priv = meta_display_get_instance_private (display);
-  int queue_idx;
   g_autoptr (GList) windows = NULL;
-
-  queue_idx = __builtin_ctz (META_QUEUE_MOVE_RESIZE);
+  int queue_idx = run_data->queue_idx;
 
   windows = g_steal_pointer (&priv->queue_windows[queue_idx]);
+
   priv->queue_later_ids[queue_idx] = 0;
 
-  g_list_foreach (windows, (GFunc) meta_window_update_layout, NULL);
-  g_list_foreach (windows, (GFunc) warn_on_incorrectly_unmanaged_window, NULL);
+  window_queue_func[queue_idx] (display, windows);
 
   return G_SOURCE_REMOVE;
 }
@@ -4078,12 +4090,6 @@ meta_display_queue_window (MetaDisplay   *display,
           META_LATER_RESIZE,
         };
 
-      const GSourceFunc window_queue_later_handler[META_N_QUEUE_TYPES] =
-        {
-          update_window_visibilities_idle,
-          move_resize_idle,
-        };
-
       if (!(queue_types & 1 << queue_idx))
         continue;
 
@@ -4097,11 +4103,15 @@ meta_display_queue_window (MetaDisplay   *display,
 
       if (!priv->queue_later_ids[queue_idx])
         {
+          MetaQueueRunData *run_data;
+
+          run_data = g_new0 (MetaQueueRunData, 1);
+          run_data->display = display;
+          run_data->queue_idx = queue_idx;
           meta_laters_add (laters,
                            window_queue_later_when[queue_idx],
-                           window_queue_later_handler[queue_idx],
-                           display, NULL);
-
+                           window_queue_run_later_func,
+                           run_data, g_free);
         }
     }
 }
@@ -4137,3 +4147,29 @@ meta_display_unqueue_window (MetaDisplay   *display,
         }
     }
 }
+
+void
+meta_display_flush_queued_window (MetaDisplay   *display,
+                                  MetaWindow    *window,
+                                  MetaQueueType  queue_types)
+{
+  g_autoptr (GList) windows = NULL;
+  int queue_idx;
+
+  meta_display_unqueue_window (display, window, queue_types);
+
+  windows = g_list_prepend (windows, window);
+
+  for (queue_idx = 0; queue_idx < META_N_QUEUE_TYPES; queue_idx++)
+    {
+      if (!(queue_types & 1 << queue_idx))
+        continue;
+
+      meta_topic (META_DEBUG_WINDOW_STATE,
+                  "Running %s for window '%s'",
+                  meta_window_queue_names[queue_idx],
+                  window->desc);
+
+      window_queue_func[queue_idx] (display, windows);
+    }
+}