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

Timestamp:

May 8, 2007 4:06:27 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20981

Message:

Main & All Frontends: Improved console window activation helper APIs (still no success on X11, works well on Win32, the old method of activation is disabled).

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• VirtualBox/include/VBoxVMListBox.h (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (8 diffs)
• VirtualBox/src/VBoxVMListBox.cpp (modified) (8 diffs)
• VirtualBox/src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -38 +38 @@
 #include <X11/cursorfont.h>      /* for XC_left_ptr */
 #include <X11/Xcursor/Xcursor.h>
+#endif
+
 #include <SDL_syswm.h>           /* for SDL_GetWMInfo() */
-#endif
 
 #include "VBoxSDL.h"
@@ -506 +507 @@
         if (!canShow)
             return E_POINTER;
-        /* @todo return TRUE if gConsole is not NULL */
+#if defined (__LINUX__)
+        /// @todo see the big comment in Frontends/VirtualBox/src/VBoxVMListBoxItem::switchTo()
         *canShow = FALSE;
+#else
+        SDL_SysWMinfo info;
+        SDL_VERSION(&info.version);
+        *canShow = !!SDL_GetWMInfo(&info);
+#endif
         return S_OK;
     }
 
-    STDMETHOD(OnShowWindow)()
-    {
-        /* @todo implement */
-        return E_NOTIMPL;
+    STDMETHOD(OnShowWindow) (ULONG64 *winId)
+    {
+        SDL_SysWMinfo info;
+        SDL_VERSION(&info.version);
+        if (SDL_GetWMInfo(&info))
+        {
+#if defined (__LINUX__)
+            *winId = (ULONG64) info.info.x11.window;
+#elif defined (__WIN__)
+            *winId = (ULONG64) info.window;
+#else
+            AssertFailed();
+            return E_FAIL;
+#endif
+            return S_OK;
+        }
+        AssertFailed();
+        return E_FAIL;
     }
 

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

@@ -133 +133 @@
     ULONG snapshotCount() const { return mSnapshotCount; }
 
+    /// @todo see comments in #switchTo() in VBoxVMListBox.cpp
+#if 0
     bool canSwitchTo() const { return mWinId != (WId) ~0; }
+#endif
+    bool canSwitchTo() const;
     bool switchTo();
 
@@ -161 +165 @@
 
     ULONG mPid;
+    /// @todo see comments in #switchTo() in VBoxVMListBox.cpp
+#if 0
     WId mWinId;
+#endif
 };
 

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

@@ -280 +280 @@
     VBoxConsoleCallback (VBoxConsoleView *v) {
 #if defined (Q_WS_WIN)
-        refcnt = 0;
-#endif
-        view = v;
+        mRefCnt = 0;
+#endif
+        mView = v;
     }
 
@@ -291 +291 @@
 #if defined (Q_WS_WIN)
     STDMETHOD_(ULONG, AddRef)() {
-        return ::InterlockedIncrement (&refcnt);
+        return ::InterlockedIncrement (&mRefCnt);
     }
     STDMETHOD_(ULONG, Release)()
     {
-        long cnt = ::InterlockedDecrement (&refcnt);
+        long cnt = ::InterlockedDecrement (&mRefCnt);
         if (cnt == 0)
             delete this;
@@ -322 +322 @@
                                           BYTE *shape)
     {
-        QApplication::postEvent (
-            view, new MousePointerChangeEvent (visible, alpha, xhot, yhot,
-                                               width, height,
-                                               shape)
-        );
+        QApplication::postEvent (mView,
+                                 new MousePointerChangeEvent (visible, alpha,
+                                                              xhot, yhot,
+                                                              width, height, shape));
         return S_OK;
     }
@@ -332 +331 @@
     STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL needsHostCursor)
     {
-        QApplication::postEvent (view, new MouseCapabilityEvent (supportsAbsolute, needsHostCursor));
+        QApplication::postEvent (mView,
+                                 new MouseCapabilityEvent (supportsAbsolute,
+                                                           needsHostCursor));
         return S_OK;
     }
@@ -339 +340 @@
     {
         LogFlowFunc (("machineState=%d\n", machineState));
-        QApplication::postEvent (
-            view, new StateChangeEvent ((CEnums::MachineState) machineState));
+        QApplication::postEvent (mView,
+                                 new StateChangeEvent (
+                                     (CEnums::MachineState) machineState));
         return S_OK;
     }
