Changeset 19152 in vbox for trunk/include/VBox/GuestHost

Timestamp:

Apr 23, 2009 9:23:45 PM (16 years ago)

Author:

vboxsync

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

46398

Message:

HostServices and GuestHost/X11 clipboard: lots of changes, see defect 3621 comment 41

File:

• trunk/include/VBox/GuestHost/SharedClipboard.h (modified) (4 diffs)

trunk/include/VBox/GuestHost/SharedClipboard.h ¶

@@ -37 +37 @@
 enum {
     /** The number of milliseconds before the clipboard times out. */
-    CLIPBOARDTIMEOUT = 5000
+    CLIPBOARD_TIMEOUT = 5000
 };
 
@@ -47 +47 @@
 struct _VBOXCLIPBOARDCONTEXTX11;
 typedef struct _VBOXCLIPBOARDCONTEXTX11 VBOXCLIPBOARDCONTEXTX11;
-
-/** Does X11 or VBox currently own the clipboard? */
-/** @todo This is ugly, get rid of it. */
-enum g_eOwner { NONE = 0, X11, VB };
 
 /** A structure containing information about where to store a request
@@ -65 +61 @@
      * during a request for the clipboard contents) */
     uint32_t *pcbActual;
+    /** The format VBox would like the data in */
+    uint32_t format;
     /** Return code for the request processing code */
     int rc;
+    /** Semaphore which is signalled when the request is completed */
+    RTSEMEVENT finished;
     /** The clipboard context this request is associated with */
     VBOXCLIPBOARDCONTEXTX11 *pCtx;
@@ -77 +77 @@
                                         (VBOXCLIPBOARDCONTEXT *pFrontend);
 extern void VBoxX11ClipboardDestructX11(VBOXCLIPBOARDCONTEXTX11 *pBackend);
-extern int VBoxX11ClipboardStartX11(VBOXCLIPBOARDCONTEXTX11 *pBackend,
-                                    bool fOwnsClipboard);
+extern int VBoxX11ClipboardStartX11(VBOXCLIPBOARDCONTEXTX11 *pBackend);
 extern int VBoxX11ClipboardStopX11(VBOXCLIPBOARDCONTEXTX11 *pBackend);
-extern void VBoxX11ClipboardRequestSyncX11(VBOXCLIPBOARDCONTEXTX11 *pBackend);
 extern void VBoxX11ClipboardAnnounceVBoxFormat(VBOXCLIPBOARDCONTEXTX11
                                                *pBackend, uint32_t u32Formats);
 extern int VBoxX11ClipboardReadX11Data(VBOXCLIPBOARDCONTEXTX11 *pBackend,
                                        uint32_t u32Format,
-                                       VBOXCLIPBOARDREQUEST *pRequest);
+                                       void *pv, uint32_t cb,
+                                       uint32_t *pcbActual);
 
 /* APIs exported by the X11/VBox frontend */