improve force_monitor behavior #113

Author: fdev31

pyprland/plugins/scratchpads/__init__.py

@@ -121,7 +121,12 @@ async def _configure_windowrules(self, scratch: Scratch) -> None:
         defined_class: str = scratch.conf.get("class", "")
         skipped_windowrules = scratch.conf.get("skip_windowrules", [])
         if defined_class:
-            monitor = await self.get_focused_monitor_props(name=scratch.conf.get("force_monitor"))
+            forced_monitor = scratch.conf.get("force_monitor")
+            if forced_monitor and forced_monitor not in state.monitors:
+                self.log.error("forced monitor %s doesn't exist", forced_monitor)
+                await self.notify_error(f"Monitor '{forced_monitor}' doesn't exist, check {scratch.uid}'s scratch configuration")
+                forced_monitor = None
+            monitor = await self.get_focused_monitor_props(name=forced_monitor)
             width, height = convert_coords(scratch.conf.get("size", "80% 80%"), monitor)
 
             ipc_commands = []
@@ -435,7 +440,7 @@ async def run_toggle(self, uid_or_uids: str) -> None:
             )  # visible on the currently focused monitor
 
         is_visible = first_scratch.visible and (
-            first_scratch.conf.get("force_monitor") or extra_visibility_check
+            first_scratch.forced_monitor or extra_visibility_check
         )  # always showing on the same monitor
         tasks = []
 
@@ -455,7 +460,7 @@ async def get_offsets(self, scratch: Scratch, monitor: MonitorInfo | None = None
         """Return offset from config or use margin as a ref."""
         offset = scratch.conf.get("offset")
         if monitor is None:
-            monitor = await get_focused_monitor_props(self.log, name=scratch.conf.get("force_monitor"))
+            monitor = await get_focused_monitor_props(self.log, name=scratch.forced_monitor)
         rotated = is_rotated(monitor)
         aspect = reversed(scratch.client_info["size"]) if rotated else scratch.client_info["size"]
 
@@ -540,7 +545,7 @@ async def run_show(self, uid: str) -> None:
 
         scratch.visible = True
         scratch.meta.space_identifier = get_active_space_identifier()
-        monitor = await self.get_focused_monitor_props(name=scratch.conf.get("force_monitor"))
+        monitor = await self.get_focused_monitor_props(name=scratch.forced_monitor)
 
         assert monitor
         assert scratch.full_address, "No address !"

pyprland/plugins/scratchpads/objects.py

@@ -56,6 +56,14 @@ def __init__(self, uid: str, opts: dict[str, Any]) -> None:
         self.meta = MetaInfo()
         self.extra_addr: set[str] = set()  # additional client addresses
 
+    @property
+    def forced_monitor(self) -> str | None:
+        """Returns forced monitor if available, else None."""
+        forced_monitor = self.conf.get("force_monitor")
+        if forced_monitor in state.monitors:
+            return forced_monitor
+        return None
+
     def set_config(self, opts: dict[str, Any]) -> None:
         """Apply constraints to the configuration."""
         if "class_match" in opts:  # NOTE: legacy, to be removed

pyprland/version.py

@@ -1,3 +1,3 @@
 """Package version."""
 
-VERSION = "2.3.8-1"
+VERSION = "2.3.8-2"