VBoxClient,GuestHost: Implemented the wayland support in the --clipboard service using the guest/host bits, refactoring the gtk subprocess handling a bit. The --wayland service remains the same. [build & doxygen fixes] bugref:10194

bird2tori · bird2tori · commit ca3bede36550 · 2026-07-21T14:36:59.000Z
svn:sync-xref-src-repo-rev: r174577
diff --git a/src/VBox/Additions/x11/VBoxClient/VBoxClient.h b/src/VBox/Additions/x11/VBoxClient/VBoxClient.h
@@ -1,4 +1,4 @@
-/* $Id: VBoxClient.h 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
+/* $Id: VBoxClient.h 114740 2026-07-21 14:36:59Z knut.osmundsen@oracle.com $ */
 /** @file
  *
  * VirtualBox additions user session daemon.
@@ -79,16 +79,33 @@ typedef struct VBCLHOSTINPUTFOCUSSTATE
 {
     /** @name User Settable Properties.
      * @{  */
+    /**
+     * Called when the host VM process receives input focus.
+     *
+     * @return Quit indicator - true to quit, false to keep going.
+     * @param  pThis    Pointer to this structure.
+     */
     DECLCALLBACKMEMBER(bool, pfnFocusEnter,(struct VBCLHOSTINPUTFOCUSSTATE *pThis));
+    /**
+     * Called when the host VM process loses input focus.
+     *
+     * @return Quit indicator - true to quit, false to keep going.
+     * @param  pThis    Pointer to this structure.
+     */
     DECLCALLBACKMEMBER(bool, pfnFocusExit,(struct VBCLHOSTINPUTFOCUSSTATE *pThis));
+    /** Pointer to the shutdown indicator (will be set to fShutdownInternal if NULL). */
     bool volatile      *pfShutdown;
+    /** Where to store user data. */
     void               *pvUser;
     /** @} */
 
     /** @name Internal
      *  @{ */
+    /** Handle of the monitoring thread (don't touch). */
     RTTHREAD            hThread;
+    /** Guest property client handle (don't touch). */
     VBGLGSTPROPCLIENT   GuestPropClient;
+    /** Internal shutdown indicator (don't touch). */
     bool volatile       fShutdownInternal;
     /** @} */
 } VBCLHOSTINPUTFOCUSSTATE;
diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -1,4 +1,4 @@
-/* $Id: main.cpp 114738 2026-07-21 13:40:26Z knut.osmundsen@oracle.com $ */
+/* $Id: main.cpp 114740 2026-07-21 14:36:59Z knut.osmundsen@oracle.com $ */
 /** @file
  * VirtualBox Guest Additions - X11 Client.
  */
@@ -52,7 +52,9 @@
 #include <VBox/version.h>
 
 #include "VBoxClient.h"
-#include "clipboard.h"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# include "clipboard.h"
+#endif
 
 
 /*********************************************************************************************************************************
@@ -424,6 +426,7 @@ static VBCLCOMMAND const g_CmdSessionDetect =
     /* .pfnExecute = */     vbclCmdSessionDetect,
 };
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
 
 /**
  * --session-detect2
@@ -450,6 +453,8 @@ static VBCLCOMMAND const g_CmdSessionDetect2 =
     /* .pfnExecute = */     vbclCmdSessionDetect2,
 };
 
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
+
 
 /**
  * Print out a usage message and exit with success.
@@ -867,7 +872,9 @@ int main(int argc, char *argv[])
                 g_Service.pCommand = &(a_Command); \
                 break
             VBOXCLIENT_OPT_CASE_COMMAND(VBOXCLIENT_OPT_SESSION_DETECT,      g_CmdSessionDetect);
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
             VBOXCLIENT_OPT_CASE_COMMAND(VBOXCLIENT_OPT_SESSION_DETECT2,     g_CmdSessionDetect2);
+#endif
 #ifdef VBOX_WITH_WAYLAND_ADDITIONS
             VBOXCLIENT_OPT_CASE_COMMAND(VBOXCLIENT_OPT_CLIPBOARD_GET,       g_CmdClipboardGet);
             VBOXCLIENT_OPT_CASE_COMMAND(VBOXCLIENT_OPT_CLIPBOARD_SET,       g_CmdClipboardSet);
