Changeset 6474 in vbox for trunk/src/VBox

Timestamp:

Jan 24, 2008 10:28:59 AM (17 years ago)

Author:

vboxsync

Message:

• Mac OS X: The seamless mode is hopefully fixed for the mac. All the masking stuff is done without the help of qt.
• As from now the available space for seamless mode is in that size which the quest allow.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)

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

@@ -254 +254 @@
     QSpacerItem *mShiftingSpacerRight;
     QSpacerItem *mShiftingSpacerBottom;
+    QSize mMaskShift;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -300 +301 @@
 #ifdef Q_WS_WIN32
     QRegion mPrevRegion;
+#endif
+
+#ifdef Q_WS_MAC
+    QRegion mCurrRegion;
+    EventHandlerRef mDarwinRegionEventHandlerRef;
 #endif
 

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

@@ -256 +256 @@
 CGImageRef DarwinCreateDockBadge (const char *aSource);
 CGImageRef DarwinCreateDockPreview (VBoxFrameBuffer *aFrameBuffer);
+OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
 #endif /* Q_WS_MAC */
 

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

@@ -583 +583 @@
     OverlayApplicationDockTileImage (dockImgStateRunning);
 #endif
+    mMaskShift.scale (0, 0, QSize::ScaleFree);
 }
 
