Changeset 21185 in vbox for trunk/src

Timestamp:

Jul 2, 2009 10:07:50 PM (16 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard fix the clipboard on Solaris 10 and remove the Xlib Xutf8* code altogether

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (6 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -905 +905 @@
                                          int *piFormatReturn)
 {
-    char *pszTmp = NULL;
+    char *pszTmp = NULL, *pszTmp2 = NULL;
     size_t cbTmp = 0, cbActual = 0;
     XTextProperty property;
@@ -923 +923 @@
         rc = clipWinTxtToUtf8(pwszSrc, cbSrc, pszTmp, cbTmp + 1,
                               &cbActual);
-    /* And finally (!) convert the Utf8 text to compound text. */
-#ifdef X_HAVE_UTF8_STRING
+    /* Convert the Utf8 text to the current encoding (usually a noop). */
     if (RT_SUCCESS(rc))
-        xrc = Xutf8TextListToTextProperty(pDisplay, &pszTmp, 1,
-                                          XCompoundTextStyle, &property);
-#else
+        rc = RTStrUtf8ToCurrentCP(&pszTmp2, pszTmp);
+    /* And finally (!) convert the resulting text to compound text. */
     if (RT_SUCCESS(rc))
-        xrc = XmbTextListToTextProperty(pDisplay, &pszTmp, 1,
+        xrc = XmbTextListToTextProperty(pDisplay, &pszTmp2, 1,
                                         XCompoundTextStyle, &property);
-#endif
     if (RT_SUCCESS(rc) && xrc < 0)
         rc = (  xrc == XNoMemory           ? VERR_NO_MEMORY
@@ -939 +936 @@
               :                              VERR_UNRESOLVED_ERROR);
     RTMemFree(pszTmp);
+    RTStrFree(pszTmp2);
     *atomTypeReturn = property.encoding;
     *pValReturn = reinterpret_cast<XtPointer>(property.value);
@@ -1262 +1260 @@
     int rc = VINF_SUCCESS;
     XTextProperty property;
-    char **ppcTmp = NULL;
+    char **ppcTmp = NULL, *pszTmp = NULL;
     int cProps;
 
@@ -1269 +1267 @@
     property.format = 8;
     property.nitems = cbSrc;
-#ifdef X_HAVE_UTF8_STRING
-    int xrc = Xutf8TextPropertyToTextList(XtDisplay(widget), &property,
-                                          &ppcTmp, &cProps);
-#else
     int xrc = XmbTextPropertyToTextList(XtDisplay(widget), &property,
                                         &ppcTmp, &cProps);
-#endif
     if (xrc < 0)
         rc = (  xrc == XNoMemory           ? VERR_NO_MEMORY
@@ -1281 +1274 @@
               : xrc == XConverterNotFound  ? VERR_NOT_SUPPORTED
               :                              VERR_UNRESOLVED_ERROR);
+    /* Convert the text returned to UTF8 */
+    if (RT_SUCCESS(rc))
+        rc = RTStrCurrentCPToUtf8(&pszTmp, *ppcTmp);
     /* Now convert the UTF8 to UTF16 */
     if (RT_SUCCESS(rc))
-        rc = clipUtf8ToWinTxt(*ppcTmp, strlen(*ppcTmp), ppwszDest, pcbDest);
+        rc = clipUtf8ToWinTxt(pszTmp, strlen(pszTmp), ppwszDest, pcbDest);
     if (ppcTmp != NULL)
         XFreeStringList(ppcTmp);
+    RTStrFree(pszTmp);
     LogFlowFunc(("Returning %Rrc\n", rc));
     if (pcbDest)