Changeset 56929 in vbox for trunk

Timestamp:

Jul 14, 2015 2:18:11 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: X11: Helpers cleanup/rework (step 3): Reworking to detect more than one X11 WM types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• platform/x11/VBoxX11Helper.cpp (modified) (5 diffs)
• platform/x11/VBoxX11Helper.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -176 +176 @@
 
 # define BOOL PRBool
-# include "VBoxX11Helper.h"
 #endif /* Q_WS_X11 */
 
@@ -232 +231 @@
     , m_fSeparateProcess(false)
     , m_pMediumEnumerator(0)
-    , mIsKWinManaged (false)
+#ifdef Q_WS_X11
+    , m_enmWindowManagerType(X11WMType_Unknown)
+#endif /* Q_WS_X11 */
 #if defined(DEBUG_bird)
     , mAgressiveCaching(false)
@@ -3948 +3949 @@
 
 #ifdef Q_WS_X11
-    mIsKWinManaged = X11IsWindowManagerKWin();
-#endif
+    /* Acquire current Window Manager type: */
+    m_enmWindowManagerType = X11WindowManagerType();
+#endif /* Q_WS_X11 */
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -35 +35 @@
 #include "UIMediumDefs.h"
 #include "VBoxGlobalSettings.h"
+#ifdef Q_WS_X11
+# include "VBoxX11Helper.h"
+#endif /* Q_WS_X11 */
 
 /* COM includes: */
@@ -149 +152 @@
     QList<QUrl> &argUrlList() { return m_ArgUrlList; }
 
-    bool isKWinManaged() const { return mIsKWinManaged; }
+#ifdef Q_WS_X11
+    /** X11: Returns the type of the Window Manager we are running under. */
+    X11WMType typeOfWindowManager() const { return m_enmWindowManagerType; }
+#endif /* Q_WS_X11 */
 
     /** Returns whether we should restore current snapshot before VM started. */
@@ -480 +486 @@
     mutable QReadWriteLock m_mediumEnumeratorDtorRwLock;
 
-    bool mIsKWinManaged;
+#ifdef Q_WS_X11
+    /** X11: Holds the type of the Window Manager we are running under. */
+    X11WMType m_enmWindowManagerType;
+#endif /* Q_WS_X11 */
 
     /** The --aggressive-caching / --no-aggressive-caching option. */

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QX11Info>
+#include <QString>
+
+/* GUI includes: */
 #include "VBoxX11Helper.h"
 
+/* Other VBox includes: */
 #include <iprt/cdefs.h>
-#include <iprt/string.h>
-#include <QX11Info>
 
 /* rhel3 build hack */
@@ -73 +77 @@
 }
 
-bool X11IsWindowManagerKWin()
+X11WMType X11WindowManagerType()
 {
     /* Get display: */
@@ -84 +88 @@
     unsigned long ulDummy;
     unsigned char *pcData = 0;
-    bool fIsKWinManaged = false;
+    X11WMType wmType = X11WMType_Unknown;
 
     /* Ask if root-window supports check for WM name: */
@@ -106 +110 @@
                                    &iReturnedFormat, &ulReturnedItemCount, &ulDummy, &pcData) == Success)
             {
-                fIsKWinManaged = RTStrCmp((const char*)pcData, "KWin") == 0;
+                if (QString((const char*)pcData).contains("KWin", Qt::CaseInsensitive))
+                    wmType = X11WMType_KWin;
+                else
+                if (QString((const char*)pcData).contains("Mutter", Qt::CaseInsensitive))
+                    wmType = X11WMType_Mutter;
                 if (pcData)
                     XFree(pcData);
@@ -112 +120 @@
         }
     }
-    return fIsKWinManaged;
+    return wmType;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -19 +19 @@
 #define ___VBoxX11Helpers_h___
 
+/** X11: Known Window Manager types. */
+enum X11WMType
+{
+    X11WMType_Unknown,
+    X11WMType_KWin,
+    X11WMType_Mutter,
+};
+
 /** X11: Inits the screen saver save/restore mechanism. */
 void X11ScreenSaverSettingsInit();
@@ -26 +34 @@
 void X11ScreenSaverSettingsRestore();
 
-/** X11: Determines whether current Window Manager is KWin. */
-bool X11IsWindowManagerKWin();
+/** X11: Determines and returns current Window Manager type. */
+X11WMType X11WindowManagerType();
 
 #endif /* !___VBoxX11Helpers_h___ */