Changeset 14652 in vbox

Timestamp:

Nov 26, 2008 4:05:08 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Systray: Now gets started through an own process; should solve the redundant systray icons as well. Reverted some changes for having an instance of the selector window in a pure console session as well.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (7 diffs)
• src/VBoxSelectorWnd.cpp (modified) (8 diffs)
• src/main.cpp (modified) (2 diffs)

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

@@ -483 +483 @@
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    bool isTrayIcon() const;
+    bool hasTrayIcon() const;
+    bool isTrayMenu() const;
     bool trayIconInstall();
 #endif
@@ -996 +997 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    bool mIsTrayIcon;           /* Is current instance responsible for tray icon? */
+    bool mHasTrayIcon;          /* Is current instance responsible for tray icon? */
+    bool mIsTrayMenu;           /* Tray icon active/desired? */
 #endif
     QThread *mMediaEnumThread;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -61 +61 @@
     virtual ~VBoxSelectorWnd();
 
-    bool startMachine (const QUuid &aId);
-
 signals:
 

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

@@ -88 +88 @@
 #include <iprt/file.h>
 #include <iprt/ldr.h>
+
+#ifdef VBOX_GUI_WITH_SYSTRAY
+#include <iprt/process.h>
+
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+#define HOSTSUFF_EXE ".exe"
+#else /* !RT_OS_WINDOWS */
+#define HOSTSUFF_EXE ""
+#endif /* !RT_OS_WINDOWS */
+#endif
 
 #if defined (Q_WS_X11)
@@ -941 +951 @@
     void postEvent (QEvent *e)
     {
-#ifndef VBOX_GUI_WITH_SYSTRAY
-        // If not using a systray menu, we don't post events if we are in the VM
-        // execution console mode, to save some CPU ticks (so far, there was no
-        // need to handle VirtualBox callback events in the execution console
-        // mode
+        // currently, we don't post events if we are in the VM execution
+        // console mode, to save some CPU ticks (so far, there was no need
+        // to handle VirtualBox callback events in the execution console mode)
         if (!mGlobal.isVMConsoleProcess())
-#endif
             QApplication::postEvent (&mGlobal, e);
     }
@@ -1235 +1242 @@
     , mUpdDlg (NULL)
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    , mIsTrayIcon (false)
+    , mHasTrayIcon (false)
+    , mIsTrayMenu (false)
 #endif
     , mMediaEnumThread (NULL)
@@ -1348 +1356 @@
 VBoxSelectorWnd &VBoxGlobal::selectorWnd()
 {
+#if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
+    AssertMsg (!vboxGlobal().isVMConsoleProcess(),
+               ("Must NOT be a VM console process"));
+#endif
+
     Assert (mValid);
 
@@ -1403 +1416 @@
  *  the tray icon.
  */
-bool VBoxGlobal::isTrayIcon() const
-{
-    return mIsTrayIcon;
+bool VBoxGlobal::hasTrayIcon() const
+{
+    return mHasTrayIcon;
+}
+
+/**
+ *  Returns true if the current instance a systray menu only (started with
+ *  "-systray" parameter).
+ */
+bool VBoxGlobal::isTrayMenu() const
+{
+    return (mHasTrayIcon && mIsTrayMenu);
 }
 
@@ -1414 +1436 @@
 bool VBoxGlobal::trayIconInstall()
 {
-    if (false == QSystemTrayIcon::isSystemTrayAvailable())
+    bool bActive = mIsTrayMenu;
+    if (false == bActive)
+        bActive = vboxGlobal().settings().trayIconEnabled();
+
+    if (   bActive
+        && (false == QSystemTrayIcon::isSystemTrayAvailable())
+        && (false == mVBox.GetExtraData (VBoxDefs::GUI_TrayIconWinID).isEmpty()))
+    {
         return false;
-
-    AssertMsg (&vboxGlobal().selectorWnd(),
-               ("Selector window must not be null for systray!"));
-
-    mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID,
-                        QString ("%1").arg ((qulonglong) vboxGlobal().selectorWnd().winId()));
-
-    /* The first process which can grab this "mutex" will win ->
-     * It will be the tray icon menu then. */
-    if (mVBox.isOk())
-    {
-        mIsTrayIcon = true;
-        emit trayIconChanged (*(new VBoxChangeTrayIconEvent (vboxGlobal().settings().trayIconEnabled())));
-    }
-
-    return mIsTrayIcon;
+    }
+
+    int rc = 0;
+    if (isVMConsoleProcess())
+    {
+        // Spawn new selector window instance
+
+        // Get the path to the executable
+        char path [RTPATH_MAX];
+        RTPathAppPrivateArch (path, RTPATH_MAX);
+        size_t sz = strlen (path);
+        path [sz++] = RTPATH_DELIMITER;
+        path [sz] = 0;
+        char *cmd = path + sz;
+        sz = RTPATH_MAX - sz;
+
+        RTPROCESS pid = NIL_RTPROCESS;
+        RTENV env = RTENV_DEFAULT;
+
+        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
+        Assert (sz >= sizeof (VirtualBox_exe));
+        strcpy (cmd, VirtualBox_exe);
+# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
+        const char * args[] = {path, "-systray", 0 };
+# else
+        const char * args[] = {path, "-systray", 0 };
+# endif
+        rc = RTProcCreate (path, args, env, 0, &pid);
+        if (RT_FAILURE (rc))
+        {
+            LogRel(("Failed to start systray window! rc=%Rrc\n", rc));
+            return false;
+        }
+    }
+    else
+    {
+        // Use this selector for displaying the tray icon
+        mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID,
+                            QString ("%1").arg ((qulonglong) vboxGlobal().mainWindow()->winId()));
+
+        /* The first process which can grab this "mutex" will win ->
+         * It will be the tray icon menu then. */
+        if (mVBox.isOk())
+        {
+            mHasTrayIcon = true;
+            emit trayIconChanged (*(new VBoxChangeTrayIconEvent (vboxGlobal().settings().trayIconEnabled())));
+        }
+    }
+
+    return mHasTrayIcon;
 }
 
