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

Timestamp:

Apr 26, 2019 6:41:46 AM (6 years ago)

Author:

vboxsync

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

130272

Message:

Shared Clipboard/URI: First commit; work in progress.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

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

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

@@ -41 +41 @@
         check3d.cpp
 
-ifdef VBOX_WITH_SHARED_CLIPBOARD
- VBoxClient_DEFS += \
-        VBOX_WITH_SHARED_CLIPBOARD
- VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
-        clipboard.cpp
-endif
-
 VBoxClient_SOURCES.linux = \
         chk_stubs.c
@@ -91 +82 @@
 VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif
+
 ifdef VBOX_WITH_DRAG_AND_DROP
 VBoxClient_DEFS += \
@@ -100 +92 @@
         $(VBOX_LIB_VBGL_R3) \
         $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
+endif
+
+ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_DEFS += \
+        VBOX_WITH_SHARED_CLIPBOARD \
+        $(if $(VBOX_WITH_SHARED_CLIPBOARD_URI_LIST),VBOX_WITH_SHARED_CLIPBOARD_URI_LIST,)
+ VBoxClient_SOURCES += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+        clipboard.cpp
+ ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+  ifdef VBOX_WITH_LIBFUSE
+   VBoxClient_SOURCES += \
+        clipboard-fuse.cpp
+   VBoxClient_LIBS += \
+        libfuse
+  endif
+  ifdef VBOX_WITH_LIBGVFS
+  VBoxClient_SOURCES += \
+        clipboard-gvfs.c
+  VBOX_VBOXCLIENT_GVFS_VER:=1.31.92
+  VBoxClient_INCS += \
+        gvfs-$(VBOX_VBOXCLIENT_GVFS_VER)/common \
+        gvfs-$(VBOX_VBOXCLIENT_GVFS_VER)/client \
+        gvfs-$(VBOX_VBOXCLIENT_GVFS_VER)/daemon \
+        /usr/lib/x86_64-linux-gnu/glib-2.0/include \
+        /usr/include/glib-2.0
+  VBoxClient_LIBS += \
+        libgio-2.0 \
+        libglib-2.0
+  endif
+ endif
 endif
 

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

@@ -152 +152 @@
     RT_NOREF1(pCtx);
     LogRelFlowFunc(("u32Formats=%d\n", u32Formats));
-    int rc = VbglR3ClipboardReportFormats(g_ctx.client, u32Formats);
+    int rc = VbglR3ClipboardWriteFormats(g_ctx.client, u32Formats);
     LogRelFlowFunc(("rc=%Rrc\n", rc));
 }