Changeset 21760 in vbox

Timestamp:

Jul 22, 2009 9:50:37 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: another attempt to fix the X11 visuals problems

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -45 +45 @@
 #include <QLocale>
 #include <QTranslator>
+
+#include <X11/Xlib.h>
 
 #include <iprt/err.h>
@@ -325 +327 @@
     {
 #ifdef Q_WS_X11
-        /* There are some buggy/strange driver/compiz combinations which lead
-         * to transparent backgrounds on ARGB visuals. Try to fix it by not
-         * allowing an ARGB visual with the help of the Xlib. After that we
-         * restore the original environment, so that others like the OpenGL
-         * service will proper work. */
-        char *pchOldVar = NULL;
-        bool fHackARGB = !RTEnvExist ("VBOX_NO_ARGB_VISUALS_HACK");
-        if (fHackARGB)
+        /* Qt has a complex algorithm for selecting the right visual which
+         * doesn't always seem to work.  So we naively choose a visual - the
+         * default one - ourselves and pass that to Qt.  This means that we
+         * also have to open the display ourselves.
+         * We check the Qt parameter list and handle Qt's -display argument
+         * ourselves, since we open the display connection.  We also check the
+         * to see if the user has passed Qt's -visual parameter, and if so we
+         * assume that the user wants Qt to handle visual selection after all,
+         * and don't supply a visual. */
+        char *pszDisplay = NULL;
+        bool useDefaultVisual = true;
+        for (int i = 0; i < argc; ++i)
         {
-            const char *pchVar = RTEnvGet ("XLIB_SKIP_ARGB_VISUALS");
-            if (pchVar)
-                pchOldVar = RTStrDup (pchVar);
-            RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", "1");
+            if (!::strcmp(argv[i], "-display") && (i + 1 < argc))
+            /* What if it isn't?  Rely on QApplication to complain? */
+            {
+                pszDisplay = argv[i + 1];
+                ++i;
+            }
+            else if (!::strcmp(argv[i], "-visual"))
+                useDefaultVisual = false;
         }
+        Display *pDisplay = XOpenDisplay(pszDisplay);
+        if (!pDisplay)
+        {
+            RTPrintf(pszDisplay ? "Failed to open the X11 display \"%s\"!\n"
+                                : "Failed to open the X11 display!\n",
+                     pszDisplay);
+            return 0;
+        }
+        Visual *pVisual =   useDefaultVisual
+                          ? DefaultVisual(pDisplay, DefaultScreen(pDisplay))
+                          : NULL;
         /* Now create the application object */
-        QIApplication a (argc, argv);
-        /* Restore previous environment */
-        if (fHackARGB)
-        {
-            if (pchOldVar)
-            {
-                RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", pchOldVar);
-                RTStrFree (pchOldVar);
-            }
-            else
-                RTEnvUnset ("XLIB_SKIP_ARGB_VISUALS");
-        }
+        QIApplication a (pDisplay, argc, argv, (Qt::HANDLE) pVisual);
 #else /* Q_WS_X11 */
         QIApplication a (argc, argv);