Merge branch 'main' into lenemter/per-user-session

Author: danirabbit

compositor/Background/Background.vala

@@ -90,7 +90,7 @@ namespace GreeterCompositor {
 #endif
             if (color == null) {
 #if HAS_MUTTER47
-                color = Cogl.Color.from_string ("black");
+                color = Cogl.Color.from_string ("#000000");
 #else
                 color = Clutter.Color.from_string ("black");
 #endif
@@ -109,7 +109,7 @@ namespace GreeterCompositor {
 #endif
                 if (second_color == null) {
 #if HAS_MUTTER47
-                    second_color = Cogl.Color.from_string ("black");
+                    second_color = Cogl.Color.from_string ("#000000");
 #else
                     second_color = Clutter.Color.from_string ("black");
 #endif

compositor/Background/BackgroundContainer.vala

@@ -29,7 +29,7 @@ namespace GreeterCompositor {
 
         public void set_black_background (bool black) {
 #if HAS_MUTTER47
-            set_background_color (black ? Cogl.Color.from_string ("Black") : null);
+            set_background_color (black ? Cogl.Color.from_string ("#000000") : null);
 #else
             set_background_color (black ? Clutter.Color.from_string ("Black") : null);
 #endif

compositor/Background/BackgroundSource.vala

@@ -39,7 +39,7 @@ namespace GreeterCompositor {
             monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.connect (monitors_changed);
 
-            gala_background_settings = new GLib.Settings ("io.elementary.desktop.background");
+            gala_background_settings = new GLib.Settings ("io.elementary.greeter-compositor.background");
             gala_background_settings.changed["dim-wallpaper-in-dark-style"].connect (() => changed ());
 
             gnome_background_settings = new GLib.Settings ("org.gnome.desktop.background");

compositor/BackgroundBlurEffect.vala

@@ -172,7 +172,11 @@ public class GreeterCompositor.BackgroundBlurEffect : Clutter.Effect {
             Mtk.Rectangle stage_view_layout = {};
 
             box_scale_factor = stage_view.get_scale ();
+#if HAS_MUTTER49
+            stage_view.get_layout (stage_view_layout);
+#else
             stage_view.get_layout (ref stage_view_layout);
+#endif
 
             origin_x -= stage_view_layout.x;
             origin_y -= stage_view_layout.y;

compositor/KeyboardManager.vala

@@ -8,6 +8,9 @@ public class GreeterCompositor.KeyboardManager : Object {
     private static KeyboardManager? instance;
     private static VariantType sources_variant_type;
     private static GLib.Settings settings;
+#if HAS_MUTTER49
+    private GLib.Cancellable? cancellable = null;
+#endif
 
     public unowned Meta.Display display { construct; private get; }
 
@@ -74,6 +77,8 @@ public class GreeterCompositor.KeyboardManager : Object {
 
     [CCode (instance_pos = -1)]
     private void set_keyboard_layout (GLib.Settings settings, string key) {
+        unowned var backend = display.get_context ().get_backend ();
+
         if (key == "sources" || key == "xkb-options") {
             string[] layouts = {}, variants = {};
 
@@ -100,14 +105,50 @@ public class GreeterCompositor.KeyboardManager : Object {
             var variant = string.joinv (",", variants);
             var options = string.joinv (",", xkb_options);
 
-#if HAS_MUTTER46
+#if HAS_MUTTER49
+            if (cancellable != null) {
+                cancellable.cancel ();
+                cancellable = new GLib.Cancellable ();
+            }
+
+            backend.set_keymap_async.begin (layout, variant, options, settings.get_string ("xkb-model"), cancellable, (obj, res) => {
+                try {
+                    ((Meta.Backend) obj).set_keymap_async.end (res);
+                } catch (Error e) {
+                    if (e is GLib.IOError.CANCELLED) {
+                        // ignore
+                    } else {
+                        cancellable = null;
+                    }
+                }
+            });
+#elif HAS_MUTTER46
             //TODO: add model support
-            display.get_context ().get_backend ().set_keymap (layout, variant, options, "");
+            backend.set_keymap (layout, variant, options, "");
 #else
-            display.get_context ().get_backend ().set_keymap (layout, variant, options);
+            backend.set_keymap (layout, variant, options);
 #endif
         } else if (key == "current") {
-            display.get_context ().get_backend ().lock_layout_group (settings.get_uint ("current"));
+#if HAS_MUTTER49
+            if (cancellable != null) {
+                cancellable.cancel ();
+                cancellable = new GLib.Cancellable ();
+            }
+
+            backend.set_keymap_layout_group_async.begin (settings.get_uint ("current"), cancellable, (obj, res) => {
+                try {
+                    ((Meta.Backend) obj).set_keymap_layout_group_async.end (res);
+                } catch (Error e) {
+                    if (e is GLib.IOError.CANCELLED) {
+                        // ignore
+                    } else {
+                        cancellable = null;
+                    }
+                }
+            });
+#else
+            backend.lock_layout_group (settings.get_uint ("current"));
+#endif
         }
     }
 }

compositor/ShellClients/ManagedClient.vala

@@ -50,8 +50,13 @@ public class GreeterCompositor.ManagedClient : Object {
     private async void start_wayland () {
         var subprocess_launcher = new GLib.SubprocessLauncher (INHERIT_FDS);
         try {
+#if HAS_MUTTER49
+            wayland_client = new Meta.WaylandClient.subprocess (display.get_context (), subprocess_launcher, args);
+            subprocess = wayland_client.get_subprocess ();
+#else
             wayland_client = new Meta.WaylandClient (display.get_context (), subprocess_launcher);
             subprocess = wayland_client.spawnv (display, args);
+#endif
 
             yield subprocess.wait_async ();
 

compositor/ShellClients/NotificationsClient.vala

@@ -27,7 +27,9 @@ public class GreeterCompositor.NotificationsClient : Object {
             window.set_data (NOTIFICATION_DATA_KEY, true);
             window.make_above ();
             window.stick ();
-#if HAS_MUTTER46
+#if HAS_MUTTER49
+            window.set_type (Meta.WindowType.DOCK);
+#elif HAS_MUTTER46
             client.wayland_client.make_dock (window);
 #endif
         });

compositor/ShellClients/ShellClientsManager.vala

@@ -52,13 +52,18 @@ public class GreeterCompositor.ShellClientsManager : Object {
     }
 
     public void make_dock (Meta.Window window) {
+#if HAS_MUTTER49
+        window.set_type (Meta.WindowType.DOCK);
+#else
         if (Meta.Util.is_wayland_compositor ()) {
             make_dock_wayland (window);
         } else {
             make_dock_x11 (window);
         }
+#endif
     }
 
+#if !HAS_MUTTER49
     private void make_dock_wayland (Meta.Window window) requires (Meta.Util.is_wayland_compositor ()) {
         foreach (var client in protocol_clients) {
             if (client.wayland_client.owns_window (window)) {
@@ -88,16 +93,22 @@ public class GreeterCompositor.ShellClientsManager : Object {
         // 0 means replace
         xdisplay.change_property (x_window, atom, (X.Atom) 4, 32, 0, (uchar[]) dock_atom, 1);
     }
+#endif
 
 
     public void make_desktop (Meta.Window window) {
+#if HAS_MUTTER49
+        window.set_type (Meta.WindowType.DESKTOP);
+#else
         if (Meta.Util.is_wayland_compositor ()) {
             make_desktop_wayland (window);
         } else {
             make_desktop_x11 (window);
         }
+#endif
     }
 
+#if !HAS_MUTTER49
     private void make_desktop_wayland (Meta.Window window) requires (Meta.Util.is_wayland_compositor ()) {
         foreach (var client in protocol_clients) {
             if (client.wayland_client.owns_window (window)) {
@@ -125,6 +136,7 @@ public class GreeterCompositor.ShellClientsManager : Object {
         // 0 means replace
         xdisplay.change_property (x_window, atom, (X.Atom) 4, 32, 0, (uchar[]) dock_atom, 1);
     }
+#endif
 
     public void set_anchor (Meta.Window window, Pantheon.Desktop.Anchor anchor) {
         if (window in panel_windows) {
@@ -170,21 +182,32 @@ public class GreeterCompositor.ShellClientsManager : Object {
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
     }
 
-    public void make_centered (Meta.Window window) requires (!is_itself_positioned (window)) {
+    public void make_centered (Meta.Window window) requires (!is_itself_shell_window (window)) {
         positioned_windows[window] = new ShellWindow (window, CENTER);
 
         // connect_after so we make sure that any queued move is unqueued
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
     }
 
-    public bool is_itself_positioned (Meta.Window window) {
-        return (window in positioned_windows) || (window in panel_windows) || NotificationStack.is_notification (window);
+    public bool is_itself_shell_window (Meta.Window window) {
+        return (
+            (window in panel_windows) ||
+            NotificationStack.is_notification (window)
+        );
     }
 
-    public bool is_positioned_window (Meta.Window window) {
-        bool positioned = is_itself_positioned (window);
+    /**
+     * Whether the given window is a shell window. A shell window is a window that's
+     * part of the desktop shell itself and should be completely ignored by other components.
+     * It is entirely managed by Gala, always above everything else, and manages hiding
+     * in e.g. multitasking view itself. This also applies to transient windows of shell windows.
+     * Note that even if `false` is returned the window might still be in part managed by gala
+     * e.g. for centered windows.
+     */
+    public bool is_shell_window (Meta.Window window) {
+        bool positioned = is_itself_shell_window (window);
         window.foreach_ancestor ((ancestor) => {
-            if (is_itself_positioned (ancestor)) {
+            if (is_itself_shell_window (ancestor)) {
                 positioned = true;
             }
 

compositor/WindowManager.vala

@@ -31,7 +31,7 @@ namespace GreeterCompositor {
 
         /**
          * The group that contains all WindowActors that make shell elements, that is all windows reported as
-         * ShellClientsManager.is_positioned_window.
+         * ShellClientsManager.is_shell_window.
          * It will (eventually) never be hidden by other components and is always on top of everything. Therefore elements are
          * responsible themselves for hiding depending on the state we are currently in (e.g. normal desktop, open multitasking view, fullscreen, etc.).
          */
@@ -99,7 +99,7 @@ namespace GreeterCompositor {
             stage = display.get_stage () as Clutter.Stage;
 #endif
 #if HAS_MUTTER47
-            stage.background_color = Cogl.Color.from_string ("black");
+            stage.background_color = Cogl.Color.from_string ("#000000");
 #else
             stage.background_color = Clutter.Color.from_rgba (0, 0, 0, 255);
 #endif
@@ -120,7 +120,7 @@ namespace GreeterCompositor {
                 width = width,
                 height = height,
 #if HAS_MUTTER47
-                background_color = Cogl.Color.from_string ("black")
+                background_color = Cogl.Color.from_string ("#000000")
 #else
                 background_color = Clutter.Color.from_rgba (0, 0, 0, 255),
 #endif
@@ -253,8 +253,15 @@ namespace GreeterCompositor {
             var subprocess_launcher = new GLib.SubprocessLauncher (GLib.SubprocessFlags.INHERIT_FDS);
             try {
                 Meta.WaylandClient daemon_client;
+                Subprocess? subprocess;
+
+#if HAS_MUTTER49
+                daemon_client = new Meta.WaylandClient.subprocess (display.get_context (), subprocess_launcher, command);
+                subprocess = daemon_client.get_subprocess ();
+#else
                 daemon_client = new Meta.WaylandClient (display.get_context (), subprocess_launcher);
-                var subprocess = daemon_client.spawnv (display, command);
+                subprocess = daemon_client.spawnv (display, command);
+#endif
 
                 yield subprocess.wait_async ();
 
@@ -302,7 +309,7 @@ namespace GreeterCompositor {
 
         private void check_shell_window (Meta.WindowActor actor) {
             unowned var window = actor.get_meta_window ();
-            if (ShellClientsManager.get_instance ().is_positioned_window (window)) {
+            if (ShellClientsManager.get_instance ().is_shell_window (window)) {
                 Utils.clutter_actor_reparent (actor, shell_group);
             }
 

compositor/WingpanelManager/FocusManager.vala

@@ -97,7 +97,10 @@ public class GreeterCompositor.FocusManager : GLib.Object {
         }
 
         if (window != null) {
-#if HAS_MUTTER46
+#if HAS_MUTTER49
+            Graphene.Point pos_hint = {x, y};
+            window.begin_grab_op (Meta.GrabOp.MOVING, null, time, pos_hint);
+#elif HAS_MUTTER46
             Graphene.Point pos_hint = {x, y};
             window.begin_grab_op (Meta.GrabOp.MOVING, null, null, time, pos_hint);
 #else