screensaver: Move custom-screensaver check to the controller, so

it can be activated by other sources.

Make Main.dismissInternalModals accessible over dbus so our
cinnamon-screensaver-command can call it before activating
cinnamon-screensaver or a custom screensaver command.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-screensaver-command/cinnamon-screensaver-command.py

@@ -84,6 +84,14 @@ def __init__(self, mainloop):
 
         ss_settings = Gio.Settings.new("org.cinnamon.desktop.screensaver")
         custom_saver = ss_settings.get_string("custom-screensaver-command").strip()
+        internal_enabled = Gio.Settings.new("org.cinnamon").get_boolean("internal-screensaver-enabled")
+
+        # Cinnamon dismisses its own modals inside the internal shield path.
+        # Only call it here when the lock is being handled by a custom command
+        # or cinnamon-screensaver.
+        if self.action_id in (Action.LOCK, Action.ACTIVATE) and (custom_saver or not internal_enabled):
+            self._dismiss_cinnamon_modals()
+
         if custom_saver:
             self._handle_custom_saver(custom_saver)
             quit()
@@ -100,6 +108,22 @@ def __init__(self, mainloop):
             self._on_proxy_ready
         )
 
+    def _dismiss_cinnamon_modals(self):
+        return
+        try:
+            bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+            bus.call_sync("org.Cinnamon",
+                          "/org/Cinnamon",
+                          "org.Cinnamon",
+                          "DismissInternalModals",
+                          None,
+                          None,
+                          Gio.DBusCallFlags.NONE,
+                          2000,
+                          None)
+        except GLib.Error as e:
+            print("Error dismissing Cinnamon modals: %s" % e.message)
+
     def _handle_custom_saver(self, custom_saver):
         if self.action_id in (Action.LOCK, Action.ACTIVATE):
             try:

js/misc/screenSaver.js

@@ -53,8 +53,6 @@ var ScreenSaverService = class ScreenSaverService {
             this._screenShield.connect('locked', this._onLocked.bind(this));
             this._screenShield.connect('unlocked', this._onUnlocked.bind(this));
         }
-
-        global.log('ScreenSaverService: providing org.cinnamon.ScreenSaver interface');
     }
 
     _onLocked() {

js/ui/cinnamonDBus.js

@@ -124,6 +124,7 @@ const CinnamonIface =
                 <arg type="b" direction="in" name="show_osd" /> \
             </method> \
             <method name="ReloadTheme"/> \
+            <method name="DismissInternalModals"/> \
             <signal name="RunStateChanged"/> \
             <signal name="XletsLoadedComplete"/> \
             <property name="AnimationsEnabled" type="b" access="read" /> \
@@ -496,6 +497,10 @@ var CinnamonDBus = class {
         Main.themeManager._changeTheme()
     }
 
+    DismissInternalModals() {
+        Main.dismissInternalModals();
+    }
+
     EmitRunStateChanged() {
         this._dbusImpl.emit_signal('RunStateChanged', null);
     }

js/ui/keybindings.js

@@ -133,8 +133,6 @@ KeybindingManager.prototype = {
         this.media_key_settings = new Gio.Settings({ schema_id: MEDIA_KEYS_SCHEMA });
         this.media_key_settings.connect("changed", Lang.bind(this, this.setup_media_keys));
 
-        this.screensaver_settings = new Gio.Settings({ schema_id: "org.cinnamon.desktop.screensaver" });
-
         this.setup_media_keys();
     },
 
@@ -441,20 +439,16 @@ KeybindingManager.prototype = {
         if (Main._shouldFilterKeybinding(entry))
             return;
 
-        // Check if this is the screensaver key and internal screensaver is enabled
-        if (action === MK.SCREENSAVER && global.settings.get_boolean('internal-screensaver-enabled')) {
-            // If a custom screensaver is configured, skip internal handling and
-            // let csd-media-keys run cinnamon-screensaver-command instead.
-            if (!this.screensaver_settings.get_string('custom-screensaver-command').trim()) {
-                GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                    Main.screensaverController.lockScreen(false);
-                    return GLib.SOURCE_REMOVE;
-                });
-                return;
-            }
+        // The screensaver key always goes through the controller - it resolves
+        // custom-screensaver-command, internal shield, and external daemon modes.
+        if (action === MK.SCREENSAVER) {
+            GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                Main.screensaverController.lockScreen(false);
+                return GLib.SOURCE_REMOVE;
+            });
+            return;
         }
 
-        // Otherwise, forward to csd-media-keys (or other handler)
         this._proxy.HandleKeybindingRemote(action);
     },
 

js/ui/screensaver/controller.js

@@ -10,6 +10,7 @@ const Main = imports.ui.main;
 const ScreenShield = imports.ui.screensaver.screenShield;
 const ScreenSaver = imports.misc.screenSaver;
 const AwayMessageDialog = imports.ui.screensaver.awayMessageDialog;
+const Util = imports.misc.util;
 
 var ScreensaverController = class {
     #screenShield = null;
@@ -28,11 +29,19 @@ var ScreensaverController = class {
             global.settings.set_boolean("session-locked-state", false);
         }
 
+        // A custom screensaver command preempts both internal and cinnamon-screensaver modes.
+        let customCommand = this.#settings.get_string('custom-screensaver-command').trim();
+        if (customCommand) {
+            global.log(`Screensaver: custom command.`);
+            return;
+        }
+
         this.#screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
 
         // The internal screensaver is the only option for wayland sessions. X11 sessions can use either
         // the internal one or cinnamon-screensaver (>= 6.7).
         if (Meta.is_wayland_compositor() || global.settings.get_boolean('internal-screensaver-enabled')) {
+            global.log('Screensaver: internal');
             let screenShieldGroup = new St.Widget({
                 name: 'screenShieldGroup',
                 visible: false,
@@ -57,6 +66,7 @@ var ScreensaverController = class {
                 this.emit('locked-changed', false);
             });
         } else {
+            global.log('Screensaver: cinnamon-screensaver');
             this.#screenSaverProxy.connectSignal('ActiveChanged', (proxy, senderName, [isActive]) => {
                 this.#locked = isActive;
                 this.emit('locked-changed', isActive);
@@ -94,6 +104,14 @@ var ScreensaverController = class {
             return;
         }
 
+        let customCommand = this.#settings.get_string('custom-screensaver-command').trim();
+        if (customCommand) {
+            Util.spawn(['cinnamon-screensaver-command', '-l']);
+            if (callback)
+                callback(true);
+            return;
+        }
+
         if (askForAwayMessage && this.#settings.get_boolean('ask-for-away-message')) {
             let dialog = new AwayMessageDialog.AwayMessageDialog((message) => {
                 this.#doLock(message, callback);