Changeset 14977 in vbox for trunk/src

Timestamp:

Dec 4, 2008 1:00:48 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: update OpenGL windows on the dock icon

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• include/VBoxConsoleWnd.h (modified) (2 diffs)
• include/VBoxDefs.h (modified) (2 diffs)
• include/VBoxGlobal.h (modified) (2 diffs)
• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (4 diffs)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (6 diffs)

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

@@ -126 +126 @@
     void requestToResize (const QSize &aSize);
 
+#if defined(Q_WS_MAC)
+    void updateDockIcon();
+    void setDockIconEnabled (bool aOn) { mDockIconEnabled = aOn; };
+#endif
+
 signals:
 
@@ -317 +322 @@
 #if defined(Q_WS_MAC)
     CGImageRef mVirtualBoxLogo;
+    bool mDockIconEnabled;
 #endif
     DesktopGeo mDesktopGeo;

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

@@ -57 +57 @@
 class VBoxSwitchMenu;
 
+class VBoxChangeDockIconUpdateEvent;
+
 class VBoxConsoleWnd : public QIWithRetranslateUI2<QMainWindow>
 {
@@ -86 +88 @@
     void clearMask();
 
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC)
     CGImageRef dockImageState () const;
 #endif
 
 public slots:
+    void changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &e);
 
 protected:

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

@@ -124 +124 @@
         MainWindowCountChangeEventType,
 #endif
-        AddVDMUrlsEventType
+        AddVDMUrlsEventType,
+        ChangeDockIconUpdateEventType
     };
 
@@ -159 +160 @@
     static const char* GUI_MainWindowCount;
 #endif
+#ifdef Q_WS_MAC
+    static const char* GUI_RealtimeDockIconUpdateEnabled;
+#endif
 };
 

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

@@ -436 +436 @@
 #endif
 
+class VBoxChangeDockIconUpdateEvent : public QEvent
+{
+public:
+    VBoxChangeDockIconUpdateEvent (bool aChanged)
+        : QEvent ((QEvent::Type) VBoxDefs::ChangeDockIconUpdateEventType)
+        , mChanged (aChanged)
+        {}
+
+    const bool mChanged;
+};
+
 class Process : public QProcess
 {
@@ -984 +995 @@
     void trayIconChanged (const VBoxChangeTrayIconEvent &e);
 #endif
+    void dockIconUpdateChanged (const VBoxChangeDockIconUpdateEvent &e);
 
     void canShowRegDlg (bool aCanShow);

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

@@ -229 +229 @@
     kEventVBoxMoveWindow   = 'mwin',
     kEventVBoxResizeWindow = 'rwin',
+    kEventVBoxUpdateDock   = 'udck'
 };
 OSStatus darwinOverlayWindowHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);

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

@@ -670 +670 @@
     , mDarwinKeyModifiers (0)
     , mVirtualBoxLogo (NULL)
+    , mDockIconEnabled (true)
 #endif
     , mDesktopGeo (DesktopGeo_Invalid)
@@ -688 +689 @@
         { kEventClassVBox, kEventVBoxShowWindow },
         { kEventClassVBox, kEventVBoxMoveWindow },
-        { kEventClassVBox, kEventVBoxResizeWindow }
+        { kEventClassVBox, kEventVBoxResizeWindow },
+        { kEventClassVBox, kEventVBoxUpdateDock }
     };
 
@@ -3067 +3069 @@
         /* Update the dock icon if we are in the running state */
         if (isRunning())
-        {
-# if defined (VBOX_GUI_USE_QUARTZ2D)
-            if (mode == VBoxDefs::Quartz2DMode)
-            {
-                /* If the render mode is Quartz2D we could use the
-                 * CGImageRef of the framebuffer for the dock icon creation.
-                 * This saves some conversion time. */
-                CGImageRef ir =
-                    static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
-                ::darwinUpdateDockPreview (ir, mVirtualBoxLogo);
-            }
-            else
-# endif
-                ::darwinUpdateDockPreview (mFrameBuf, mVirtualBoxLogo);
-        }
+            updateDockIcon();
 #endif
         return;
@@ -3875 +3863 @@
 }
 
