Put Greeter in a separate group

lenemter · lenemter · commit c8364d069f36 · 2026-07-24T15:58:52.000+09:00
diff --git a/lib/WindowManager.vala b/lib/WindowManager.vala
@@ -40,6 +40,7 @@ namespace Gala {
 
     public enum WindowGroup {
         DESKTOP_SHELL,
+        LOCK_SCREEN_APPLICATION,
         LOCK_SCREEN,
         LOCK_SCREEN_SHELL,
         MODAL,
diff --git a/protocol/pantheon-desktop-shell-v1.xml b/protocol/pantheon-desktop-shell-v1.xml
@@ -35,6 +35,14 @@
       <arg name="output" type="new_id" interface="io_elementary_pantheon_extended_behavior_v1"/>
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
+
+    <request name="get_greeter">
+      <description summary="create a greeter surface from a surface">
+        Create a greeter surface from an existing surface.
+      </description>
+      <arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
   </interface>
 
   <interface name="io_elementary_pantheon_panel_v1" version="1">
@@ -128,6 +136,16 @@
     <request name="destroy" type="destructor"/>
   </interface>
 
+  <interface name="io_elementary_pantheon_greeter_v1" version="1">
+    <request name="destroy" type="destructor"/>
+
+    <request name="init">
+      <description summary="init greeter">
+        Init Greeter
+      </description>
+    </request>
+  </interface>
+
   <interface name="io_elementary_pantheon_extended_behavior_v1" version="1">
     <request name="destroy" type="destructor"/>
     <request name="set_keep_above">
diff --git a/protocol/pantheon-desktop-shell.vapi b/protocol/pantheon-desktop-shell.vapi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 elementary, Inc. <https://elementary.io>
+ * Copyright 2023-2026 elementary, Inc. <https://elementary.io>
  * Copyright 2023 Corentin Noël <tintou@noel.tf>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -12,7 +12,7 @@ namespace Pantheon.Desktop {
         public Pantheon.Desktop.GetPanel get_panel;
         public Pantheon.Desktop.GetWidget get_widget;
         public Pantheon.Desktop.GetExtendedBehavior get_extended_behavior;
-
+        public Pantheon.Desktop.GetGreeter get_greeter;
     }
 
     [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "enum io_elementary_pantheon_panel_v1_anchor", cprefix="IO_ELEMENTARY_PANTHEON_PANEL_V1_ANCHOR_", has_type_id = false)]
@@ -53,6 +53,14 @@ namespace Pantheon.Desktop {
         public Destroy destroy;
     }
 
+    [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "struct io_elementary_pantheon_greeter_v1_interface")]
+    public struct GreeterInterface {
+        [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "io_elementary_pantheon_greeter_v1_interface")]
+        public static Wl.Interface iface;
+        public Destroy destroy;
+        public Init init;
+    }
+
     [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "struct io_elementary_pantheon_extended_behavior_v1_interface")]
     public struct ExtendedBehaviorInterface {
         [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "io_elementary_pantheon_extended_behavior_v1_interface")]
