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

Timestamp:

May 22, 2013 7:32:28 PM (12 years ago)

Author:

vboxsync

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

85954

Message:

FE/Qt: Runtime UI: Seamless-mode: Multi-screen support: Make sure seamless-region correctly propagated for non-primary screens while GUI using QImage frame-buffer.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless

Files:

• UIMachineViewSeamless.cpp (modified) (1 diff)
• UIMachineWindowSeamless.cpp (modified) (4 diffs)
• UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -84 +84 @@
         case SetRegionEventType:
         {
-            /* Get region-update event: */
+            /* Apply new seamless-region: */
             UISetRegionEvent *pSetRegionEvent = static_cast<UISetRegionEvent*>(pEvent);
-
-            /* Apply new region: */
-            if (pSetRegionEvent->region() != m_lastVisibleRegion)
-            {
-                m_lastVisibleRegion = pSetRegionEvent->region();
-                machineWindow()->setMask(m_lastVisibleRegion);
-            }
+            m_lastVisibleRegion = pSetRegionEvent->region();
+            machineWindow()->setMask(m_lastVisibleRegion);
             return true;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -97 +97 @@
     /* This might be required to correctly mask: */
     centralWidget()->setAutoFillBackground(false);
-
-#ifdef Q_WS_WIN
-    /* Get corresponding screen: */
-    int iScreen = qobject_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId);
-    /* Prepare previous region: */
-    m_prevRegion = vboxGlobal().availableGeometry(iScreen);
-#endif /* Q_WS_WIN */
 
 #ifdef Q_WS_MAC
@@ -280 +273 @@
 #endif /* Q_WS_MAC */
 
-void UIMachineWindowSeamless::setMask(const QRegion &constRegion)
-{
-    /* Could be unused under Mac: */
-    Q_UNUSED(constRegion);
-
-#ifndef Q_WS_MAC
-    /* Copy mask: */
-    QRegion region = constRegion;
-
+void UIMachineWindowSeamless::setMask(const QRegion &incomingRegion)
+{
+    /* Copy region: */
+    QRegion region(incomingRegion);
+
+#ifndef Q_WS_MAC
     /* Shift region if left spacer width is NOT zero or top spacer height is NOT zero: */
     if (m_pLeftSpacer->geometry().width() || m_pTopSpacer->geometry().height())
@@ -304 +294 @@
 #endif /* !Q_WS_MAC */
 
-#if defined (Q_WS_WIN)
-# if 0 /* This code is disabled for a long time already, need analisys... */
-    QRegion difference = m_prevRegion.subtract(region);
-
-    /* Region offset calculation */
-    int fleft = 0, ftop = 0;
-
-    /* Visible region calculation */
-    HRGN newReg = CreateRectRgn(0, 0, 0, 0);
-    CombineRgn(newReg, region.handle(), 0, RGN_COPY);
-    OffsetRgn(newReg, fleft, ftop);
-
-    /* Invisible region calculation */
-    HRGN diffReg = CreateRectRgn(0, 0, 0, 0);
-    CombineRgn(diffReg, difference.handle(), 0, RGN_COPY);
-    OffsetRgn(diffReg, fleft, ftop);
-
-    /* Set the current visible region and clean the previous */
-    SetWindowRgn(winId(), newReg, FALSE);
-    RedrawWindow(0, 0, diffReg, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
-    if (machineView())
-        RedrawWindow(machineView()->viewport()->winId(), 0, 0, RDW_INVALIDATE);
-
-    m_prevRegion = region;
-# endif /* This code is disabled for a long time already, need analisys... */
-    UIMachineWindow::setMask(region);
-#elif defined (Q_WS_MAC)
-# ifdef VBOX_GUI_USE_QUARTZ2D
+#ifdef VBOX_GUI_USE_QUARTZ2D
     if (vboxGlobal().vmRenderMode() == Quartz2DMode)
     {
@@ -338 +301 @@
         ::darwinWindowInvalidateShape(m_pMachineView->viewport());
     }
-# else /* VBOX_GUI_USE_QUARTZ2D */
-    UIMachineWindow::setMask(constRegion);
-# endif /* !VBOX_GUI_USE_QUARTZ2D */
-#else /* !Q_WS_MAC */
-    UIMachineWindow::setMask(region);
-#endif
-}
-
+#else /* VBOX_GUI_USE_QUARTZ2D */
+    /* Seamless-window for empty region should be empty too,
+     * but native API wrapped by the QWidget::setMask() doesn't allow this.
+     * Instead, we have a full painted screen of seamless-geometry size visible.
+     * Moreover, we can't just hide the empty seamless-window as 'hiding'
+     * 1. will collide with the multi-screen layout behavior and
+     * 2. will cause a task-bar flicker on moving window from one screen to another.
+     * As a temporary though quite a dirty workaround we have to make sure
+     * region have at least one pixel. */
+    if (region.isEmpty())
+        region += QRect(0, 0, 1, 1);
+    /* Make sure region had changed: */
+    if (m_previousRegion != region)
+    {
+        /* Remember new region: */
+        m_previousRegion = region;
+        /* Assign new region: */
+        UIMachineWindow::setMask(m_previousRegion);
+        /* Update viewport contents: */
+        m_pMachineView->viewport()->update();
+    }
+#endif /* !VBOX_GUI_USE_QUARTZ2D */
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -96 +96 @@
 
     /* Variables: */
-#ifdef Q_WS_WIN
-    QRegion m_prevRegion;
-#endif /* Q_WS_WIN */
+    QRegion m_previousRegion;
 
     /* Factory support: */