@@ -5386 +5449 @@
             }
         }
+#ifdef VBOX_GUI_WITH_SYSTRAY
+        else if (!::strcmp (arg, "-systray"))
+        {
+            mIsTrayMenu = true;
+        }
+#endif
         else if (!::strcmp (arg, "-comment"))
         {

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

@@ -714 +714 @@
     /* Delete systray menu object */
     delete mTrayIcon;
+    mTrayIcon = NULL;
 #endif
 
@@ -911 +912 @@
 #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())
@@ -1080 +1084 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    if (vboxGlobal().isTrayIcon())
+    if (vboxGlobal().hasTrayIcon())
         mTrayIcon->refresh();
 #endif
@@ -1191 +1195 @@
 void VBoxSelectorWnd::closeEvent (QCloseEvent *aEvent)
 {
-    emit closing();
-    return QMainWindow::closeEvent (aEvent);
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    if (vboxGlobal().isTrayMenu())
+    {
+        hide();
+    }
+    else
+    {
+#endif
+        emit closing();
+        QMainWindow::closeEvent (aEvent);
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    }
+#endif
 }
 
@@ -1315 +1330 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    if (vboxGlobal().isTrayIcon())
+    if (vboxGlobal().hasTrayIcon())
     {
         mTrayIcon->retranslateUi();
@@ -1619 +1634 @@
 void VBoxSelectorWnd::trayIconChanged (const VBoxChangeTrayIconEvent &aEvent)
 {
-    mTrayIcon->trayIconShow (aEvent.mEnabled);
+    if (mTrayIcon)
+        mTrayIcon->trayIconShow (aEvent.mEnabled);
 }
 
@@ -1935 +1951 @@
 void VBoxTrayIcon::trayIconShow (bool aShow)
 {
+    if (!vboxGlobal().hasTrayIcon())
+        return;
+
     mActive = aShow;
     if (mActive)
@@ -1942 +1961 @@
     }
     setVisible (mActive);
+
+    if (!mActive && vboxGlobal().isTrayMenu())
+        mParent->fileExit();
 }
 

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

@@ -361 +361 @@
             if (vboxGlobal().isVMConsoleProcess())
             {
+                vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
 #ifdef VBOX_GUI_WITH_SYSTRAY
-                /* Keep selector window in memory (hidden) because we need it for
-                 * the systray menu. */
-                vboxGlobal().startEnumeratingMedia();
-                vboxGlobal().selectorWnd();
-                vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
                 if (   vboxGlobal().trayIconInstall()
-                    && vboxGlobal().isTrayIcon())
+                    && vboxGlobal().hasTrayIcon())
                 {
                     /* Nothing to do here yet. */
                 }
-#else
-                vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
 #endif
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
@@ -389 +383 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
                 if (   vboxGlobal().trayIconInstall()
-                    && vboxGlobal().isTrayIcon())
+                    && vboxGlobal().hasTrayIcon())
                 {
                     /* Nothing to do here yet. */
                 }
-#endif
-                vboxGlobal().selectorWnd().show();
+
+                if (false == vboxGlobal().isTrayMenu())
+#endif
+                    vboxGlobal().selectorWnd().show();
 #ifdef VBOX_WITH_REGISTRATION_REQUEST
                 vboxGlobal().showRegistrationDialog (false /* aForce */);