WIP SDL tray

Author: C0rn3j

src/tauon/t_modules/t_dbus.py

@@ -107,6 +107,10 @@ def start_indicator(self) -> None:
 		pctl = self.tauon.pctl
 		tauon = self.tauon
 
+		# Create SDL tray
+		tauon.requested_tray = True
+
+
 		import gi
 
 		try:
@@ -210,19 +214,19 @@ def update() -> None:
 
 		if self.loaded_indicator == "AyatanaAppIndicatorGlib":
 			pActions = Gio.SimpleActionGroup.new ()
-#			self.menu.append(tauon.strings.menu_open_tauon, restore)
+			#self.menu.append(tauon.strings.menu_open_tauon, restore)
 			pSimpleAction = Gio.SimpleAction.new("restore", None)
 			pActions.add_action (pSimpleAction)
 			pSimpleAction.connect ("activate", restore, 6)
 			pItem = Gio.MenuItem.new(tauon.strings.menu_open_tauon, "indicator.restore")
 			self.menu.append_item (pItem)
 			# TODO(Martin): Add rest of actions
 			# TODO(Martin): Separator
-#			self.menu.append(tauon.strings.menu_play_pause, play_pause)
-#			self.menu.append(tauon.strings.menu_next, next)
-#			self.menu.append(tauon.strings.menu_previous, back)
+			#self.menu.append(tauon.strings.menu_play_pause, play_pause)
+			#self.menu.append(tauon.strings.menu_next, next)
+			#self.menu.append(tauon.strings.menu_previous, back)
 			# TODO(Martin): Separator
-#			self.menu.append(tauon.strings.menu_quit, menu_quit)
+			#self.menu.append(tauon.strings.menu_quit, menu_quit)
 			self.indicator.set_actions(pActions)
 		else:
 			item = Gtk.MenuItem(label=tauon.strings.menu_open_tauon)

src/tauon/t_modules/t_main.py

@@ -6028,6 +6028,140 @@ def __init__(self, holder: Holder, bag: Bag, gui: GuiVar) -> None:
 		self.now_searching: Literal["off", "searching", "errored", "success"] = "off"
 
 		self.requested_raise = False
+		self.requested_tray  = False
+		self.sdl_tray        = None
+		self._tray_quit_cb = None
+		self._tray_open_cb = None
+		self._tray_playpause_cb = None
+		self._tray_next_cb = None
+		self._tray_prev_cb = None
+
+	def tray_quit_callback(self, userdata, entry):
+		"""Called when the 'Quit' tray entry is clicked."""
+		logging.info("Exit via tray")
+		self.exit("Exit received from app indicator")
+
+	def tray_open_callback(self, userdata, entry):
+		"""Open Tauon main UI."""
+		# Adjust to whatever your real function is
+		self.request_raise()
+
+
+	def tray_playpause_callback(self, userdata, entry):
+		"""Toggle play/pause."""
+		self.pctl.play_pause()
+
+
+	def tray_next_callback(self, userdata, entry):
+		"""Next track."""
+		self.pctl.advance()
+
+
+	def tray_prev_callback(self, userdata, entry):
+		"""Previous track."""
+		self.pctl.back()
+
+	def load_sdl_icon(self, path: Path):
+		"""Load an image file into an SDL_Surface suitable for a tray icon."""
+		# Load image as a surface (requires SDL3_image installed)
+		surf = sdl3.IMG_Load(str(path).encode("utf-8"))
+		if not surf:
+			raise RuntimeError(f"IMG_Load failed: {sdl3.SDL_GetError().decode()}")
+		return surf
+
+	def init_sdl_tray(self):
+		icon_surface = self.load_sdl_icon(Path(self.get_tray_icon("tray-indicator-default")))
+		# Create tray (no icon, just tooltip)
+		self.sdl_tray = sdl3.SDL_CreateTray(icon_surface, b"My tray")
+		if not self.sdl_tray:
+			raise RuntimeError(f"SDL_CreateTray failed: {sdl3.SDL_GetError().decode()}")
+		# Create menu
+		menu = sdl3.SDL_CreateTrayMenu(self.sdl_tray)
+		if not menu:
+			raise RuntimeError(f"SDL_CreateTrayMenu failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Open Tauon Music Box ---
+		open_entry = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			b"Open Tauon Music Box",
+			sdl3.SDL_TRAYENTRY_BUTTON,
+		)
+		if not open_entry:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(Open) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Separator ---
+		sep1 = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			None,  # NULL label => separator
+			0,     # flags ignored for separators
+		)
+		if not sep1:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(sep1) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Play/Pause ---
+		playpause_entry = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			b"Play/Pause",
+			sdl3.SDL_TRAYENTRY_BUTTON,
+		)
+		if not playpause_entry:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(Play/Pause) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Next Track ---
+		next_entry = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			b"Next Track",
+			sdl3.SDL_TRAYENTRY_BUTTON,
+		)
+		if not next_entry:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(Next) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Previous Track ---
+		prev_entry = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			b"Previous Track",
+			sdl3.SDL_TRAYENTRY_BUTTON,
+		)
+		if not prev_entry:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(Previous) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Separator ---
+		sep2 = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			None,  # separator
+			0,
+		)
+		if not sep2:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(sep2) failed: {sdl3.SDL_GetError().decode()}")
+
+		# --- Quit ---
+		quit_entry = sdl3.SDL_InsertTrayEntryAt(
+			menu,
+			-1,
+			b"Quit",
+			sdl3.SDL_TRAYENTRY_BUTTON,
+		)
+		if not quit_entry:
+			raise RuntimeError(f"SDL_InsertTrayEntryAt(Quit) failed: {sdl3.SDL_GetError().decode()}")
+
+		self._tray_open_cb =      sdl3.SDL_TrayCallback(self.tray_open_callback)
+		self._tray_playpause_cb = sdl3.SDL_TrayCallback(self.tray_playpause_callback)
+		self._tray_next_cb =      sdl3.SDL_TrayCallback(self.tray_next_callback)
+		self._tray_quit_cb =      sdl3.SDL_TrayCallback(self.tray_quit_callback)
+		self._tray_prev_cb =      sdl3.SDL_TrayCallback(self.tray_prev_callback)
+
+		sdl3.SDL_SetTrayEntryCallback(open_entry, self._tray_open_cb, None)
+		sdl3.SDL_SetTrayEntryCallback(playpause_entry, self._tray_playpause_cb, None)
+		sdl3.SDL_SetTrayEntryCallback(next_entry, self._tray_next_cb, None)
+		sdl3.SDL_SetTrayEntryCallback(quit_entry, self._tray_quit_cb, None)
+		sdl3.SDL_SetTrayEntryCallback(prev_entry, self._tray_prev_cb, None)
+
 
 	def coll(self, r: list[int]) -> bool:
 		return r[0] < self.inp.mouse_position[0] <= r[0] + r[2] and r[1] <= self.inp.mouse_position[1] <= r[1] + r[3]
@@ -44955,6 +45089,10 @@ def dev_mode_disable_save_state() -> None:
 			tauon.raise_window()
 			tauon.requested_raise = False
 
+		if tauon.requested_tray:
+			tauon.init_sdl_tray()
+			tauon.requested_tray = False
+
 		if pctl.playing_state != PlayingState.STOPPED:
 			power += 400