Changeset 8067 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 16, 2008 7:30:39 PM (17 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard: another attempt to fix a segfault in the X11 clipboard

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (4 diffs)

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

@@ -45 +45 @@
 #include <X11/Shell.h>
 #include <X11/Xproto.h>
+#include <X11/StringDefs.h>
 
 /** The different clipboard formats which we support. */
@@ -688 +689 @@
     char *pcArgv = 0;
     int rc = VINF_SUCCESS;
-    static String szFallbackResources[] = { (char*)"*.width: 1", (char*)"*.height: 1", NULL };
+    // static String szFallbackResources[] = { (char*)"*.width: 1", (char*)"*.height: 1", NULL };
     Display *pDisplay;
     LogRel (("vboxClipboardThread: starting clipboard thread\n"));
@@ -699 +700 @@
     XtToolkitInitialize();
     g_ctx.appContext = XtCreateApplicationContext();
-    XtAppSetFallbackResources(g_ctx.appContext, szFallbackResources);
+    // XtAppSetFallbackResources(g_ctx.appContext, szFallbackResources);
     pDisplay = XtOpenDisplay(g_ctx.appContext, 0, 0, "VBoxClipboard", 0, 0, &cArgc, &pcArgv);
     if (pDisplay == 0)
@@ -706 +707 @@
         return VERR_NOT_SUPPORTED;
     }
-    g_ctx.widget = XtAppCreateShell(0, "VBoxClipboard", applicationShellWidgetClass, pDisplay,
-                                    0, 0);
+    g_ctx.widget = XtVaAppCreateShell(0, "VBoxClipboard", applicationShellWidgetClass, pDisplay,
+                                      XtNwidth, 1, XtNheight, 1, NULL);
     if (g_ctx.widget == 0)
     {