Changeset 6366 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Jan 17, 2008 9:36:42 AM (17 years ago)

Author:

vboxsync

Message:

Solaris: Host-side Shared clipboard lib, some fixes to clipboard-new and
more flow logging. The previous problem of invalid client Id is fixed but
seems there's more work here to be fixed, most possibly in the r3 guest
clipboard side.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• Makefile.kmk (modified) (2 diffs)
• linux.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -36 +36 @@
 VBoxSharedClipboard_SOURCES.linux = \
         linux.cpp
+VBoxSharedClipboard_SOURCES.solaris = \
+        linux.cpp
 else
 VBoxSharedClipboard_SOURCES.linux = \
+        linux-stub.cpp
+VBoxSharedClipboard_SOURCES.solaris = \
         linux-stub.cpp
 endif
@@ -48 +52 @@
 VBoxSharedClipboard_LIBPATH.linux = \
         $(VBOX_LIBPATH_X11)
+VBoxSharedClipboard_LIBPATH.solaris = \
+        $(VBOX_LIBPATH_X11)
 VBoxSharedClipboard_LIBS.linux = \
+        Xt \
+        X11
+VBoxSharedClipboard_LIBS.solaris = \
         Xt \
         X11

trunk/src/VBox/HostServices/SharedClipboard/linux.cpp

@@ -628 +628 @@
     property.format = 8;
     property.nitems = cbSrcLen;
+#ifdef RT_OS_SOLARIS
+    rc = XConverterNotFound;
+    NOREF(cProps);
+#else
     rc = Xutf8TextPropertyToTextList(XtDisplay(g_ctx.widget), &property, &ppu8SrcText, &cProps);
+#endif
     XtFree(reinterpret_cast<char *>(pValue));
     if (rc < 0)
@@ -1408 +1413 @@
     }
     /* And finally (!) convert the Utf8 text to compound text. */
+#ifdef RT_OS_SOLARIS
+    rc = XConverterNotFound;
+#else
     rc = Xutf8TextListToTextProperty(XtDisplay(g_ctx.widget), &pu8DestText, 1,
                                      XCompoundTextStyle, &property);
+#endif
     RTMemFree(pu8DestText);
     if (rc < 0)