deine cousine 4. grades

quick commit
better working tray
2026-01-10 22:02:27 +01:00 · 2026-01-03 22:55:02 +01:00 · 2026-01-02 16:50:02 +01:00 · 2025-12-30 21:55:11 +01:00 · 2025-12-25 21:13:00 +01:00 · 2025-12-23 19:57:52 +01:00
41 changed files with 2435 additions and 570 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,3 +1,12 @@
 IndentWidth: 4
 ColumnLimit: 0
 AlignConsecutiveAssignments: true
+
+IncludeCategories:
+  - Regex: '^(<.+>)$'
+    Priority: 1
+  - Regex: '^"(.+\.hpp)"$'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
+IncludeBlocks: Regroup
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,25 +12,39 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTKMM REQUIRED gtkmm-4.0)
 pkg_check_modules(LAYERSHELL REQUIRED gtk4-layer-shell-0)
 pkg_check_modules(WEBKIT REQUIRED webkitgtk-6.0)
+pkg_check_modules(SQLITE3 REQUIRED sqlite3)

-include_directories(${GTKMM_INCLUDE_DIRS} ${LAYERSHELL_INCLUDE_DIRS} ${WEBKIT_INCLUDE_DIRS})
-link_directories(${GTKMM_LIBRARY_DIRS} ${LAYERSHELL_LIBRARY_DIRS} ${WEBKIT_LIBRARY_DIRS})
+include_directories(${GTKMM_INCLUDE_DIRS} ${LAYERSHELL_INCLUDE_DIRS} ${WEBKIT_INCLUDE_DIRS} ${SQLITE3_INCLUDE_DIRS})
+link_directories(${GTKMM_LIBRARY_DIRS} ${LAYERSHELL_LIBRARY_DIRS} ${WEBKIT_LIBRARY_DIRS} ${SQLITE3_LIBRARY_DIRS})

 add_library(bar_lib)
 target_sources(bar_lib
    PUBLIC
        src/app.cpp
        src/bar/bar.cpp
+
        src/widgets/clock.cpp
        src/widgets/date.cpp
        src/widgets/workspaceIndicator.cpp
        src/widgets/volumeWidget.cpp
        src/widgets/webWidget.cpp
+        src/widgets/battery.cpp
+        
+        src/services/todo.cpp
+        src/services/sqliteTodoAdapter.cpp
        src/services/hyprland.cpp
        src/services/tray.cpp
        src/services/notifications.cpp
+        src/services/bluetooth.cpp
+
        src/widgets/tray.cpp
+        src/widgets/todo.cpp
+        src/widgets/bluetooth.cpp
+        src/widgets/controlCenter.cpp
+        
        src/components/popover.cpp
+        src/components/todoEntry.cpp
+        src/components/base/button.cpp
 )
 include_directories(bar_lib PRIVATE 
    include
@@ -38,7 +52,7 @@ include_directories(bar_lib PRIVATE

 add_executable(bar main.cpp)

-target_link_libraries(bar bar_lib ${GTKMM_LIBRARIES} ${LAYERSHELL_LIBRARIES} ${WEBKIT_LIBRARIES})
+target_link_libraries(bar bar_lib ${GTKMM_LIBRARIES} ${LAYERSHELL_LIBRARIES} ${WEBKIT_LIBRARIES} ${SQLITE3_LIBRARIES})

 # Copy `resources/bar.css` into the build directory when it changes
 set(RES_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/bar.css")
--- a/include/app.hpp
+++ b/include/app.hpp
@@ -3,12 +3,13 @@
 #include <vector>

 #include "bar/bar.hpp"
-#include "glibmm/refptr.h"
-#include "gtkmm/application.h"
 #include "services/hyprland.hpp"
 #include "services/notifications.hpp"
 #include "services/tray.hpp"

+#include "glibmm/refptr.h"
+#include "gtkmm/application.h"
+
 class App {
  public:
    App();
@@ -18,9 +19,9 @@ class App {
  private:
    Glib::RefPtr<Gtk::Application> app;
    std::vector<Bar *> bars;
-    HyprlandService hyprlandService;
+    HyprlandService *hyprlandService = HyprlandService::getInstance();
    NotificationService notificationService;
-    TrayService trayService;
+    TrayService *trayService = TrayService::getInstance();

    void setupServices();
 };
--- a/include/bar/bar.hpp
+++ b/include/bar/bar.hpp
@@ -2,38 +2,43 @@

 #include <gtk4-layer-shell/gtk4-layer-shell.h>
 #include <gtkmm.h>
+
 #include "icons.hpp"
-#include "services/hyprland.hpp"
-#include "services/tray.hpp"
+#include "widgets/battery.hpp"
 #include "widgets/clock.hpp"
+#include "widgets/controlCenter.hpp"
 #include "widgets/date.hpp"
 #include "widgets/tray.hpp"
+#include "widgets/volumeWidget.hpp"
 #include "widgets/webWidget.hpp"
 #include "widgets/workspaceIndicator.hpp"

 class Bar : public Gtk::Window {
  public:
-    Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
-        TrayService &trayService, int monitorId);
+    Bar(GdkMonitor *monitor, int monitorId);
+
+  private:
+    int monitorId;

-  protected:
    Gtk::CenterBox main_box{};
    Gtk::Box left_box{Gtk::Orientation::HORIZONTAL};
    Gtk::Box center_box{Gtk::Orientation::HORIZONTAL};
    Gtk::Box right_box{Gtk::Orientation::HORIZONTAL};

-  private:
    Clock clock;
    Date date;
-    WebWidget homeAssistant{ICON_HOME, "Home Assistant",
-                            "https://home.rivercry.com"};
-    TrayService &trayService;
-    HyprlandService &hyprlandService;
-    int monitorId;
+    WebWidget homeAssistant{ICON_HOME, "Home Assistant", "https://home.rivercry.com"};
+    ControlCenter controlCenter{"\ue8bb", "Control Center"};
+
    WorkspaceIndicator *workspaceIndicator = nullptr;
    TrayWidget *trayWidget                 = nullptr;
-    class VolumeWidget *volumeWidget = nullptr;
+    VolumeWidget *volumeWidget             = nullptr;
+    BatteryWidget *batteryWidget           = nullptr;
+

    void setup_ui();
+    void setup_left_box();
+    void setup_center_box();
+    void setup_right_box();
    void load_css();
 };
--- a/include/components/base/button.hpp
+++ b/include/components/base/button.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include "gtkmm/image.h"
+#include "sigc++/signal.h"
+
+class Button : public Gtk::Button {
+  public:
+    Button(const std::string label);
+    Button(Gtk::Image &image);
+
+    sigc::signal<void()> onClickedSignal;
+  
+  private:
+    void on_clicked() {
+        onClickedSignal.emit();
+    }
+};
--- a/include/components/popover.hpp
+++ b/include/components/popover.hpp
@@ -2,18 +2,18 @@

 #include <gtkmm/button.h>
 #include <gtkmm/popover.h>
-
 #include <string>
+#include "components/base/button.hpp"

-class Popover: public Gtk::Button {
-public:
-    Popover(std::string icon, std::string name);
+class Popover : public Button {
+  public:
+    Popover(const std::string icon, std::string name);
    ~Popover() override;

-protected:
+  protected:
    void on_toggle_window();
-    Gtk::Popover* popover = nullptr;
-    void set_popover_child(Gtk::Widget& child) {
+    Gtk::Popover *popover = nullptr;
+    void set_popover_child(Gtk::Widget &child) {
        gtk_popover_set_child(popover->gobj(), child.gobj());
    }
 };
--- a/include/components/todoEntry.hpp
+++ b/include/components/todoEntry.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <sys/stat.h>
+
+#include "gtkmm/box.h"
+
+class TodoEntry : public Gtk::Box {
+  public:
+    TodoEntry(int id, std::string text, sigc::signal<void(int)> signal_dismissed, sigc::signal<void(int, std::string)> signal_edited);
+
+    int get_id() const { return id; }
+    std::string get_text() const { return text; }
+
+  private:
+    int id;
+    std::string text;
+    sigc::signal<void(int)> signal_dismissed;
+    sigc::signal<void(int, std::string)> signal_edited;
+
+    void on_dismiss_clicked();
+};
--- a/include/interface/updateable.ipp
+++ b/include/interface/updateable.ipp
@@ -1,7 +1,7 @@
 #pragma once

 class IUpdatable {
-public:
+  public:
    virtual ~IUpdatable()   = default;
    virtual bool onUpdate() = 0;
 };
--- a/include/services/bluetooth.hpp
+++ b/include/services/bluetooth.hpp
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <string>
+#include <vector>
+
+#include "sigc++/signal.h"
+
+class BluetoothService {
+  inline static BluetoothService *instance = nullptr;
+  
+  public:
+    sigc::signal<void(bool)> powerStateChangedSignal;
+    sigc::signal<void(bool)> isDiscoveringChangedSignal;
+
+    bool getPowerState();
+    bool getIsDiscovering();
+
+    void togglePowerState();
+    void toggleIsDiscovering();
+
+    static BluetoothService *getInstance() {
+        if (BluetoothService::instance == nullptr) {
+
+            BluetoothService::instance = new BluetoothService();
+        }
+        return BluetoothService::instance;
+    }
+
+  private:
+    BluetoothService();
+
+    GDBusProxy *adapter_proxy = nullptr;
+
+    std::vector<std::string> getDeviceObjectPaths();
+    bool powerState    = false;
+    bool isDiscovering = false;
+
+    void onPropertyChanged(GDBusProxy *proxy,
+                           GVariant *changed_properties,
+                           const gchar *const *invalidated_properties,
+                           gpointer user_data);
+
+    static void onPropertyChangedStatic(GDBusProxy *proxy,
+                                        GVariant *changed_properties,
+                                        const gchar *const *invalidated_properties,
+                                        gpointer user_data);
+};
--- a/include/services/hyprland.hpp
+++ b/include/services/hyprland.hpp
@@ -5,9 +5,12 @@
 #include <map>
 #include <sigc++/sigc++.h>
 #include <string>
+#include <sys/stat.h>
 #include <vector>

 class HyprlandService {
+    inline static HyprlandService *instance = nullptr;
+
  public:
    static constexpr int kWorkspaceSlotCount = 7;
    const char *kMonitorCommand              = "hyprctl monitors -j";
@@ -36,9 +39,6 @@ class HyprlandService {
        int focusedWorkspaceId = -1;
    };

-    HyprlandService();
-    ~HyprlandService();
-
    void start();
    void on_hyprland_event(std::string event, std::string data);
    void printMonitor(const Monitor &mon) const;
@@ -55,11 +55,21 @@ class HyprlandService {
        return this->workspaces;
    }

+    static HyprlandService *getInstance() {
+        if (HyprlandService::instance == nullptr) {
+            HyprlandService::instance = new HyprlandService();
+        }
+
+        return HyprlandService::instance;
+    }
+
  private:
+    HyprlandService();
+    ~HyprlandService();
+
    int fd = -1;
    std::map<int, Monitor> monitors;
    std::map<int, WorkspaceState *> workspaces;
-    // persistent buffer for socket reads to handle partial messages
    std::string socket_buffer;

    std::string get_socket_path();
--- a/include/services/notifications.hpp
+++ b/include/services/notifications.hpp
@@ -3,18 +3,18 @@
 #include <gio/gio.h>

 class NotificationService {
-public:
+  public:
    void intialize();

    NotificationService() = default;
    ~NotificationService();

    guint32 allocateNotificationId(guint32 replacesId);
-    GDBusConnection* getConnection() const { return connection; }
+    GDBusConnection *getConnection() const { return connection; }

-private:
-    GDBusConnection* connection = nullptr;
+  private:
+    GDBusConnection *connection = nullptr;
    guint registrationId        = 0;
-    GDBusNodeInfo* nodeInfo = nullptr;
+    GDBusNodeInfo *nodeInfo     = nullptr;
    guint32 nextNotificationId  = 1;
 };
--- a/include/services/todo.hpp
+++ b/include/services/todo.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "components/todoEntry.hpp"
+#include "services/todoAdapter.hpp"
+
+class TodoService {
+  public:
+    TodoService(sigc::signal<void()> refreshSignal);
+    ~TodoService();
+
+    std::map<int, TodoEntry *> getTodos();
+    void init();
+    void removeTodo(int id);
+    TodoEntry *addTodo(std::string text, bool emitSignal = true, bool persist = true);
+    void updateTodo(int id, std::string text);
+
+  private:
+    void load();
+
+    int nextId = 1;
+    std::map<int, TodoEntry *> todos;
+    sigc::signal<void()> refreshSignal;
+
+    std::unique_ptr<ITodoAdapter> adapter;
+};
--- a/include/services/todoAdapter.hpp
+++ b/include/services/todoAdapter.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+struct TodoRecord {
+    int id;
+    std::string text;
+};
+
+class ITodoAdapter {
+  public:
+    virtual ~ITodoAdapter() = default;
+
+    virtual bool init()                         = 0;
+    virtual std::vector<TodoRecord> listTodos() = 0;
+
+    virtual int addTodo(const std::string &text)             = 0;
+    virtual bool removeTodo(int id)                          = 0;
+    virtual bool updateTodo(int id, const std::string &text) = 0;
+};
--- a/include/services/tray.hpp
+++ b/include/services/tray.hpp
@@ -1,22 +1,22 @@
 #pragma once

 #include <gdkmm/memorytexture.h>
+#include <gio/gio.h>
 #include <giomm/actiongroup.h>
 #include <giomm/dbusconnection.h>
 #include <giomm/init.h>
 #include <giomm/menumodel.h>
 #include <glibmm/bytes.h>
 #include <glibmm/refptr.h>
-#include <sigc++/sigc++.h>
-
-#include <gio/gio.h>
 #include <map>
 #include <memory>
 #include <optional>
+#include <sigc++/sigc++.h>
 #include <string>
 #include <vector>

 class TrayService {
+    inline static TrayService *instance = nullptr;
  public:
    struct Item {
        std::string id;
@@ -30,9 +30,6 @@ class TrayService {
        Glib::RefPtr<Gdk::Paintable> iconPaintable;
    };

-    TrayService();
-    ~TrayService();
-
    void start();
    void stop();

@@ -45,7 +42,6 @@ class TrayService {

    Glib::RefPtr<Gio::MenuModel> get_menu_model(const std::string &id);
    Glib::RefPtr<Gio::ActionGroup> get_menu_action_group(const std::string &id);
-    void debug_dump_menu_layout(const std::string &id);
    struct MenuNode {
        int id = 0;
        std::string label;
@@ -54,20 +50,39 @@ class TrayService {
        bool separator = false;
        std::vector<MenuNode> children;
    };
-    std::optional<MenuNode> get_menu_layout(const std::string &id);
-    bool activate_menu_item(const std::string &id, int itemId);
+    using MenuLayoutCallback = sigc::slot<void(std::optional<MenuNode>)>;
+    void request_menu_layout(const std::string &id, MenuLayoutCallback callback);
+    bool activate_menu_item(const std::string &id, int itemId, int32_t x = -1,
+                            int32_t y = -1, uint32_t button = 1,
+                            uint32_t timestampMs = 0);

    sigc::signal<void(const Item &)> &signal_item_added();
    sigc::signal<void(const std::string &)> &signal_item_removed();
    sigc::signal<void(const Item &)> &signal_item_updated();

+    static TrayService *getInstance() {
+        if (TrayService::instance == nullptr) {
+            TrayService::instance = new TrayService();
+        }
+        
+        return TrayService::instance;
+    }
+
  private:
+    TrayService();
+    ~TrayService();
+
    struct TrackedItem {
        Item publicData;
        guint signalSubscriptionId = 0;
        guint ownerWatchId         = 0;
        Glib::RefPtr<Gio::MenuModel> menuModel;
        Glib::RefPtr<Gio::ActionGroup> menuActions;
+
+        guint refreshSourceId = 0;
+        bool refreshInFlight  = false;
+        bool refreshQueued    = false;
+        bool addSignalPending = false;
    };

    Glib::RefPtr<Gio::DBus::Connection> connection;
@@ -117,7 +132,11 @@ class TrayService {
    void register_item(const Glib::ustring &sender, const std::string &service);
    void unregister_item(const std::string &id);

-    void refresh_item(TrackedItem &item);
+    void schedule_refresh(const std::string &id);
+    void begin_refresh(const std::string &id);
+    static gboolean refresh_timeout_cb(gpointer user_data);
+    static void on_refresh_finished_static(GObject *source, GAsyncResult *res,
+                                          gpointer user_data);
    void emit_registered_items_changed();

    Glib::Variant<std::vector<Glib::ustring>>
--- a/include/widgets/battery.hpp
+++ b/include/widgets/battery.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <filesystem>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <sigc++/connection.h>
+
+class BatteryWidget : public Gtk::Box {
+  public:
+    BatteryWidget();
+    ~BatteryWidget();
+
+  private:
+    Gtk::Label iconLabel;
+    Gtk::Label label;
+    sigc::connection timeoutConn;
+    std::filesystem::path batteryPath;
+    std::string currentStateClass;
+
+    void update();
+    bool on_timeout();
+    void find_battery_path();
+    void set_state_class(const std::string &stateClass);
+    std::string build_icon(int capacity, bool hasBattery, bool charging, bool full) const;
+    std::string build_text(int capacity, const std::string &status, bool hasBattery, bool charging, bool full) const;
+};
--- a/include/widgets/bluetooth.hpp
+++ b/include/widgets/bluetooth.hpp
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+
+#include "components/base/button.hpp"
+
+
+
+class BluetoothEntry : Gtk::Box {
+  public:
+    BluetoothEntry(std::string name, std::string address) {
+        this->set_orientation(Gtk::Orientation::VERTICAL);
+        this->add_css_class("bluetooth-entry-box");
+
+        auto nameLabel = Gtk::make_managed<Gtk::Label>(name);
+        nameLabel->set_halign(Gtk::Align::START);
+        nameLabel->add_css_class("bluetooth-entry-name");
+        this->append(*nameLabel);
+
+        auto addressLabel = Gtk::make_managed<Gtk::Label>(address);
+        addressLabel->set_halign(Gtk::Align::START);
+        addressLabel->add_css_class("bluetooth-entry-address");
+        this->append(*addressLabel);
+
+        this->add_css_class("bluetooth-entry");
+
+        auto connectButton = Gtk::make_managed<Button>("Connect");
+        connectButton->set_halign(Gtk::Align::END);
+        connectButton->set_tooltip_text("Connect to Device");
+        connectButton->onClickedSignal.connect([this, address]() {
+            this->connect_clicked.emit(address);
+        });
+        this->append(*connectButton);
+    }
+
+    sigc::signal<void(std::string)> connect_clicked;
+};
+
+
+class BluetoothWidget : public Gtk::Box {
+  public:
+    BluetoothWidget();
+
+    void setPowerState(bool state);
+    void setIsDiscovering(bool state);
+
+    sigc::signal<void()> onPowerStateButtonClickedSignal;
+    sigc::signal<void()> onIsDiscoveringButtonClickedSignal;
+
+    void update();
+
+  private:
+    bool isPowered     = false;
+    bool isDiscovering = false;
+
+    Gtk::Box statusArea;
+    std::map<std::string, BluetoothEntry *> deviceEntries;
+    Gtk::Box devicesArea;
+    Button *scanButton  = nullptr;
+    Button *powerButton = nullptr;
+
+    void onPowerButtonClicked();
+    void onScanButtonClicked();
+
+    void toggleButton(Button *button, bool state);
+};
--- a/include/widgets/controlCenter.hpp
+++ b/include/widgets/controlCenter.hpp
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "components/popover.hpp"
+#include "services/bluetooth.hpp"
+#include "widgets/bluetooth.hpp"
+#include "gtkmm/box.h"
+
+class ControlCenter : public Popover {
+    public:
+        ControlCenter(std::string icon, std::string name);
+    
+    private:
+        Gtk::Box container;
+
+        BluetoothWidget *bluetoothWidget = nullptr;
+        BluetoothService *bluetoothService = BluetoothService::getInstance();
+};
--- a/include/widgets/todo.hpp
+++ b/include/widgets/todo.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <string>
+
+#include "components/popover.hpp"
+#include "services/todo.hpp"
+
+class TodoPopover : public Popover {
+
+  public:
+    TodoPopover(std::string icon, std::string title);
+
+    void update();
+
+  private:
+    std::string name;
+    TodoService *todoService = nullptr;
+    Gtk::Box container;
+    Gtk::Box inputArea;
+    Gtk::Box *todoList = nullptr;
+};
--- a/include/widgets/tray.hpp
+++ b/include/widgets/tray.hpp
@@ -11,54 +11,60 @@
 #include <gtkmm/image.h>
 #include <gtkmm/picture.h>
 #include <gtkmm/popovermenu.h>
-
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
+#include <vector>

 #include "services/tray.hpp"
+#include "components/base/button.hpp"

-class TrayIconWidget : public Gtk::Button {
+class TrayIconWidget : public Button {
  public:
-    TrayIconWidget(TrayService &service, std::string id);
+    TrayIconWidget(std::string id);
+    ~TrayIconWidget() override;

    void update(const TrayService::Item &item);

  private:
-    TrayService &service;
+    TrayService &service = *TrayService::getInstance();
    std::string id;
    Gtk::Box container;
    Gtk::Picture picture;
    Gtk::Image image;
    Glib::RefPtr<Gtk::GestureClick> primaryGesture;
+    Glib::RefPtr<Gtk::GestureClick> middleGesture;
    Glib::RefPtr<Gtk::GestureClick> secondaryGesture;
    Glib::RefPtr<Gtk::PopoverMenu> menuPopover;
    Glib::RefPtr<Gio::SimpleActionGroup> menuActions;
    Glib::RefPtr<Gio::MenuModel> menuModel;
-    sigc::connection menuChangedConnection;
    bool menuPopupPending = false;
+    bool menuRequestInFlight = false;
+    bool hasRemoteMenu = false;
+    std::shared_ptr<bool> aliveFlag;
    double pendingX       = 0.0;
    double pendingY       = 0.0;

    void on_primary_released(int n_press, double x, double y);
+    void on_middle_released(int n_press, double x, double y);
    void on_secondary_released(int n_press, double x, double y);
-    bool ensure_menu();
-    void on_menu_items_changed(guint position, guint removed, guint added);
-    void try_popup();
+    void on_menu_layout_ready(std::optional<TrayService::MenuNode> layout);
    void
    populate_menu_items(const std::vector<TrayService::MenuNode> &nodes,
                        const Glib::RefPtr<Gio::Menu> &menu,
                        const Glib::RefPtr<Gio::SimpleActionGroup> &actions);
    void on_menu_action(const Glib::VariantBase &parameter, int itemId);
+    bool try_get_pending_coords(int32_t &outX, int32_t &outY) const;
 };

 class TrayWidget : public Gtk::Box {
  public:
-    explicit TrayWidget(TrayService &service);
+    explicit TrayWidget();
    ~TrayWidget() override;

  private:
-    TrayService &service;
+    TrayService *service = TrayService::getInstance();
    std::map<std::string, std::unique_ptr<TrayIconWidget>> icons;

    sigc::connection addConnection;
--- a/include/widgets/webWidget.hpp
+++ b/include/widgets/webWidget.hpp
@@ -1,11 +1,11 @@
 #pragma once

-#include "components/popover.hpp"
 #include <gtkmm/button.h>
 #include <gtkmm/popover.h>

+#include "components/popover.hpp"
+
 class WebWidget : public Popover {
-public:
+  public:
    WebWidget(std::string icon, std::string title, std::string url);
-private:
 };
--- a/include/widgets/workspaceIndicator.hpp
+++ b/include/widgets/workspaceIndicator.hpp
@@ -1,27 +1,28 @@
 #pragma once

 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
 #include <gtkmm/gestureclick.h>
+#include <gtkmm/label.h>
 #include <sigc++/connection.h>

 #include "services/hyprland.hpp"
+#include "gtkmm/overlay.h"

 class WorkspaceIndicator : public Gtk::Box {
  public:
-    WorkspaceIndicator(HyprlandService &service, int monitorId);
+    WorkspaceIndicator(int monitorId);
    ~WorkspaceIndicator() override;

  private:
-    HyprlandService &service;
+    HyprlandService *service = HyprlandService::getInstance();
    int monitorId;
    sigc::connection workspaceConnection;
    sigc::connection monitorConnection;
-    std::map<int, Gtk::Label *> workspaceLabels;
+    std::map<int, Gtk::Overlay *> workspaceIndicators;
    std::map<int, Glib::RefPtr<Gtk::GestureClick>> workspaceGestures;

    void rebuild();
    void on_workspace_update();
    void on_monitor_update();
-    void refreshLabel(Gtk::Label *label, const HyprlandService::WorkspaceState &state);
+    void refreshLabel(Gtk::Overlay *overlay, const HyprlandService::WorkspaceState &state);
 };
--- a/resources/bar.css
+++ b/resources/bar.css
@@ -1,35 +1,86 @@
+/** biome-ignore-all lint/correctness/noUnknownTypeSelector: gtk css has more valid identifiers */
 * {
 	all: unset;
 }

-
 window {
-    background-color: rgba(30, 30, 30, 0.8);
+	background-color: #191919c6;
 	color: #ffffff;
-    font-family: "IBMPlexSans-Regular", sans-serif;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-top: 2px;
+	padding-bottom: 2px;
 	font-size: 14px;
-    padding: 2px 7px;
+	font-family:
+		"Hack Nerd Font Mono", "Font Awesome 7 Brands", "Font Awesome 7 Free",
+		sans-serif;
 }

-#clock-label {
-    font-weight: bold;
-    font-family: monospace;
+popover {
+	margin-top: 4px;
+	font-family:
+		"Hack Nerd Font Mono", "Material Icons", "Font Awesome 7 Free", sans-serif;
+	padding: 6px;
+	border-radius: 8px;
+
+	background: rgba(25, 25, 25, 0.8);
+	box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1);
+	border: 1px solid rgba(57, 57, 57, 0.71);
+	font-size: 14px;
+}
+
+tooltip {
+	background-color: #222222;
+	color: #ffffff;
+	padding: 4px 8px;
+	border-radius: 4px;
+	font-size: 12px;
+}
+
+button {
+	font-family: "Material Icons", sans-serif;
+	font-size: 20px;
+}
+
+#spacer {
+	font-weight: 900;
+	padding: 0 5px;
+	text-shadow: 0 0 5px #ffffffaa;
+}
+
+.button {
+	padding: 4px 8px;
+	border-radius: 4px;
+	font-family: "Material Icons", sans-serif;
+}
+
+.button:hover {
+	background-color: #111111;
 }

 .workspace-pill {
 	padding: 2px 5px;
 	margin-right: 6px;
 	border-radius: 5px;
+	text-shadow: 0 0 2px #646464;
+	transition:
+		background-color 0.2s,
+		color 0.2s,
+		box-shadow 0.2s;
 }

 .workspace-pill:hover {
 	background-color: rgba(255, 255, 255, 0.1);
+	color: #ffffff;
+}
+
+.workspace-pill-active {
+	background-color: #666666;
 }

 .workspace-pill-focused {
 	background-color: #ffffff;
 	color: #1e1e1e;
-    font-weight: bold;
 	box-shadow: 0 0 6px rgba(255, 255, 255, 0.8);
 }

@@ -37,17 +88,41 @@ window {
 	box-shadow: none;
 }

-.workspace-pill-active {
-    background-color: rgba(255, 255, 255, 0.2);
-}
-
 .workspace-pill-urgent {
 	background-color: #ff5555;
 	color: #fff;
 	animation: workspace-blink 1s linear infinite;
 }

-/* blinking animation for urgent workspaces */
+.workspace-pill-six {
+	animation: workspace-updown 1.2s ease-in-out infinite;
+	margin-left: -4px;
+	margin-top: 4px;
+	font-size: 12px;
+}
+
+.workspace-pill-seven {
+	animation: workspace-updown 1.2s ease-in-out infinite;
+	animation-delay: 0.6s;
+	margin-right: -4px;
+	margin-top: 4px;
+	font-size: 12px;
+}
+
+@keyframes workspace-updown {
+	0% {
+		transform: translateY(4px);
+	}
+
+	50% {
+		transform: translateY(0px);
+	}
+
+	100% {
+		transform: translateY(4px);
+	}
+}
+
@keyframes workspace-blink {
 	0% {
 		opacity: 1;
@@ -62,50 +137,92 @@ window {
 	}
 }

-.workspace-pill:last-child {
-    margin-right: 0;
+.battery-widget {
+	padding: 2px 6px;
+	border-radius: 6px;
+	background-color: rgba(255, 255, 255, 0.04);
 }

-.minimized {
-    background-color: rgba(50, 50, 50, 0.5);
+.battery-widget-icon {
+	min-width: 7ch;
+	text-align: center;
+	font-weight: 700;
+	letter-spacing: 0.08ch;
 }

-.restored {
-    background-color: transparent;
+.battery-widget-text {
+	font-weight: 500;
 }

-button {
-    padding: 2px 5px;
-    margin: 0 2px;
-    border-radius: 3px;
-    background-color: transparent;
-    color: #ffffff;
-    border: none;
+.battery-widget-normal {
+	background-color: rgba(120, 120, 120, 0.18);
 }

-button:hover {
-    background-color: #111111;
+.battery-widget-full {
+	background-color: rgba(76, 129, 76, 0.24);
 }

-#spacer {
-    color: rgba(255, 255, 255, 0.3);
-    padding: 0 5px;
+.battery-widget-full .battery-widget-icon {
+	color: #bdf5bd;
 }

-popover {
-    background-color: rgb(30, 30, 30);
-    color: #ffffff;
-    font-family: "IBMPlexSans-Regular", sans-serif;
+.battery-widget-charging {
+	background-color: rgba(76, 129, 76, 0.28);
 }

-tooltip {
-    background-color: rgba(50, 50, 50, 0.9);
-    color: #ffffff;
-    font-family: "IBMPlexSans-Regular", sans-serif;
-    padding: 5px 10px;
+.battery-widget-charging .battery-widget-icon {
+	color: #9df19d;
+	animation: battery-charge-glow 1.4s ease-in-out infinite;
 }

-.icon-label {
-    font-family: "Material Icons, Font Awesome 7 Brands, Hack Nerd Font Mono";
-    font-size: 19px;
+.battery-widget-low {
+	background-color: rgba(148, 61, 61, 0.28);
+}
+
+.battery-widget-low .battery-widget-icon {
+	color: #ff8585;
+	animation: battery-low-blink 1s steps(2, start) infinite;
+}
+
+.battery-widget-external {
+	background-color: rgba(100, 100, 100, 0.18);
+}
+
+.battery-widget-external .battery-widget-icon {
+	color: #d7d7d7;
+}
+
+@keyframes battery-charge-glow {
+	0% {
+		opacity: 0.7;
+		transform: translateX(0);
+	}
+
+	50% {
+		opacity: 1;
+		transform: translateX(1px);
+	}
+
+	100% {
+		opacity: 0.7;
+		transform: translateX(0);
+	}
+}
+
+@keyframes battery-low-blink {
+	0% {
+		opacity: 1;
+	}
+
+	49% {
+		opacity: 1;
+	}
+
+	50% {
+		opacity: 0.4;
+	}
+
+	100% {
+		opacity: 0.4;
+	}
 }
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -22,15 +22,14 @@ App::App() {

                try {
                    hyprlandMonitor =
-                        this->hyprlandService.getMonitorByIndex(i);
+                        this->hyprlandService->getMonitorByIndex(i);
                } catch (const std::exception &ex) {
                    std::cerr << "[App] Failed to fetch Hyprland monitor: "
                              << ex.what() << std::endl;
                    continue;
                }

-                auto bar = new Bar(monitor->gobj(), this->hyprlandService,
-                                   this->trayService, hyprlandMonitor->id);
+                auto bar = new Bar(monitor->gobj(), hyprlandMonitor->id);

                bar->set_application(app);
                bar->show();
@@ -39,22 +38,23 @@ App::App() {
        }
    });

+
    app->signal_shutdown().connect([&]() {
        for (auto bar : bars) {
            delete bar;
        }
        bars.clear();

-        this->trayService.stop();
+        this->trayService->stop();
    });
 }

 void App::setupServices() {
-    this->hyprlandService.socketEventSignal.connect(sigc::mem_fun(
-        this->hyprlandService, &HyprlandService::on_hyprland_event));
+    this->hyprlandService->socketEventSignal.connect(sigc::mem_fun(
+        *this->hyprlandService, &HyprlandService::on_hyprland_event));

-    this->hyprlandService.start();
-    this->trayService.start();
+    this->hyprlandService->start();
+    this->trayService->start();
 }

 int App::run() { return this->app->run(); }
--- a/src/bar/bar.cpp
+++ b/src/bar/bar.cpp
@@ -1,26 +1,23 @@
 #include "bar/bar.hpp"

-#include "gtk/gtk.h"
-
-#include "widgets/date.hpp"
-#include "widgets/spacer.hpp"
-#include "widgets/volumeWidget.hpp"
-#include "widgets/workspaceIndicator.hpp"
-
-#include "helpers/systemHelper.hpp"
-
 #include <filesystem>
 #include <gtkmm/enums.h>
 #include <gtkmm/label.h>
 #include <gtkmm/window.h>

+#include "helpers/systemHelper.hpp"
+#include "widgets/date.hpp"
+#include "widgets/spacer.hpp"
+#include "widgets/todo.hpp"
+#include "widgets/volumeWidget.hpp"
+#include "widgets/workspaceIndicator.hpp"
+
 #include "glibmm/main.h"
+#include "gtk/gtk.h"
 #include "sigc++/functors/mem_fun.h"

-Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
-         TrayService &trayService, int monitorId)
-    : hyprlandService(hyprlandService), trayService(trayService),
-      monitorId(monitorId) {
+Bar::Bar(GdkMonitor *monitor, int monitorId)
+    : monitorId(monitorId) {
    set_name("bar-window");

    gtk_layer_init_for_window(this->gobj());
@@ -39,50 +36,51 @@ Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
    set_child(main_box);

    this->volumeWidget       = Gtk::make_managed<VolumeWidget>();
+    this->workspaceIndicator = Gtk::make_managed<WorkspaceIndicator>(monitorId);
+    this->trayWidget         = Gtk::make_managed<TrayWidget>();
+    this->batteryWidget      = Gtk::make_managed<BatteryWidget>();

    load_css();
    setup_ui();

    clock.onUpdate();
-
-    Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate),
-                                   1000);
-
    date.onUpdate();

+    Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate), 1000);
    Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate), 1000);
 }

 void Bar::setup_ui() {
-    main_box.set_hexpand(true);
-
    main_box.set_start_widget(left_box);
    main_box.set_center_widget(center_box);
    main_box.set_end_widget(right_box);
-    main_box.set_valign(Gtk::Align::CENTER);

-    left_box.set_valign(Gtk::Align::CENTER);
-
-    center_box.set_hexpand(false);
-    center_box.set_valign(Gtk::Align::CENTER);
-    center_box.set_halign(Gtk::Align::CENTER);
-
-    right_box.set_valign(Gtk::Align::CENTER);
-
-    workspaceIndicator = Gtk::make_managed<WorkspaceIndicator>(hyprlandService, monitorId);
+    setup_left_box();
+    setup_center_box();
+    setup_right_box();
+}

+void Bar::setup_left_box() {
    left_box.append(*workspaceIndicator);
+}

-    clock.set_name("clock-label");
+void Bar::setup_center_box() {
+    center_box.set_hexpand(false);
+
+    center_box.append(*(new TodoPopover("\uf23a", "To-Do")));
+    center_box.append(*(new Spacer()));
    center_box.append(this->date);
    center_box.append(*(new Spacer()));
    center_box.append(this->clock);
    center_box.append(*(new Spacer()));
    center_box.append(*this->volumeWidget);
+}

-    trayWidget = Gtk::make_managed<TrayWidget>(trayService);
-    right_box.append(*trayWidget);
-    right_box.append(homeAssistant);
+void Bar::setup_right_box() {
+    right_box.append(*this->trayWidget);
+    right_box.append(*this->batteryWidget);
+    right_box.append(this->homeAssistant);
+    right_box.append(this->controlCenter);
 }

 void Bar::load_css() {
--- a/src/components/base/button.cpp
+++ b/src/components/base/button.cpp
@@ -0,0 +1,19 @@
+#include "components/base/button.hpp"
+
+#include "sigc++/functors/mem_fun.h"
+
+
+Button::Button(const std::string label)
+    : Gtk::Button(label) {
+    signal_clicked().connect(
+        sigc::mem_fun(*this, &Button::on_clicked));
+    this->add_css_class("button");
+}
+
+Button::Button(Gtk::Image &image)
+    : Gtk::Button() {
+    set_child(image);
+    signal_clicked().connect(
+        sigc::mem_fun(*this, &Button::on_clicked));
+    this->add_css_class("button");
+}
--- a/src/components/popover.cpp
+++ b/src/components/popover.cpp
@@ -3,21 +3,12 @@
 #include "gtkmm/label.h"
 #include "gtkmm/object.h"

-Popover::Popover(std::string icon, std::string name) {
-    auto label = Gtk::make_managed<Gtk::Label>(icon);
-    label->add_css_class("icon-label");
-    set_child(*label);
-    signal_clicked().connect(
-        sigc::mem_fun(*this, &Popover::on_toggle_window));
+Popover::Popover(const std::string icon, std::string name): Button(icon) {
+    signal_clicked().connect(sigc::mem_fun(*this, &Popover::on_toggle_window));

    popover = new Gtk::Popover();
    popover->set_parent(*this);
    popover->set_autohide(true);
-
-    popover->signal_closed().connect([this]() {
-        this->add_css_class("minimized");
-        this->remove_css_class("restored");
-    });
 }

 Popover::~Popover() {
@@ -28,8 +19,6 @@ void Popover::on_toggle_window() {
    if (popover->get_visible()) {
        popover->popdown();
    } else {
-        this->remove_css_class("minimized");
-        this->add_css_class("restored");
        popover->popup();
    }
 }
--- a/src/components/todoEntry.cpp
+++ b/src/components/todoEntry.cpp
@@ -0,0 +1,47 @@
+#include "components/todoEntry.hpp"
+
+#include <gtkmm/label.h>
+#include <string>
+#include "components/base/button.hpp"
+
+TodoEntry::TodoEntry(int id, std::string text, sigc::signal<void(int)> signal_dismissed, sigc::signal<void(int, std::string)> signal_edited)
+    : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
+    this->id               = id;
+    this->text             = text;
+    this->signal_dismissed = signal_dismissed;
+    this->signal_edited    = signal_edited;
+
+    auto box = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::HORIZONTAL);
+    box->set_hexpand(true);
+    box->set_halign(Gtk::Align::START);
+    box->set_valign(Gtk::Align::CENTER);
+    box->set_name("todo-entry-box");
+    box->add_css_class("todo-entry-box");
+    append(*box);
+
+    auto label = Gtk::make_managed<Gtk::Label>(text);
+    label->set_halign(Gtk::Align::START);
+    label->set_valign(Gtk::Align::CENTER);
+    box->append(*label);
+
+    auto buttonBox = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::HORIZONTAL);
+    buttonBox->set_halign(Gtk::Align::END);
+    buttonBox->set_valign(Gtk::Align::CENTER);
+    append(*buttonBox);
+
+    auto dismissButton = Gtk::make_managed<Button>("\uf00d");
+    dismissButton->set_valign(Gtk::Align::CENTER);
+    dismissButton->set_tooltip_text("Dismiss");
+
+    dismissButton->signal_clicked().connect(sigc::mem_fun(*this, &TodoEntry::on_dismiss_clicked));
+
+    auto editButton = Gtk::make_managed<Button>("\uf044");
+    editButton->set_valign(Gtk::Align::CENTER);
+
+    buttonBox->append(*editButton);
+    buttonBox->append(*dismissButton);
+}
+
+void TodoEntry::on_dismiss_clicked() {
+    this->signal_dismissed.emit(this->id);
+}
--- a/src/services/bluetooth.cpp
+++ b/src/services/bluetooth.cpp
@@ -0,0 +1,237 @@
+#include "services/bluetooth.hpp"
+
+#include <cassert>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "glib.h"
+
+BluetoothService::BluetoothService() {
+    GError *error = nullptr;
+
+    this->adapter_proxy = g_dbus_proxy_new_for_bus_sync(
+        G_BUS_TYPE_SYSTEM,
+        G_DBUS_PROXY_FLAGS_NONE,
+        nullptr,
+        "org.bluez",
+        "/org/bluez/hci0",
+        "org.bluez.Adapter1",
+        nullptr,
+        &error);
+
+    if (error) {
+        std::cerr << "Error creating Bluetooth adapter proxy: "
+                  << error->message << std::endl;
+        g_error_free(error);
+        assert(false);
+    } 
+
+    this->powerState    = this->getPowerState();
+    this->isDiscovering = this->getIsDiscovering();
+
+    g_signal_connect(
+        this->adapter_proxy,
+        "g-properties-changed",
+        G_CALLBACK(BluetoothService::onPropertyChangedStatic),
+        this);
+}
+
+bool BluetoothService::getPowerState() {
+    GVariant *result = g_dbus_proxy_get_cached_property(
+        this->adapter_proxy,
+        "Powered");
+
+    if (!result) {
+        std::cerr << "Error getting Powered property." << std::endl;
+        return false;
+    }
+
+    gboolean powered;
+    g_variant_get(result, "b", &powered);
+    g_variant_unref(result);
+
+    return powered;
+}
+
+bool BluetoothService::getIsDiscovering() {
+    GVariant *result = g_dbus_proxy_get_cached_property(
+        this->adapter_proxy,
+        "Discovering");
+
+    if (!result) {
+        std::cerr << "Error getting Discovering property." << std::endl;
+        return false;
+    }
+
+    gboolean discovering;
+    g_variant_get(result, "b", &discovering);
+    g_variant_unref(result);
+
+    return discovering;
+}
+
+void BluetoothService::togglePowerState() {
+    GError *error = nullptr;
+    bool state    = !this->powerState;
+
+    GDBusConnection *connection = g_dbus_proxy_get_connection(this->adapter_proxy);
+    GVariant *reply             = g_dbus_connection_call_sync(
+        connection,
+        "org.bluez",
+        "/org/bluez/hci0",
+        "org.freedesktop.DBus.Properties",
+        "Set",
+        g_variant_new(
+            "(ssv)",
+            "org.bluez.Adapter1",
+            "Powered",
+            g_variant_new_boolean(state)),
+        nullptr,
+        G_DBUS_CALL_FLAGS_NONE,
+        -1,
+        nullptr,
+        &error);
+
+    if (error) {
+        std::cerr << "Error setting Powered property: "
+                  << error->message << std::endl;
+        g_error_free(error);
+    }
+
+    if (reply) {
+        g_variant_unref(reply);
+    }
+
+    if (!error) {
+        this->powerState = state;
+    }
+}
+
+void BluetoothService::toggleIsDiscovering() {
+    bool newState = !this->isDiscovering;
+    GError *error = nullptr;
+
+    const char *method = newState ? "StartDiscovery" : "StopDiscovery";
+    GVariant *reply    = g_dbus_proxy_call_sync(
+        this->adapter_proxy,
+        method,
+        nullptr,
+        G_DBUS_CALL_FLAGS_NONE,
+        -1,
+        nullptr,
+        &error);
+
+    if (error) {
+        std::cerr << "Error calling " << method << ": "
+                  << error->message << std::endl;
+        g_error_free(error);
+
+        if (reply) {
+            g_variant_unref(reply);
+        }
+        
+        return;
+    }
+
+    this->isDiscovering = newState;
+
+    if (reply) {
+        g_variant_unref(reply);
+    }
+}
+
+void BluetoothService::onPropertyChanged(GDBusProxy *proxy,
+                                         GVariant *changed_properties,
+                                         const gchar *const *invalidated_properties,
+                                         gpointer user_data) {
+
+    gboolean is_powered     = FALSE;
+    gboolean is_discovering = FALSE;
+
+    if (g_variant_lookup(changed_properties, "Powered", "b", &is_powered)) {
+
+        if (!is_powered) {
+            this->isDiscovering = is_discovering;
+            isDiscoveringChangedSignal.emit(isDiscovering);
+        }
+
+        this->powerState = is_powered;
+        powerStateChangedSignal.emit(powerState);
+    }
+
+    if (g_variant_lookup(changed_properties, "Discovering", "b", &is_discovering)) {
+        this->isDiscovering = is_discovering;
+        isDiscoveringChangedSignal.emit(isDiscovering);
+        getDeviceObjectPaths();
+    }
+}
+
+void BluetoothService::onPropertyChangedStatic(GDBusProxy *proxy,
+                                               GVariant *changed_properties,
+                                               const gchar *const *invalidated_properties,
+                                               gpointer user_data) {
+    BluetoothService *service = static_cast<BluetoothService *>(user_data);
+
+    if (service) {
+        service->onPropertyChanged(proxy, changed_properties, invalidated_properties, user_data);
+    } else {
+        std::cerr << "Error: BluetoothService instance is null in static callback." << std::endl;
+        assert(false);
+    }
+}
+
+std::vector<std::string> BluetoothService::getDeviceObjectPaths() {
+    std::vector<std::string> device_paths;
+
+    GError *error = nullptr;
+    GDBusConnection *connection = g_dbus_proxy_get_connection(this->adapter_proxy);
+    GVariant *reply = g_dbus_connection_call_sync(
+        connection,
+        "org.bluez",
+        "/",
+        "org.freedesktop.DBus.ObjectManager",
+        "GetManagedObjects",
+        nullptr,
+        G_VARIANT_TYPE("(a{oa{sa{sv}}})"),
+        G_DBUS_CALL_FLAGS_NONE,
+        -1,
+        nullptr,
+        &error);
+
+    if (error) {
+        std::cerr << "Error calling GetManagedObjects: " << error->message << std::endl;
+        g_error_free(error);
+        return device_paths;
+    }
+
+    if (!reply) {
+        return device_paths;
+    }
+
+    GVariant *objects = g_variant_get_child_value(reply, 0);
+    g_variant_unref(reply);
+
+    if (!objects) {
+        return device_paths;
+    }
+
+    GVariantIter iter;
+    g_variant_iter_init(&iter, objects);
+
+    const gchar *object_path = nullptr;
+    GVariant *interfaces = nullptr;
+    while (g_variant_iter_next(&iter, "{&o@a{sa{sv}}}", &object_path, &interfaces)) {
+        GVariant *device_props = nullptr;
+        if (g_variant_lookup(interfaces, "org.bluez.Device1", "@a{sv}", &device_props)) {
+            device_paths.emplace_back(object_path);
+            g_variant_unref(device_props);
+        }
+
+        g_variant_unref(interfaces);
+        interfaces = nullptr;
+    }
+
+    g_variant_unref(objects);
+    return device_paths;
+}
--- a/src/services/hyprland.cpp
+++ b/src/services/hyprland.cpp
@@ -1,17 +1,18 @@
 #include "services/hyprland.hpp"

+#include <algorithm>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 #include <iterator>
 #include <nlohmann/json.hpp>
 #include <stdexcept>
 #include <string>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unordered_set>
 #include <unistd.h>

-#include <iostream>
-
 #include "helpers/systemHelper.hpp"

 HyprlandService::HyprlandService() = default;
@@ -44,9 +45,6 @@ void HyprlandService::on_hyprland_event(std::string event, std::string data) {
        refresh_workspaces();
    }

-    // use for
-    //  event == "focusedmon"
-
    if (event == "monitoradded" || event == "monitorremoved") {
        refresh_monitors();
    }
@@ -78,8 +76,6 @@ void HyprlandService::start() {
        return;
    }

-    std::cout << "[Hyprland] Connected to event socket." << std::endl;
-
    Glib::signal_io().connect(
        sigc::mem_fun(*this, &HyprlandService::on_socket_read), fd,
        Glib::IOCondition::IO_IN | Glib::IOCondition::IO_HUP |
@@ -219,6 +215,22 @@ void HyprlandService::refresh_workspaces() {
        }
    }

+    std::string clientsOutput = SystemHelper::get_command_output(kClientsCommand);
+    auto clientsJson          = nlohmann::json::parse(clientsOutput, nullptr, false);
+    std::unordered_set<std::string> liveClientAddresses;
+    for (const auto &clientJson : clientsJson) {
+        const std::string addr = clientJson.value("address", "");
+        if (addr.empty()) {
+            continue;
+        }
+
+        if (addr.rfind("0x", 0) == 0) {
+            liveClientAddresses.insert(addr.substr(2));
+        } else {
+            liveClientAddresses.insert(addr);
+        }
+    }
+
    for (const auto &workspaceJson : workspacesJson) {
        const int workspaceId = workspaceJson.value("id", -1);
        auto workspaceStateIt = this->workspaces.find(workspaceId);
@@ -236,6 +248,17 @@ void HyprlandService::refresh_workspaces() {
        workspaceState->active = true;
    }

+    // drop urgent flags for windows no longer reported by hyprctl clients
+    for (auto &[id, ws] : this->workspaces) {
+        auto &urgent = ws->urgentWindows;
+        auto newEnd  = std::remove_if(urgent.begin(), urgent.end(), [&](const std::string &addr) {
+            return liveClientAddresses.find(addr) == liveClientAddresses.end();
+        });
+        if (newEnd != urgent.end()) {
+            urgent.erase(newEnd, urgent.end());
+        }
+    }
+
    workspaceStateChanged.emit();
 }

@@ -264,10 +287,10 @@ void HyprlandService::onUrgentEvent(std::string windowAddress) {
            auto it = this->workspaces.find(workspaceId);
            if (it != this->workspaces.end() && it->second) {

-                if (std::find(it->second->urgentWindows.begin(),
-                              it->second->urgentWindows.end(), windowAddress) ==
-                    it->second->urgentWindows.end()) {
-                    it->second->urgentWindows.push_back(windowAddress);
+                WorkspaceState *ws = it->second;
+                auto uit           = std::find(ws->urgentWindows.begin(), ws->urgentWindows.end(), windowAddress);
+                if (uit == ws->urgentWindows.end()) {
+                    ws->urgentWindows.push_back(windowAddress);
                    workspaceStateChanged.emit();
                }
            }
@@ -301,45 +324,6 @@ void HyprlandService::onActiveWindowEvent(std::string windowAddress) {
    }
 }

-void HyprlandService::printMonitor(const Monitor &mon) const {
-    std::cout << "=== Monitor Info ===\n";
-    std::cout << "Name: " << mon.name << " (ID: " << mon.id << ")\n";
-    std::cout << "Position: (" << mon.x << ", " << mon.y << ")\n";
-    std::cout << "Focused Workspace ID: " << mon.focusedWorkspaceId << "\n";
-
-    std::cout << "Workspaces:\n";
-
-    if (mon.workspaceStates.empty()) {
-        std::cout << "  (None)\n";
-
-        return;
-    }
-
-    for (int slot = 1; slot <= HyprlandService::kWorkspaceSlotCount; ++slot) {
-        const auto it = mon.workspaceStates.find(slot);
-        if (it == mon.workspaceStates.end()) {
-            std::cout << "  - [Slot: " << slot << " | HyprID: n/a]"
-                      << " Label: <none> | Active: No | Focused: No | "
-                         "Urgent: No\n";
-            continue;
-        }
-
-        const WorkspaceState *ws = it->second;
-        std::cout << "  - [HyprID: "
-                  << (ws->hyprId >= 0 ? std::to_string(ws->hyprId)
-                                      : std::string("n/a"))
-                  << "] "
-                  << "Label: " << (ws->label.empty() ? "<none>" : ws->label)
-                  << " | "
-                  << "Active: " << (ws->active ? "Yes" : "No") << " | "
-                  << "Focused: " << (ws->focused ? "Yes" : "No") << " | "
-                  << "Urgent: " << (ws->urgentWindows.size() > 0 ? "Yes" : "No")
-                  << "\n";
-    }
-
-    std::cout << "====================\n";
-}
-
 HyprlandService::Monitor *HyprlandService::getMonitorById(int id) {
    auto it = monitors.find(id);
    if (it == monitors.end()) {
--- a/src/services/notifications.cpp
+++ b/src/services/notifications.cpp
@@ -302,6 +302,4 @@ void NotificationService::intialize() {
                  << "). Stop your existing notification daemon (e.g. dunst/mako/swaync) or allow replacement." << std::endl;
        return;
    }
-
-    std::cout << "Notifications daemon active (org.freedesktop.Notifications)." << std::endl;
 }
--- a/src/services/sqliteTodoAdapter.cpp
+++ b/src/services/sqliteTodoAdapter.cpp
@@ -0,0 +1,164 @@
+#include <filesystem>
+#include <iostream>
+#include <memory>
+#include <sqlite3.h>
+
+#include "services/todoAdapter.hpp"
+
+namespace {
+std::string getDbPath() {
+    const char *homeDir = getenv("HOME");
+    if (!homeDir) {
+        return "todos.db";
+    }
+
+    std::string path = std::string(homeDir) + "/.config/bar";
+    if (!std::filesystem::exists(path)) {
+        std::filesystem::create_directories(path);
+    }
+
+    return path + "/todos.db";
+}
+
+class SqliteTodoAdapter final : public ITodoAdapter {
+  public:
+    ~SqliteTodoAdapter() override {
+        if (db_) {
+            sqlite3_close(db_);
+            db_ = nullptr;
+        }
+    }
+
+    bool init() override {
+        std::string dbPath = getDbPath();
+
+        int rc = sqlite3_open(dbPath.c_str(), &db_);
+        if (rc != SQLITE_OK) {
+            std::cerr << "Can't open database: " << sqlite3_errmsg(db_) << std::endl;
+            return false;
+        }
+
+        const char *sql = "CREATE TABLE IF NOT EXISTS todos ("
+                          "id INTEGER PRIMARY KEY AUTOINCREMENT,"
+                          "text TEXT NOT NULL);";
+        char *zErrMsg   = nullptr;
+        rc              = sqlite3_exec(db_, sql, nullptr, nullptr, &zErrMsg);
+        if (rc != SQLITE_OK) {
+            std::cerr << "SQL error (create table): " << (zErrMsg ? zErrMsg : "") << std::endl;
+            sqlite3_free(zErrMsg);
+            return false;
+        }
+
+        return true;
+    }
+
+    std::vector<TodoRecord> listTodos() override {
+        std::vector<TodoRecord> results;
+        if (!db_) {
+            return results;
+        }
+
+        sqlite3_stmt *stmt = nullptr;
+        const char *sql    = "SELECT id, text FROM todos";
+        int rc             = sqlite3_prepare_v2(db_, sql, -1, &stmt, nullptr);
+        if (rc != SQLITE_OK) {
+            std::cerr << "Failed to fetch data: " << sqlite3_errmsg(db_) << std::endl;
+            return results;
+        }
+
+        while ((rc = sqlite3_step(stmt)) == SQLITE_ROW) {
+            int id                   = sqlite3_column_int(stmt, 0);
+            const unsigned char *txt = sqlite3_column_text(stmt, 1);
+            results.push_back({id, txt ? reinterpret_cast<const char *>(txt) : ""});
+        }
+
+        sqlite3_finalize(stmt);
+        return results;
+    }
+
+    int addTodo(const std::string &text) override {
+        if (!db_) {
+            return -1;
+        }
+
+        sqlite3_stmt *stmt = nullptr;
+        const char *sql    = "INSERT INTO todos (text) VALUES (?1);";
+        int rc             = sqlite3_prepare_v2(db_, sql, -1, &stmt, nullptr);
+        if (rc != SQLITE_OK) {
+            std::cerr << "SQL prepare error (insert): " << sqlite3_errmsg(db_) << std::endl;
+            return -1;
+        }
+
+        sqlite3_bind_text(stmt, 1, text.c_str(), -1, SQLITE_TRANSIENT);
+        rc = sqlite3_step(stmt);
+        if (rc != SQLITE_DONE) {
+            std::cerr << "SQL step error (insert): " << sqlite3_errmsg(db_) << std::endl;
+            sqlite3_finalize(stmt);
+            return -1;
+        }
+
+        sqlite3_finalize(stmt);
+        return static_cast<int>(sqlite3_last_insert_rowid(db_));
+    }
+
+    bool removeTodo(int id) override {
+        if (!db_) {
+            return false;
+        }
+
+        sqlite3_stmt *stmt = nullptr;
+        const char *sql    = "DELETE FROM todos WHERE id = ?1;";
+        int rc             = sqlite3_prepare_v2(db_, sql, -1, &stmt, nullptr);
+        if (rc != SQLITE_OK) {
+            std::cerr << "SQL prepare error (delete): " << sqlite3_errmsg(db_) << std::endl;
+            return false;
+        }
+
+        sqlite3_bind_int(stmt, 1, id);
+        rc = sqlite3_step(stmt);
+        if (rc != SQLITE_DONE) {
+            std::cerr << "SQL step error (delete): " << sqlite3_errmsg(db_) << std::endl;
+            sqlite3_finalize(stmt);
+            return false;
+        }
+
+        sqlite3_finalize(stmt);
+        return true;
+    }
+
+    bool updateTodo(int id, const std::string &text) override {
+        if (!db_) {
+            return false;
+        }
+
+        sqlite3_stmt *stmt = nullptr;
+        const char *sql    = "UPDATE todos SET text = ?1 WHERE id = ?2;";
+        int rc             = sqlite3_prepare_v2(db_, sql, -1, &stmt, nullptr);
+        if (rc != SQLITE_OK) {
+            std::cerr << "SQL prepare error (update): " << sqlite3_errmsg(db_) << std::endl;
+            return false;
+        }
+
+        sqlite3_bind_text(stmt, 1, text.c_str(), -1, SQLITE_TRANSIENT);
+        sqlite3_bind_int(stmt, 2, id);
+        rc = sqlite3_step(stmt);
+        if (rc != SQLITE_DONE) {
+            std::cerr << "SQL step error (update): " << sqlite3_errmsg(db_) << std::endl;
+            sqlite3_finalize(stmt);
+            return false;
+        }
+
+        sqlite3_finalize(stmt);
+        return true;
+    }
+
+  private:
+    sqlite3 *db_ = nullptr;
+};
+
+} // namespace
+
+// Factory kept local to this TU for now; TodoService uses it.
+std::unique_ptr<ITodoAdapter> makeSqliteTodoAdapter() {
+    return std::make_unique<SqliteTodoAdapter>();
+}
--- a/src/services/todo.cpp
+++ b/src/services/todo.cpp
@@ -0,0 +1,128 @@
+#include "services/todo.hpp"
+
+#include <cassert>
+#include <iostream>
+#include <gtkmm/object.h>
+
+#include "components/todoEntry.hpp"
+
+std::unique_ptr<ITodoAdapter> makeSqliteTodoAdapter();
+
+TodoService::TodoService(sigc::signal<void()> refreshSignal) {
+    this->refreshSignal = refreshSignal;
+    this->adapter       = makeSqliteTodoAdapter();
+    this->init();
+}
+
+TodoService::~TodoService() {
+    this->adapter.reset();
+}
+
+std::map<int, TodoEntry *> TodoService::getTodos() {
+    return this->todos;
+}
+
+void TodoService::init() {
+    if (!this->adapter) {
+        std::cerr << "Todo adapter not set" << std::endl;
+        return;
+    }
+
+    if (!this->adapter->init()) {
+        std::cerr << "Todo adapter init failed" << std::endl;
+        return;
+    }
+
+    this->load();
+}
+
+void TodoService::removeTodo(int id) {
+    if (todos.find(id) == todos.end()) {
+        std::cerr << "Todo with id " << id << " not found!" << std::endl;
+        assert(false);
+    }
+
+    if (this->adapter) {
+        this->adapter->removeTodo(id);
+    }
+
+    todos.erase(id);
+    this->refreshSignal.emit();
+}
+
+TodoEntry *TodoService::addTodo(std::string text, bool emitSignal, bool persist) {
+    int id = nextId;
+
+    if (persist) {
+        if (!this->adapter) {
+            return nullptr;
+        }
+        int newId = this->adapter->addTodo(text);
+        if (newId < 0) {
+            return nullptr;
+        }
+        id = newId;
+    }
+
+    auto dismissSignal = sigc::signal<void(int)>();
+    dismissSignal.connect(sigc::mem_fun(*this, &TodoService::removeTodo));
+
+    auto editSignal = sigc::signal<void(int, std::string)>();
+    editSignal.connect(sigc::mem_fun(*this, &TodoService::updateTodo));
+
+    TodoEntry *todo = Gtk::make_managed<TodoEntry>(id, text, dismissSignal, editSignal);
+
+    todos[id] = todo;
+
+    if (id >= nextId) {
+        nextId = id + 1;
+    }
+
+    if (emitSignal) {
+        this->refreshSignal.emit();
+    }
+
+    return todo;
+}
+
+void TodoService::updateTodo(int id, std::string text) {
+    if (todos.find(id) == todos.end()) {
+        std::cerr << "Todo with id " << id << " not found!" << std::endl;
+        assert(false);
+    }
+
+    if (this->adapter) {
+        this->adapter->updateTodo(id, text);
+    }
+
+    this->refreshSignal.emit();
+}
+
+void TodoService::load() {
+    if (!this->adapter) {
+        return;
+    }
+
+    auto rows = this->adapter->listTodos();
+
+    int count = 0;
+
+    for (const auto &row : rows) {
+        count++;
+        int id           = row.id;
+        std::string text = row.text;
+
+        auto dismissSignal = sigc::signal<void(int)>();
+        dismissSignal.connect(sigc::mem_fun(*this, &TodoService::removeTodo));
+
+        auto editSignal = sigc::signal<void(int, std::string)>();
+        editSignal.connect(sigc::mem_fun(*this, &TodoService::updateTodo));
+
+        TodoEntry *todo = Gtk::make_managed<TodoEntry>(id, text, dismissSignal, editSignal);
+
+        todos[id] = todo;
+        if (id >= nextId) {
+            nextId = id + 1;
+        }
+    }
+}
--- a/src/services/tray.cpp
+++ b/src/services/tray.cpp
@@ -1,5 +1,7 @@
 #include "services/tray.hpp"

+#include <algorithm>
+#include <cstring>
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/texture.h>
 #include <gio/gdbusmenumodel.h>
@@ -7,10 +9,8 @@
 #include <giomm/dbusactiongroup.h>
 #include <giomm/dbusownname.h>
 #include <giomm/menumodel.h>
-
-#include <algorithm>
-#include <cstring>
 #include <iostream>
+#include <memory>
 #include <tuple>
 #include <vector>

@@ -22,6 +22,11 @@ constexpr const char *kItemInterface       = "org.kde.StatusNotifierItem";
 constexpr const char *kDBusPropertiesIface = "org.freedesktop.DBus.Properties";
 constexpr const char *kDBusMenuInterface   = "com.canonical.dbusmenu";

+constexpr int kDBusTimeoutMs        = 1500;
+constexpr int kDBusMenuTimeoutMs    = 2000;
+constexpr int kRefreshDebounceMs    = 50;
+constexpr int kAboutToShowTimeoutMs = 800;
+
 const char *kWatcherIntrospection =
    R"(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
@@ -106,53 +111,43 @@ void call_about_to_show(const Glib::RefPtr<Gio::DBus::Connection> &connection,
        return;
    }

-    GError *error    = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
-        connection->gobj(), busName.c_str(), menuPath.c_str(),
-        kDBusMenuInterface, "AboutToShow", g_variant_new("(i)", id), nullptr,
-        G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
-    if (result) {
-        g_variant_unref(result);
-    }
-    if (error) {
-        std::cerr << "[TrayService] AboutToShow failed for " << busName
-                  << menuPath << " (" << id << "): " << error->message
-                  << std::endl;
-        g_error_free(error);
-    }
+    g_dbus_connection_call(connection->gobj(), busName.c_str(), menuPath.c_str(),
+                           kDBusMenuInterface, "AboutToShow",
+                           g_variant_new("(i)", id), nullptr,
+                           G_DBUS_CALL_FLAGS_NONE, kAboutToShowTimeoutMs,
+                           nullptr, nullptr, nullptr);
 }

-GVariant *call_get_layout(const Glib::RefPtr<Gio::DBus::Connection> &connection,
-                          const std::string &busName,
-                          const std::string &menuPath) {
-    if (!connection) {
-        return nullptr;
-    }
+struct SimpleCallData {
+    std::string debugLabel;
+    bool ignoreUnknownMethod = false;
+};

-    GVariant *properties = create_property_list_variant();
-    if (!properties) {
-        return nullptr;
-    }
-
-    GVariant *params = g_variant_new("(ii@as)", 0, -1, properties);
-    g_variant_ref_sink(properties);
+void on_simple_call_finished(GObject *source, GAsyncResult *res,
+                             gpointer user_data) {
+    std::unique_ptr<SimpleCallData> data(
+        static_cast<SimpleCallData *>(user_data));

    GError *error   = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
-        connection->gobj(), busName.c_str(), menuPath.c_str(),
-        kDBusMenuInterface, "GetLayout", params, nullptr,
-        G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
+    GVariant *reply =
+        g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);

-    g_variant_unref(properties);
-
-    if (error) {
-        std::cerr << "[TrayService] GetLayout failed for " << busName
-                  << menuPath << ": " << error->message << std::endl;
-        g_error_free(error);
-        return nullptr;
+    if (reply) {
+        g_variant_unref(reply);
    }

-    return result;
+    if (!error) {
+        return;
+    }
+
+    const bool isUnknownMethod =
+        (error->domain == G_DBUS_ERROR && error->code == G_DBUS_ERROR_UNKNOWN_METHOD);
+    if (!(data && data->ignoreUnknownMethod && isUnknownMethod)) {
+        std::cerr << "[TrayService] "
+                  << (data ? data->debugLabel : std::string("D-Bus call"))
+                  << " failed: " << error->message << std::endl;
+    }
+    g_error_free(error);
 }

 void parse_menu_node(GVariant *tuple, TrayService::MenuNode &outNode) {
@@ -309,6 +304,10 @@ void TrayService::start() {
 void TrayService::stop() {
    if (connection) {
        for (auto &pair : items) {
+            if (pair.second->refreshSourceId != 0) {
+                g_source_remove(pair.second->refreshSourceId);
+                pair.second->refreshSourceId = 0;
+            }
            if (pair.second->signalSubscriptionId != 0) {
                g_dbus_connection_signal_unsubscribe(
                    connection->gobj(), pair.second->signalSubscriptionId);
@@ -362,22 +361,14 @@ void TrayService::activate(const std::string &id, int32_t x, int32_t y) {
        return;
    }

-    GError *error    = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
+    auto data            = new SimpleCallData();
+    data->debugLabel     = "Activate(" + id + ")";
+    data->ignoreUnknownMethod = false;
+    g_dbus_connection_call(
        connection->gobj(), it->second->publicData.busName.c_str(),
        it->second->publicData.objectPath.c_str(), kItemInterface, "Activate",
-        g_variant_new("(ii)", x, y), nullptr, G_DBUS_CALL_FLAGS_NONE, -1,
-        nullptr, &error);
-
-    if (result) {
-        g_variant_unref(result);
-    }
-
-    if (error) {
-        std::cerr << "[TrayService] Activate failed for " << id << ": "
-                  << error->message << std::endl;
-        g_error_free(error);
-    }
+        g_variant_new("(ii)", x, y), nullptr, G_DBUS_CALL_FLAGS_NONE,
+        kDBusTimeoutMs, nullptr, &on_simple_call_finished, data);
 }

 void TrayService::secondaryActivate(const std::string &id, int32_t x,
@@ -387,22 +378,15 @@ void TrayService::secondaryActivate(const std::string &id, int32_t x,
        return;
    }

-    GError *error    = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
+    auto data            = new SimpleCallData();
+    data->debugLabel     = "SecondaryActivate(" + id + ")";
+    data->ignoreUnknownMethod = false;
+    g_dbus_connection_call(
        connection->gobj(), it->second->publicData.busName.c_str(),
        it->second->publicData.objectPath.c_str(), kItemInterface,
        "SecondaryActivate", g_variant_new("(ii)", x, y), nullptr,
-        G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
-
-    if (result) {
-        g_variant_unref(result);
-    }
-
-    if (error) {
-        std::cerr << "[TrayService] SecondaryActivate failed for " << id << ": "
-                  << error->message << std::endl;
-        g_error_free(error);
-    }
+        G_DBUS_CALL_FLAGS_NONE, kDBusTimeoutMs, nullptr,
+        &on_simple_call_finished, data);
 }

 void TrayService::contextMenu(const std::string &id, int32_t x, int32_t y) {
@@ -411,25 +395,15 @@ void TrayService::contextMenu(const std::string &id, int32_t x, int32_t y) {
        return;
    }

-    GError *error    = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
+    auto data                 = new SimpleCallData();
+    data->debugLabel          = "ContextMenu(" + id + ")";
+    data->ignoreUnknownMethod = true;
+    g_dbus_connection_call(
        connection->gobj(), it->second->publicData.busName.c_str(),
        it->second->publicData.objectPath.c_str(), kItemInterface,
        "ContextMenu", g_variant_new("(ii)", x, y), nullptr,
-        G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
-
-    if (result) {
-        g_variant_unref(result);
-    }
-
-    if (error) {
-        if (!(error->domain == G_DBUS_ERROR &&
-              error->code == G_DBUS_ERROR_UNKNOWN_METHOD)) {
-            std::cerr << "[TrayService] ContextMenu failed for " << id << ": "
-                      << error->message << std::endl;
-        }
-        g_error_free(error);
-    }
+        G_DBUS_CALL_FLAGS_NONE, kDBusTimeoutMs, nullptr,
+        &on_simple_call_finished, data);
 }

 Glib::RefPtr<Gio::MenuModel>
@@ -486,70 +460,110 @@ TrayService::get_menu_action_group(const std::string &id) {
    return item.menuActions;
 }

-void TrayService::debug_dump_menu_layout(const std::string &id) {
-    auto it = items.find(id);
-    if (it == items.end() || !connection) {
+struct MenuLayoutCallData {
+    TrayService *self = nullptr;
+    std::string id;
+    std::string busName;
+    std::string menuPath;
+    TrayService::MenuLayoutCallback callback;
+};
+
+void on_menu_layout_finished(GObject *source, GAsyncResult *res,
+                             gpointer user_data) {
+    std::unique_ptr<MenuLayoutCallData> data(
+        static_cast<MenuLayoutCallData *>(user_data));
+    if (!data || !data->self) {
        return;
    }

-    const auto &item = *it->second;
-    if (!item.publicData.menuAvailable || item.publicData.menuPath.empty()) {
+    GError *error   = nullptr;
+    GVariant *reply =
+        g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
+
+    if (error) {
+        if (data->callback) {
+            data->callback(std::nullopt);
+        }
+        g_error_free(error);
        return;
    }

-    GVariant *result = call_get_layout(connection, item.publicData.busName,
-                                       item.publicData.menuPath);
-
-    if (!result) {
+    if (!reply) {
+        if (data->callback) {
+            data->callback(std::nullopt);
+        }
        return;
    }

-    gchar *printed = g_variant_print(result, TRUE);
-    if (printed) {
-        std::cout << "[TrayService] GetLayout for " << id << ":\n"
-                  << printed << std::endl;
-        g_free(printed);
+    GVariant *rootTuple = g_variant_get_child_value(reply, 1);
+    g_variant_unref(reply);
+
+    if (!rootTuple) {
+        if (data->callback) {
+            data->callback(std::nullopt);
+        }
+        return;
    }

-    g_variant_unref(result);
+    TrayService::MenuNode rootNode;
+    parse_menu_node(rootTuple, rootNode);
+    g_variant_unref(rootTuple);
+
+    if (data->callback) {
+        data->callback(std::make_optional(std::move(rootNode)));
+    }
 }

-std::optional<TrayService::MenuNode>
-TrayService::get_menu_layout(const std::string &id) {
+void TrayService::request_menu_layout(const std::string &id,
+                                      MenuLayoutCallback callback) {
    auto it = items.find(id);
    if (it == items.end() || !connection) {
-        return std::nullopt;
+        if (callback) {
+            callback(std::nullopt);
+        }
+        return;
    }

    auto &item = *it->second;
    if (!item.publicData.menuAvailable || item.publicData.menuPath.empty()) {
-        return std::nullopt;
+        if (callback) {
+            callback(std::nullopt);
+        }
+        return;
    }

    call_about_to_show(connection, item.publicData.busName,
                       item.publicData.menuPath, 0);

-    GVariant *result = call_get_layout(connection, item.publicData.busName,
-                                       item.publicData.menuPath);
-    if (!result) {
-        return std::nullopt;
+    auto data      = new MenuLayoutCallData();
+    data->self     = this;
+    data->id       = id;
+    data->busName  = item.publicData.busName;
+    data->menuPath = item.publicData.menuPath;
+    data->callback = std::move(callback);
+
+    GVariant *properties = create_property_list_variant();
+    if (!properties) {
+        if (data->callback) {
+            data->callback(std::nullopt);
+        }
+        delete data;
+        return;
    }

-    GVariant *rootTuple = g_variant_get_child_value(result, 1);
-    g_variant_unref(result);
+    // g_variant_new consumes the floating reference for '@as'.
+    GVariant *params = g_variant_new("(ii@as)", 0, -1, properties);

-    if (!rootTuple) {
-        return std::nullopt;
-    }
-
-    MenuNode rootNode;
-    parse_menu_node(rootTuple, rootNode);
-    g_variant_unref(rootTuple);
-
-    return rootNode;
+    g_dbus_connection_call(connection->gobj(), data->busName.c_str(),
+                           data->menuPath.c_str(), kDBusMenuInterface,
+                           "GetLayout", params, nullptr,
+                           G_DBUS_CALL_FLAGS_NONE, kDBusMenuTimeoutMs, nullptr,
+                           &on_menu_layout_finished, data);
 }

-bool TrayService::activate_menu_item(const std::string &id, int itemId) {
+bool TrayService::activate_menu_item(const std::string &id, int itemId,
+                                     int32_t x, int32_t y, uint32_t button,
+                                     uint32_t timestampMs) {
    auto it = items.find(id);
    if (it == items.end() || !connection) {
        return false;
@@ -560,28 +574,44 @@ bool TrayService::activate_menu_item(const std::string &id, int itemId) {
        return false;
    }

-    GVariant *emptyData =
-        g_variant_new_array(G_VARIANT_TYPE("{sv}"), nullptr, 0);
-    GVariant *params = g_variant_new(
-        "(isvu)", itemId, "clicked", g_variant_new_variant(emptyData),
-        static_cast<guint32>(g_get_monotonic_time() / 1000));
+    const guint32 nowMs = static_cast<guint32>(g_get_real_time() / 1000);
+    const guint32 ts    = timestampMs ? timestampMs : nowMs;

-    GError *error    = nullptr;
-    GVariant *result = g_dbus_connection_call_sync(
-        connection->gobj(), item.publicData.busName.c_str(),
-        item.publicData.menuPath.c_str(), kDBusMenuInterface, "Event", params,
-        nullptr, G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
+    std::cerr << "[TrayService] MenuEvent id=" << id << " item=" << itemId
+              << " x=" << x << " y=" << y << " button=" << button
+              << " tsMs=" << ts << std::endl;

-    if (result) {
-        g_variant_unref(result);
+    // dbusmenu Event signature: (i s v u)
+    // Some handlers (e.g., media players) look for both "timestamp" and
+    // "time" keys; send both alongside coords/button when available.
+    GVariantBuilder dict;
+    g_variant_builder_init(&dict, G_VARIANT_TYPE("a{sv}"));
+    g_variant_builder_add(&dict, "{sv}", "timestamp",
+                          g_variant_new_uint32(ts));
+    g_variant_builder_add(&dict, "{sv}", "time", g_variant_new_uint32(ts));
+
+    if (x != -1 && y != -1) {
+        g_variant_builder_add(&dict, "{sv}", "x", g_variant_new_int32(x));
+        g_variant_builder_add(&dict, "{sv}", "y", g_variant_new_int32(y));
+    }
+    if (button > 0) {
+        g_variant_builder_add(
+            &dict, "{sv}", "button",
+            g_variant_new_int32(static_cast<int32_t>(button)));
    }

-    if (error) {
-        std::cerr << "[TrayService] Event failed for " << id << " (" << itemId
-                  << "): " << error->message << std::endl;
-        g_error_free(error);
-        return false;
-    }
+    GVariant *payloadDict = g_variant_builder_end(&dict);
+    GVariant *payload     = g_variant_new_variant(payloadDict);
+    GVariant *params      = g_variant_new("(isvu)", itemId, "clicked",
+                                          payload, ts);
+
+    auto data        = new SimpleCallData();
+    data->debugLabel = "MenuEvent(" + id + "," + std::to_string(itemId) + ")";
+    g_dbus_connection_call(connection->gobj(), item.publicData.busName.c_str(),
+                           item.publicData.menuPath.c_str(), kDBusMenuInterface,
+                           "Event", params, nullptr, G_DBUS_CALL_FLAGS_NONE,
+                           kDBusMenuTimeoutMs, nullptr,
+                           &on_simple_call_finished, data);

    return true;
 }
@@ -725,8 +755,7 @@ void TrayService::register_item(const Glib::ustring &sender,
    const std::string id = parsed.busName + parsed.objectPath;
    auto existing        = items.find(id);
    if (existing != items.end()) {
-        refresh_item(*existing->second);
-        itemUpdatedSignal.emit(existing->second->publicData);
+        schedule_refresh(id);
        return;
    }

@@ -735,7 +764,7 @@ void TrayService::register_item(const Glib::ustring &sender,
    item->publicData.busName    = parsed.busName;
    item->publicData.objectPath = parsed.objectPath;

-    refresh_item(*item);
+    item->addSignalPending = true;

    item->signalSubscriptionId = g_dbus_connection_signal_subscribe(
        connection->gobj(), item->publicData.busName.c_str(), nullptr, nullptr,
@@ -755,7 +784,7 @@ void TrayService::register_item(const Glib::ustring &sender,
        std::make_tuple(Glib::ustring(id)));
    emit_watcher_signal("StatusNotifierItemRegistered", params);

-    itemAddedSignal.emit(items.at(id)->publicData);
+    schedule_refresh(id);
 }

 void TrayService::unregister_item(const std::string &id) {
@@ -764,6 +793,11 @@ void TrayService::unregister_item(const std::string &id) {
        return;
    }

+    if (it->second->refreshSourceId != 0) {
+        g_source_remove(it->second->refreshSourceId);
+        it->second->refreshSourceId = 0;
+    }
+
    if (connection && it->second->signalSubscriptionId != 0) {
        g_dbus_connection_signal_unsubscribe(connection->gobj(),
                                             it->second->signalSubscriptionId);
@@ -784,31 +818,58 @@ void TrayService::unregister_item(const std::string &id) {
    itemRemovedSignal.emit(id);
 }

-void TrayService::refresh_item(TrackedItem &item) {
-    if (!connection) {
+struct RefreshCallData {
+    TrayService *self = nullptr;
+    std::string id;
+    std::string busName;
+    std::string objectPath;
+};
+
+void TrayService::on_refresh_finished_static(GObject *source, GAsyncResult *res,
+                                            gpointer user_data) {
+    std::unique_ptr<RefreshCallData> data(
+        static_cast<RefreshCallData *>(user_data));
+    if (!data || !data->self) {
        return;
    }

+    auto it = data->self->items.find(data->id);
+    if (it == data->self->items.end()) {
+        return;
+    }
+
+    auto &tracked = *it->second;
+
    GError *error   = nullptr;
-    GVariant *reply = g_dbus_connection_call_sync(
-        connection->gobj(), item.publicData.busName.c_str(),
-        item.publicData.objectPath.c_str(), kDBusPropertiesIface, "GetAll",
-        g_variant_new("(s)", kItemInterface), G_VARIANT_TYPE("(a{sv})"),
-        G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
+    GVariant *reply =
+        g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
    if (!reply) {
        if (error) {
            std::cerr << "[TrayService] Failed to query properties for "
-                      << item.publicData.id << ": " << error->message
-                      << std::endl;
+                      << data->id << ": " << error->message << std::endl;
            g_error_free(error);
        }
+
+        tracked.refreshInFlight = false;
+        if (tracked.addSignalPending) {
+            tracked.addSignalPending = false;
+            data->self->itemAddedSignal.emit(tracked.publicData);
+        }
+        if (tracked.refreshQueued) {
+            tracked.refreshQueued = false;
+            data->self->schedule_refresh(data->id);
+        }
        return;
    }

    GVariant *dictVariant = g_variant_get_child_value(reply, 0);
    g_variant_unref(reply);
-
    if (!dictVariant) {
+        tracked.refreshInFlight = false;
+        if (tracked.refreshQueued) {
+            tracked.refreshQueued = false;
+            data->self->schedule_refresh(data->id);
+        }
        return;
    }

@@ -841,13 +902,8 @@ void TrayService::refresh_item(TrackedItem &item) {
            const gchar *str = g_variant_get_string(value, nullptr);
            status           = str ? str : "";
        } else if (std::strcmp(key, "Menu") == 0) {
-            if (g_variant_is_of_type(value, G_VARIANT_TYPE_OBJECT_PATH)) {
            const gchar *str = g_variant_get_string(value, nullptr);
            menuPath         = str ? str : "";
-            } else {
-                const gchar *str = g_variant_get_string(value, nullptr);
-                menuPath         = str ? str : "";
-            }
        } else if (std::strcmp(key, "IconName") == 0) {
            const gchar *str = g_variant_get_string(value, nullptr);
            iconName         = str ? str : "";
@@ -855,39 +911,127 @@ void TrayService::refresh_item(TrackedItem &item) {
            const gchar *str  = g_variant_get_string(value, nullptr);
            attentionIconName = str ? str : "";
        } else if (std::strcmp(key, "IconPixmap") == 0) {
-            iconTexture = parse_icon_pixmap(value);
+            iconTexture = TrayService::parse_icon_pixmap(value);
        } else if (std::strcmp(key, "AttentionIconPixmap") == 0) {
-            attentionTexture = parse_icon_pixmap(value);
+            attentionTexture = TrayService::parse_icon_pixmap(value);
        }

        g_variant_unref(value);
    }

    g_variant_unref(dictVariant);
-    const bool menuPathChanged    = (item.publicData.menuPath != menuPath);
-    item.publicData.title         = title;
-    item.publicData.status        = status;
-    item.publicData.menuPath      = menuPath;
-    item.publicData.menuAvailable = !menuPath.empty();

-    if (menuPathChanged || !item.publicData.menuAvailable) {
-        item.menuModel.reset();
-        item.menuActions.reset();
+    const bool menuPathChanged = (tracked.publicData.menuPath != menuPath);
+    tracked.publicData.title   = title;
+    tracked.publicData.status  = status;
+    tracked.publicData.menuPath      = menuPath;
+    tracked.publicData.menuAvailable = !menuPath.empty();
+
+    if (menuPathChanged || !tracked.publicData.menuAvailable) {
+        tracked.menuModel.reset();
+        tracked.menuActions.reset();
    }
-    item.publicData.iconName =
+
+    tracked.publicData.iconName =
        (status == "NeedsAttention" && !attentionIconName.empty())
            ? attentionIconName
            : iconName;

    if (status == "NeedsAttention" && attentionTexture) {
-        item.publicData.iconPaintable = attentionTexture;
+        tracked.publicData.iconPaintable = attentionTexture;
    } else {
-        item.publicData.iconPaintable = iconTexture;
+        tracked.publicData.iconPaintable = iconTexture;
    }

-    if (!item.publicData.iconPaintable && iconTexture) {
-        item.publicData.iconPaintable = iconTexture;
+    if (!tracked.publicData.iconPaintable && iconTexture) {
+        tracked.publicData.iconPaintable = iconTexture;
    }
+
+    tracked.refreshInFlight = false;
+
+    if (tracked.addSignalPending) {
+        tracked.addSignalPending = false;
+        data->self->itemAddedSignal.emit(tracked.publicData);
+    } else {
+        data->self->itemUpdatedSignal.emit(tracked.publicData);
+    }
+
+    if (tracked.refreshQueued) {
+        tracked.refreshQueued = false;
+        data->self->schedule_refresh(data->id);
+    }
+}
+
+struct RefreshTimeoutData {
+    TrayService *self = nullptr;
+    std::string id;
+};
+
+gboolean TrayService::refresh_timeout_cb(gpointer user_data) {
+    std::unique_ptr<RefreshTimeoutData> data(
+        static_cast<RefreshTimeoutData *>(user_data));
+    if (!data || !data->self) {
+        return G_SOURCE_REMOVE;
+    }
+
+    auto it = data->self->items.find(data->id);
+    if (it == data->self->items.end()) {
+        return G_SOURCE_REMOVE;
+    }
+
+    it->second->refreshSourceId = 0;
+    data->self->begin_refresh(data->id);
+    return G_SOURCE_REMOVE;
+}
+
+void TrayService::schedule_refresh(const std::string &id) {
+    auto it = items.find(id);
+    if (it == items.end()) {
+        return;
+    }
+
+    auto &tracked = *it->second;
+    if (tracked.refreshSourceId != 0) {
+        return;
+    }
+
+    auto *data = new RefreshTimeoutData();
+    data->self = this;
+    data->id   = id;
+    tracked.refreshSourceId =
+        g_timeout_add(kRefreshDebounceMs, &TrayService::refresh_timeout_cb, data);
+}
+
+void TrayService::begin_refresh(const std::string &id) {
+    if (!connection) {
+        return;
+    }
+
+    auto it = items.find(id);
+    if (it == items.end()) {
+        return;
+    }
+
+    auto &tracked = *it->second;
+    if (tracked.refreshInFlight) {
+        tracked.refreshQueued = true;
+        return;
+    }
+
+    tracked.refreshInFlight = true;
+
+    auto data        = new RefreshCallData();
+    data->self       = this;
+    data->id         = id;
+    data->busName    = tracked.publicData.busName;
+    data->objectPath = tracked.publicData.objectPath;
+
+    g_dbus_connection_call(connection->gobj(), data->busName.c_str(),
+                           data->objectPath.c_str(), kDBusPropertiesIface,
+                           "GetAll", g_variant_new("(s)", kItemInterface),
+                           G_VARIANT_TYPE("(a{sv})"), G_DBUS_CALL_FLAGS_NONE,
+                           kDBusTimeoutMs, nullptr,
+                           &TrayService::on_refresh_finished_static, data);
 }

 void TrayService::emit_registered_items_changed() {
@@ -985,12 +1129,10 @@ void TrayService::on_dbus_signal(const gchar *sender_name,
            std::strcmp(signal_name, "NewAttentionIcon") == 0 ||
            std::strcmp(signal_name, "NewToolTip") == 0 ||
            std::strcmp(signal_name, "NewMenu") == 0) {
-            refresh_item(*it->second);
-            itemUpdatedSignal.emit(it->second->publicData);
+            schedule_refresh(it->first);
        }
    } else if (isPropertiesSignal) {
-        refresh_item(*it->second);
-        itemUpdatedSignal.emit(it->second->publicData);
+        schedule_refresh(it->first);
    }
 }

--- a/src/widgets/battery.cpp
+++ b/src/widgets/battery.cpp
@@ -0,0 +1,219 @@
+#include "widgets/battery.hpp"
+
+#include <algorithm>
+#include <cctype>
+#include <filesystem>
+#include <fstream>
+#include <string>
+
+#include <glibmm/main.h>
+#include <sigc++/functors/mem_fun.h>
+
+namespace {
+std::string trim(const std::string &value) {
+    const auto start = value.find_first_not_of(" \t\n\r");
+    if (start == std::string::npos) {
+        return "";
+    }
+
+    const auto end = value.find_last_not_of(" \t\n\r");
+    return value.substr(start, end - start + 1);
+}
+}
+
+BatteryWidget::BatteryWidget() : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
+    set_valign(Gtk::Align::CENTER);
+    set_halign(Gtk::Align::CENTER);
+    set_spacing(6);
+    add_css_class("battery-widget");
+
+    iconLabel.set_halign(Gtk::Align::CENTER);
+    iconLabel.set_valign(Gtk::Align::CENTER);
+    iconLabel.set_width_chars(7);
+    iconLabel.set_text("[     ]");
+    iconLabel.add_css_class("battery-widget-icon");
+
+    append(iconLabel);
+
+    label.set_halign(Gtk::Align::CENTER);
+    label.set_valign(Gtk::Align::CENTER);
+    label.set_width_chars(5);
+    label.set_text("--%");
+    label.add_css_class("battery-widget-text");
+
+    append(label);
+
+    update();
+
+    timeoutConn = Glib::signal_timeout().connect(
+        sigc::mem_fun(*this, &BatteryWidget::on_timeout), 100);
+}
+
+BatteryWidget::~BatteryWidget() {
+    if (timeoutConn.connected()) {
+        timeoutConn.disconnect();
+    }
+}
+
+void BatteryWidget::find_battery_path() {
+    constexpr auto base = "/sys/class/power_supply";
+
+    batteryPath.clear();
+
+    if (!std::filesystem::exists(base)) {
+        return;
+    }
+
+    for (const auto &entry : std::filesystem::directory_iterator(base)) {
+        if (!entry.is_directory()) {
+            continue;
+        }
+
+        std::ifstream typeFile(entry.path() / "type");
+        if (!typeFile) {
+            continue;
+        }
+
+        std::string type;
+        std::getline(typeFile, type);
+        type = trim(type);
+        std::transform(type.begin(), type.end(), type.begin(), [](unsigned char ch) {
+            return static_cast<char>(std::toupper(ch));
+        });
+
+        if (type == "BATTERY") {
+            batteryPath = entry.path();
+            break;
+        }
+    }
+}
+
+void BatteryWidget::update() {
+    try {
+        if (batteryPath.empty() || !std::filesystem::exists(batteryPath)) {
+            find_battery_path();
+        }
+
+        const bool hasBattery = !batteryPath.empty();
+
+        int capacity = -1;
+        std::string status;
+        if (hasBattery) {
+            std::ifstream capacityFile(batteryPath / "capacity");
+            if (capacityFile) {
+                capacityFile >> capacity;
+            }
+
+            std::ifstream statusFile(batteryPath / "status");
+            if (statusFile) {
+                std::getline(statusFile, status);
+            }
+        }
+
+        status = trim(status);
+
+        const bool charging = status == "Charging";
+        const bool full = hasBattery && (status == "Full" || (capacity >= 95));
+        const bool low = (capacity >= 0 && capacity < 20 && !charging);
+
+        std::string stateClass;
+        if (!hasBattery) {
+            stateClass = "battery-widget-external";
+        } else if (charging) {
+            stateClass = "battery-widget-charging";
+        } else if (low) {
+            stateClass = "battery-widget-low";
+        } else if (full) {
+            stateClass = "battery-widget-full";
+        } else {
+            stateClass = "battery-widget-normal";
+        }
+
+        set_state_class(stateClass);
+
+        iconLabel.set_text(build_icon(capacity, hasBattery, charging, full));
+        label.set_text(build_text(capacity, status, hasBattery, charging, full));
+    } catch (...) {
+        set_state_class("battery-widget-normal");
+        iconLabel.set_text("[???]");
+        label.set_text("??%");
+    }
+}
+
+bool BatteryWidget::on_timeout() {
+    update();
+    return true;
+}
+
+void BatteryWidget::set_state_class(const std::string &stateClass) {
+    if (currentStateClass == stateClass) {
+        return;
+    }
+
+    if (!currentStateClass.empty()) {
+        remove_css_class(currentStateClass);
+    }
+
+    currentStateClass = stateClass;
+
+    if (!currentStateClass.empty()) {
+        add_css_class(currentStateClass);
+    }
+}
+
+std::string BatteryWidget::build_icon(int capacity, bool hasBattery, bool charging, bool full) const {
+    if (!hasBattery) {
+        return "<AC>";
+    }
+
+    static constexpr int segments = 5;
+    const int clampedCapacity = std::clamp(capacity, 0, 100);
+    int filledSegments = (clampedCapacity * segments + 99) / 100;
+
+    if (full) {
+        filledSegments = segments;
+    }
+
+    std::string icon = "[";
+    for (int i = 0; i < segments; ++i) {
+        icon += (i < filledSegments) ? '=' : ' ';
+    }
+    icon += ']';
+
+    if (charging) {
+        icon += '>';
+    } else if (clampedCapacity <= 5) {
+        icon += '!';
+    } else {
+        icon += ' ';
+    }
+
+    return icon;
+}
+
+std::string BatteryWidget::build_text(int capacity, const std::string &status, bool hasBattery, bool charging, bool full) const {
+    if (!hasBattery) {
+        return "AC";
+    }
+
+    if (capacity >= 0) {
+        std::string text;
+        if (full && capacity >= 99) {
+            text = "100%";
+        } else {
+            text = std::to_string(std::clamp(capacity, 0, 100)) + "%";
+        }
+
+        if (charging && capacity < 100) {
+            text.insert(text.begin(), '+');
+        }
+
+        return text;
+    }
+
+    if (!status.empty()) {
+        return status;
+    }
+
+    return "?%";
+}
--- a/src/widgets/bluetooth.cpp
+++ b/src/widgets/bluetooth.cpp
@@ -0,0 +1,72 @@
+#include "widgets/bluetooth.hpp"
+#include "gtkmm/label.h"
+
+
+BluetoothWidget::BluetoothWidget() : Gtk::Box() {
+    this->set_orientation(Gtk::Orientation::VERTICAL);
+    this->add_css_class("bluetooth-popover-container");
+
+    this->statusArea.add_css_class("bluetooth-status-area");
+    this->statusArea.set_hexpand(true);
+    this->statusArea.set_halign(Gtk::Align::FILL);
+    this->append(this->statusArea);
+
+    this->powerButton = Gtk::make_managed<Button>("\ue1a8");
+    this->powerButton->set_tooltip_text("Turn Bluetooth Off");
+    this->powerButton->signal_clicked().connect(sigc::mem_fun(*this, &BluetoothWidget::onPowerButtonClicked));
+    this->powerButton->add_css_class("toggle-button");
+
+    this->scanButton = Gtk::make_managed<Button>("\ue1aa");
+    this->scanButton->set_tooltip_text("Scan for Devices");
+    this->scanButton->add_css_class("toggle-button");
+    this->scanButton->signal_clicked().connect(sigc::mem_fun(*this, &BluetoothWidget::onScanButtonClicked));
+
+    this->statusArea.append(*this->powerButton);
+    this->statusArea.append(*this->scanButton);
+}
+
+void BluetoothWidget::onPowerButtonClicked() {
+    onPowerStateButtonClickedSignal.emit();
+}
+
+void BluetoothWidget::onScanButtonClicked() {
+    onIsDiscoveringButtonClickedSignal.emit();
+}
+
+void BluetoothWidget::toggleButton(Button *button, bool state) {
+    if (state) {
+        button->add_css_class("toggle-button-on");
+        button->remove_css_class("toggle-button-off");
+    } else {
+        button->add_css_class("toggle-button-off");
+        button->remove_css_class("toggle-button-on");
+    }
+}
+
+void BluetoothWidget::setPowerState(bool state) {
+    this->isPowered = state;
+
+    this->scanButton->set_sensitive(state);
+
+    if (!state) {
+        this->scanButton->add_css_class("toggle-button-disabled");
+        // this->add_css_class("disabled-popover-icon");
+        this->setIsDiscovering(false);
+    } else {
+        this->scanButton->remove_css_class("toggle-button-disabled");
+        // this->remove_css_class("disabled-popover-icon");
+    }
+
+    this->toggleButton(this->powerButton, state);
+}
+
+void BluetoothWidget::setIsDiscovering(bool state) {
+    this->isDiscovering = state;
+
+    this->toggleButton(this->scanButton, state);
+}
+
+void BluetoothWidget::update() {
+    setPowerState(isPowered);
+    setIsDiscovering(isDiscovering);
+}
--- a/src/widgets/controlCenter.cpp
+++ b/src/widgets/controlCenter.cpp
@@ -0,0 +1,24 @@
+#include "widgets/controlCenter.hpp"
+
+ControlCenter::ControlCenter(std::string icon, std::string name)
+    : Popover(icon, name) {
+        this->popover->set_size_request(200, -1);
+        set_popover_child(this->container);
+
+        this->bluetoothWidget = Gtk::make_managed<BluetoothWidget>();
+        this->container.append(*this->bluetoothWidget);
+
+            bluetoothService->powerStateChangedSignal.connect(
+        sigc::mem_fun(*this->bluetoothWidget, &BluetoothWidget::setPowerState));
+    
+        bluetoothWidget->onPowerStateButtonClickedSignal.connect(
+        sigc::mem_fun(*this->bluetoothService, &BluetoothService::togglePowerState));
+    
+        bluetoothWidget->setPowerState(bluetoothService->getPowerState());
+
+    bluetoothService->isDiscoveringChangedSignal.connect(
+        sigc::mem_fun(*this->bluetoothWidget, &BluetoothWidget::setIsDiscovering));
+    bluetoothWidget->onIsDiscoveringButtonClickedSignal.connect(
+        sigc::mem_fun(*this->bluetoothService, &BluetoothService::toggleIsDiscovering));
+    bluetoothWidget->setIsDiscovering(bluetoothService->getIsDiscovering());
+    }    
--- a/src/widgets/todo.cpp
+++ b/src/widgets/todo.cpp
@@ -0,0 +1,78 @@
+#include "widgets/todo.hpp"
+
+#include <gtkmm/box.h>
+#include <gtkmm/entry.h>
+#include <string>
+
+TodoPopover::TodoPopover(std::string icon, std::string title) : Popover(icon, title) {
+    this->name = title;
+    this->popover->set_size_request(300, -1);
+
+    container.set_orientation(Gtk::Orientation::VERTICAL);
+    container.add_css_class("todo-popover-container");
+
+    auto entry = Gtk::make_managed<Gtk::Entry>();
+    entry->set_placeholder_text("Enter your to-do item...");
+    entry->add_css_class("todo-input");
+    entry->set_hexpand(true);
+    entry->set_halign(Gtk::Align::FILL);
+    entry->set_valign(Gtk::Align::START);
+
+    inputArea.append(*entry);
+    inputArea.add_css_class("todo-input-area");
+    inputArea.set_hexpand(true);
+    inputArea.set_halign(Gtk::Align::FILL);
+
+    entry->signal_activate().connect([this, entry]() {
+        std::string text = entry->get_text();
+        if (!text.empty()) {
+            this->todoService->addTodo(text);
+
+            entry->set_text("");
+        }
+    });
+
+    container.append(inputArea);
+
+    this->todoList = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::VERTICAL);
+    container.append(*todoList);
+    todoList->add_css_class("todo-list");
+
+    auto signal       = sigc::signal<void()>();
+    this->todoService = new TodoService(signal);
+
+    signal.connect(sigc::mem_fun(*this, &TodoPopover::update));
+
+    this->set_popover_child(this->container);
+    this->update();
+}
+
+void TodoPopover::update() {
+    auto todos = this->todoService->getTodos();
+
+    Gtk::Widget *child = todoList->get_first_child();
+
+    while (child) {
+        Gtk::Widget *next = child->get_next_sibling();
+
+        bool found = false;
+        for (auto &[id, todo] : todos) {
+            if (child == todo) {
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            todoList->remove(*child);
+        }
+
+        child = next;
+    }
+
+    for (auto &[id, todo] : todos) {
+        if (todo->get_parent() == nullptr) {
+            todoList->append(*todo);
+        }
+    }
+}
--- a/src/widgets/tray.cpp
+++ b/src/widgets/tray.cpp
@@ -3,12 +3,187 @@
 #include <gdkmm/rectangle.h>
 #include <gio/gmenu.h>
 #include <gtk/gtk.h>
-#include <iostream>
+#include <cmath>
+#include <graphene.h>
 #include <utility>
+#include <iostream>
+#include "components/base/button.hpp"

-TrayIconWidget::TrayIconWidget(TrayService &service, std::string id)
-    : service(service), id(std::move(id)),
+namespace {
+bool is_wayland_display(GtkWidget *widget) {
+    if (!widget) {
+        return true;
+    }
+
+    GtkNative *native = gtk_widget_get_native(widget);
+    if (!native) {
+        return true;
+    }
+
+    GdkSurface *surface = gtk_native_get_surface(native);
+    if (!surface) {
+        return true;
+    }
+
+    GdkDisplay *display = gdk_surface_get_display(surface);
+    if (!display) {
+        return true;
+    }
+
+    const char *typeName = G_OBJECT_TYPE_NAME(display);
+    if (!typeName) {
+        return true;
+    }
+
+    return std::string(typeName).find("Wayland") != std::string::npos;
+}
+
+bool try_get_monitor_geometry(GtkWidget *widget, GdkRectangle &outGeom) {
+    if (!widget) {
+        return false;
+    }
+
+    GtkNative *native = gtk_widget_get_native(widget);
+    if (!native) {
+        return false;
+    }
+
+    GdkSurface *surface = gtk_native_get_surface(native);
+    if (!surface) {
+        return false;
+    }
+
+    GdkDisplay *display = gdk_surface_get_display(surface);
+    if (!display) {
+        return false;
+    }
+
+    GdkMonitor *monitor = gdk_display_get_monitor_at_surface(display, surface);
+    if (!monitor) {
+        return false;
+    }
+
+    gdk_monitor_get_geometry(monitor, &outGeom);
+    return true;
+}
+
+bool try_get_global_click_coords(GtkWidget *widget, double x, double y,
+                                 int32_t &outX, int32_t &outY) {
+    if (!widget) {
+        return false;
+    }
+
+    GtkNative *native = gtk_widget_get_native(widget);
+    if (!native) {
+        return false;
+    }
+
+    GtkWidget *nativeWidget = GTK_WIDGET(native);
+    graphene_point_t src{static_cast<float>(x), static_cast<float>(y)};
+    graphene_point_t dst{0.0f, 0.0f};
+    if (!gtk_widget_compute_point(widget, nativeWidget, &src, &dst)) {
+        return false;
+    }
+
+    GdkRectangle geom;
+    if (!try_get_monitor_geometry(widget, geom)) {
+        return false;
+    }
+
+    outX = static_cast<int32_t>(geom.x + std::lround(dst.x));
+    outY = static_cast<int32_t>(geom.y + std::lround(dst.y));
+    return true;
+}
+
+bool try_get_global_pointer_coords(GtkWidget *widget, int32_t &outX,
+                                   int32_t &outY) {
+    if (!widget) {
+        return false;
+    }
+
+    GtkNative *native = gtk_widget_get_native(widget);
+    if (!native) {
+        return false;
+    }
+
+    GdkSurface *surface = gtk_native_get_surface(native);
+    if (!surface) {
+        return false;
+    }
+
+    GdkDisplay *display = gdk_surface_get_display(surface);
+    if (!display) {
+        return false;
+    }
+
+    GdkSeat *seat = gdk_display_get_default_seat(display);
+    if (!seat) {
+        return false;
+    }
+
+    GdkDevice *pointer = gdk_seat_get_pointer(seat);
+    if (!pointer) {
+        return false;
+    }
+
+    double sx = 0.0;
+    double sy = 0.0;
+    if (!gdk_surface_get_device_position(surface, pointer, &sx, &sy, nullptr)) {
+        return false;
+    }
+
+    GdkRectangle geom;
+    if (!try_get_monitor_geometry(widget, geom)) {
+        return false;
+    }
+
+    outX = static_cast<int32_t>(geom.x + std::lround(sx));
+    outY = static_cast<int32_t>(geom.y + std::lround(sy));
+    return true;
+}
+
+bool has_popup_surface(GtkWidget *widget) {
+    if (!widget) {
+        return false;
+    }
+    GtkRoot *root = gtk_widget_get_root(widget);
+    if (!root) {
+        return false;
+    }
+    GtkNative *native = gtk_widget_get_native(widget);
+    if (!native) {
+        return false;
+    }
+    GdkSurface *surface = gtk_native_get_surface(native);
+    if (!surface) {
+        return false;
+    }
+    return gdk_surface_get_mapped(surface);
+}
+
+void log_menu_tree(const std::vector<TrayService::MenuNode> &nodes,
+                   int depth = 0) {
+    const std::string indent(static_cast<std::size_t>(depth) * 2, ' ');
+    for (const auto &node : nodes) {
+        if (!node.visible) {
+            continue;
+        }
+        std::cerr << "[TrayIconWidget] menu node id=" << node.id
+                  << " label='" << node.label << "' enabled="
+                  << (node.enabled ? "1" : "0") << " sep="
+                  << (node.separator ? "1" : "0") << " depth=" << depth
+                  << std::endl;
+        if (!node.children.empty()) {
+            log_menu_tree(node.children, depth + 1);
+        }
+    }
+}
+} // namespace
+
+TrayIconWidget::TrayIconWidget( std::string id)
+    : Button(id),  id(std::move(id)),
      container(Gtk::Orientation::HORIZONTAL) {
+    aliveFlag = std::make_shared<bool>(true);
    set_has_frame(false);
    set_focusable(false);
    set_valign(Gtk::Align::CENTER);
@@ -39,6 +214,12 @@ TrayIconWidget::TrayIconWidget(TrayService &service, std::string id)
        sigc::mem_fun(*this, &TrayIconWidget::on_primary_released));
    add_controller(primaryGesture);

+    middleGesture = Gtk::GestureClick::create();
+    middleGesture->set_button(GDK_BUTTON_MIDDLE);
+    middleGesture->signal_released().connect(
+        sigc::mem_fun(*this, &TrayIconWidget::on_middle_released));
+    add_controller(middleGesture);
+
    secondaryGesture = Gtk::GestureClick::create();
    secondaryGesture->set_button(GDK_BUTTON_SECONDARY);
    secondaryGesture->signal_released().connect(
@@ -46,19 +227,36 @@ TrayIconWidget::TrayIconWidget(TrayService &service, std::string id)
    add_controller(secondaryGesture);
 }

+TrayIconWidget::~TrayIconWidget() {
+    if (aliveFlag) {
+        *aliveFlag = false;
+    }
+    if (menuPopover) {
+        menuPopover->popdown();
+        menuPopover->remove_action_group("dbusmenu");
+        menuPopover->set_menu_model({});
+        if (menuPopover->get_parent()) {
+            menuPopover->unparent();
+        }
+        menuPopover.reset();
+    }
+}
+
 void TrayIconWidget::update(const TrayService::Item &item) {
+    hasRemoteMenu = item.menuAvailable;
+    menuPopupPending = false;
+    menuRequestInFlight = false;
+
    if (!item.menuAvailable) {
        menuModel.reset();
        menuActions.reset();
-        menuPopupPending = false;
-        if (menuChangedConnection.connected()) {
-            menuChangedConnection.disconnect();
-        }
        if (menuPopover) {
-            menuPopover->insert_action_group("dbusmenu",
-                                             Glib::RefPtr<Gio::ActionGroup>());
+            menuPopover->insert_action_group(
+                "dbusmenu", Glib::RefPtr<Gio::ActionGroup>());
            menuPopover->set_menu_model({});
+            if (menuPopover->get_parent()) {
                menuPopover->unparent();
+            }
            menuPopover.reset();
        }
    }
@@ -88,54 +286,131 @@ void TrayIconWidget::update(const TrayService::Item &item) {
 }

 void TrayIconWidget::on_primary_released(int /*n_press*/, double x, double y) {
-    service.activate(id, -1, -1);
+    int32_t sendX = static_cast<int32_t>(std::lround(x));
+    int32_t sendY = static_cast<int32_t>(std::lround(y));
+
+    // Try the most accurate coordinates first; fall back to pointer and finally
+    // to -1/-1 so apps (e.g. Spotify) see a valid activate event on both
+    // Wayland and X11.
+    if (!try_get_global_click_coords(GTK_WIDGET(gobj()), x, y, sendX, sendY)) {
+        if (!try_get_global_pointer_coords(GTK_WIDGET(gobj()), sendX, sendY)) {
+            sendX = -1;
+            sendY = -1;
+        }
+    }
+
+    std::cerr << "[TrayIconWidget] Activate primary id=" << id << " x="
+              << sendX << " y=" << sendY << std::endl;
+    service.activate(id, sendX, sendY);
+}
+
+void TrayIconWidget::on_middle_released(int /*n_press*/, double x, double y) {
+    // Map middle click to the StatusNotifier SecondaryActivate event; some
+    // apps (e.g. media players) use this for alternate actions like toggling
+    // visibility.
+    int32_t sendX = static_cast<int32_t>(std::lround(x));
+    int32_t sendY = static_cast<int32_t>(std::lround(y));
+    if (!try_get_global_click_coords(GTK_WIDGET(gobj()), x, y, sendX, sendY)) {
+        if (!try_get_global_pointer_coords(GTK_WIDGET(gobj()), sendX, sendY)) {
+            sendX = -1;
+            sendY = -1;
+        }
+    }
+
+    std::cerr << "[TrayIconWidget] SecondaryActivate (middle) id=" << id
+              << " x=" << sendX << " y=" << sendY << std::endl;
+    service.secondaryActivate(id, sendX, sendY);
 }

 void TrayIconWidget::on_secondary_released(int /*n_press*/, double x,
                                           double y) {
+    // If we are not attached to a toplevel (e.g., window hidden), fall back to
+    // the item's own ContextMenu instead of trying to show a popover, which
+    // would crash without a mapped surface.
+    GtkWidget *selfWidget = GTK_WIDGET(gobj());
+    if (!gtk_widget_get_mapped(selfWidget) || !has_popup_surface(selfWidget)) {
+        std::cerr << "[TrayIconWidget] Secondary fallback ContextMenu (no surface) id="
+                  << id << std::endl;
        service.contextMenu(id, -1, -1);
-
-    if (!ensure_menu()) {
        return;
    }

    pendingX = x;
    pendingY = y;
+
+    // Use dbusmenu popover when available and we have a mapped surface; else
+    // fall back to the item's ContextMenu.
+    if (hasRemoteMenu && has_popup_surface(selfWidget)) {
+        std::cerr << "[TrayIconWidget] Requesting dbusmenu for id=" << id
+                  << std::endl;
        menuPopupPending = true;
-    try_popup();
+        if (menuRequestInFlight) {
+            return;
+        }
+
+        menuRequestInFlight = true;
+        auto weak = std::weak_ptr<bool>(aliveFlag);
+        service.request_menu_layout(
+            id, [weak, this](std::optional<TrayService::MenuNode> layout) {
+                if (auto locked = weak.lock()) {
+                    if (*locked) {
+                        on_menu_layout_ready(std::move(layout));
+                    }
+                }
+            });
+        return;
+    }
+
+    int32_t sendX = static_cast<int32_t>(std::lround(x));
+    int32_t sendY = static_cast<int32_t>(std::lround(y));
+    if (!try_get_global_click_coords(GTK_WIDGET(gobj()), x, y, sendX, sendY)) {
+        (void)try_get_global_pointer_coords(GTK_WIDGET(gobj()), sendX, sendY);
+    }
+    if (is_wayland_display(GTK_WIDGET(gobj()))) {
+        std::cerr << "[TrayIconWidget] ContextMenu wayland id=" << id
+                  << " x=-1 y=-1" << std::endl;
+        service.contextMenu(id, -1, -1);
+    } else {
+        std::cerr << "[TrayIconWidget] ContextMenu id=" << id << " x=" << sendX
+                  << " y=" << sendY << std::endl;
+        service.contextMenu(id, sendX, sendY);
+    }
 }

-bool TrayIconWidget::ensure_menu() {
-    auto layoutOpt = service.get_menu_layout(id);
-    if (!layoutOpt) {
+void TrayIconWidget::on_menu_layout_ready(
+    std::optional<TrayService::MenuNode> layoutOpt) {
+    menuRequestInFlight = false;
+
+    if (!menuPopupPending) {
+        return;
+    }
+
+    GtkWidget *selfWidget = GTK_WIDGET(gobj());
+
+    if (!has_popup_surface(selfWidget)) {
+        menuPopupPending = false;
        menuModel.reset();
        menuActions.reset();
+        return;
+    }
+
+    if (!layoutOpt) {
        menuPopupPending = false;
-        if (menuChangedConnection.connected()) {
-            menuChangedConnection.disconnect();
-        }
-        if (menuPopover) {
-            remove_action_group("dbusmenu");
-            menuPopover->set_menu_model({});
-            menuPopover->unparent();
-            menuPopover.reset();
-        }
-        return false;
+        return;
    }

    const auto &layout = *layoutOpt;
-
+    log_menu_tree(layout.children, 0);
    auto menu          = Gio::Menu::create();
    auto actions       = Gio::SimpleActionGroup::create();

    populate_menu_items(layout.children, menu, actions);

-    const auto itemCount = menu->get_n_items();
-    std::cout << "[TrayIconWidget] menu update for " << id
-              << ", items: " << itemCount << std::endl;
-    if (itemCount == 0) {
-        service.debug_dump_menu_layout(id);
-        return false;
+    if (menu->get_n_items() == 0) {
+        menuModel.reset();
+        menuActions.reset();
+        menuPopupPending = false;
+        return;
    }

    menuModel   = menu;
@@ -146,7 +421,8 @@ bool TrayIconWidget::ensure_menu() {
        menuPopover =
            Glib::make_refptr_for_instance<Gtk::PopoverMenu>(rawPopover);
        if (!menuPopover) {
-            return false;
+            menuPopupPending = false;
+            return;
        }

        menuPopover->set_has_arrow(false);
@@ -156,36 +432,17 @@ bool TrayIconWidget::ensure_menu() {

    menuPopover->remove_action_group("dbusmenu");
    menuPopover->insert_action_group("dbusmenu", menuActions);
-
-    if (menuChangedConnection.connected()) {
-        menuChangedConnection.disconnect();
-    }
-    menuChangedConnection = menuModel->signal_items_changed().connect(
-        sigc::mem_fun(*this, &TrayIconWidget::on_menu_items_changed));
-
    menuPopover->set_menu_model(menuModel);

-    return true;
-}
-
-void TrayIconWidget::on_menu_items_changed(guint /*position*/,
-                                           guint /*removed*/, guint /*added*/) {
-    if (!menuModel) {
-        return;
+    // Ensure popover is still parented to us and has a native/root before popup.
+    if (!menuPopover->get_parent()) {
+        menuPopover->set_parent(*this);
    }

-    const auto count = menuModel->get_n_items();
-    std::cout << "[TrayIconWidget] items changed for " << id << ": " << count
-              << " entries" << std::endl;
-    try_popup();
-}
-
-void TrayIconWidget::try_popup() {
-    if (!menuPopupPending || !menuPopover || !menuModel) {
-        return;
-    }
-
-    if (menuModel->get_n_items() == 0) {
+    GtkWidget *popoverWidget = GTK_WIDGET(menuPopover->gobj());
+    if (!popoverWidget || !gtk_widget_get_root(popoverWidget) ||
+        !gtk_widget_get_native(popoverWidget) || !has_popup_surface(selfWidget)) {
+        menuPopupPending = false;
        return;
    }

@@ -245,23 +502,61 @@ void TrayIconWidget::populate_menu_items(

 void TrayIconWidget::on_menu_action(const Glib::VariantBase & /*parameter*/,
                                    int itemId) {
-    service.activate_menu_item(id, itemId);
+    // Pop down immediately so the popover doesn't outlive us if the item
+    // removes itself synchronously (e.g., "Exit"), which would otherwise lead
+    // to use-after-free.
    if (menuPopover) {
        menuPopover->popdown();
+        // Also detach to avoid double-unparent if the item disappears during
+        // the ensuing D-Bus call.
+        if (menuPopover->get_parent()) {
+            menuPopover->unparent();
        }
+    }
+
+    int32_t sendX = -1;
+    int32_t sendY = -1;
+    (void)try_get_pending_coords(sendX, sendY);
+
+    std::cerr << "[TrayIconWidget] Menu action id=" << this->id
+              << " item=" << itemId << " x=" << sendX << " y=" << sendY
+              << std::endl;
+
+    const uint32_t nowMs = static_cast<uint32_t>(g_get_monotonic_time() / 1000);
+    // Use button 1 for menu activation events; some dbusmenu handlers ignore
+    // secondary-button payloads for activate.
+    service.activate_menu_item(id, itemId, sendX, sendY, 1 /*button*/, nowMs);
 }

-TrayWidget::TrayWidget(TrayService &service)
-    : Gtk::Box(Gtk::Orientation::HORIZONTAL), service(service) {
+bool TrayIconWidget::try_get_pending_coords(int32_t &outX, int32_t &outY) const {
+    outX = -1;
+    outY = -1;
+    int32_t sendX = static_cast<int32_t>(std::lround(pendingX));
+    int32_t sendY = static_cast<int32_t>(std::lround(pendingY));
+    if (!try_get_global_click_coords(GTK_WIDGET(gobj()), pendingX, pendingY,
+                                     sendX, sendY)) {
+        if (!try_get_global_pointer_coords(GTK_WIDGET(gobj()), sendX, sendY)) {
+            sendX = -1;
+            sendY = -1;
+        }
+    }
+
+    outX = sendX;
+    outY = sendY;
+    return (sendX != -1 || sendY != -1);
+}
+
+TrayWidget::TrayWidget()
+    : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
    set_valign(Gtk::Align::CENTER);
    set_halign(Gtk::Align::CENTER);
    set_visible(false);

-    addConnection = service.signal_item_added().connect(
+    addConnection = service->signal_item_added().connect(
        sigc::mem_fun(*this, &TrayWidget::on_item_added));
-    removeConnection = service.signal_item_removed().connect(
+    removeConnection = service->signal_item_removed().connect(
        sigc::mem_fun(*this, &TrayWidget::on_item_removed));
-    updateConnection = service.signal_item_updated().connect(
+    updateConnection = service->signal_item_updated().connect(
        sigc::mem_fun(*this, &TrayWidget::on_item_updated));

    rebuild_existing();
@@ -280,7 +575,7 @@ TrayWidget::~TrayWidget() {
 }

 void TrayWidget::rebuild_existing() {
-    auto items = service.snapshotItems();
+    auto items = service->snapshotItems();
    for (const auto &item : items) {
        on_item_added(item);
    }
@@ -295,7 +590,7 @@ void TrayWidget::on_item_added(const TrayService::Item &item) {
        return;
    }

-    auto icon = std::make_unique<TrayIconWidget>(service, item.id);
+    auto icon = std::make_unique<TrayIconWidget>(item.id);
    icon->update(item);
    auto *raw = icon.get();
    append(*raw);
@@ -311,7 +606,6 @@ void TrayWidget::on_item_removed(const std::string &id) {
    }

    remove(*it->second);
-    it->second->unparent();
    icons.erase(it);

    if (icons.empty()) {
--- a/src/widgets/volumeWidget.cpp
+++ b/src/widgets/volumeWidget.cpp
@@ -1,12 +1,12 @@
 #include "widgets/volumeWidget.hpp"

-#include "helpers/systemHelper.hpp"
-
 #include <cmath>
 #include <iostream>
 #include <regex>
 #include <sigc++/functors/mem_fun.h>

+#include "helpers/systemHelper.hpp"
+
 VolumeWidget::VolumeWidget() : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
    set_valign(Gtk::Align::CENTER);
    set_halign(Gtk::Align::CENTER);
--- a/src/widgets/webWidget.cpp
+++ b/src/widgets/webWidget.cpp
@@ -1,5 +1,5 @@
 #include "widgets/webWidget.hpp"
-#include <gtkmm/box.h>
+
 #include <gtkmm/label.h>
 #include <webkit/webkit.h>

--- a/src/widgets/workspaceIndicator.cpp
+++ b/src/widgets/workspaceIndicator.cpp
@@ -1,40 +1,59 @@
 #include "widgets/workspaceIndicator.hpp"
-#include "services/hyprland.hpp"

 #include <cassert>
 #include <gdk/gdk.h>
 #include <gtkmm/gestureclick.h>
+#include <gtkmm/overlay.h>
 #include <gtkmm/widget.h>
 #include <sigc++/functors/mem_fun.h>

-WorkspaceIndicator::WorkspaceIndicator(HyprlandService &service, int monitorId)
-    : Gtk::Box(Gtk::Orientation::HORIZONTAL), service(service),
+#include "services/hyprland.hpp"
+
+#include "gtkmm/box.h"
+#include "gtkmm/label.h"
+
+WorkspaceIndicator::WorkspaceIndicator(int monitorId)
+    : Gtk::Box(Gtk::Orientation::HORIZONTAL),
      monitorId(monitorId) {
    set_margin_top(2);
    set_margin_bottom(2);

-    workspaceConnection = service.workspaceStateChanged.connect(
+    workspaceConnection = service->workspaceStateChanged.connect(
        sigc::mem_fun(*this, &WorkspaceIndicator::on_workspace_update));
-    monitorConnection = service.monitorStateChanged.connect(
+    monitorConnection = service->monitorStateChanged.connect(
        sigc::mem_fun(*this, &WorkspaceIndicator::on_monitor_update));

    for (int i = 1; i <= HyprlandService::kWorkspaceSlotCount; ++i) {
-        auto label = Gtk::make_managed<Gtk::Label>(std::to_string(i));
-        label->add_css_class("workspace-pill");
+        auto overlay       = Gtk::make_managed<Gtk::Overlay>();
+        auto numLabel      = Gtk::make_managed<Gtk::Label>(std::to_string(i));
+        auto pillContainer = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::HORIZONTAL);

-        // create and store a gesture controller once to avoid duplicate handlers
        auto gesture = Gtk::GestureClick::create();
        gesture->set_button(GDK_BUTTON_PRIMARY);
-        gesture->signal_released().connect(
-            [this, i](int, double, double) {
-                this->service.switchToWorkspace(
+        gesture->signal_released().connect([this, i](int, double, double) {
+            this->service->switchToWorkspace(
                i + this->monitorId * HyprlandService::kWorkspaceSlotCount);
        });
-        label->add_controller(gesture);
-        workspaceGestures[i] = gesture;

-        workspaceLabels[i] = label;
-        append(*label);
+        workspaceGestures[i]   = gesture;
+        workspaceIndicators[i] = overlay;
+
+        overlay->add_controller(gesture);
+        overlay->add_css_class("workspace-pill");
+
+        if (i == 6 || i == 7) {
+            auto indicator = Gtk::make_managed<Gtk::Label>(i == 6 ? "🫱🏻" : "🫲🏻");
+            indicator->add_css_class(i == 6 ? "workspace-pill-six" : "workspace-pill-seven");
+            indicator->set_valign(Gtk::Align::END);
+            overlay->set_child(*indicator);
+            overlay->add_overlay(*numLabel);
+            pillContainer->append(*overlay);
+        } else {
+            overlay->set_child(*numLabel);
+            pillContainer->append(*overlay);
+        }
+
+        append(*pillContainer);
    }

    rebuild();
@@ -54,30 +73,32 @@ void WorkspaceIndicator::on_workspace_update() {
    rebuild();
 }

-void WorkspaceIndicator::on_monitor_update() { rebuild(); }
+void WorkspaceIndicator::on_monitor_update() {
+    rebuild();
+}

-void WorkspaceIndicator::refreshLabel(Gtk::Label *label, const HyprlandService::WorkspaceState &state) {
-    label->remove_css_class("workspace-pill-active");
-    label->remove_css_class("workspace-pill-focused");
-    label->remove_css_class("workspace-pill-urgent");
+void WorkspaceIndicator::refreshLabel(Gtk::Overlay *overlay, const HyprlandService::WorkspaceState &state) {
+    overlay->remove_css_class("workspace-pill-active");
+    overlay->remove_css_class("workspace-pill-focused");
+    overlay->remove_css_class("workspace-pill-urgent");

    // controller created once in constructor and reused
    if (state.urgentWindows.size() > 0) {
-        label->add_css_class("workspace-pill-urgent");
+        overlay->add_css_class("workspace-pill-urgent");
    } else {
        if (state.focused) {
-            label->add_css_class("workspace-pill-focused");
+            overlay->add_css_class("workspace-pill-focused");
        } else if (state.active) {
-            label->add_css_class("workspace-pill-active");
+            overlay->add_css_class("workspace-pill-active");
        }
    }
 }

 void WorkspaceIndicator::rebuild() {
-    HyprlandService::Monitor *mon = service.getMonitorById(this->monitorId);
+    HyprlandService::Monitor *mon = service->getMonitorById(this->monitorId);

    for (auto [id, workspaceState] : mon->workspaceStates) {
-        Gtk::Label *label = workspaceLabels[id];
-        this->refreshLabel(label, *workspaceState);
+        Gtk::Overlay *overlay = workspaceIndicators[id];
+        this->refreshLabel(overlay, *workspaceState);
    }
 }
Author	SHA1	Message	Date
Arif Hasanic	e3bb3fdf31	deine cousine 4. grades	2026-01-10 22:02:27 +01:00
Arif Hasanic	0e613141da	quick commit	2026-01-03 22:55:02 +01:00
Arif Hasanic	ab7b3b3092	better working tray	2026-01-02 16:50:02 +01:00
Arif Hasanic	2d5b492da8	deine mum	2025-12-30 21:55:11 +01:00
Arif Hasanic	9b5db719cb	refactor and shizz	2025-12-25 21:13:00 +01:00
Arif Hasanic	a06c96f648	make bluetooth service singleton	2025-12-23 19:57:52 +01:00
Arif Hasanic	8613024f8d	nicer button interactivities	2025-12-22 02:32:18 +01:00
Arif Hasanic	5a429a3b8b	bar can now toggle bluetooth power and discovery	2025-12-22 01:41:01 +01:00
Arif Hasanic	0101ea1ec0	add todos	2025-12-21 22:22:59 +01:00
Arif Hasanic	22a1b7e369	add todo setup	2025-12-21 00:36:00 +01:00
Arif Hasanic	36f8b6d8b2	small refactors	2025-12-20 21:05:57 +01:00