something-x-dev 1.3.0.dev5__tar.gz → 1.4.0.dev7__tar.gz

{something_x_dev-1.3.0.dev5/something_x_dev.egg-info → something_x_dev-1.4.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.3.0.dev5
+Version: 1.4.0.dev7
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/nothing_app/application.py

@@ -13,6 +13,7 @@ from gi.repository import Gtk, Adw, Gdk, Gio, GLib
 from .bluetooth import BluetoothManager
 from .window import SomethingXWindow
 from .splash import SplashScreen
+from .tray import SomethingXTray
 
 
 def _install_desktop_file():
@@ -50,6 +51,7 @@ class SomethingXApplication(Adw.Application):
         self._bt: BluetoothManager | None = None
         self._splash: SplashScreen | None = None
         self._window: SomethingXWindow | None = None
+        self._tray: SomethingXTray | None = None
         self.connect("activate", self._on_activate)
 
     def _on_activate(self, _app):
@@ -72,6 +74,7 @@ class SomethingXApplication(Adw.Application):
         win = SomethingXWindow(bt_manager=self._bt, application=self)
         win.connect("close-request", self._on_window_close)
         self._window = win
+        self._tray = SomethingXTray(self._bt, on_show_window=win.present)
         win.present()
         if self._splash:
             self._splash.destroy()

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/nothing_app/bluetooth.py

@@ -44,6 +44,40 @@ class BluetoothDevice:
         return f"<BTDevice {self.name!r} {'●' if self.connected else '○'}>"
 
 
+# BlueZ Device1.Icon → GTK symbolic icon name
+_BLUEZ_ICON_MAP: dict[str, str] = {
+    "audio-headphones": "audio-headphones-symbolic",
+    "audio-headset": "audio-headset-symbolic",
+    "audio-card": "audio-card-symbolic",
+    "input-mouse": "input-mouse-symbolic",
+    "input-keyboard": "input-keyboard-symbolic",
+    "input-gaming": "input-gaming-symbolic",
+    "input-tablet": "input-tablet-symbolic",
+    "phone": "phone-symbolic",
+    "computer": "computer-symbolic",
+    "printer": "printer-symbolic",
+}
+
+_WATCH_NAME_PATTERNS = ("watch", "band", "gear", "amazfit", "fenix", "vivoactive", "galaxy fit")
+
+
+def device_icon_name(device: "BluetoothDevice | None") -> str:
+    """Return a GTK symbolic icon name for a Bluetooth device."""
+    if device is None:
+        return "audio-headphones-symbolic"
+    name_lower = device.name.lower()
+    if any(p in name_lower for p in _WATCH_NAME_PATTERNS):
+        return "alarm-symbolic"
+    if "ear (stick)" in name_lower:
+        return "audio-input-microphone-symbolic"
+    mapped = _BLUEZ_ICON_MAP.get(device.icon)
+    if mapped:
+        return mapped
+    if "phone" in name_lower:
+        return "phone-symbolic"
+    return "audio-headphones-symbolic"
+
+
 class BluetoothManager(GObject.Object):
     __gsignals__ = {
         "devices-changed": (GObject.SignalFlags.RUN_FIRST, None, ()),

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/nothing_app/pages/device.py

@@ -93,19 +93,24 @@ class EarbudVisual(Gtk.DrawingArea):
         self._left = -1
         self._right = -1
         self._case = -1
+        self._left_wearing = False
+        self._right_wearing = False
 
-    def update(self, left: int, right: int, case: int):
+    def update(
+        self, left: int, right: int, case: int, left_wearing: bool = False, right_wearing: bool = False
+    ):
         self._left, self._right, self._case = left, right, case
+        self._left_wearing, self._right_wearing = left_wearing, right_wearing
         self.queue_draw()
 
     def _draw(self, _area, cr, width, height):
         cx = width / 2
         cy = height / 2 - 8
-        self._draw_bud(cr, cx - 92, cy, self._left, "L")
-        self._draw_bud(cr, cx + 92, cy, self._right, "R")
+        self._draw_bud(cr, cx - 92, cy, self._left, "L", self._left_wearing)
+        self._draw_bud(cr, cx + 92, cy, self._right, "R", self._right_wearing)
         self._draw_case(cr, cx, cy + 54, self._case)
 
-    def _draw_bud(self, cr, cx, cy, pct, label):
+    def _draw_bud(self, cr, cx, cy, pct, label, wearing: bool = False):
         R = 42
         r = 29
         bc = _battery_color(pct) if pct >= 0 else (0.18, 0.18, 0.18)
@@ -166,12 +171,27 @@ class EarbudVisual(Gtk.DrawingArea):
         cr.move_to(cx - te.width / 2 - te.x_bearing, cy - te.height / 2 - te.y_bearing)
         cr.show_text(text)
 
+        # in-ear indicator dot (always rendered; glows red when wearing)
+        dot_y = cy + R + 8
+        if wearing:
+            rg = cairo.RadialGradient(cx, dot_y, 0, cx, dot_y, 9)
+            rg.add_color_stop_rgba(0, 0.87, 0.18, 0.18, 0.30)
+            rg.add_color_stop_rgba(1, 0.87, 0.18, 0.18, 0.0)
+            cr.set_source(rg)
+            cr.arc(cx, dot_y, 9, 0, 2 * math.pi)
+            cr.fill()
+            cr.set_source_rgba(0.87, 0.18, 0.18, 0.9)
+        else:
+            cr.set_source_rgba(1.0, 1.0, 1.0, 0.07)
+        cr.arc(cx, dot_y, 3, 0, 2 * math.pi)
+        cr.fill()
+
         # L / R label below
         cr.set_source_rgba(1.0, 1.0, 1.0, 0.20)
         cr.select_font_face(_MONO, cairo.FontSlant.NORMAL, cairo.FontWeight.BOLD)
         cr.set_font_size(9)
         te = cr.text_extents(label)
-        cr.move_to(cx - te.width / 2 - te.x_bearing, cy + R + 17)
+        cr.move_to(cx - te.width / 2 - te.x_bearing, cy + R + 20)
         cr.show_text(label)
 
     def _draw_case(self, cr, cx, cy, pct):
@@ -508,7 +528,13 @@ class DevicePage(Gtk.Box):
 
     def _on_state_changed(self, dev: NothingDevice):
         state = dev.state
-        self._visual.update(state.left_battery, state.right_battery, state.case_battery)
+        self._visual.update(
+            state.left_battery,
+            state.right_battery,
+            state.case_battery,
+            state.left_wearing,
+            state.right_wearing,
+        )
         self._sync_anc_ui(state.anc_mode)
         self._sync_eq_ui(state.eq_preset)
         self._updating_ui = True

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/nothing_app/pages/home.py

@@ -3,7 +3,7 @@ import gi
 gi.require_version("Gtk", "4.0")
 from gi.repository import Gtk, GLib, GObject
 
-from ..bluetooth import BluetoothDevice, BluetoothManager
+from ..bluetooth import BluetoothDevice, BluetoothManager, device_icon_name
 
 
 class DeviceRow(Gtk.Box):
@@ -14,12 +14,7 @@ class DeviceRow(Gtk.Box):
         self._build()
 
     def _build(self):
-        icon_name = "audio-headphones-symbolic"
-        if "phone" in self.device.name.lower():
-            icon_name = "phone-symbolic"
-        elif "ear (stick)" in self.device.name.lower():
-            icon_name = "audio-input-microphone-symbolic"
-        icon = Gtk.Image.new_from_icon_name(icon_name)
+        icon = Gtk.Image.new_from_icon_name(device_icon_name(self.device))
         icon.set_pixel_size(28)
         icon.set_opacity(0.6)
         self.append(icon)

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/nothing_app/protocol.py

@@ -417,6 +417,8 @@ class NothingDevice(GObject.Object):
             GLib.timeout_add(3000, self._activation_fallback)
         elif cmd_id == _CMD_SET_ACTIVATED:
             _log(f"[RX INFO] activation ACK payload={payload.hex()}")
+            if not self._activated:
+                GLib.timeout_add(2000, self._poll_earphone_status)
             self._activated = True
             from . import profiles
 
@@ -433,8 +435,15 @@ class NothingDevice(GObject.Object):
             changed = self._parse_battery(payload)
         elif cmd_id in (_CMD_NOISE_RED, _EVT_NOISE_RED):
             changed = self._parse_anc(payload)
-        elif cmd_id in (_CMD_EARPHONE, _EVT_STATUS):
+        elif cmd_id == _CMD_EARPHONE:
             changed = self._parse_earphone_status(payload)
+        elif cmd_id == _EVT_STATUS:
+            # The pushed event only carries accurate data for the bud that
+            # changed; the other entries are stale placeholders. Use it purely
+            # as a trigger and re-query for a fresh full snapshot.
+            if _DEBUG:
+                _log(f"[protocol] EVT_STATUS {payload.hex()} → re-query GET_EARPHONE")
+            self._x55_send(_CMD_EARPHONE)
         elif cmd_id == _CMD_HOST_VERSION:
             ver = payload.decode(errors="replace").strip("\x00").strip()
             if ver and ver != self.state.firmware_version:
@@ -512,26 +521,29 @@ class NothingDevice(GObject.Object):
         return changed
 
     def _parse_earphone_status(self, payload: bytes) -> bool:
-        # payload: [count:1][type:1][val:1]...
-        # EarphoneStatus.java: bit2=inEar, bit7=isConnect, bit0=inCase/caseOpen
-        # type: 2=left, 3=right, 4=case
+        # payload: [count:1][type:1][val:1]...  (only GET responses reach here;
+        # they are a fresh full snapshot, unlike the EVT push frames)
+        # EarphoneStatus.java: bit0=inCase, bit2=inEar, bit7=isConnect
+        # type: 2=left, 3=right, 4=case, 5=tws, 6=stereo
         if len(payload) < 3:
             return False
         count = payload[0]
         changed = False
+        if _DEBUG:
+            _log(f"[protocol] earphone raw={payload.hex()}")
         for i in range(1, 1 + count * 2, 2):
             if i + 1 >= len(payload):
                 break
             etype = payload[i]
             val = payload[i + 1]
+            if etype not in (2, 3):
+                continue
             in_ear = bool(val & 0x04)
-            connected = bool(val & 0x80)
-            wearing = in_ear and connected
-            if etype == 2 and wearing != self.state.left_wearing:
-                self.state.left_wearing = wearing
+            if etype == 2 and in_ear != self.state.left_wearing:
+                self.state.left_wearing = in_ear
                 changed = True
-            elif etype == 3 and wearing != self.state.right_wearing:
-                self.state.right_wearing = wearing
+            elif etype == 3 and in_ear != self.state.right_wearing:
+                self.state.right_wearing = in_ear
                 changed = True
         if changed:
             _log(f"[protocol] wearing L={self.state.left_wearing} R={self.state.right_wearing}")
@@ -632,10 +644,20 @@ class NothingDevice(GObject.Object):
                 ).start()
                 break
 
+    def _poll_earphone_status(self):
+        # The firmware only computes a fresh per-bud snapshot when asked; the
+        # pushed EVT frames carry stale placeholder entries for the bud that
+        # didn't change. Polling keeps both buds' wearing state accurate.
+        if not self._rfcomm_connected:
+            return False
+        self._x55_send(_CMD_EARPHONE)
+        return True
+
     def _activation_fallback(self):
         if not self._activated and self._rfcomm_connected:
             _log("[protocol] activation ACK not received within 3s — sending GET queries")
             self._activated = True
+            GLib.timeout_add(2000, self._poll_earphone_status)
             self._x55_send(_CMD_BATTERY)
             self._x55_send(_CMD_NOISE_RED, bytes([0x03]))
             self._x55_send(_CMD_EARPHONE)

something_x_dev-1.4.0.dev7/nothing_app/tray.py

@@ -0,0 +1,149 @@
+import os
+import dbus
+import dbus.service
+from gi.repository import GLib, GObject
+
+from .bluetooth import BluetoothManager, BluetoothDevice, device_icon_name
+
+_ITEM_IFACE = "org.kde.StatusNotifierItem"
+_WATCHER_IFACE = "org.kde.StatusNotifierWatcher"
+_WATCHER_SERVICE = "org.kde.StatusNotifierWatcher"
+_ITEM_PATH = "/StatusNotifierItem"
+
+_EMPTY_PIXMAPS = dbus.Array([], signature="(iiay)")
+
+
+class _SNIItem(dbus.service.Object):
+    def __init__(self, bus, service_name, on_activate):
+        bus_name = dbus.service.BusName(service_name, bus)
+        super().__init__(bus_name, _ITEM_PATH)
+        self._on_activate = on_activate
+        self._icon_name = "audio-headphones"
+        self._tooltip_title = "Something X"
+        self._tooltip_body = ""
+
+    # ── SNI methods ────────────────────────────────────────────────────────────
+
+    @dbus.service.method(_ITEM_IFACE, in_signature="ii")
+    def Activate(self, x, y):
+        GLib.idle_add(self._on_activate)
+
+    @dbus.service.method(_ITEM_IFACE, in_signature="ii")
+    def SecondaryActivate(self, x, y):
+        pass
+
+    @dbus.service.method(_ITEM_IFACE, in_signature="ii")
+    def ContextMenu(self, x, y):
+        pass
+
+    @dbus.service.method(_ITEM_IFACE, in_signature="is")
+    def Scroll(self, delta, orientation):
+        pass
+
+    # ── SNI signals ───────────────────────────────────────────────────────────
+
+    @dbus.service.signal(_ITEM_IFACE)
+    def NewIcon(self):
+        pass
+
+    @dbus.service.signal(_ITEM_IFACE)
+    def NewToolTip(self):
+        pass
+
+    @dbus.service.signal(_ITEM_IFACE, signature="s")
+    def NewStatus(self, status):
+        pass
+
+    # ── D-Bus Properties ──────────────────────────────────────────────────────
+
+    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss", out_signature="v")
+    def Get(self, interface, prop):
+        return self._props()[prop]
+
+    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s", out_signature="a{sv}")
+    def GetAll(self, interface):
+        return self._props()
+
+    def _props(self):
+        tooltip = dbus.Struct(
+            (
+                dbus.String(""),
+                _EMPTY_PIXMAPS,
+                dbus.String(self._tooltip_title),
+                dbus.String(self._tooltip_body),
+            ),
+            signature="sa(iiay)ss",
+        )
+        return {
+            "Id": dbus.String("something-x"),
+            "Category": dbus.String("Hardware"),
+            "Title": dbus.String("Something X"),
+            "Status": dbus.String("Active"),
+            "WindowId": dbus.UInt32(0),
+            "IconName": dbus.String(self._icon_name),
+            "IconPixmap": _EMPTY_PIXMAPS,
+            "OverlayIconName": dbus.String(""),
+            "OverlayIconPixmap": _EMPTY_PIXMAPS,
+            "AttentionIconName": dbus.String(""),
+            "AttentionIconPixmap": _EMPTY_PIXMAPS,
+            "AttentionMovieName": dbus.String(""),
+            "ToolTip": tooltip,
+            "ItemIsMenu": dbus.Boolean(False),
+            "Menu": dbus.ObjectPath(_ITEM_PATH),
+        }
+
+    # ── update helpers ────────────────────────────────────────────────────────
+
+    def set_icon(self, icon_name: str):
+        if icon_name != self._icon_name:
+            self._icon_name = icon_name
+            self.NewIcon()
+
+    def set_tooltip(self, title: str, body: str):
+        self._tooltip_title = title
+        self._tooltip_body = body
+        self.NewToolTip()
+
+
+class SomethingXTray(GObject.Object):
+    """StatusNotifierItem tray icon. Shows battery on hover; icon adapts to device type."""
+
+    def __init__(self, bt_manager: BluetoothManager, on_show_window):
+        super().__init__()
+        self._bt = bt_manager
+        self._on_show = on_show_window
+        self._item: _SNIItem | None = None
+        self._setup()
+        bt_manager.connect("devices-changed", self._on_devices_changed)
+
+    def _setup(self):
+        try:
+            bus = dbus.SessionBus()
+            service_name = f"org.kde.StatusNotifierItem-{os.getpid()}-1"
+            self._item = _SNIItem(bus, service_name, self._on_show)
+            try:
+                watcher = bus.get_object(_WATCHER_SERVICE, "/StatusNotifierWatcher")
+                dbus.Interface(watcher, _WATCHER_IFACE).RegisterStatusNotifierItem(service_name)
+            except dbus.exceptions.DBusException:
+                pass  # watcher not running; item is still exported on the bus
+        except Exception as exc:
+            print(f"[tray] SNI setup failed: {exc}")
+
+    def _on_devices_changed(self, _manager):
+        if not self._item:
+            return
+        nothing_devs = self._bt.get_nothing_devices()
+        connected = [d for d in nothing_devs if d.connected]
+        if connected:
+            dev = connected[0]
+            parts = []
+            if dev.battery is not None:
+                parts.append(f"{dev.name}: {dev.battery}%")
+            self._item.set_tooltip("Something X", "\n".join(parts) if parts else "Connected")
+            self._item.set_icon(device_icon_name(dev))
+        else:
+            # fall back to first paired Nothing device, or generic icon
+            paired = nothing_devs[0] if nothing_devs else None
+            icon = device_icon_name(paired) if paired else "audio-headphones"
+            self._item.set_tooltip("Something X", "No devices connected")
+            self._item.set_icon(icon)

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "something-x-dev"
-version = "1.3.0.dev5"
+version = "1.4.0.dev7"
 description     = "Something X device manager for Omarchy / Linux"
 readme          = "README.md"
 license         = { text = "MIT" }

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7/something_x_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: something-x-dev
-Version: 1.3.0.dev5
+Version: 1.4.0.dev7
 Summary: Something X device manager for Omarchy / Linux
 Author: Raphael
 License: MIT

{something_x_dev-1.3.0.dev5 → something_x_dev-1.4.0.dev7}/something_x_dev.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ nothing_app/bluetooth.py
 nothing_app/profiles.py
 nothing_app/protocol.py
 nothing_app/splash.py
+nothing_app/tray.py
 nothing_app/window.py
 nothing_app/data/__init__.py
 nothing_app/data/com.something.x.omarchy.desktop