Changeset 102826 in vbox

Timestamp:

Jan 10, 2024 5:52:33 PM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161018

Message:

Shared Clipboard/X11: Don't report an error in ShClX11ReadDataFromX11Async() + ShClX11WriteDataToX11Async() if an X11 server is not running (like we do with other APIs as well). bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-x11.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (4 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-x11.h

@@ -116 +116 @@
     /** Our callback table to use. */
     SHCLCALLBACKS    Callbacks;
-    /** Is an X server actually available? */
+    /** Is an X server actually available?
+     *  Needed for non-interactive systems (i.e. servers) where X11 depedencies are installed,
+     *  but no X11 server is actually running. */
     bool             fHaveX11;
     /** The X Toolkit application context structure. */

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -2619 +2619 @@
 
 /**
- * Reads the X11 clipboard (asynchronously).
+ * Reads from the X11 clipboard (asynchronously).
  *
  * @returns VBox status code.
- * @retval  VERR_NO_DATA if format is supported but no data is available currently.
- * @retval  VERR_NOT_IMPLEMENTED if the format is not implemented.
  * @param   pCtx                Context data for the clipboard backend.
  * @param   uFmt                The format that the VBox would like to receive the data in.
@@ -2638 +2636 @@
      */
     if (!pCtx->fHaveX11)
-        return VERR_NO_DATA;
+        return VINF_SUCCESS;
 
     int rc = VINF_SUCCESS;
@@ -2736 +2734 @@
  *
  * @returns VBox status code.
- * @retval  VERR_NOT_AVAILABLE the the X11 clipboard is not available.
- * @retval  VERR_NOT_IMPLEMENTED if the format is not implemented.
  * @param   pCtx                Context data for the clipboard backend.
  * @param   uFmts               The format(s) to write.
@@ -2758 +2754 @@
      */
     if (!pCtx->fHaveX11)
-        return VERR_NOT_AVAILABLE;
+        return VINF_SUCCESS;
 
     int rc = ShClCacheSetMultiple(&pCtx->Cache, uFmts, pvBuf, cbBuf);