multiple monitor support

2025-05-06 13:09:40 +02:00
parent 53713ee0f5
commit f8b352d624
5 changed files with 263 additions and 211 deletions
--- a/bar/modules/bar.py
+++ b/bar/modules/bar.py
@@ -0,0 +1,128 @@
+import psutil
+from fabric.widgets.box import Box
+from fabric.widgets.label import Label
+from fabric.widgets.overlay import Overlay
+from fabric.widgets.datetime import DateTime
+from fabric.widgets.centerbox import CenterBox
+from bar.modules.player import Player
+from bar.modules.vinyl import VinylButton
+from fabric.widgets.wayland import WaylandWindow as Window
+from fabric.system_tray.widgets import SystemTray
+from ..river.widgets import (
+    RiverWorkspaces,
+    RiverWorkspaceButton,
+    RiverActiveWindow,
+    get_river_connection,
+)
+from fabric.utils import (
+    invoke_repeater,
+)
+from fabric.widgets.circularprogressbar import CircularProgressBar
+
+
+class StatusBar(Window):
+    def __init__(
+        self,
+        display: int,
+        tray: SystemTray | None = None,
+        monitor: int = 1,
+        river_service=None,
+    ):
+        super().__init__(
+            name="bar",
+            layer="top",
+            anchor="left top right",
+            margin="0px 0px -2px 0px",
+            exclusivity="auto",
+            visible=False,
+            all_visible=False,
+            monitor=monitor,
+        )
+        if river_service:
+            self.river = river_service
+        else:
+            self.river = get_river_connection()
+
+        self.workspaces = RiverWorkspaces(
+            display,
+            name="workspaces",
+            spacing=4,
+            buttons_factory=lambda ws_id: RiverWorkspaceButton(id=ws_id, label=None),
+            river_service=self.river,
+        )
+        self.date_time = DateTime(name="date-time", formatters="%d %b - %H:%M")
+        self.system_tray = tray
+
+        self.active_window = RiverActiveWindow(
+            name="active-window",
+            max_length=50,
+            style="color: #ffffff; font-size: 14px; font-weight: bold;",
+        )
+
+        self.ram_progress_bar = CircularProgressBar(
+            name="ram-progress-bar", pie=True, size=24
+        )
+        self.cpu_progress_bar = CircularProgressBar(
+            name="cpu-progress-bar", pie=True, size=24
+        )
+
+        self.progress_label = Label(
+            "", style="margin: 0px 6px 0px 0px; font-size: 12px"
+        )
+        self.progress_bars_overlay = Overlay(
+            child=self.ram_progress_bar,
+            overlays=[self.cpu_progress_bar, self.progress_label],
+        )
+        self.player = Player()
+        self.vinyl = VinylButton()
+
+        self.status_container = Box(
+            name="widgets-container",
+            spacing=4,
+            orientation="h",
+            children=self.progress_bars_overlay,
+        )
+
+        end_container_children = [
+            self.vinyl,
+            self.status_container,
+        ]
+
+        if self.system_tray:
+            end_container_children.append(self.system_tray)
+
+        end_container_children.append(self.date_time)
+
+        self.children = CenterBox(
+            name="bar-inner",
+            start_children=Box(
+                name="start-container",
+                spacing=6,
+                orientation="h",
+                children=[
+                    Label(name="nixos-label", markup=""),
+                    self.workspaces,
+                ],
+            ),
+            center_children=Box(
+                name="center-container",
+                spacing=4,
+                orientation="h",
+                children=[self.active_window],
+            ),
+            end_children=Box(
+                name="end-container",
+                spacing=4,
+                orientation="h",
+                children=end_container_children,
+            ),
+        )
+
+        invoke_repeater(1000, self.update_progress_bars)
+
+        self.show_all()
+
+    def update_progress_bars(self):
+        self.ram_progress_bar.value = psutil.virtual_memory().percent / 100
+        self.cpu_progress_bar.value = psutil.cpu_percent() / 100
+        return True
--- a/bar/modules/volume.py
+++ b/bar/modules/volume.py
@@ -0,0 +1,48 @@
+from fabric.widgets.circularprogressbar import CircularProgressBar
+from fabric.audio.service import Audio
+from fabric.widgets.eventbox import EventBox
+from fabric.widgets.box import Box
+from fabric.widgets.overlay import Overlay
+from fabric.widgets.label import Label
+
+
+class VolumeWidget(Box):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.audio = Audio()
+
+        self.progress_bar = CircularProgressBar(
+            name="volume-progress-bar", pie=True, size=24
+        )
+
+        self.event_box = EventBox(
+            events="scroll",
+            child=Overlay(
+                child=self.progress_bar,
+                overlays=Label(
+                    label="",
+                    style="margin: 0px 6px 0px 0px; font-size: 12px",  # to center the icon glyph
+                ),
+            ),
+        )
+
+        self.audio.connect("notify::speaker", self.on_speaker_changed)
+        self.event_box.connect("scroll-event", self.on_scroll)
+        self.add(self.event_box)
+
+    def on_scroll(self, _, event):
+        match event.direction:
+            case 0:
+                self.audio.speaker.volume += 8
+            case 1:
+                self.audio.speaker.volume -= 8
+        return
+
+    def on_speaker_changed(self, *_):
+        if not self.audio.speaker:
+            return
+        self.progress_bar.value = self.audio.speaker.volume / 100
+        self.audio.speaker.bind(
+            "volume", "value", self.progress_bar, lambda _, v: v / 100
+        )
+        return