Massive refactor (Zed wouldn't stop complaining about formatting) and

beginning of proper GNOME implementation.

pkg/wayland_display_manager/gnome/__init__.py

@@ -1,45 +1,67 @@
-from ..structs import MonitorInfo, Modeline
-from ..abstracts import AbstractDisplay
-
 import os
 import re
 import subprocess
 
-### Dirty Implementation ###
-# Needs to be replaced with a proper dbus solution. Preferably by taking reference from gdctl. `cat /usr/bin/gdctl` #
-# Issues:
-#   - Only works with one monitor (will lead to strange results if multiple are present).
-#   - Possible has 1 quadrillion issues that aren't known.
-#   - Sucks dog eggs and unironically uses the unholy trinity `os`, `re`, and `subprocess`.
+from ..abstracts import AbstractDisplay
+from ..structs import Modeline, MonitorInfo
+from ._gnome_types import GNOMEDisplayConfig
 
-MODE_REGEX_PATTERN = re.compile(r'(\d+)x(\d+)@(\d+\.\d+)')
+# Half replaced implementation. More refactoring needs to be done in regards to setting the display.
+# Everything will be replaced with dorkbus Mutter stuff.
+
+MODE_REGEX_PATTERN = re.compile(r"(\d+)x(\d+)@(\d+\.\d+)")
 
 class Display(AbstractDisplay):
     def get_modes(self):
-        gdctl_output = subprocess.run(["gdctl", "show", "--modes"], capture_output=True, text=True, check=True)
-        modes = MODE_REGEX_PATTERN.findall(gdctl_output.stdout)
+        mutter_display_state = GNOMEDisplayConfig()
+        mutter_display_state.get_dbus_info()
 
-        # Hard coding my beloved
-        return [ 
-            MonitorInfo(
-                connector = "HDMI-2",
-                primary = True,
-                modes = [
-                    Modeline(
-                        width = int(w),
-                        height = int(h),
-                        refresh_rate = float(r)
-                    )
-                    for _, (w, h, r) in enumerate(modes)
-                ]
+        primary_connectors = {
+            m[0]
+            for lm in mutter_display_state.logical_monitors
+            if lm.is_primary
+            for m in lm.monitors
+        }
+
+        result = []
+        for monitor in mutter_display_state.monitors:
+            modes = [
+                Modeline(
+                    mode.width,
+                    mode.height,
+                    mode.refresh_rate,
+                )
+                for mode in monitor.modes
+            ]
+
+            result.append(
+                MonitorInfo(
+                    monitor.connector,
+                    monitor.connector in primary_connectors,
+                    modes
+                )
             )
-        ]
-    
-    def set_mode(self, modeline, requested_connector = None) -> None:
-        subprocess.run(["gdctl", "set", "--logical-monitor", "--primary", "--monitor", requested_connector, "--mode", str(modeline)])
+
+        return result
+        
+    def set_mode(self, modeline, requested_connector=None) -> None:
+        subprocess.run(
+            [
+                "gdctl",
+                "set",
+                "--logical-monitor",
+                "--primary",
+                "--monitor",
+                requested_connector,
+                "--mode",
+                str(modeline),
+            ]
+        )
 
     def save_current_mode(self, location):
-        gdctl_output = subprocess.run(["gdctl", "show"], capture_output=True, text=True, check=True)
+        gdctl_output = subprocess.run(
+            ["gdctl", "show"], capture_output=True, text=True, check=True
+        )
         match = MODE_REGEX_PATTERN.search(gdctl_output.stdout)
         w, h, r = match.groups()
         with open(location, "w") as file:
@@ -49,16 +71,11 @@ class Display(AbstractDisplay):
         with open(location, "r") as file:
             config_file_content = file.read()
 
-
         match = MODE_REGEX_PATTERN.search(config_file_content)
 
         w, h, r = match.groups()
-        return Modeline(
-            width = int(w),
-            height = int(h),
-            refresh_rate = float(r)
-        )
+        return Modeline(width=int(w), height=int(h), refresh_rate=float(r))
 
     @staticmethod
     def detect():
-        return "gnome" in os.environ.get("XDG_CURRENT_DESKTOP", "").lower()
+        return "gnome" in os.environ.get("XDG_CURRENT_DESKTOP", "").lower()