Changeset 5823 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 22, 2007 7:22:50 PM (17 years ago)

Author:

vboxsync

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

26253

Message:

Additions (Linux): committed current seamless code, still disabled

Location:

trunk/src/VBox/Additions/linux/xclient

Files:

• Makefile.kmk (modified) (2 diffs)
• main.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/linux/xclient/Makefile.kmk

@@ -18 +18 @@
 include $(PATH_KBUILD)/header.kmk
 
-
 ifneq ($(USERNAME),bird) # crap
 PROGRAMS = vboxadd-xclient
@@ -27 +26 @@
 vboxadd-xclient_TEMPLATE = VBOXLNX32GUESTR3EXE
 vboxadd-xclient_SOURCES  = clipboard.cpp main.cpp
+ifdef LINUX_SEAMLESS_GUEST
+vboxadd-xclient_SOURCES += \
+                seamless-host.cpp \
+                seamless-x11.cpp
+endif
 vboxadd-xclient_LIBPATH  = $(PATH_TARGET)/vboxadd-xclient $(VBOX_LIBPATH32_X11)
 vboxadd-xclient_LIBS     = \
-    $(PATH_LIB)/RuntimeLnx32GuestR3.a pthread rt Xt X11
+                $(PATH_LIB)/VBoxGuestR3LibLinux.a \
+                $(PATH_LIB)/RuntimeLnx32GuestR3.a \
+                pthread \
+                rt \
+                Xt \
+                Xext \
+                X11
 vboxadd-xclient_DEFS     = _GNU_SOURCE VBOX_HGCM
+ifdef LINUX_SEAMLESS_GUEST
+vboxadd-xclient_DEFS     += LINUX_SEAMLESS
+endif
 
 # link agaginst libstdc++.a (http://www.trilithium.com/johan/2005/06/static-libstdc/)

trunk/src/VBox/Additions/linux/xclient/main.cpp

@@ -37 +37 @@
 #include "clipboard.h"
 
+#ifdef SEAMLESS_LINUX
+# include "seamless.h"
+#endif
+
 static bool gbDaemonise = true;
 
@@ -93 +97 @@
 {
     int rc;
+#ifdef SEAMLESS_LINUX
+    /** Our instance of the seamless class. */
+    VBoxGuestSeamless seamless;
+#endif
 
     /* Parse our option(s) */
@@ -136 +144 @@
     XSetErrorHandler(vboxClipboardXLibErrorHandler);
     /* Connect to the host clipboard. */
+    LogRel(("Starting clipboard Guest Additions...\n"));
     rc = vboxClipboardConnect();
     if (rc != VINF_SUCCESS)
     {
-        Log(("vboxClipboardConnect failed with rc = %d\n", rc));
+        LogRel(("vboxClipboardConnect failed with rc = %d\n", rc));
         cout << "Failed to connect to the host clipboard." << endl;
-        LogFlowFunc(("returning 1\n"));
-        return 1;
-    }
+    }
+#ifdef SEAMLESS_LINUX
+    try
+    {
+        LogRel(("Starting seamless Guest Additions...\n"));
+        rc = seamless.init();
+        if (rc != VINF_SUCCESS)
+        {
+            LogRel(("Failed to initialise seamless Additions, rc = %d\n", rc));
+            cout << "Failed to initialise seamless Additions." << endl;
+        }
+    }
+    catch (std::exception e)
+    {
+        LogRel(("Failed to initialise seamless Additions - caught exception: %s\n", e.what()));
+        cout << "Failed to initialise seamless Additions\n" << endl;
+        rc = VERR_UNRESOLVED_ERROR;
+    }
+    catch (...)
+    {
+        LogRel(("Failed to initialise seamless Additions - caught unknown exception.\n"));
+        cout << "Failed to initialise seamless Additions\n" << endl;
+        rc = VERR_UNRESOLVED_ERROR;
+    }
+#endif /* SEAMLESS_LINUX defined */
     if (gbDaemonise)
     {
@@ -150 +181 @@
     vboxClipboardMain();
     vboxClipboardDisconnect();
-    LogFlowFunc(("returning 0\n"));
-    return 0;
+#ifdef SEAMLESS_LINUX
+    try
+    {
+        seamless.uninit();
+    }
+    catch (std::exception e)
+    {
+        LogRel(("Error shutting down seamless Additions - caught exception: %s\n", e.what()));
+        rc = VERR_UNRESOLVED_ERROR;
+    }
+    catch (...)
+    {
+        LogRel(("Error shutting down seamless Additions - caught unknown exception.\n"));
+        rc = VERR_UNRESOLVED_ERROR;
+    }
+#endif /* SEAMLESS_LINUX defined */
+    LogFlowFunc(("returning %Vrc\n", rc));
+    return rc;
 }