Refactor X11 backend service layout

Author: edumucelli

docking/app.py

@@ -74,9 +74,11 @@
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib, Gtk
 
+from docking.applets.services import AppletServices
 from docking.core.config import Config
 from docking.core.theme import Theme
 from docking.ipc import DockItemsService
+from docking.platform.backends.base import SessionBackend
 from docking.platform.backends.selection import create_session_backend
 from docking.platform.environment import apply_tweaks, detect_desktop
 from docking.platform.launcher import Launcher
@@ -99,6 +101,15 @@ def main() -> None:
     model = DockModel(config=config, launcher=launcher)
     renderer = DockRenderer()
     backend = create_session_backend(config=config, launcher=launcher, model=model)
+    model.set_applet_services(
+        AppletServices(
+            desktop_actions=backend.desktop_actions,
+            workspaces=backend.workspaces,
+            window_picker=backend.window_picker,
+            idle=backend.idle,
+            screen_capture=backend.screen_capture,
+        )
+    )
     unity = UnityLauncherListener(model=model)
 
     window = build_dock_window(
@@ -108,6 +119,7 @@ def main() -> None:
         theme=theme,
         window_tracker=backend.windows,
         preview_service=backend.previews,
+        surface_service=backend.surface,
         visibility_service=backend.visibility,
         launcher=launcher,
     )
@@ -130,17 +142,15 @@ def main() -> None:
         window.stop_update_checks()
         new_year.stop()
         unity.stop()
-        backend.stop()
         model.stop_applets()
+        backend.stop()
 
 
 def _start_runtime(
-    items_service: DockItemsService, model: DockModel, backend: object
+    items_service: DockItemsService, model: DockModel, backend: SessionBackend
 ) -> bool:
     """Start background runtime pieces after the window has been shown."""
-    backend_start = getattr(backend, "start", None)
-    if callable(backend_start):
-        backend_start()
+    backend.start()
     items_service.start()
     model.start_applets()
     return False

docking/applets/base.py

@@ -83,6 +83,7 @@
 from docking.log import get_logger
 
 if TYPE_CHECKING:
+    from docking.applets.services import AppletServices
     from docking.core.config import Config
 
 log = get_logger("applets.base")
@@ -455,6 +456,11 @@ def apply_prefs(self) -> None:
         """
         return
 
+    def set_services(self, services: AppletServices) -> None:
+        """Attach backend services; applets that need them override this hook."""
+        _ = services
+        return
+
     def start(self, notify: Callable[[], None]) -> None:
         """Start timers/monitors. Call notify() to trigger redraw."""
         self._notify = notify

docking/applets/colorpicker/applet.py

@@ -26,18 +26,20 @@
 from docking.applets.base import Applet
 from docking.applets.colorpicker import meta
 from docking.applets.colorpicker.render import create_icon
-from docking.applets.colorpicker.state import pick_pixel, rgb_to_hex
+from docking.applets.colorpicker.state import rgb_to_hex
 from docking.applets.menu import menu_sections
 from docking.applets.popup import (
     create_capture_overlay,
     dismiss_capture_overlay,
     draw_transparent_capture_overlay,
 )
+from docking.applets.services import AppletServices
 from docking.i18n import _
 from docking.log import get_logger, with_context
 
 if TYPE_CHECKING:
     from docking.core.config import Config
+    from docking.platform.backends.base import ScreenCaptureService
 
 log = with_context(get_logger(name="colorpicker"), applet_id=meta.id)
 
@@ -62,6 +64,7 @@ def __init__(self, icon_size: int, config: Config | None = None) -> None:
         self._hex = ""
         self._show_hex = True
         self._overlay: Gtk.Window | None = None
+        self._screen_capture: ScreenCaptureService | None = None
 
         if config:
             prefs = config.applet_prefs.get(meta.id, {})
@@ -75,6 +78,9 @@ def __init__(self, icon_size: int, config: Config | None = None) -> None:
         super().__init__(icon_size=icon_size, config=config)
         self.present()
 
+    def set_services(self, services: AppletServices) -> None:
+        self._screen_capture = services.screen_capture
+
     def create_icon(self, size: int) -> GdkPixbuf.Pixbuf | None:
         return create_icon(
             size=size,
@@ -91,6 +97,10 @@ def on_clicked(self) -> None:
         """Enter pick mode - fullscreen transparent overlay captures click."""
         self._start_pick()
 
+    def stop(self) -> None:
+        self._dismiss_overlay()
+        super().stop()
+
     def get_menu_items(self) -> list[Gtk.MenuItem]:
         primary: list[Gtk.MenuItem] = []
 
@@ -112,7 +122,7 @@ def _on_toggle_hex(self, widget: Gtk.CheckMenuItem) -> None:
 
     def _start_pick(self) -> None:
         """Create fullscreen transparent overlay to capture a click."""
-        if self._overlay:
+        if self._overlay or self._screen_capture is None:
             return
 
         self._overlay = create_capture_overlay(
@@ -130,7 +140,11 @@ def _on_overlay_click(self, _widget: Gtk.Window, event: Gdk.EventButton) -> bool
         """Sample pixel at click position."""
         self._dismiss_overlay()
 
-        pixel = pick_pixel(x=int(event.x_root), y=int(event.y_root))
+        pixel = (
+            self._screen_capture.pick_color(x=int(event.x_root), y=int(event.y_root))
+            if self._screen_capture is not None
+            else None
+        )
         if pixel:
             r, g, b = pixel
             self._r = r / 255.0

docking/applets/colorpicker/state.py

@@ -15,23 +15,6 @@
 
 from __future__ import annotations
 
-import gi
-
-gi.require_version("Gdk", "3.0")
-from gi.repository import Gdk
-
-
-def pick_pixel(x: int, y: int) -> tuple[int, int, int] | None:
-    """Read a single pixel from the root window at screen coordinates."""
-    root = Gdk.get_default_root_window()
-    if root is None:
-        return None
-    pb = Gdk.pixbuf_get_from_window(root, x, y, 1, 1)
-    if pb is None:
-        return None
-    p = pb.get_pixels()
-    return (p[0], p[1], p[2])
-
 
 def rgb_to_hex(r: int, g: int, b: int) -> str:
     """Convert RGB to uppercase hex string."""

docking/applets/deskpresence/applet.py

@@ -28,7 +28,6 @@
 
 from docking.applets.base import Applet
 from docking.applets.deskpresence import meta
-from docking.applets.deskpresence.idle import get_idle_ms
 from docking.applets.deskpresence.render import render_icon
 from docking.applets.deskpresence.state import (
     DEFAULT_POLL_INTERVAL_S,
@@ -42,13 +41,15 @@
     state_from_prefs,
 )
 from docking.applets.menu import disabled_menu_item, menu_sections, radio_submenu
+from docking.applets.services import AppletServices
 from docking.core.math import clamp
 from docking.i18n import _
 from docking.log import get_logger, with_context
 
 if TYPE_CHECKING:
     from docking.applets.deskpresence.state import PresenceState
     from docking.core.config import Config
+    from docking.platform.backends.base import IdleService
 
 log = with_context(get_logger(name="deskpresence"), applet_id=meta.id)
 
@@ -70,7 +71,7 @@ def __init__(self, icon_size: int, config: Config | None = None) -> None:
         self._timer_id: int = 0
         self._pulse_timer_id: int = 0
         self._pulse_phase: float = 0.0
-        self._idle_probe: Callable[[], int | None] = get_idle_ms
+        self._idle_service: IdleService | None = None
 
         prefs = prefs_from_mapping(
             config.applet_prefs.get(meta.id, {}) if config else None
@@ -80,6 +81,9 @@ def __init__(self, icon_size: int, config: Config | None = None) -> None:
         super().__init__(icon_size=icon_size, config=config)
         self.present()
 
+    def set_services(self, services: AppletServices) -> None:
+        self._idle_service = services.idle
+
     def create_icon(self, size: int) -> GdkPixbuf.Pixbuf | None:
         phase = self._pulse_phase if self._state.presence is Presence.AT_DESK else None
         return render_icon(
@@ -148,7 +152,12 @@ def _tick_once(self) -> bool:
         return False
 
     def _tick(self) -> bool:
-        idle_ms = self._idle_probe()
+        idle_seconds = (
+            self._idle_service.idle_seconds()
+            if self._idle_service is not None
+            else None
+        )
+        idle_ms = int(idle_seconds * 1000) if idle_seconds is not None else None
         apply_tick(
             state=self._state,
             idle_ms=idle_ms,

docking/applets/desktop/applet.py

@@ -19,18 +19,18 @@
 
 import gi
 
-gi.require_version("Wnck", "3.0")
 gi.require_version("GdkPixbuf", "2.0")
-from gi.repository import GdkPixbuf, Wnck
+from gi.repository import GdkPixbuf
 
 from docking.applets.base import Applet
 from docking.applets.desktop import meta
 from docking.applets.desktop.render import create_icon
-from docking.applets.desktop.state import next_showing_desktop
 from docking.i18n import _
 
 if TYPE_CHECKING:
+    from docking.applets.services import AppletServices
     from docking.core.config import Config
+    from docking.platform.backends.base import DesktopActionService
 
 
 class DesktopApplet(Applet):
@@ -42,16 +42,18 @@ class DesktopApplet(Applet):
     supports_system_icon = True
 
     def __init__(self, icon_size: int, config: Config | None = None) -> None:
+        self._desktop_actions: DesktopActionService | None = None
         super().__init__(icon_size=icon_size, config=config)
         self.present()
 
+    def set_services(self, services: AppletServices) -> None:
+        self._desktop_actions = services.desktop_actions
+
     def create_docking_icon(self, size: int) -> GdkPixbuf.Pixbuf | None:
         return create_icon(size=size)
 
     def on_clicked(self) -> None:
-        """Toggle show desktop via Wnck."""
-        screen = Wnck.Screen.get_default()
-        screen.force_update()
-        screen.toggle_showing_desktop(
-            next_showing_desktop(current=screen.get_showing_desktop())
-        )
+        """Toggle show desktop through the selected backend service."""
+        if self._desktop_actions is None:
+            return
+        self._desktop_actions.show_desktop()

docking/applets/services.py

@@ -0,0 +1,37 @@
+# Author: Eduardo Mucelli Rezende Oliveira
+# E-mail: edumucelli@gmail.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+"""Small backend services exposed to applets."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from docking.platform.backends.base import (
+    DesktopActionService,
+    IdleService,
+    ScreenCaptureService,
+    WindowPickService,
+    WorkspaceService,
+)
+
+
+@dataclass(frozen=True)
+class AppletServices:
+    """Optional backend services consumed by platform-sensitive applets."""
+
+    desktop_actions: DesktopActionService | None = None
+    workspaces: WorkspaceService | None = None
+    window_picker: WindowPickService | None = None
+    idle: IdleService | None = None
+    screen_capture: ScreenCaptureService | None = None