@@ -70,6 +78,8 @@ namespace Pantheon.Desktop {
     [CCode (has_target = false, has_typedef = false)]
     public delegate void GetWidget (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface);
     [CCode (has_target = false, has_typedef = false)]
+    public delegate void GetGreeter (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface);
+    [CCode (has_target = false, has_typedef = false)]
     public delegate void GetExtendedBehavior (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface);
     [CCode (has_target = false, has_typedef = false)]
     public delegate void SetAnchor (Wl.Client client, Wl.Resource resource, [CCode (type = "uint32_t")] Anchor anchor);
@@ -86,6 +96,8 @@ namespace Pantheon.Desktop {
     [CCode (has_target = false, has_typedef = false)]
     public delegate void RemoveBlur (Wl.Client client, Wl.Resource resource);
     [CCode (has_target = false, has_typedef = false)]
+    public delegate void Init (Wl.Client client, Wl.Resource resource);
+    [CCode (has_target = false, has_typedef = false)]
     public delegate void SetKeepAbove (Wl.Client client, Wl.Resource resource);
     [CCode (has_target = false, has_typedef = false)]
     public delegate void MakeCentered (Wl.Client client, Wl.Resource resource);
diff --git a/src/PantheonShell.vala b/src/PantheonShell.vala
@@ -17,6 +17,7 @@ namespace Gala {
     private static Pantheon.Desktop.ShellInterface wayland_pantheon_shell_interface;
     private static Pantheon.Desktop.PanelInterface wayland_pantheon_panel_interface;
     private static Pantheon.Desktop.WidgetInterface wayland_pantheon_widget_interface;
+    private static Pantheon.Desktop.GreeterInterface wayland_pantheon_greeter_interface;
     private static Pantheon.Desktop.ExtendedBehaviorInterface wayland_pantheon_extended_behavior_interface;
     private static Wl.Global shell_global;
 
@@ -31,6 +32,7 @@ namespace Gala {
             get_panel,
             get_widget,
             get_extended_behavior,
+            get_greeter,
         };
 
         wayland_pantheon_panel_interface = {
@@ -48,6 +50,11 @@ namespace Gala {
             destroy_widget_surface,
         };
 
+        wayland_pantheon_greeter_interface = {
+            destroy_greeter_surface,
+            init_greeter,
+        };
+
         wayland_pantheon_extended_behavior_interface = {
             destroy_extended_behavior_surface,
             set_keep_above,
@@ -59,6 +66,7 @@ namespace Gala {
 
         PanelSurface.quark = GLib.Quark.from_string ("-gala-wayland-panel-surface-data");
         WidgetSurface.quark = GLib.Quark.from_string ("-gala-wayland-widget-surface-data");
+        GreeterSurface.quark = GLib.Quark.from_string ("-gala-wayland-greeter-surface-data");
         ExtendedBehaviorSurface.quark = GLib.Quark.from_string ("-gala-wayland-extended-behavior-surface-data");
 
         shell_global = Wl.Global.create (wl_disp, ref Pantheon.Desktop.ShellInterface.iface, 1, (client, version, id) => {
@@ -105,6 +113,25 @@ namespace Gala {
         }
     }
 
+    public class GreeterSurface : GLib.Object {
+        public static GLib.Quark quark = 0;
+        public unowned GLib.Object? wayland_surface;
+
+        public GreeterSurface (GLib.Object wayland_surface) {
+            this.wayland_surface = wayland_surface;
+        }
+
+        ~GreeterSurface () {
+            if (wayland_surface != null) {
+                wayland_surface.steal_qdata<unowned GLib.Object> (quark);
+            }
+        }
+
+        public void on_wayland_surface_disposed () {
+            wayland_surface = null;
+        }
+    }
+
     public class ExtendedBehaviorSurface : GLib.Object {
         public static GLib.Quark quark = 0;
         public unowned GLib.Object? wayland_surface;
@@ -186,6 +213,35 @@ namespace Gala {
         );
     }
 
+    internal static void get_greeter (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface_resource) {
+        unowned GLib.Object? wayland_surface = surface_resource.get_user_data<GLib.Object> ();
+        GreeterSurface? greeter_surface = wayland_surface.get_qdata (GreeterSurface.quark);
+        if (greeter_surface != null) {
+            surface_resource.post_error (
+                Wl.DisplayError.INVALID_OBJECT,
+                "io_elementary_pantheon_shell_v1_interface::get_greeter already requested"
+            );
+            return;
+        }
+
+        greeter_surface = new GreeterSurface (wayland_surface);
+        unowned var greeter_resource = client.create_resource (
+            ref Pantheon.Desktop.GreeterInterface.iface,
+            resource.get_version (),
+            output
+        );
+        greeter_resource.set_implementation (
+            &wayland_pantheon_greeter_interface,
+            greeter_surface.ref (),
+            unref_obj_on_destroy
+        );
+        wayland_surface.set_qdata_full (
+            GreeterSurface.quark,
+            greeter_surface,
+            (GLib.DestroyNotify) GreeterSurface.on_wayland_surface_disposed
+        );
+    }
+
     internal static void get_extended_behavior (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface_resource) {
         unowned GLib.Object? wayland_surface = surface_resource.get_user_data<GLib.Object> ();
         ExtendedBehaviorSurface? eb_surface = wayland_surface.get_qdata (ExtendedBehaviorSurface.quark);
@@ -348,6 +404,23 @@ namespace Gala {
         BlurManager.get_instance ().remove_blur (window);
     }
 
+    internal static void init_greeter (Wl.Client client, Wl.Resource resource) {
+        unowned GreeterSurface? greeter_surface = resource.get_user_data<GreeterSurface> ();
+        if (greeter_surface.wayland_surface == null) {
+            warning ("Window tried to init greeter but wayland surface is null.");
+            return;
+        }
+
+        Meta.Window? window;
+        greeter_surface.wayland_surface.get ("window", out window, null);
+        if (window == null) {
+            warning ("Window tried to init greeter but wayland surface had no associated window.");
+            return;
+        }
+
+        ShellClientsManager.get_instance ().init_greeter (window);
+    }
+
     internal static void set_keep_above (Wl.Client client, Wl.Resource resource) {
         unowned ExtendedBehaviorSurface? eb_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
         if (eb_surface.wayland_surface == null) {
@@ -416,6 +489,10 @@ namespace Gala {
         resource.destroy ();
     }
 
+    internal static void destroy_greeter_surface (Wl.Client client, Wl.Resource resource) {
+        resource.destroy ();
+    }
+
     internal static void destroy_extended_behavior_surface (Wl.Client client, Wl.Resource resource) {
         resource.destroy ();
     }
diff --git a/src/ShellClients/ShellClientsManager.vala b/src/ShellClients/ShellClientsManager.vala
@@ -182,6 +182,50 @@ public class Gala.ShellClientsManager : Object, GestureTarget {
     }
 #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)) {
+#if HAS_MUTTER46
+                client.wayland_client.make_desktop (window);
+#endif
+                break;
+            }
+        }
+    }
+
+    private void make_desktop_x11 (Meta.Window window) requires (!Meta.Util.is_wayland_compositor ()) {
+        unowned var x11_display = wm.get_display ().get_x11_display ();
+
+#if HAS_MUTTER46
+        var x_window = x11_display.lookup_xwindow (window);
+#else
+        var x_window = window.get_xwindow ();
+#endif
+        // gtk3's gdk_x11_window_set_type_hint() is used as a reference
+        unowned var xdisplay = x11_display.get_xdisplay ();
+        var atom = xdisplay.intern_atom ("_NET_WM_WINDOW_TYPE", false);
+        var dock_atom = xdisplay.intern_atom ("_NET_WM_WINDOW_TYPE_DESKTOP", false);
+
+        // (X.Atom) 4 is XA_ATOM
+        // 32 is format
+        // 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) {
             panel_windows[window].anchor = anchor;
@@ -255,6 +299,12 @@ public class Gala.ShellClientsManager : Object, GestureTarget {
         panel_windows[window].request_visible_in_multitasking_view ();
     }
 
+    public void init_greeter (Meta.Window window) {
+        make_desktop (window);
+
+        wm.override_window_group (window, LOCK_SCREEN_APPLICATION);
+    }
+
     public void make_centered (Meta.Window window) requires (!is_itself_shell_window (window)) {
         positioned_windows[window] = new ExtendedBehaviorWindow (window);
 
diff --git a/src/Widgets/LockScreen.vala b/src/Widgets/LockScreen.vala
@@ -6,10 +6,11 @@
  */
 
 public class Gala.LockScreen : Clutter.Actor {
-    private const WindowGroup[] ALLOWED_WINDOW_GROUPS = { LOCK_SCREEN, LOCK_SCREEN_SHELL, OVERLAY };
+    private const WindowGroup[] ALLOWED_WINDOW_GROUPS = { LOCK_SCREEN_APPLICATION, LOCK_SCREEN, LOCK_SCREEN_SHELL, OVERLAY };
 
     public WindowManager wm { get; construct; }
 
+    public Clutter.Actor lock_application_group { get; private set; }
     public Clutter.Actor window_group { get; private set; }
     public Clutter.Actor shell_group { get; private set; }
 
@@ -24,10 +25,12 @@ public class Gala.LockScreen : Clutter.Actor {
         var background = new BackgroundContainer (wm.get_display ());
         background.add_effect (new BlurEffect (background, 18));
 
+        lock_application_group = new Clutter.Actor ();
         window_group = new Clutter.Actor ();
         shell_group = new Clutter.Actor ();
 
         add_child (background);
+        add_child (lock_application_group);
         add_child (window_group);
         add_child (shell_group);
 
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -1086,6 +1086,7 @@ namespace Gala {
         private Clutter.Actor get_window_group_actor (WindowGroup group) {
             switch (group) {
                 case DESKTOP_SHELL: return shell_group;
+                case LOCK_SCREEN_APPLICATION: return lock_screen.lock_application_group;
                 case LOCK_SCREEN: return lock_screen.window_group;
                 case LOCK_SCREEN_SHELL: return lock_screen.shell_group;
                 case MODAL: return modal_group.window_group;
