[Wayland] Implement xdg-activation-v1 protocol

meson.build

@@ -38,7 +38,7 @@ gudev_req = '>= 232'
 
 # wayland version requirements
 wayland_server_req = '>= 1.13.0'
-wayland_protocols_req = '>= 1.19'
+wayland_protocols_req = '>= 1.21'
 
 # native backend version requirements
 libinput_req = '>= 1.7'

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

@@ -5573,6 +5573,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',
@@ -813,6 +815,7 @@ if have_wayland
     ['tablet', 'unstable', 'v2', ],
     ['text-input', 'unstable', 'v3', ],
     ['viewporter', 'stable', ],
+    ['xdg-activation', 'staging', 'v1', ],
     ['xdg-foreign', 'unstable', 'v1', ],
     ['xdg-output', 'unstable', 'v1', ],
     ['xdg-shell', 'unstable', 'v6', ],
@@ -840,6 +843,13 @@ if have_wayland
                          '@0@/@1@/@[email protected]'.format(protocol_type,
                          protocol_name,
                          output_base))
+    elif protocol_type == 'staging'
+      protocol_version = p.get(2)
+      output_base = '@0@-@1@'.format(protocol_name, protocol_version)
+      input = join_paths(protocols_dir,
+                         '@0@/@1@/@[email protected]'.format(protocol_type,
+                         protocol_name,
+                         output_base))
     elif protocol_type == 'private'
       output_base = protocol_name
       input = 'wayland/protocol/@[email protected]'.format(protocol_name)