Changeset 80444 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Aug 27, 2019 5:47:44 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Added protocol versioning support plus enhanced versions of existing commands (to also provide context IDs, among other stuff). So far only the host service(s) and the Windows guest is using the new(er) protocol.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• clipboard.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -99 +99 @@
   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_GUEST
   VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-VbglR3.cpp
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-uri.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
   ifdef VBOX_WITH_LIBFUSE_DISABLED
    VBoxClient_SOURCES += \

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

@@ -145 +145 @@
  * Tell the host that new clipboard formats are available.
  *
- * @param  pCtx      Our context information
- * @param u32Formats The formats to advertise
+ * @param pCtx                  Our context information.
+ * @param u32Formats            The formats to report.
  */
 void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
@@ -229 +229 @@
             switch (Msg)
             {
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS:
+                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
                 {
                     /* The host has announced available clipboard formats.
@@ -235 +235 @@
                      * future requests from guest applications.
                      */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS fFormats=%x\n", fFormats));
+                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE fFormats=%x\n", fFormats));
                     ClipAnnounceFormatToX11(g_ctx.pBackend, fFormats);
                     break;