Changeset 26469 in vbox

Timestamp:

Feb 12, 2010 5:12:27 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: make the KWin hack only active if we are actually running on KWin

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxGlobalSettings.h (modified) (3 diffs)
• X11/VBoxX11Helper.cpp (modified) (2 diffs)
• X11/VBoxX11Helper.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)

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

@@ -2810 +2810 @@
 
 #ifdef Q_WS_X11
-    if (!mIsSeamless && !mIsFullscreen)
-    {
-        /* Workaround for KDE to
-         * let console window to exit
+    if (vboxGlobal().isKWinManaged() && !mIsSeamless && !mIsFullscreen)
+    {
+        /* Workaround for a KWin bug to let console window to exit
          * seamless mode correctly. */
         setWindowFlags(Qt::Window);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -44 +44 @@
     int hostkey;
     bool autoCapture;
+    bool captureMouseOnClick;
     QString guiFeatures;
     QString languageId;
@@ -62 +63 @@
     Q_PROPERTY (int hostKey READ hostKey WRITE setHostKey)
     Q_PROPERTY (bool autoCapture READ autoCapture WRITE setAutoCapture)
+    Q_PROPERTY (bool captureMouseOnClick READ captureMouseOnClick WRITE setCaptureMouseOnClick)
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
@@ -90 +92 @@
     {
         mData()->autoCapture = aAutoCapture;
+        resetError();
+    }
+
+    bool captureMouseOnClick() const { return data()->captureMouseOnClick; }
+    void setCaptureMouseOnClick (bool aCaptureMouseOnClick)
+    {
+        mData()->captureMouseOnClick = aCaptureMouseOnClick;
         resetError();
     }

trunk/src/VBox/Frontends/VirtualBox/src/X11/VBoxX11Helper.cpp

@@ -24 +24 @@
 
 #include <iprt/cdefs.h>
+#include <iprt/string.h>
 #include <QX11Info>
 
 /* rhel3 build hack */
 RT_C_DECLS_BEGIN
+#include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
@@ -84 +86 @@
         DPMSEnable(display);
 }
+
+/**
+ * Determine if the current Window manager is KWin (KDE)
+ */
+bool X11IsWindowManagerKWin()
+{
+    Atom typeReturned;
+    Atom utf8Atom;
+    int formatReturned;
+    unsigned long ulNitemsReturned;
+    unsigned long ulDummy;
+    unsigned char *pcData = NULL;
+    bool fIsKWinManaged = false;
+    Display *display = QX11Info::display();
+    Atom propNameAtom;
+    Window WMWindow = None;
+    
+    propNameAtom = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", True);
+    if (XGetWindowProperty(display, QX11Info::appRootWindow(), propNameAtom,
+                           0, 512, False, XA_WINDOW, &typeReturned,
+                           &formatReturned, &ulNitemsReturned, &ulDummy, &pcData)
+                            == Success)
+    {
+
+        if (typeReturned == XA_WINDOW && formatReturned == 32)
+            WMWindow = *((Window*) pcData);
+        if (pcData)
+            XFree(pcData);
+        if (WMWindow != None)
+        {
+            propNameAtom = XInternAtom(display, "_NET_WM_NAME", True);
+            utf8Atom = XInternAtom(display, "UTF8_STRING", True);
+            if (XGetWindowProperty(QX11Info::display(), WMWindow, propNameAtom,
+                                   0, 512, False, utf8Atom, &typeReturned,
+                                   &formatReturned, &ulNitemsReturned, &ulDummy, &pcData)
+                    == Success)
+            {
+                fIsKWinManaged = RTStrCmp((const char*)pcData, "KWin") == 0;
+                if (pcData)
+                    XFree(pcData);
+            }
+        }
+    }
+    return fIsKWinManaged;
+}

trunk/src/VBox/Frontends/VirtualBox/src/X11/VBoxX11Helper.h

@@ -27 +27 @@
 void X11ScreenSaverSettingsSave();
 void X11ScreenSaverSettingsRestore();
+bool X11IsWindowManagerKWin();
 
 #endif

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

@@ -63 +63 @@
 
 #ifdef Q_WS_X11
-#ifndef VBOX_OSE
-# include "VBoxLicenseViewer.h"
-#endif /* VBOX_OSE */
-
-#include <QTextBrowser>
-#include <QScrollBar>
-#include <QX11Info>
+# ifndef VBOX_OSE
+#  include "VBoxLicenseViewer.h"
+# endif /* VBOX_OSE */
+# include <QTextBrowser>
+# include <QScrollBar>
+# include <QX11Info>
+# include "VBoxX11Helper.h"
 #endif
 
@@ -590 +590 @@
 #endif
     , mMediaEnumThread (NULL)
+    , mIsKWinManaged (false)
     , mVerString ("1.0")
 {
@@ -4779 +4780 @@
             .GetExtraData (VBoxDefs::GUI_RenderMode).toAscii().constData());
 
+#ifdef QT_WS_X11
+    mIsKWin = X11IsWindowManagerKWin();
+#endif
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
 # ifdef VBOX_WITH_DEBUGGER_GUI_MENU

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

@@ -324 +324 @@
     VBoxDefs::RenderMode vmRenderMode() const { return vm_render_mode; }
     const char *vmRenderModeStr() const { return vm_render_mode_str; }
+    bool isKWinManaged() const { return mIsKWinManaged; }
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -917 +918 @@
     VBoxDefs::RenderMode vm_render_mode;
     const char * vm_render_mode_str;
+    bool mIsKWinManaged;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI