Changeset 57101 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 27, 2015 5:27:26 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: X11: Extend X11WMType with Xfwm4 detection support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11

Files:

• VBoxX11Helper.cpp (modified) (1 diff)
• VBoxX11Helper.h (modified) (1 diff)

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

@@ -70 +70 @@
                                    &iReturnedFormat, &ulReturnedItemCount, &ulDummy, &pcData) == Success)
             {
+                if (QString((const char*)pcData).contains("Compiz", Qt::CaseInsensitive))
+                    wmType = X11WMType_Compiz;
+                else
+                if (QString((const char*)pcData).contains("GNOME Shell", Qt::CaseInsensitive))
+                    wmType = X11WMType_GNOMEShell;
+                else
                 if (QString((const char*)pcData).contains("KWin", Qt::CaseInsensitive))
                     wmType = X11WMType_KWin;
-                else
-                if (QString((const char*)pcData).contains("Compiz", Qt::CaseInsensitive))
-                    wmType = X11WMType_Compiz;
                 else
                 if (QString((const char*)pcData).contains("Mutter", Qt::CaseInsensitive))
                     wmType = X11WMType_Mutter;
                 else
-                if (QString((const char*)pcData).contains("GNOME Shell", Qt::CaseInsensitive))
-                    wmType = X11WMType_GnomeShell;
+                if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
+                    wmType = X11WMType_Xfwm4;
                 if (pcData)
                     XFree(pcData);

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

@@ -23 +23 @@
 {
     X11WMType_Unknown,
+    X11WMType_Compiz,
+    X11WMType_GNOMEShell,
     X11WMType_KWin,
-    X11WMType_Compiz,
     X11WMType_Mutter,
-    X11WMType_GnomeShell,
+    X11WMType_Xfwm4,
 };