Changeset 1121 in vbox

Timestamp:

Feb 28, 2007 6:39:26 PM (18 years ago)

Author:

vboxsync

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

19018

Message:

FE/Qt: Doubleclicking a VM in the Selector window will switch to an existing VM window if the VM is already running and there is a visual representation.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMListBox.h (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (7 diffs)
• src/VBoxVMListBox.cpp (modified) (4 diffs)

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

@@ -116 +116 @@
     void setMachine (const CMachine &aM);
 
-    QUuid id() const { return mId; }
-
     void recache();
 
@@ -125 +123 @@
     int width (const QListBox *) const;
 
+    QUuid id() const { return mId; }
     bool accessible() const { return mAccessible; }
     const CVirtualBoxErrorInfo &accessError() const { return mAccessError; }
+    QString name() const { return mName; }
+    CEnums::MachineState state() const { return mState; }
+    CEnums::SessionState sessionState() const { return mSessionState; }
+    ULONG snapshotCount() const { return mSnapshotCount; }
+
+    bool canSwitchTo() const { return mWinId != (WId) ~0; }
+    bool switchTo();
 
 protected:
@@ -150 +156 @@
     CEnums::SessionState mSessionState;
     QString mOSType;
+    ULONG mSnapshotCount;
+
+    ULONG mPid;
+    WId mWinId;
 };
 

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

@@ -640 +640 @@
     AssertMsg (item, ("Item must be always selected here"));
 
-    CMachine machine = item->machine();
-    AssertMsg (machine.GetState() < CEnums::Running,
-               ("Machine must be PoweredOff/Saved/Aborted"));
-
 #if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
 
     AssertMsg (!vboxGlobal().isVMConsoleProcess(),
                ("Must NOT be a VM console process"));
+
+    /* just switch to the VM window if it already exists */
+    if (item->canSwitchTo())
+    {
+        item->switchTo();
+        return;
+    }
+
+    AssertMsg (item->state() < CEnums::Running,
+               ("Machine must be PoweredOff/Saved/Aborted"));
 
     QUuid id = item->id();
@@ -668 +674 @@
     if (!vbox.isOk())
     {
-        vboxProblem().cannotOpenSession (vbox, machine);
+        vboxProblem().cannotOpenSession (vbox, item->machine());
         return;
     }
 
     /* show the "VM spawning" progress dialog */
-    vboxProblem().showModalProgressDialog (progress, machine.GetName(), this);
+    vboxProblem().showModalProgressDialog (progress, item->name(), this);
 
     if (progress.GetResultCode() != 0)
-        vboxProblem().cannotOpenSession (vbox, machine, progress);
+        vboxProblem().cannotOpenSession (vbox, item->machine(), progress);
 
     session.Close();
@@ -682 +688 @@
 #else // !VBOX_GUI_SEPARATE_VM_PROCESS
 
-    if (!vboxGlobal().startMachine (machine.GetId()))
+    if (!vboxGlobal().startMachine (id))
         return;
 
@@ -847 +853 @@
     vmDeleteAction->setStatusTip (tr ("Delete the selected virtual machine"));
 
-    vmStartAction->setMenuText (tr ("S&tart"));
-    vmStartAction->setText (tr ("Start"));
-    vmStartAction->setAccel (QString::null);
-    vmStartAction->setStatusTip (tr ("Start the selected virtual machine"));
+    /* Note: vmStartAction text is set up in vmListBoxCurrentChanged() */
 
     vmDiscardAction->setMenuText (tr ("D&iscard"));
@@ -919 +922 @@
         if (aRefreshSnapshots)
         {
-            /* update snapshots tab name */
+            /* update the snapshots tab name */
             QString shotName = tr ("&Snapshots");
-            ULONG shotCount = m.GetSnapshotCount();
+            ULONG shotCount = item->snapshotCount();
             if (shotCount)
                 shotName += QString (" (%1)").arg (shotCount);
@@ -929 +932 @@
         }
 
-        CEnums::MachineState state = m.GetState();
-        bool running = m.GetSessionState() != CEnums::SessionClosed;
+        CEnums::MachineState state = item->state();
+        bool running = item->sessionState() != CEnums::SessionClosed;
         bool modifyEnabled = !running && state != CEnums::Saved;
 
@@ -940 +943 @@
         vmConfigAction->setEnabled (modifyEnabled);
         vmDeleteAction->setEnabled (modifyEnabled);
-        vmStartAction->setEnabled (!running);
         vmDiscardAction->setEnabled (state == CEnums::Saved && !running);
 
+        /* change the Start button text accordingly */
+        if (state >= CEnums::Running)
+        {
+            vmStartAction->setMenuText (tr ("S&how"));
+            vmStartAction->setText (tr ("Show"));
+            vmStartAction->setAccel (QString::null);
+            vmStartAction->setStatusTip (
+                tr ("Switch to the window of the selected virtual machine"));
+
+            vmStartAction->setEnabled (item->canSwitchTo());
+        }
+        else
+        {
+            vmStartAction->setMenuText (tr ("S&tart"));
+            vmStartAction->setText (tr ("Start"));
+            vmStartAction->setAccel (QString::null);
+            vmStartAction->setStatusTip (
+                tr ("Start the selected virtual machine"));
+
+            vmStartAction->setEnabled (!running);
+        }
+
+        /* disable Refresh for accessible machines */
         vmRefreshAction->setEnabled (false);
     }

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

@@ -36 +36 @@
 
 ////////////////////////////////////////////////////////////////////////////////