+#if defined(Q_WS_MAC)
+void VBoxConsoleView::updateDockIcon()
+{
+    if (mDockIconEnabled)
+    {
+# if defined (VBOX_GUI_USE_QUARTZ2D)
+        if (mode == VBoxDefs::Quartz2DMode)
+        {
+            /* If the render mode is Quartz2D we could use the
+             * CGImageRef of the framebuffer for the dock icon creation.
+             * This saves some conversion time. */
+            CGImageRef ir =
+                static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
+            ::darwinUpdateDockPreview (ir, mVirtualBoxLogo);
+        }
+        else
+# endif
+            ::darwinUpdateDockPreview (mFrameBuf, mVirtualBoxLogo);
+    }
+}
+#endif
+

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

@@ -666 +666 @@
     connect (&vboxGlobal().settings(), SIGNAL (propertyChanged (const char *, const char *)),
              this, SLOT (processGlobalSettingChange (const char *, const char *)));
+#ifdef Q_WS_MAC
+    connect (&vboxGlobal(), SIGNAL (dockIconUpdateChanged (const VBoxChangeDockIconUpdateEvent &)),
+             this, SLOT (changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &)));
+#endif
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -928 +932 @@
 
 #ifdef Q_WS_MAC
-    QString osTypeId = cmachine.GetOSTypeId();
-    QImage osImg100x75 = vboxGlobal().vmGuestOSTypeIcon (osTypeId).toImage().scaled (100, 75, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-    QImage osImg = QImage (":/dock_1.png");
-    QImage VBoxOverlay = QImage (":/VirtualBox_cube_42px.png");
-    QPainter painter (&osImg);
-    painter.drawImage (QPoint (14, 22), osImg100x75);
-    painter.drawImage (QPoint (osImg.width() - VBoxOverlay.width(), osImg.height() - VBoxOverlay.height()), VBoxOverlay);
-    painter.end();
-    if (dockImgOS)
-        CGImageRelease (dockImgOS);
-    dockImgOS = ::darwinToCGImageRef (&osImg);
-    SetApplicationDockTileImage (dockImgOS);
+    bool b = (vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_RealtimeDockIconUpdateEnabled) == "true") ? true : false;
+    console->setDockIconEnabled (b);
+    if (b)
+    {
+        QString osTypeId = cmachine.GetOSTypeId();
+        QImage osImg100x75 = vboxGlobal().vmGuestOSTypeIcon (osTypeId).toImage().scaled (100, 75, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        QImage osImg = QImage (":/dock_1.png");
+        QImage VBoxOverlay = QImage (":/VirtualBox_cube_42px.png");
+        QPainter painter (&osImg);
+        painter.drawImage (QPoint (14, 22), osImg100x75);
+        painter.drawImage (QPoint (osImg.width() - VBoxOverlay.width(), osImg.height() - VBoxOverlay.height()), VBoxOverlay);
+        painter.end();
+        if (dockImgOS)
+            CGImageRelease (dockImgOS);
+        dockImgOS = ::darwinToCGImageRef (&osImg);
+        SetApplicationDockTileImage (dockImgOS);
+    }
 #endif
 
@@ -2408 +2417 @@
 #endif
 
+void VBoxConsoleWnd::changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &e)
+{
+#ifdef Q_WS_MAC
+    if (console)
+    {
+        console->setDockIconEnabled (e.mChanged);
+        if (e.mChanged)
+            console->updateDockIcon();
+        else
+            RestoreApplicationDockTileImage();
+    }
+#else
+    Q_UNUSED (e);
+#endif
+}
+
 //
 // Private slots

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

@@ -49 +49 @@
 const char* VBoxDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
 #endif
+#ifdef Q_WS_MAC
+const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
+#endif

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

@@ -885 +885 @@
                     QApplication::postEvent (&mGlobal, new VBoxChangeTrayIconEvent ((sVal.toLower() == "true") ? true : false));
 #endif
+#ifdef Q_WS_MAC
+                if (sKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled)
+                    QApplication::postEvent (&mGlobal, new VBoxChangeDockIconUpdateEvent ((sVal.toLower() == "true") ? true : false));
+#endif
 
                 mMutex.lock();
