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

Timestamp:

Jun 1, 2007 1:00:44 AM (18 years ago)

Author:

vboxsync

Message:

Implemented the VM selector 'Show' feature on darwin, including the restoring the console if it was minimized.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -140 +140 @@
 #endif
         ActivateMenuEventType,
+#if defined (Q_WS_MAC)
+        ShowWindowEventType,
+#endif 
     };
 };

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

@@ -411 +411 @@
             return E_POINTER;
 
+#if defined (Q_WS_MAC)
+        /* 
+         * Let's try the simple approach first - grab the focus.
+         * Getting a window out of the dock (minimized or whatever it's called)
+         * needs to be done on the GUI thread, so post it a note.
+         */
+        *winId = 0;
+        if (!mView)
+            return S_OK;
+
+        ProcessSerialNumber psn = { 0, kCurrentProcess }; 
+        OSErr rc = ::SetFrontProcess (&psn);
+        if (!rc) 
+            QApplication::postEvent (mView, new QEvent ((QEvent::Type)VBoxDefs::ShowWindowEventType));
+        else
+        {
+            /*
+             * It failed for some reason, send the other process our PSN so it can try.
+             * (This is just a precaution should Mac OS X start imposing the same sensible 
+             * focus stealing restrictions that other window managers implement.)
+             */
+            AssertMsgFailed(("SetFrontProcess -> %#x\n", rc));
+            if (::GetCurrentProcess (&psn))
+                *winId = RT_MAKE_U64 (psn.lowLongOfPSN, psn.highLongOfPSN);
+        }
+
+#else
         /* Return the ID of the top-level console window. */
         *winId = (ULONG64) mView->topLevelWidget()->winId();
+#endif 
 
         return S_OK;
@@ -1025 +1053 @@
             }
 
+#ifdef Q_WS_MAC
+            /* posted OnShowWindow */
+            case VBoxDefs::ShowWindowEventType:
+            {
+                /* 
+                 *  Dunno what Qt3 thinks a window that has minimized to the dock 
+                 *  should be - it is not hidden, neither is it minimized. OTOH it is
+                 *  marked shown and visible, but not activated. This latter isn't of 
+                 *  much help though, since at this point nothing is marked activated.
+                 *  I might have overlooked something, but I'm buggered what if I know
+                 *  what. So, I'll just always show & activate the stupid window to 
+                 *  make it get out of the dock when the user wishes to show a VM.
+                 */
+                topLevelWidget()->show();
+                topLevelWidget()->setActiveWindow();
+                return true;
+            }
+#endif 
             default:
                 break;

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

@@ -34 +34 @@
 #include <qfileinfo.h>
 
-/// @todo Remove? See @c todo in #switchTo() below.
 #if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
@@ -541 +540 @@
 bool VBoxVMListBoxItem::switchTo()
 {
+#ifdef Q_WS_MAC
+    ULONG64 id = mMachine.ShowConsoleWindow();
+#else
     WId id = (WId) mMachine.ShowConsoleWindow();
+#endif 
     AssertWrapperOk (mMachine);
     if (!mMachine.isOk())
@@ -556 +559 @@
 
 #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;
+    /*
+     * This is just for the case were the other process cannot steal 
+     * the focus from us. It will send us a PSN so we can try.
+     */
+    ProcessSerialNumber psn;
+    psn.highLongOfPSN = id >> 32;
+    psn.lowLongOfPSN = (UInt32)id;
+    OSErr rc = ::SetFrontProcess (&psn);
+    if (!rc)
+        Log (("GUI: %#RX64 couldn't do SetFrontProcess on itself, the selector (we) had to do it...\n", id));
+    else
+        Log (("GUI: Failed to bring %#RX64 to front. rc=%#x\n", id, rc));
+    return !rc;
 
 #endif