@@ -1007 +1008 @@
 {
     disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
-#ifndef Q_WS_MAC
     /* It isn't guaranteed that the guest os set the video mode that
      * we requested. So after all the resizing stuff set the clipping
      * mask and the spacing shifter to the corresponding values. */
     setViewInSeamlessMode (QRect(console->mapToGlobal (QPoint(0, 0)), console->size()));
-#endif
 #ifdef Q_WS_MAC
     if (!mIsSeamless)
@@ -2088 +2087 @@
 //        maskRect.setBottom (maskRect.bottom() + 1);
 //        setMask (maskRect);
+        if (aSeamless)
+        {
+            OSStatus status;
+            WindowPtr WindowRef = reinterpret_cast<WindowPtr>(winId());
+            EventTypeSpec wNonCompositingEvent = { kEventClassWindow, kEventWindowGetRegion };
+            status = InstallWindowEventHandler (WindowRef, DarwinRegionHandler, GetEventTypeCount (wNonCompositingEvent), &wNonCompositingEvent, &mCurrRegion, &mDarwinRegionEventHandlerRef);
+            Assert (status == noErr);
+            status = ReshapeCustomWindow (WindowRef);
+            Assert (status == noErr);
+            UInt32 features;
+            status = GetWindowFeatures (WindowRef, &features);
+            Assert (status == noErr);
+            if (( features & kWindowIsOpaque ) != 0)
+            {
+                status = HIWindowChangeFeatures (WindowRef, 0, kWindowIsOpaque);
+                Assert(status == noErr);
+            }
+            status = SetWindowAlpha(WindowRef, 0.999);
+            Assert (status == noErr);
+        }
 #else
 //        setMask (dtw->screenGeometry (this));
@@ -2118 +2137 @@
         if (!aSeamless)
             SetSystemUIMode (kUIModeNormal, 0);
+
+        if (aSeamless)
+        {
+            /* Undo all mac specific installations */
+            OSStatus status;
+            WindowPtr WindowRef = reinterpret_cast<WindowPtr>(winId());
+            status = RemoveEventHandler (mDarwinRegionEventHandlerRef);
+            Assert (status == noErr);
+            status = ReshapeCustomWindow (WindowRef);
+            Assert (status == noErr);
+            status = SetWindowAlpha (WindowRef, 1);
+            Assert (status == noErr);
+        }
 #endif
 
@@ -2162 +2194 @@
          * we requested. So after all the resizing stuff set the clipping
          * mask and the spacing shifter to the corresponding values. */
-        QDesktopWidget *dtw = QApplication::desktop();
+        QDesktopWidget *dtw = QApplication::desktop ();
         QRect sRect = dtw->screenGeometry (this);
         QRect aRect (aTargetRect);
-        QRect a1Rect (aTargetRect);
+        mMaskShift.scale (aTargetRect.left(), aTargetRect.top(), QSize::ScaleFree);
 #ifdef Q_WS_MAC
         /* On mac os x this isn't necessary cause the screen starts
          * by y=0 always regardless if there is the global menubar or not. */
         aRect.setRect (aRect.left(), 0, aRect.width(), aRect.height() + aRect.top());
-        a1Rect.setRect (a1Rect.left(), 0, a1Rect.width(), a1Rect.height());
 #endif // Q_WS_MAC
         /* Set the clipping mask */
-        mStrictedRegion = QRegion (sRect) - a1Rect;
+        mStrictedRegion = aRect;
         /* Set the shifting spacer */
         mShiftingSpacerLeft->changeSize (RT_ABS (sRect.left() - aRect.left()), 0,
@@ -2578 +2609 @@
 {
     QRegion region = aRegion;
-    region.translate (mShiftingSpacerLeft->sizeHint().width(), mShiftingSpacerTop->sizeHint().height());
-    region -= mStrictedRegion;
-
-#ifdef Q_WS_MAC
-    /* This is necessary to avoid the flicker by
-     * an mask update.
-     * See http://lists.apple.com/archives/Carbon-development/2001/Apr/msg01651.html
-     * for the hint.
-     * There *must* be a better solution. */
-    if(!region.isEmpty())
-      region |= QRect(0, 0, 1, 1);
-#endif
+    /* The global mask shift cause of toolbars and such thinks. */
+    region.translate (mMaskShift.width(), mMaskShift.height());
+    /* Restrict the drawing to the available space on the screen.
+     * (The &operator is better than the previous used -operator, 
+     * because this excludes space around the real screen also. 
+     * This is necessary for the mac.) */
+    region &= mStrictedRegion;
 
 #ifdef Q_WS_WIN
@@ -2620 +2646 @@
 
     mPrevRegion = region;
+#elif defined(Q_WS_MAC)
+    /* This is necessary to avoid the flicker by an mask update. 
+     * See http://lists.apple.com/archives/Carbon-development/2001/Apr/msg01651.html
+     * for the hint.
+     * There *must* be a better solution. */
+    if(!region.isEmpty ())
+      region |= QRect (0, 0, 1, 1);
+    /* Save the current region for later processing in the darwin event handler. */
+    mCurrRegion = region;
+    /* We repaint the screen before the ReshapeCustomWindow command. Unfortunately
+     * this command flushes a copy of the backbuffer to the screen after the new
+     * mask is set. This leads into a missplaced drawing of the content. Currently
+     * no alternative to this and also this is not 100% perfect. */
+    repaint ();
+    qApp->processEvents ();
+    /* Now force the reshaping of the window. This is definitly necessary. */
+    ReshapeCustomWindow (reinterpret_cast<WindowPtr>(winId()));
 #else
     QMainWindow::setMask (region);

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

@@ -196 +196 @@
 }
 
+OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData)
+{
+    NOREF(aInHandlerCallRef);
+
+        OSStatus status = eventNotHandledErr;
+        
+        switch(GetEventKind (aInEvent))
+        {
+                case kEventWindowGetRegion:
+                {
+                        WindowRegionCode code;
+                        RgnHandle rgn;
+                        
+                        /* which region code is being queried? */
+                        GetEventParameter (aInEvent, kEventParamWindowRegionCode, typeWindowRegionCode, NULL, sizeof(code), NULL, &code);
+
+                        /* if it is the opaque region code then set the region to Empty and return noErr to stop the propagation */
+                        if (code == kWindowOpaqueRgn)
+                        {
+                                GetEventParameter (aInEvent, kEventParamRgnHandle, typeQDRgnHandle, NULL, sizeof(rgn), NULL, &rgn);
+                                SetEmptyRgn (rgn);
+                                status = noErr;
+                        }
+            /* if the content of the whole window is queried return a copy of our saved region. */
+            else if (code == (kWindowStructureRgn))// || kWindowGlobalPortRgn || kWindowUpdateRgn))
+            {
+                                GetEventParameter (aInEvent, kEventParamRgnHandle, typeQDRgnHandle, NULL, sizeof(rgn), NULL, &rgn);
+                QRegion *pRegion = static_cast<QRegion*>(aInUserData);
+                if(!pRegion->isNull () && pRegion)
+                {
+                    CopyRgn (pRegion->handle(), rgn);
+                    status = noErr;
+                }
+            }
+            break;
+                }
+        }
+        
+        return status;
+}
+