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

Timestamp:

Nov 29, 2011 10:57:46 AM (13 years ago)

Author:

vboxsync

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

75096

Message:

Additions-X11: initial DnD support

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxClient.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -51 +51 @@
         Xrandr \
         Xt
+#       Xtst
 # These are static replacements for gcc-specific parts of libstdc++
 VBoxClient_LIBS += \
@@ -69 +70 @@
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
+endif
+ifdef VBOX_WITH_DRAG_AND_DROP
+ VBoxClient_DEFS += VBOX_WITH_DRAG_AND_DROP
+ VBoxClient_SOURCES += \
+        draganddrop.cpp
 endif
 

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -43 +43 @@
 extern Service *GetDisplayService();
 extern Service *GetHostVersionService();
+#ifdef VBOX_WITH_DRAG_AND_DROP
+extern Service *GetDragAndDropService();
+#endif /* VBOX_WITH_DRAG_AND_DROP */
 
 extern void CleanUp();

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

@@ -141 +141 @@
 void vboxClientUsage(const char *pcszFileName)
 {
-    RTPrintf("Usage: %s --clipboard|--display|--checkhostversion|--seamless [-d|--nodaemon]\n", pcszFileName);
+    RTPrintf("Usage: %s --clipboard|"
+#ifdef VBOX_WITH_DRAG_AND_DROP
+             "--draganddrop|"
+#endif
+             "--display|"
+# ifdef VBOX_WITH_GUEST_PROPS
+             "--checkhostversion|"
+#endif
+             "--seamless [-d|--nodaemon]\n", pcszFileName);
     RTPrintf("Start the VirtualBox X Window System guest services.\n\n");
     RTPrintf("Options:\n");
     RTPrintf("  --clipboard        start the shared clipboard service\n");
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    RTPrintf("  --draganddrop      start the drag and drop service\n");
+#endif
     RTPrintf("  --display          start the display management service\n");
-# ifdef VBOX_WITH_GUEST_PROPS
+#ifdef VBOX_WITH_GUEST_PROPS
     RTPrintf("  --checkhostversion start the host version notifier service\n");
-# endif
+#endif
     RTPrintf("  --seamless         start the seamless windows service\n");
     RTPrintf("  -d, --nodaemon     continue running as a system service\n");
@@ -219 +230 @@
                 fSuccess = false;
         }
+#ifdef VBOX_WITH_DRAG_AND_DROP
+        else if (!strcmp(argv[i], "--draganddrop"))
+        {
+            if (g_pService == NULL)
+                g_pService = VBoxClient::GetDragAndDropService();
+            else
+                fSuccess = false;
+        }
+#endif /* VBOX_WITH_DRAG_AND_DROP */
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {