Changeset 2708 in vbox for trunk/src

Timestamp:

May 18, 2007 12:58:15 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Implemented the "Show VM Window" functionality on X11.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxVMListBox.cpp (modified) (2 diffs)

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

@@ -431 +431 @@
     static QString getFirstExistingDir (const QString &);
 
+    static bool activateWindow (WId aWId, bool aSwitchDesktop = true);
+
 signals:
 

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

@@ -400 +400 @@
             return E_POINTER;
 
-#if defined (Q_WS_X11)
-        /// @todo see the big comment in VBoxVMListBoxItem::switchTo()
-        *canShow = FALSE;
-#else
+        /* as long as there is VBoxConsoleView (which creates/destroys us), it
+         * can be shown */
         *canShow = TRUE;
-#endif
         return S_OK;
     }

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

@@ -44 +44 @@
 #include <qprocess.h>
 
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC)
 #include <Carbon/Carbon.h> // for HIToolbox/InternetConfig
 #endif
 
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN)
 #include "shlobj.h"
 #include <qeventloop.h>
+#endif
+
+#if defined (Q_WS_X11)
+#undef BOOL /* typedef CARD8 BOOL in Xmd.h conflicts with #define BOOL PRBool
+             * in COMDefs.h. A better fix would be to isolate X11-specific
+             * stuff by placing XX* helpers below to a separate source file. */
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#define BOOL PRBool
 #endif
 
@@ -2788 +2799 @@
 }
 
+#if defined (Q_WS_X11)
+
+static char *XXGetProperty (Display *aDpy, Window aWnd,
+                            Atom aPropType, const char *aPropName)
+{
+    Atom propNameAtom = XInternAtom (aDpy, aPropName,
+                                     True /* only_if_exists */);
+    if (propNameAtom == None)
+        return NULL;
+
+    Atom actTypeAtom = None;
+    int actFmt = 0;
+    unsigned long nItems = 0;
+    unsigned long nBytesAfter = 0;
+    unsigned char *propVal = NULL;
+    int rc = XGetWindowProperty (aDpy, aWnd, propNameAtom,
+                                 0, LONG_MAX, False /* delete */,
+                                 aPropType, &actTypeAtom, &actFmt,
+                                 &nItems, &nBytesAfter, &propVal);
+    if (rc != Success)
+        return NULL;
+
+    return reinterpret_cast <char *> (propVal);
+}
+
+static Bool XXSendClientMessage (Display *aDpy, Window aWnd, const char *aMsg,
+                                 unsigned long aData0 = 0, unsigned long aData1 = 0,
+                                 unsigned long aData2 = 0, unsigned long aData3 = 0,
+                                 unsigned long aData4 = 0)
+{
+    Atom msgAtom = XInternAtom (aDpy, aMsg, True /* only_if_exists */);
+    if (msgAtom == None)
+        return False;
+
+    XEvent ev;
+
+    ev.xclient.type = ClientMessage;
+    ev.xclient.serial = 0;
+    ev.xclient.send_event = True;
+    ev.xclient.display = aDpy;
+    ev.xclient.window = aWnd;
+    ev.xclient.message_type = msgAtom;
+
+    /* always send as 32 bit for now */
+    ev.xclient.format = 32;
+    ev.xclient.data.l [0] = aData0;
+    ev.xclient.data.l [1] = aData1;
+    ev.xclient.data.l [2] = aData2;
+    ev.xclient.data.l [3] = aData3;
+    ev.xclient.data.l [4] = aData4;
+    
+    return XSendEvent (aDpy, DefaultRootWindow (aDpy), False,
+                       SubstructureRedirectMask, &ev) != 0;
+}
+
+#endif
+
+/** 
+ * Activates the specified window. If necessary, the window will be
+ * de-iconified activation.
+ *
+ * @note On X11, it is implied that @a aWid represents a window of the same
+ * display the application was started on.
+ * 
+ * @param aWId              Window ID to activate.        
+ * @param aSwitchDesktop    @c true to switch to the window's desktop before
+ *                          activation.
+ * 
+ * @return @c true on success and @c false otherwise.
+ */
+/* static */
+bool VBoxGlobal::activateWindow (WId aWId, bool aSwitchDesktop /* = true */)
+{
+    bool result = true;
+
+#if defined (Q_WS_WIN32)
+
+    if (IsIconic (aWId))
+        result &= !!ShowWindow (aWId, SW_RESTORE);
+    else if (!IsWindowVisible (aWId))
+        result &= !!ShowWindow (aWId, SW_SHOW);
+
+    result &= !!SetForegroundWindow (aWId);
+
+#elif defined (Q_WS_X11)
+
+    Display *dpy = QPaintDevice::x11AppDisplay();
+
+    if (aSwitchDesktop)
+    {
+        /* try to find a desktop ID */
+        CARD32 *desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
+                                                    "_NET_WM_DESKTOP");
+        if (desktop == NULL)
+            desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
+                                                "_WIN_WORKSPACE");
+
+        if (desktop != NULL)
+        {
+            Bool ok = XXSendClientMessage (dpy, DefaultRootWindow (dpy), 
+                                           "_NET_CURRENT_DESKTOP",
+                                           *desktop);
+            if (!ok)
+            {
+                LogWarningFunc (("Couldn't swith to desktop=%08X\n",
+                                 desktop));
+                result = false;
+            }
+            XFree (desktop);
+        }
+        else
+        {
+            LogWarningFunc (("Couldn't find a desktop ID for aWId=%08X\n",
+                             aWId));
+            result = false;
+        }
+    }
+
+    Bool ok = XXSendClientMessage (dpy, aWId, "_NET_ACTIVE_WINDOW");
+    result &= !!ok;
+
+    XRaiseWindow (dpy, aWId);
+
+#else
+
+    AssertFailed();
+    result = false;
+
+#endif
+
+    if (!result)
+        LogWarningFunc (("Couldn't activate aWId=%08X\n", aWId));
+
+    return result;
+}
 
 // Protected members

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