@@ -346 +348 @@
     STDMETHOD(OnAdditionsStateChange)()
     {
-        CGuest guest = view->console().GetGuest();
+        CGuest guest = mView->console().GetGuest();
         LogFlowFunc (("ver=%s, active=%d\n",
                       guest.GetAdditionsVersion().latin1(),
@@ -356 +358 @@
     STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
     {
-        QApplication::postEvent (
-            view, new ModifierKeyChangeEvent (fNumLock, fCapsLock, fScrollLock));
+        QApplication::postEvent (mView,
+                                 new ModifierKeyChangeEvent (fNumLock, fCapsLock,
+                                                             fScrollLock));
         return S_OK;
     }
@@ -363 +366 @@
     STDMETHOD(OnRuntimeError)(BOOL fatal, IN_BSTRPARAM id, IN_BSTRPARAM message)
     {
-        QApplication::postEvent (
-            view, new RuntimeErrorEvent (!!fatal, QString::fromUcs2 (id),
-                                         QString::fromUcs2 (message)));
+        QApplication::postEvent (mView,
+                                 new RuntimeErrorEvent (!!fatal,
+                                                        QString::fromUcs2 (id),
+                                                        QString::fromUcs2 (message)));
         return S_OK;
     }
 
-    STDMETHOD(OnCanShowWindow)(BOOL *canShow)
+    STDMETHOD(OnCanShowWindow) (BOOL *canShow)
     {
         if (!canShow)
             return E_POINTER;
-        /* @todo return TRUE... */
+
+#if defined (Q_WS_X11)
+        /// @todo see the big comment in VBoxVMListBoxItem::switchTo()
         *canShow = FALSE;
+#else
+        *canShow = TRUE;
+#endif
         return S_OK;
     }
 
-    STDMETHOD(OnShowWindow)()
-    {
-        /* @todo implement */
-        return E_NOTIMPL;
+    STDMETHOD(OnShowWindow) (ULONG64 *winId)
+    {
+        if (!winId)
+            return E_POINTER;
+
+        /* Return the ID of the top-level console window. */
+        *winId = (ULONG64) mView->topLevelWidget()->winId();
+
+        return S_OK;
     }
 
 protected:
 
-    VBoxConsoleView *view;
+    VBoxConsoleView *mView;
 
 #if defined (Q_WS_WIN)
 private:
-    long refcnt;
+    long mRefCnt;
 #endif
 };

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

@@ -34 +34 @@
 #include <qfileinfo.h>
 
-#if defined (Q_WS_MAC)
+#if defined (Q_WS_X11)
+# include <X11/Xlib.h>
+#elif defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
 #endif
@@ -42 +44 @@
 // Helpers
 ////////////////////////////////////////////////////////////////////////////////
+
+/// @todo Remove. See @c todo in #switchTo() below.
+#if 0
 
 #if defined (Q_WS_WIN32)
@@ -136 +141 @@
 }
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // VBoxVMListBoxItem class
@@ -367 +374 @@
         {
             mPid = mMachine.GetSessionPid();
+    /// @todo Remove. See @c todo in #switchTo() below.
+#if 0
             mWinId = FindWindowIdFromPid (mPid);
+#endif
         }
         else
         {
             mPid = (ULONG) ~0;
+    /// @todo Remove. See @c todo in #switchTo() below.
+#if 0
             mWinId = (WId) ~0;
+#endif
         }
     }
@@ -393 +406 @@
 
         mPid = (ULONG) ~0;
+    /// @todo Remove. See @c todo in #switchTo() below.
+#if 0
         mWinId = (WId) ~0;
+#endif
     }
 
@@ -507 +523 @@
 
 /** 
+ * Returns @a true if we can activate and bring the VM console window to
+ * foreground, and @a false otherwise.
+ */
+bool VBoxVMListBoxItem::canSwitchTo() const
+{
+    return const_cast <CMachine &> (mMachine).CanShowConsoleWindow();
+
+    /// @todo Remove. See @c todo in #switchTo() below.
+#if 0
+    return mWinId != (WId) ~0;
+#endif
+}
+
+/** 
  * Tries to switch to the main window of the VM process.
  * 
@@ -513 +543 @@
 bool VBoxVMListBoxItem::switchTo()
 {
+    WId id = (WId) mMachine.ShowConsoleWindow();
+    AssertWrapperOk (mMachine);
+    if (!mMachine.isOk())
+        return false;
+
+    /* winId = 0 it means the console window has already done everything
+     * necessary to implement the "show window" semantics. */
+    if (id == 0)
+        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;
+
+#elif defined (Q_WS_MAC)
+
+    /// @todo (r=dmik) Knut, everything you have to do here is to raise the
+    /// given window over all other top-level windows and give it focus. Ah,
+    /// and deiconify/show it first if it is minimized/hidden. I really hope
+    /// it's better on Mac than on X11. If not, feel free to revert to the
+    /// previous pid-based behavior.
+
+    return false;
+
+#endif
+
+    return false;
+
+    /// @todo Below is the old method of switching to the console window
+    //  based on the process ID of the console process. It should go away
+    //  after the new (callback-based) method is fully tested.
+#if 0
+
     if (!canSwitchTo())
         return false;
@@ -575 +666 @@
 
     return false;
+
+#endif
 
 #endif

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

@@ -135 +135 @@
 
     QIApplication a (argc, argv);
+
+    /* weird palette test */
+#if 0
+    QPalette pal = a.palette();
+    pal.setColor (QColorGroup::Background, Qt::red);
+    pal.setBrush (QColorGroup::Background,
+                  QBrush (QColor(),
+                          QPixmap::fromMimeSource ("about_16px.png")));
+    a.setPalette (pal);
+#endif
 
 #ifdef Q_WS_X11