feat(windows): add menu-opened callback handling to Windows tray

- Introduced `onMenuOpened` support in `WindowsTrayManager` for detecting menu opening events
- Integrated JNI binding for `tray_set_menu_opened_callback` in native Windows implementation
- Updated initialization and update methods to include the menu-opened callback
- Enhanced tray behavior with improved event handling and callback support

Author: kdroidFilter

src/jvmMain/kotlin/com/kdroid/composetray/lib/windows/WindowsNativeBridge.kt

@@ -36,6 +36,11 @@ internal object WindowsNativeBridge {
         callback: Runnable?,
     )
 
+    @JvmStatic external fun nativeSetMenuOpenedCallback(
+        handle: Long,
+        callback: Runnable?,
+    )
+
     @JvmStatic external fun nativeSetTrayMenu(
         trayHandle: Long,
         menuHandle: Long,

src/jvmMain/kotlin/com/kdroid/composetray/lib/windows/WindowsTrayManager.kt

@@ -18,6 +18,7 @@ internal class WindowsTrayManager(
     private var iconPath: String,
     private var tooltip: String = "",
     private var onLeftClick: (() -> Unit)? = null,
+    private var onMenuOpened: (() -> Unit)? = null,
 ) {
     private var trayHandle: Long = 0L
     private val running = AtomicBoolean(false)
@@ -50,6 +51,7 @@ internal class WindowsTrayManager(
         val iconPath: String,
         val tooltip: String,
         val onLeftClick: (() -> Unit)?,
+        val onMenuOpened: (() -> Unit)?,
         val menuItems: List<MenuItem>,
     )
 
@@ -69,7 +71,7 @@ internal class WindowsTrayManager(
         updateLock.withLock {
             if (initialized.get()) {
                 log("Already initialized, delegating to update()")
-                update(iconPath, tooltip, onLeftClick, menuItems)
+                update(iconPath, tooltip, onLeftClick, onMenuOpened, menuItems)
                 return
             }
 
@@ -103,6 +105,9 @@ internal class WindowsTrayManager(
                             throw RuntimeException("Failed to initialize tray: $initResult")
                         }
 
+                        // Set menu-opened callback after init (TrayContext must exist)
+                        setupMenuOpenedCallback(handle)
+
                         initialized.set(true)
 
                         // Signal that initialization is complete before entering the loop
@@ -141,6 +146,7 @@ internal class WindowsTrayManager(
         newIconPath: String,
         newTooltip: String,
         newOnLeftClick: (() -> Unit)?,
+        newOnMenuOpened: (() -> Unit)?,
         newMenuItems: List<MenuItem>,
     ) {
         log("update() called - icon: $newIconPath, tooltip: $newTooltip, menuItems: ${newMenuItems.size}")
@@ -150,13 +156,14 @@ internal class WindowsTrayManager(
             iconPath = newIconPath
             tooltip = newTooltip
             onLeftClick = newOnLeftClick
+            onMenuOpened = newOnMenuOpened
             initialize(newMenuItems)
             return
         }
 
         // Queue the update to be processed on the tray thread
         synchronized(updateQueueLock) {
-            updateQueue.add(UpdateRequest(newIconPath, newTooltip, newOnLeftClick, newMenuItems))
+            updateQueue.add(UpdateRequest(newIconPath, newTooltip, newOnLeftClick, newOnMenuOpened, newMenuItems))
             updateQueueLock.notify()
         }
     }
@@ -357,6 +364,7 @@ internal class WindowsTrayManager(
         iconPath = update.iconPath
         tooltip = update.tooltip
         onLeftClick = update.onLeftClick
+        onMenuOpened = update.onMenuOpened
 
         val handle = trayHandle
         if (handle == 0L) return
@@ -371,6 +379,7 @@ internal class WindowsTrayManager(
         // Set up new callbacks and menu
         setupLeftClickCallback(handle)
         setupMenu(handle, update.menuItems)
+        setupMenuOpenedCallback(handle)
 
         // Update the native tray
         log("Calling nativeUpdateTray()")
@@ -416,6 +425,32 @@ internal class WindowsTrayManager(
         }
     }
 
+    private fun setupMenuOpenedCallback(handle: Long) {
+        val callback = onMenuOpened
+        if (callback != null) {
+            log("Setting up menu opened callback")
+            WindowsNativeBridge.nativeSetMenuOpenedCallback(
+                handle,
+                Runnable {
+                    log("Menu opened callback invoked")
+                    try {
+                        mainScope?.launch {
+                            ioScope?.launch {
+                                callback()
+                            }
+                        }
+                    } catch (e: Exception) {
+                        log("Error in menu opened callback: ${e.message}")
+                        e.printStackTrace()
+                    }
+                },
+            )
+        } else {
+            log("No menu opened callback set")
+            WindowsNativeBridge.nativeSetMenuOpenedCallback(handle, null)
+        }
+    }
+
     private fun setupMenu(
         handle: Long,
         menuItems: List<MenuItem>,

src/jvmMain/kotlin/com/kdroid/composetray/tray/impl/WindowsTrayInitializer.kt

@@ -17,7 +17,7 @@ object WindowsTrayInitializer {
         tooltip: String,
         onLeftClick: (() -> Unit)? = null,
         menuContent: (TrayMenuBuilder.() -> Unit)? = null,
-        @Suppress("UNUSED_PARAMETER") onMenuOpened: (() -> Unit)? = null,
+        onMenuOpened: (() -> Unit)? = null,
     ) {
         val menuItems =
             WindowsTrayMenuBuilderImpl(iconPath, tooltip, onLeftClick).apply {
@@ -26,11 +26,11 @@ object WindowsTrayInitializer {
 
         val manager = trayManagers[id]
         if (manager == null) {
-            val windowsTrayManager = WindowsTrayManager(id, iconPath, tooltip, onLeftClick)
+            val windowsTrayManager = WindowsTrayManager(id, iconPath, tooltip, onLeftClick, onMenuOpened)
             trayManagers[id] = windowsTrayManager
             windowsTrayManager.initialize(menuItems)
         } else {
-            manager.update(iconPath, tooltip, onLeftClick, menuItems)
+            manager.update(iconPath, tooltip, onLeftClick, onMenuOpened, menuItems)
         }
     }
 
@@ -41,10 +41,10 @@ object WindowsTrayInitializer {
         tooltip: String,
         onLeftClick: (() -> Unit)? = null,
         menuContent: (TrayMenuBuilder.() -> Unit)? = null,
-        @Suppress("UNUSED_PARAMETER") onMenuOpened: (() -> Unit)? = null,
+        onMenuOpened: (() -> Unit)? = null,
     ) {
         // Same as initialize - it will handle both cases per ID
-        initialize(id, iconPath, tooltip, onLeftClick, menuContent)
+        initialize(id, iconPath, tooltip, onLeftClick, menuContent, onMenuOpened)
     }
 
     @Synchronized

src/native/windows/jni_bridge.c

@@ -53,6 +53,7 @@ typedef struct CallbackEntry {
 
 static CallbackEntry *g_trayCallbacks = NULL;
 static CallbackEntry *g_menuCallbacks = NULL;
+static CallbackEntry *g_menuOpenedCallbacks = NULL;
 
 static void storeCallback(CallbackEntry **list, uintptr_t key, JNIEnv *env, jobject callback) {
     CallbackEntry **pp = list;
@@ -137,6 +138,12 @@ static void menu_item_cb_trampoline(struct tray_menu_item *item) {
     if (runnable) invokeRunnable(runnable);
 }
 
+static void menu_opened_cb_trampoline(struct tray *t) {
+    uintptr_t key = (uintptr_t)t;
+    jobject runnable = findCallback(g_menuOpenedCallbacks, key);
+    if (runnable) invokeRunnable(runnable);
+}
+
 /* ========================================================================== */
 /*  Helper: duplicate UTF-8 string from JNI                                   */
 /* ========================================================================== */
@@ -176,8 +183,9 @@ Java_com_kdroid_composetray_lib_windows_WindowsNativeBridge_nativeFreeTray(
     struct tray *t = (struct tray *)(uintptr_t)handle;
     if (!t) return;
 
-    /* Remove tray callback */
+    /* Remove tray callbacks */
     storeCallback(&g_trayCallbacks, (uintptr_t)t, env, NULL);
+    storeCallback(&g_menuOpenedCallbacks, (uintptr_t)t, env, NULL);
 
     free((void *)t->icon_filepath);
     free((void *)t->tooltip);
@@ -218,6 +226,17 @@ Java_com_kdroid_composetray_lib_windows_WindowsNativeBridge_nativeSetTrayCallbac
     t->cb = callback ? tray_cb_trampoline : NULL;
 }
 
+JNIEXPORT void JNICALL
+Java_com_kdroid_composetray_lib_windows_WindowsNativeBridge_nativeSetMenuOpenedCallback(
+    JNIEnv *env, jclass clazz, jlong handle, jobject callback)
+{
+    (void)clazz;
+    struct tray *t = (struct tray *)(uintptr_t)handle;
+    if (!t) return;
+    storeCallback(&g_menuOpenedCallbacks, (uintptr_t)t, env, callback);
+    tray_set_menu_opened_callback(t, callback ? menu_opened_cb_trampoline : NULL);
+}
+
 JNIEXPORT void JNICALL
 Java_com_kdroid_composetray_lib_windows_WindowsNativeBridge_nativeSetTrayMenu(
     JNIEnv *env, jclass clazz, jlong trayHandle, jlong menuHandle)
@@ -271,6 +290,7 @@ Java_com_kdroid_composetray_lib_windows_WindowsNativeBridge_nativeExitTray(
     (void)env; (void)clazz;
     tray_exit();
     clearAllCallbacks(&g_menuCallbacks);
+    clearAllCallbacks(&g_menuOpenedCallbacks);
 }
 
 /* ========================================================================== */

src/native/windows/tray.h

@@ -60,6 +60,9 @@ TRAY_EXPORT void tray_exit (void);               /* Free all resources
 TRAY_EXPORT int tray_get_notification_icons_position(int *x, int *y);
 TRAY_EXPORT const char *tray_get_notification_icons_region(void);
 
+/* Menu-opened callback: invoked just before the popup menu is shown */
+TRAY_EXPORT void tray_set_menu_opened_callback(struct tray *tray, void (*cb)(struct tray *));
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

src/native/windows/tray_windows.c

@@ -99,6 +99,7 @@ typedef struct TrayContext {
     UINT         uID;                 /* unique id for Shell_NotifyIcon   */
     DWORD        threadId;            /* thread that owns this context    */
     BOOL         exiting;             /* exit requested for this context  */
+    void       (*menu_opened_cb)(struct tray *); /* called before menu popup */
     struct TrayContext *next;         /* linked list                      */
 } TrayContext;
 
@@ -337,6 +338,12 @@ static LRESULT CALLBACK tray_wnd_proc(HWND h, UINT msg, WPARAM w, LPARAM l)
             GetCursorPos(&p);
             SetForegroundWindow(h);
 
+            /* Invoke menu-opened callback outside the critical section
+             * to avoid deadlocks with JNI calls */
+            if (ctx && ctx->menu_opened_cb && ctx->tray) {
+                ctx->menu_opened_cb(ctx->tray);
+            }
+
             EnterCriticalSection(&tray_cs);
             if (ctx && ctx->hmenu) {
                 WORD cmd = TrackPopupMenu(ctx->hmenu,
@@ -655,6 +662,20 @@ void tray_exit(void)
     LeaveCriticalSection(&tray_cs);
 }
 
+/* -------------------------------------------------------------------------- */
+/*  Set/clear the menu-opened callback for a given tray                       */
+/* -------------------------------------------------------------------------- */
+void tray_set_menu_opened_callback(struct tray *tray, void (*cb)(struct tray *))
+{
+    if (!tray) return;
+    ensure_critical_section();
+    EnterCriticalSection(&tray_cs);
+    TrayContext *ctx = find_ctx_by_tray(tray);
+    if (!ctx) ctx = find_ctx_by_thread(GetCurrentThreadId());
+    if (ctx) ctx->menu_opened_cb = cb;
+    LeaveCriticalSection(&tray_cs);
+}
+
 static BOOL get_tray_icon_rect(RECT *r)
 {
     /* Use per-thread context to identify the correct tray icon */