@@ -34 +34 @@
 #include <qfileinfo.h>
 
-#if defined (Q_WS_X11)
-# include <X11/Xlib.h>
-#elif defined (Q_WS_MAC)
+/// @todo Remove? See @c todo in #switchTo() below.
+#if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
 #endif
 
 
-////////////////////////////////////////////////////////////////////////////////
 // Helpers
 ////////////////////////////////////////////////////////////////////////////////
@@ -553 +551 @@
         return true;
 
-#if defined (Q_WS_WIN32)
-
-    if (IsIconic (id))
-        ShowWindow (id, SW_RESTORE);
-    else if (!IsWindowVisible (id))
-        ShowWindow (id, SW_SHOW);
-
-    return SetForegroundWindow (id);
-
-#elif defined (Q_WS_X11)
-
-    /// @todo I've tried XRaiseWindow, XConfigureWindow, XRestackWindows and
-    /// XSetInputFocus here but couldn't get a useless result under
-    /// metacity/Ubuntu-7.04.  XSetInputFocus works, but XRaiseWindow and
-    /// friends don't -- when it comes to bringing the window represented by
-    /// the given id (or its parent) to front, on top of all other top-level
-    /// windows. As a result, we would get input focus to a possibly invisible
-    /// (obscured by others) window!.. I've found one way to steal raise
-    /// window events from Metacity and prevent it from applying focus
-    /// stealing prevention (by settings override_redirect to True on the id's
-    /// parent using using XChangeWindowAttributes), but the result didn't
-    /// satisfy me: the raised console window started to behave like an
-    /// always-on-top window until moved or minimized which is wrong. Also,
-    /// there is little hope that this approach will work for other window
-    /// managers with "strong" focus stealing prevention algorithms, so I
-    /// decided to completely disable this feature on X11 -- Until someone has
-    /// enough time to find an acceptable solution that will work constantly
-    /// well under at least selected window managers, and will be simply
-    /// disabled on those where it doesn't work.
-
-    return false;
+#if defined (Q_WS_WIN32) || defined (Q_WS_X11)
+
+    return vboxGlobal().activateWindow (id, true);
 
 #elif defined (Q_WS_MAC)