VBoxClient: Made pfnPopup optional, since it's only needed by the 'gtk' backend. buref:10194

bird2tori · bird2tori · commit 85df36d409f5 · 2026-07-20T13:04:35.000Z
svn:sync-xref-src-repo-rev: r174569
diff --git a/src/VBox/Additions/x11/VBoxClient/wayland-helper-edcp.cpp b/src/VBox/Additions/x11/VBoxClient/wayland-helper-edcp.cpp
@@ -1,4 +1,4 @@
-/* $Id: wayland-helper-edcp.cpp 114620 2026-07-04 00:00:20Z knut.osmundsen@oracle.com $ */
+/* $Id: wayland-helper-edcp.cpp 114732 2026-07-20 13:04:35Z knut.osmundsen@oracle.com $ */
 /** @file
  * Guest Additions - Ext Data Control Protocol (EDCP) helper for Wayland.
  *
@@ -831,14 +831,6 @@ static DECLCALLBACK(void) vbcl_wayland_hlp_edcp_clip_set_ctx(PSHCLCONTEXT pCtx)
     g_EdcpCtx.BaseCtx.pShClCtx = pCtx;
 }
 
-/**
- * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnPopup}
- */
-static DECLCALLBACK(int) vbcl_wayland_hlp_edcp_clip_popup(void)
-{
-    return VINF_SUCCESS;
-}
-
 /**
  * @callback_method_impl{FNVBCLWAYLANDSESSIONJOIN,
  *      Session callback: Copy clipboard from the host.}
@@ -902,7 +894,7 @@ const VBCLWAYLANDHELPER g_WaylandHelperEdcp =
         /* .pfnInit            = */ vbcl_wayland_hlp_edcp_clip_init,
         /* .pfnTerm            = */ vbcl_wayland_hlp_edcp_clip_term,
         /* .pfnSetClipboardCtx = */ vbcl_wayland_hlp_edcp_clip_set_ctx,
-        /* .pfnPopup           = */ vbcl_wayland_hlp_edcp_clip_popup,
+        /* .pfnPopup           = */ NULL,
         /* .pfnHGClipReport    = */ vbcl_wayland_hlp_edcp_clip_hg_report,
         /* .pfnGHClipRead      = */ NULL,
     },
diff --git a/src/VBox/Additions/x11/VBoxClient/wayland-helper.h b/src/VBox/Additions/x11/VBoxClient/wayland-helper.h
@@ -1,4 +1,4 @@
-/* $Id: wayland-helper.h 114464 2026-06-21 01:25:02Z knut.osmundsen@oracle.com $ */
+/* $Id: wayland-helper.h 114732 2026-07-20 13:04:35Z knut.osmundsen@oracle.com $ */
 /** @file
  * Guest Additions - Definitions for Wayland helpers.
  */
@@ -167,6 +167,7 @@ typedef struct
      * Callback to force guest to announce its clipboard content.
      *
      * @returns IPRT status code.
+     * @note Optional. Only needed by plain Wayland/Gtk.
      */
     DECLCALLBACKMEMBER(int, pfnPopup, (void));
 
diff --git a/src/VBox/Additions/x11/VBoxClient/wayland.cpp b/src/VBox/Additions/x11/VBoxClient/wayland.cpp
@@ -1,4 +1,4 @@
-/* $Id: wayland.cpp 114626 2026-07-04 01:32:49Z knut.osmundsen@oracle.com $ */
+/* $Id: wayland.cpp 114732 2026-07-20 13:04:35Z knut.osmundsen@oracle.com $ */
 /** @file
  * Guest Additions - Wayland Desktop Environment assistant.
  */
@@ -545,11 +545,14 @@ static DECLCALLBACK(int) vbclWaylandWorker(bool volatile *pfShutdown)
     }
 #endif
 
-    /* Start polling host input focus events. */
-    if (RT_SUCCESS(rc))
+    /* Start waiting host input focus events (only basic Wayland clipboard protocol
+       requires this, thus the pfnPopup check). */
+    if (   RT_SUCCESS(rc)
+        && g_pWaylandHelperClipboard
+        && g_pWaylandHelperClipboard->clip.pfnPopup != NULL)
     {
         rc = vbcl_wayland_thread_start(&g_hHostInputFocusThread, vbclWaylandHostInputFocusWorker, "wl-focus", (void *)pfShutdown);
-        VBClLogVerbose(1, "host input focus polling thread started, rc=%Rrc\n", rc);
+        VBClLogVerbose(1, "host input focus event thread started, rc=%Rrc\n", rc);
     }
 
     /* Notify parent thread that we are successfully started. */