+// Helpers
+////////////////////////////////////////////////////////////////////////////////
+
+#if defined (Q_WS_WIN32)
+
+struct EnumWindowsProcData
+{
+    ULONG pid;
+    WId wid;
+};
+
+BOOL CALLBACK EnumWindowsProc (HWND hwnd, LPARAM lParam)
+{
+    EnumWindowsProcData *d = (EnumWindowsProcData *) lParam;
+
+    DWORD pid = 0;
+    GetWindowThreadProcessId (hwnd, &pid);
+
+    if (d->pid == pid)
+    {
+        WINDOWINFO info;
+        if (!GetWindowInfo (hwnd, &info))
+            return TRUE;
+
+#if 0
+        LogFlowFunc (("pid=%d, wid=%08X\n", pid, hwnd));
+        LogFlowFunc (("  parent=%08X\n", GetParent (hwnd)));
+        LogFlowFunc (("  owner=%08X\n", GetWindow (hwnd, GW_OWNER)));
+        TCHAR buf [256];
+        LogFlowFunc (("  rcWindow=%d,%d;%d,%d\n",
+                      info.rcWindow.left, info.rcWindow.top,
+                      info.rcWindow.right, info.rcWindow.bottom));
+        LogFlowFunc (("  dwStyle=%08X\n", info.dwStyle));
+        LogFlowFunc (("  dwExStyle=%08X\n", info.dwExStyle));
+        GetClassName (hwnd, buf, 256);
+        LogFlowFunc (("  class=%ls\n", buf));
+        GetWindowText (hwnd, buf, 256);
+        LogFlowFunc (("  text=%ls\n", buf));
+#endif
+
+        /* we are interested in unowned top-level windows only */
+        if (!(info.dwStyle & (WS_CHILD | WS_POPUP)) &&
+            info.rcWindow.left < info.rcWindow.right &&
+            info.rcWindow.top < info.rcWindow.bottom &&
+            GetParent (hwnd) == NULL &&
+            GetWindow (hwnd, GW_OWNER) == NULL)
+        {
+            d->wid = hwnd;
+            /* if visible, stop the search immediately */
+            if (info.dwStyle & WS_VISIBLE)
+                return FALSE;
+            /* otherwise, give other top-level windows a chance
+             * (the last one wins) */
+        }
+    }
+
+    return TRUE;
+}
+
+#endif
+
+/** 
+ * Searches for a main window of the given process.
+ * 
+ * @param aPid process ID to search for
+ * 
+ * @return window ID on success or <tt>(WId) ~0</tt> otherwise.
+ */
+static WId FindWindowIdFromPid (ULONG aPid)
+{
+#if defined (Q_WS_WIN32)
+
+    EnumWindowsProcData d = { aPid, (WId) ~0 };
+    EnumWindows (EnumWindowsProc, (LPARAM) &d);
+    LogFlowFunc (("SELECTED wid=%08X\n", d.wid));
+    return d.wid;
+
+#elif defined (Q_WS_X11)
+
+    return (WId) ~0;
+
+#else
+
+    return (WId) ~0;
+
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // VBoxVMListBoxItem class
 ////////////////////////////////////////////////////////////////////////////////
@@ -261 +350 @@
         mSessionState = mMachine.GetSessionState();
         mOSType = mMachine.GetOSType().GetId();
+        mSnapshotCount = mMachine.GetSnapshotCount();
+
+        if (mState >= CEnums::Running)
+        {
+            mPid = mMachine.GetSessionPid();
+            mWinId = FindWindowIdFromPid (mPid);
+        }
+        else
+        {
+            mPid = (ULONG) ~0;
+            mWinId = (WId) ~0;
+        }
     }
     else
@@ -277 +378 @@
         mLastStateChange = QDateTime::currentDateTime();
         mOSType = QString::null;
+        mSnapshotCount = 0;
+
+        mPid = (ULONG) ~0;
+        mWinId = (WId) ~0;
     }
 
@@ -389 +494 @@
 }
 
+/** 
+ * Tries to switch to the main window of the VM process.
+ * 
+ * @return true if successfully switched and false otherwise.
+ */
+bool VBoxVMListBoxItem::switchTo()
+{
+    if (!canSwitchTo())
+        return false;
+
+#if defined (Q_WS_WIN32)
+
+    HWND hwnd = mWinId;
+
+    /* if there are ownees (modal and modeless dialogs, etc), find the
+     * topmost one */
+    HWND hwndAbove = NULL;
+    do
+    {
+        hwndAbove = GetNextWindow (hwnd, GW_HWNDPREV);
+        HWND hwndOwner;
+        if (hwndAbove != NULL &&
+            ((hwndOwner = GetWindow (hwndAbove, GW_OWNER)) == hwnd ||
+             hwndOwner  == hwndAbove))
+            hwnd = hwndAbove;
+        else
+            break;
+    }
+    while (1);
+
+    /* first, check that the primary window is visible */
+    if (IsIconic (mWinId))
+        ShowWindow (mWinId, SW_RESTORE);
+    else if (!IsWindowVisible (mWinId))
+        ShowWindow (mWinId, SW_SHOW);
+
+#if 0
+    LogFlowFunc (("mWinId=%08X hwnd=%08X\n", mWinId, hwnd));
+#endif
+
+    /* then, activate the topmost in the group */
+    AllowSetForegroundWindow (mPid);
+    SetForegroundWindow (hwnd);
+
+    return true;
+
+#elif defined (Q_WS_X11)
+
+    return false;
+
+#else
+
+    return false;
+
+#endif
+}
+
 // protected members
 ////////////////////////////////////////////////////////////////////////////////