Merge branch 'master' into idle_inhibit

Author: Sunderland93

config.h.meson

@@ -71,5 +71,8 @@
 /* Whether Xwayland has -initfd option */
 #mesondefine HAVE_XWAYLAND_INITFD
 
+/* Whether Xwayland has -listenfd option */
+#mesondefine HAVE_XWAYLAND_LISTENFD
+
 /* Whether the Xwayland supports +/-byteswappedclients */
 #mesondefine HAVE_XWAYLAND_BYTE_SWAPPED_CLIENTS

meson.build

@@ -376,6 +376,8 @@ if cc.has_header_symbol('sys/prctl.h', 'prctl')
 endif
 
 have_xwayland_initfd = false
+have_xwayland_listenfd = false
+
 have_xwayland_byte_swapped_clients = false
 if have_wayland
   xwayland_dep = dependency('xwayland', required: false)
@@ -418,6 +420,15 @@ if have_wayland
     cdata.set('HAVE_XWAYLAND_INITFD', 1)
   endif
 
+    # For Xwayland -listenfd usage
+  if xwayland_dep.found()
+    have_xwayland_listenfd = xwayland_dep.get_pkgconfig_variable('have_listenfd') == 'true'
+  endif
+
+  if (have_xwayland_listenfd)
+    cdata.set('HAVE_XWAYLAND_LISTENFD', 1)
+  endif
+
     # For Xwayland +/-byteswappedclients usage
   if xwayland_dep.found()
     have_xwayland_byte_swapped_clients = xwayland_dep.get_variable('have_byteswappedclients',
@@ -489,6 +500,7 @@ output = [
   '        Introspection.................... ' + have_introspection.to_string(),
   '        Profiler......................... ' + have_profiler.to_string(),
   '        Xwayland initfd.................. ' + have_xwayland_initfd.to_string(),
+  '        Xwayland listenfd................ ' + have_xwayland_listenfd.to_string(),
   '        Xwayland byte-swapped clients.... ' + have_xwayland_byte_swapped_clients.to_string(),
   '',
   '    Tests:',

src/core/startup-notification.c

@@ -62,6 +62,7 @@ enum
 enum
 {
   SEQ_COMPLETE,
+  SEQ_TIMEOUT,
   N_SEQ_SIGNALS
 };
 
@@ -268,6 +269,13 @@ meta_startup_sequence_class_init (MetaStartupSequenceClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
+  seq_signals[SEQ_TIMEOUT] =
+    g_signal_new ("timeout",
+                  META_TYPE_STARTUP_SEQUENCE,
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
   seq_props[PROP_SEQ_ID] =
     g_param_spec_string ("id",
                          "ID",
@@ -488,7 +496,11 @@ startup_sequence_timeout (void *data)
                   "Timed out sequence %s\n",
                   meta_startup_sequence_get_id (sequence));
 
-      meta_startup_sequence_complete (sequence);
+      if (!meta_startup_sequence_get_completed (sequence))
+      {
+        g_signal_emit (sequence, seq_signals[SEQ_TIMEOUT], 0, sequence);
+        meta_startup_sequence_complete (sequence);
+      }
       meta_startup_notification_remove_sequence (sn, sequence);
     }
 

src/core/window.c

@@ -5578,6 +5578,13 @@ meta_window_raise (MetaWindow  *window)
 
   g_return_if_fail (!window->override_redirect);
 
+  /* Flush pending visible state now.
+   * It is important that this runs before meta_stack_raise() because
+   * showing a window may overwrite its stacking order based on the
+   * stacking rules for newly shown windows.
+   */
+  meta_window_flush_calc_showing (window);
+
   ancestor = meta_window_find_root_ancestor (window);
 
   meta_topic (META_DEBUG_WINDOW_OPS,

src/meson.build

@@ -489,6 +489,8 @@ if have_wayland
     'wayland/meta-pointer-lock-wayland.h',
     'wayland/meta-selection-source-wayland.c',
     'wayland/meta-selection-source-wayland-private.h',
+    'wayland/meta-wayland-activation.c',
+    'wayland/meta-wayland-activation.h',
     'wayland/meta-wayland-actor-surface.c',
     'wayland/meta-wayland-actor-surface.h',
     'wayland/meta-wayland-buffer.c',
@@ -809,6 +811,7 @@ if have_wayland
     ['tablet', 'unstable', 'v2', ],
     ['text-input', 'unstable', 'v3', ],
     ['viewporter', 'stable', ],
+    ['xdg-activation', 'staging', 'v1', ],
     ['xdg-dialog', 'staging', 'v1', ],
     ['xdg-foreign', 'unstable', 'v1', ],
     ['xdg-foreign', 'unstable', 'v2', ],