Changeset 56929 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h (modified) (3 diffs)

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. */