Changeset 106753 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 28, 2024 2:23:51 PM (3 months ago)

Author:

vboxsync

Message:

Additions: Linux/Wayland: Split Clipboard and DnD helpers, bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• wayland-helper.h (modified) (2 diffs)
• wayland.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper.h

@@ -137 +137 @@
 
 /**
+ * Wayland Desktop Environment helper clipboard operations.
+ */
+typedef struct
+{
+
+    /**
+     * Initialization callback.
+     *
+     * @returns IPRT status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnInit, (void));
+
+    /**
+     * Termination callback.
+     *
+     * @returns IPRT status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnTerm, (void));
+
+    /**
+     * Callback to set host clipboard connection handle.
+     *
+     * @param   pCtx    Host service connection context.
+     */
+    DECLCALLBACKMEMBER(void, pfnSetClipboardCtx, (PVBGLR3SHCLCMDCTX pCtx));
+
+    /**
+     * Callback to force guest to announce its clipboard content.
+     *
+     * @returns IPRT status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnPopup, (void));
+
+    /** A callback to notify guest about new content in host clipboard. */
+    PFNHOSTCLIPREPORTFMTS pfnHGClipReport;
+
+    /** Callback to notify guest that host wants to read clipboard data in specified format. */
+    PFNHOSTCLIPREAD pfnGHClipRead;
+
+} VBCLWAYLANDHELPER_CLIPBOARD;
+
+/**
+ * Wayland Desktop Environment helper DnD operations.
+ */
+typedef struct
+{
+
+    /**
+     * Initialization callback.
+     *
+     * @returns IPRT status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnInit, (void));
+
+    /**
+     * Termination callback.
+     *
+     * @returns IPRT status code.
+     */
+    DECLCALLBACKMEMBER(int, pfnTerm, (void));
+
+} VBCLWAYLANDHELPER_DND;
+
+/**
  * Wayland Desktop Environment helper definition structure.
  */
@@ -150 +214 @@
      * which is compatible with the helper.
      *
-     * @returns Helpercapabilities bitmask as described by VBOX_WAYLAND_HELPER_CAP_XXX.
+     * @returns Helper capabilities bitmask as described by VBOX_WAYLAND_HELPER_CAP_XXX.
      */
     DECLCALLBACKMEMBER(int, pfnProbe, (void));
 
-    /**
-     * Initialization callback.
-     *
-     * @returns IPRT status code.
-     */
-    DECLCALLBACKMEMBER(int, pfnInit, (void));
-
-    /**
-     * Termination callback.
-     *
-     * @returns IPRT status code.
-     */
-    DECLCALLBACKMEMBER(int, pfnTerm, (void));
-
-    /**
-     * Callback to set host clipboard connection handle.
-     *
-     * @param   pCtx    Host service connection context.
-     */
-    DECLCALLBACKMEMBER(void, pfnSetClipboardCtx, (PVBGLR3SHCLCMDCTX pCtx));
-
-    /**
-     * Callback to force guest to announce its clipboard content.
-     *
-     * @returns IPRT status code.
-     */
-    DECLCALLBACKMEMBER(int, pfnPopup, (void));
-
-    PFNHOSTCLIPREPORTFMTS pfnHGClipReport;
-    PFNHOSTCLIPREAD pfnGHClipRead;
+    /** Helper functions for clipboard operations. */
+    VBCLWAYLANDHELPER_CLIPBOARD clip;
+
+    /** Helper functions for DnD operations. */
+    VBCLWAYLANDHELPER_DND dnd;
 
 } VBCLWAYLANDHELPER;

trunk/src/VBox/Additions/x11/VBoxClient/wayland.cpp

@@ -85 +85 @@
     {
         /* Provide helper with host clipboard service connection handle. */
-        g_pWaylandHelperClipboard->pfnSetClipboardCtx(&ctx.CmdCtx);
+        g_pWaylandHelperClipboard->clip.pfnSetClipboardCtx(&ctx.CmdCtx);
 
         /* Process host events. */
         while (!ASMAtomicReadBool(&g_fShutdown))
         {
-            rc = VBClClipboardReadHostEvent(&ctx, g_pWaylandHelperClipboard->pfnHGClipReport,
-                                            g_pWaylandHelperClipboard->pfnGHClipRead);
+            rc = VBClClipboardReadHostEvent(&ctx,
+                                            g_pWaylandHelperClipboard->clip.pfnHGClipReport,
+                                            g_pWaylandHelperClipboard->clip.pfnGHClipRead);
             if (RT_FAILURE(rc))
             {
@@ -179 +180 @@
                                 if (RTStrNCmp(pszValue, "0", GUEST_PROP_MAX_NAME_LEN) == 0)
                                 {
-                                    rc = g_pWaylandHelperClipboard->pfnPopup();
+                                    rc = g_pWaylandHelperClipboard->clip.pfnPopup();
                                     VBClLogVerbose(1, "trigger popup, rc=%Rrc\n", rc);
                                 }
@@ -238 +239 @@
                 && !RT_VALID_PTR(g_pWaylandHelperClipboard))
             {
-                if (RT_VALID_PTR(g_apWaylandHelpers[idxHelper]->pfnInit))
+                if (RT_VALID_PTR(g_apWaylandHelpers[idxHelper]->clip.pfnInit))
                 {
-                    rc = g_apWaylandHelpers[idxHelper]->pfnInit();
+                    rc = g_apWaylandHelpers[idxHelper]->clip.pfnInit();
                     if (RT_SUCCESS(rc))
                         g_pWaylandHelperClipboard = g_apWaylandHelpers[idxHelper];
@@ -256 +257 @@
                 && !RT_VALID_PTR(g_pWaylandHelperDnd))
             {
-                if (RT_VALID_PTR(g_apWaylandHelpers[idxHelper]->pfnInit))
+                if (RT_VALID_PTR(g_apWaylandHelpers[idxHelper]->dnd.pfnInit))
                 {
-                    rc = g_apWaylandHelpers[idxHelper]->pfnInit();
+                    rc = g_apWaylandHelpers[idxHelper]->dnd.pfnInit();
                     if (RT_SUCCESS(rc))
                         g_pWaylandHelperDnd = g_apWaylandHelpers[idxHelper];
@@ -389 +390 @@
 
     if (   RT_VALID_PTR(g_pWaylandHelperClipboard)
-        && RT_VALID_PTR(g_pWaylandHelperClipboard->pfnTerm))
-        rc = g_pWaylandHelperClipboard->pfnTerm();
+        && RT_VALID_PTR(g_pWaylandHelperClipboard->clip.pfnTerm))
+        rc = g_pWaylandHelperClipboard->clip.pfnTerm();
 
     if (   RT_SUCCESS(rc)
         && RT_VALID_PTR(g_pWaylandHelperDnd)
-        && RT_VALID_PTR(g_pWaylandHelperDnd->pfnTerm))
-        rc = g_pWaylandHelperDnd->pfnTerm();
+        && RT_VALID_PTR(g_pWaylandHelperDnd->dnd.pfnTerm))
+        rc = g_pWaylandHelperDnd->dnd.pfnTerm();
 
     return rc;