Changeset 52794 in vbox

Timestamp:

Sep 19, 2014 2:33:37 PM (11 years ago)

Author:

vboxsync

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

96186

Message:

FE/Qt: X11: Runtime UI: Seamless mode: Calcualte available-regions using Qt again.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/seamless/UIMachineViewSeamless.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -613 +613 @@
 }
 #endif /* ifdef Q_WS_X11 */
-
-const QRect VBoxGlobal::availableGeometry(int iScreen) const
-{
-    /* Prepare empty result: */
-    QRect result;
-
-#ifdef Q_WS_X11
-
-    /* Get current display: */
-    Display* pDisplay = QX11Info::display();
-
-    /* Get current application desktop: */
-    QDesktopWidget *pDesktopWidget = QApplication::desktop();
-
-    /* If it's a virtual desktop: */
-    if (pDesktopWidget->isVirtualDesktop())
-    {
-        /* If it's a Xinerama desktop: */
-        if (XineramaIsActive(pDisplay))
-        {
-            /* Get desktops list: */
-            QList<QRect> desktops = XGetDesktopList();
-
-            /* Combine to get full virtual region: */
-            QRegion virtualRegion;
-            foreach (QRect desktop, desktops)
-                virtualRegion += desktop;
-            virtualRegion = virtualRegion.boundingRect();
-
-            /* Remember initial virtual desktop: */
-            QRect virtualDesktop = virtualRegion.boundingRect();
-            //AssertMsgFailed(("LOG... Virtual desktop is: %dx%dx%dx%d\n", virtualDesktop.x(), virtualDesktop.y(),
-            //                                                             virtualDesktop.width(), virtualDesktop.height()));
-
-            /* Set available geometry to screen geometry initially: */
-            result = desktops[iScreen];
-
-            /* Feat available geometry of virtual desktop to respect all the struts: */
-            QList<Window> list = XGetWindowIDList();
-            for (int i = 0; i < list.size(); ++ i)
-            {
-                /* Get window: */
-                Window wid = list[i];
-                QList<ulong> struts = XGetStrut(wid);
-
-                /* If window has strut: */
-                if (struts.size())
-                {
-                    ulong uLeftShift = struts[0];
-                    ulong uLeftFromY = struts[4];
-                    ulong uLeftToY = struts[5];
-
-                    ulong uRightShift = struts[1];
-                    ulong uRightFromY = struts[6];
-                    ulong uRightToY = struts[7];
-
-                    ulong uTopShift = struts[2];
-                    ulong uTopFromX = struts[8];
-                    ulong uTopToX = struts[9];
-
-                    ulong uBottomShift = struts[3];
-                    ulong uBottomFromX = struts[10];
-                    ulong uBottomToX = struts[11];
-
-                    if (uLeftShift)
-                    {
-                        QRect sr(QPoint(0, uLeftFromY),
-                                 QSize(uLeftShift, uLeftToY - uLeftFromY + 1));
-
-                        //AssertMsgFailed(("LOG... Subtract left strut: top-left: %dx%d, size: %dx%d\n", sr.x(), sr.y(), sr.width(), sr.height()));
-                        virtualRegion -= sr;
-                    }
-
-                    if (uRightShift)
-                    {
-                        QRect sr(QPoint(virtualDesktop.x() + virtualDesktop.width() - uRightShift, uRightFromY),
-                                 QSize(virtualDesktop.x() + virtualDesktop.width(), uRightToY - uRightFromY + 1));
-
-                        //AssertMsgFailed(("LOG... Subtract right strut: top-left: %dx%d, size: %dx%d\n", sr.x(), sr.y(), sr.width(), sr.height()));
-                        virtualRegion -= sr;
-                    }
-
-                    if (uTopShift)
-                    {
-                        QRect sr(QPoint(uTopFromX, 0),
-                                 QSize(uTopToX - uTopFromX + 1, uTopShift));
-
-                        //AssertMsgFailed(("LOG... Subtract top strut: top-left: %dx%d, size: %dx%d\n", sr.x(), sr.y(), sr.width(), sr.height()));
-                        virtualRegion -= sr;
-                    }
-
-                    if (uBottomShift)
-                    {
-                        QRect sr(QPoint(uBottomFromX, virtualDesktop.y() + virtualDesktop.height() - uBottomShift),
-                                 QSize(uBottomToX - uBottomFromX + 1, uBottomShift));
-
-                        //AssertMsgFailed(("LOG... Subtract bottom strut: top-left: %dx%d, size: %dx%d\n", sr.x(), sr.y(), sr.width(), sr.height()));
-                        virtualRegion -= sr;
-                    }
-                }
-            }
-
-            /* Get final available geometry: */
-            result = (virtualRegion & result).boundingRect();
-        }
-    }
-
-    /* If result is still NULL: */
-    if (result.isNull())
-    {
-        /* Use QT default functionality: */
-        result = pDesktopWidget->availableGeometry(iScreen);
-    }
-
-    //AssertMsgFailed(("LOG... Final geometry: %dx%dx%dx%d\n", result.x(), result.y(), result.width(), result.height()));
-
-#else /* ifdef Q_WS_X11 */
-
-    result = QApplication::desktop()->availableGeometry(iScreen);
-
-#endif /* ifndef Q_WS_X11 */
-
-    return result;
-}
 
 /**

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -127 +127 @@
 
     bool isKWinManaged() const { return mIsKWinManaged; }
-
-    const QRect availableGeometry(int iScreen = 0) const;
 
     bool shouldRestoreCurrentSnapshot() const { return mRestoreCurrentSnapshot; }

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

@@ -179 +179 @@
     int iScreen = static_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(screenId());
     /* Return available geometry for that screen: */
-    return vboxGlobal().availableGeometry(iScreen);
+    return QApplication::desktop()->availableGeometry(iScreen);
 }
 

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

@@ -165 +165 @@
     int iScreen = qobject_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId);
     /* Calculate working area: */
-    QRect workingArea = vboxGlobal().availableGeometry(iScreen);
+    QRect workingArea = QApplication::desktop()->availableGeometry(iScreen);
 
     /* Move to the appropriate position: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -147 +147 @@
     switch (m_geometryType)
     {
-        case GeometryType_Available: screenRect = vboxGlobal().availableGeometry(iHostScreen); break;
+        case GeometryType_Available: screenRect = QApplication::desktop()->availableGeometry(iHostScreen); break;
         case GeometryType_Full:      screenRect = QApplication::desktop()->screenGeometry(iHostScreen); break;
         default: break;