@@ -5253 +5257 @@
         {
             emit trayIconChanged (*(VBoxChangeTrayIconEvent *) e);
+            return true;
+        }
+#endif
+#if defined(Q_WS_MAC)
+        case VBoxDefs::ChangeDockIconUpdateEventType:
+        {
+            emit dockIconUpdateChanged (*(VBoxChangeDockIconUpdateEvent *) e);
             return true;
         }

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -24 +24 @@
 #include "VBoxUtils.h"
 #include "VBoxFrameBuffer.h"
+#include "VBoxConsoleView.h"
 
 #include <iprt/assert.h>
@@ -167 +168 @@
     return ::darwinToCGImageRef (&transImage);
 }
+
+/* Import private function to capture the window content of any given window. */
+CG_EXTERN_C_BEGIN
+typedef int CGSWindowID;
+typedef void *CGSConnectionID;
+CG_EXTERN CGSWindowID GetNativeWindowFromWindowRef(WindowRef ref);
+CG_EXTERN CGSConnectionID CGSMainConnectionID(void);
+CG_EXTERN void CGContextCopyWindowCaptureContentsToRect(CGContextRef c, CGRect dstRect, CGSConnectionID connection, CGSWindowID window, int zero);
+CG_EXTERN_C_END
 
 /**
@@ -226 +236 @@
     iconRect = CGRectInset (iconRect, 1, 1);
     CGContextDrawImage (context, iconRect, aVMImage);
+    /* Process the content of any external OpenGL windows. */
+    WindowRef w = FrontNonFloatingWindow();
+    WindowGroupRef g = GetWindowGroup (w);
+    WindowGroupContentOptions wgco = kWindowGroupContentsReturnWindows | kWindowGroupContentsRecurse | kWindowGroupContentsVisible;
+    ItemCount c = CountWindowGroupContents (g, wgco);
+    float a1 = iconRect.size.width / static_cast <float> (CGImageGetWidth (aVMImage));
+    float a2 = iconRect.size.height / static_cast <float> (CGImageGetHeight (aVMImage));
+    HIViewRef mainView = HIViewGetRoot (w);
+    Rect tmpR;
+    GetWindowBounds (w, kWindowContentRgn, &tmpR);
+    HIRect mainRect = CGRectMake (tmpR.left, tmpR.top, tmpR.right-tmpR.left, tmpR.bottom-tmpR.top);
+    for (ItemCount i = 0; i <= c; ++i)
+    {
+        WindowRef wc;
+        OSStatus status = GetIndexedWindow (g, i, wgco, &wc);
+        if (status == noErr &&
+            wc != w)
+        {
+            Rect tmpR1;
+            GetWindowBounds (wc, kWindowContentRgn, &tmpR1);
+            HIRect rect;
+            rect.size.width = (tmpR1.right-tmpR1.left) * a1;
+            rect.size.height = (tmpR1.bottom-tmpR1.top) * a2;
+            rect.origin.x = iconRect.origin.x + (tmpR1.left - mainRect.origin.x) * a1;
+            rect.origin.y = targetHeight - (iconRect.origin.y + (tmpR1.top - mainRect.origin.y) * a2) - rect.size.height;
+            /* This is a big, bad hack. The following functions aren't
+             * documented nor official supported by apple. But its the only way
+             * to capture the OpenGL content of a window without fiddling
+             * around with gPixelRead or something like that. */
+            CGSWindowID wid = GetNativeWindowFromWindowRef(wc);
+            CGContextCopyWindowCaptureContentsToRect(context, rect, CGSMainConnectionID(), wid, 0);
+        }
+    }
+
     /* the state image at center */
     if (aStateImage)
@@ -386 +430 @@
         ::darwinDebugPrintEvent ("view: ", aInEvent);
     */
-    QWidget *view = static_cast<QWidget *> (aInUserData);
+    VBoxConsoleView *view = static_cast<VBoxConsoleView *> (aInUserData);
 
     if (eventClass == kEventClassVBox)
@@ -429 +473 @@
             return noErr;
         }
+        if (eventKind == kEventVBoxUpdateDock)
+        {
+//            printf ("UpdateDock requested\n");
+            view->updateDockIcon();
+            return noErr;
+        }
     }
 
@@ -436 +486 @@
 
 
-/* Event debugging stuff. Borrowed from the Knuts Qt patch. */
+/* Event debugging stuff. Borrowed from Knuts Qt patch. */
 #ifdef DEBUG