ScreenShield -> SessionLocker (#2339)

Author: lenemter

src/ScreenSaverManager.vala

@@ -8,36 +8,36 @@ public class Gala.ScreenSaverManager : Object {
     public signal void active_changed (bool new_value);
 
     [DBus (visible = false)]
-    public ScreenShield screen_shield { get; construct; }
+    public SessionLocker session_locker { get; construct; }
 
-    public ScreenSaverManager (ScreenShield shield) {
-        Object (screen_shield: shield);
+    public ScreenSaverManager (SessionLocker session_locker) {
+        Object (session_locker: session_locker);
     }
 
     construct {
-        screen_shield.active_changed.connect (() => {
-            active_changed (screen_shield.active);
+        session_locker.active_changed.connect (() => {
+            active_changed (session_locker.active);
         });
     }
 
     public void @lock () throws GLib.Error {
-        screen_shield.@lock (true);
+        session_locker.@lock (true);
     }
 
     public bool get_active () throws GLib.Error {
-        return screen_shield.active;
+        return session_locker.active;
     }
 
     public void set_active (bool active) throws GLib.Error {
         if (active) {
-            screen_shield.activate (true);
+            session_locker.activate (true);
         } else {
-            screen_shield.deactivate (false);
+            session_locker.deactivate (false);
         }
     }
 
     public uint get_active_time () throws GLib.Error {
-        var started = screen_shield.activation_time;
+        var started = session_locker.activation_time;
         if (started > 0) {
             return (uint)Math.floor ((GLib.get_monotonic_time () - started) / 1000000);
         } else {

src/Widgets/ScreenShield.vala renamed to src/Widgets/SessionLocker.vala

@@ -3,7 +3,7 @@
  * SPDX-FileCopyrightText: 2020, 2025 elementary, Inc. (https://elementary.io)
  */
 
-public class Gala.ScreenShield : Clutter.Actor {
+public class Gala.SessionLocker : Clutter.Actor {
     [DBus (name = "org.freedesktop.login1.Manager")]
     private interface LoginManager : Object {
         public signal void prepare_for_sleep (bool about_to_suspend);
@@ -92,7 +92,7 @@ public class Gala.ScreenShield : Clutter.Actor {
 
     private bool connected_to_buses = false;
 
-    public ScreenShield (WindowManager wm) {
+    public SessionLocker (WindowManager wm) {
         Object (wm: wm);
     }
 

src/WindowManager.vala

@@ -200,16 +200,15 @@ namespace Gala {
              * + ui group
              * +-- window group
              * +---- background manager
-             * +-- shell elements
              * +-- top window group
-             * +-- workspace view
+             * +-- multitasking view
              * +-- window switcher
              * +-- window overview
-             * +-- notification group
+             * +-- shell group
+             * +-- feedback group (e.g. DND icons)
              * +-- pointer locator
              * +-- dwell click timer
-             * +-- screen shield
-             * +-- feedback group (e.g. DND icons)
+             * +-- session locker
              */
 
             system_background = new SystemBackground (display);
@@ -219,7 +218,6 @@ namespace Gala {
             stage.insert_child_below (system_background.background_actor, null);
 
             ui_group = new Clutter.Actor ();
-            ui_group.reactive = true;
             update_ui_group_size ();
             stage.add_child (ui_group);
 
@@ -275,10 +273,10 @@ namespace Gala {
             ui_group.add_child (pointer_locator);
             ui_group.add_child (new DwellClickTimer (display));
 
-            var screen_shield = new ScreenShield (this);
-            ui_group.add_child (screen_shield);
+            var session_locker = new SessionLocker (this);
+            ui_group.add_child (session_locker);
 
-            screensaver = new ScreenSaverManager (screen_shield);
+            screensaver = new ScreenSaverManager (session_locker);
             // Due to a bug which enables access to the stage when using multiple monitors
             // in the screensaver, we have to listen for changes and make sure the input area
             // is set to NONE when we are in locked mode

src/meson.build

@@ -71,7 +71,7 @@ gala_bin_sources = files(
     'Widgets/MultitaskingView/WorkspaceRow.vala',
     'Widgets/PixelPicker.vala',
     'Widgets/PointerLocator.vala',
-    'Widgets/ScreenShield.vala',
+    'Widgets/SessionLocker.vala',
     'Widgets/SelectionArea.vala',
     'Widgets/WindowOverview.vala',
     'Widgets/WindowSwitcher/WindowSwitcher.vala',