Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 27427) @@ -241,4 +241,8 @@ # Necessary for the hdd backend enumeration VirtualBox_LIBS = $(LIB_DDU) + +# This library is required for multi-monitor support +VirtualBox_LIBS.linux += Xinerama +VirtualBox_LIBS.solaris += Xinerama ifdef VBOX_WITH_VIDEOHWACCEL Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 27427) @@ -94,4 +94,5 @@ #include #include +#include #define BOOL PRBool #endif @@ -966,4 +967,245 @@ #endif + +#ifdef Q_WS_X11 +QList XGetDesktopList() +{ + /* Prepare empty resulting list: */ + QList result; + + /* Get current display: */ + Display* pDisplay = QX11Info::display(); + + /* If thats Xinerama desktop: */ + if (XineramaIsActive(pDisplay)) + { + /* Reading Xinerama data: */ + int iScreens = 0; + XineramaScreenInfo *pScreensData = XineramaQueryScreens(pDisplay, &iScreens); + + /* Fill resulting list: */ + for (int i = 0; i < iScreens; ++ i) + result << QRect(pScreensData[i].x_org, pScreensData[i].y_org, + pScreensData[i].width, pScreensData[i].height); + + /* Free screens data: */ + XFree(pScreensData); + } + + /* Return resulting list: */ + return result; +} + +QList XGetWindowIDList() +{ + /* Get current display: */ + Display *pDisplay = QX11Info::display(); + + /* Get virtual desktop window: */ + Window window = QX11Info::appRootWindow(); + + /* Get 'client list' atom: */ + Atom propNameAtom = XInternAtom(pDisplay, "_NET_CLIENT_LIST", True /* only if exists */); + + /* Prepare empty resulting list: */ + QList result; + + /* If atom does not exists return empty list: */ + if (propNameAtom == None) + return result; + + /* Get atom value: */ + Atom realAtomType = None; + int iRealFormat = 0; + unsigned long uItemsCount = 0; + unsigned long uBytesAfter = 0; + unsigned char *pData = 0; + int rc = XGetWindowProperty(pDisplay, window, propNameAtom, + 0, 0x7fffffff /*LONG_MAX*/, False /* delete */, + XA_WINDOW, &realAtomType, &iRealFormat, + &uItemsCount, &uBytesAfter, &pData); + + /* If get property is failed return empty list: */ + if (rc != Success) + return result; + + /* Fill resulting list with win ids: */ + Window *pWindowData = reinterpret_cast(pData); + for (ulong i = 0; i < uItemsCount; ++ i) + result << pWindowData[i]; + + /* Releasing resources: */ + XFree(pData); + + /* Return resulting list: */ + return result; +} + +QList XGetStrut(Window window) +{ + /* Get current display: */ + Display *pDisplay = QX11Info::display(); + + /* Get 'strut' atom: */ + Atom propNameAtom = XInternAtom(pDisplay, "_NET_WM_STRUT_PARTIAL", True /* only if exists */); + + /* Prepare empty resulting list: */ + QList result; + + /* If atom does not exists return empty list: */ + if (propNameAtom == None) + return result; + + /* Get atom value: */ + Atom realAtomType = None; + int iRealFormat = 0; + ulong uItemsCount = 0; + ulong uBytesAfter = 0; + unsigned char *pData = 0; + int rc = XGetWindowProperty(pDisplay, window, propNameAtom, + 0, LONG_MAX, False /* delete */, + XA_CARDINAL, &realAtomType, &iRealFormat, + &uItemsCount, &uBytesAfter, &pData); + + /* If get property is failed return empty list: */ + if (rc != Success) + return result; + + /* Fill resulting list with strut shifts: */ + ulong *pStrutsData = reinterpret_cast(pData); + for (ulong i = 0; i < uItemsCount; ++ i) + result << pStrutsData[i]; + + /* Releasing resources: */ + XFree(pData); + + /* Return resulting list: */ + return result; +} +#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 thats virtual desktop: */ + if (pDesktopWidget->isVirtualDesktop()) + { + /* If thats Xinerama desktop: */ + if (XineramaIsActive(pDisplay)) + { + /* Get desktops list: */ + QList 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 list = XGetWindowIDList(); + for (int i = 0; i < list.size(); ++ i) + { + /* Get window: */ + Window wid = list[i]; + QList 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; +} /** Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h (revision 27427) @@ -336,4 +336,6 @@ const char *vmRenderModeStr() const { return vm_render_mode_str; } bool isKWinManaged() const { return mIsKWinManaged; } + + const QRect availableGeometry(int iScreen = 0) const; #ifdef VBOX_WITH_DEBUGGER_GUI Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h (revision 27427) @@ -63,4 +63,5 @@ friend class UIMachineLogic; friend class UIMachineWindowSeamless; + friend class UIMachineViewSeamless; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 27427) @@ -35,8 +35,10 @@ /* Local includes */ +#include "VBoxGlobal.h" #include "UISession.h" #include "UIMachineWindow.h" #include "UIMachineLogic.h" #include "UIFrameBuffer.h" +#include "UIMachineLogicSeamless.h" #include "UIMachineViewSeamless.h" @@ -293,5 +295,8 @@ QRect UIMachineViewSeamless::workingArea() { - return QApplication::desktop()->availableGeometry(this); + /* Get corresponding screen: */ + int iScreen = static_cast(machineLogic())->hostScreenForGuestScreen(screenId()); + /* Return available geometry for that screen: */ + return vboxGlobal().availableGeometry(iScreen); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 27427) @@ -106,7 +106,11 @@ void UIMachineWindowSeamless::sltPlaceOnScreen() { - QRect r = QApplication::desktop()->availableGeometry(static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId)); - move(r.topLeft()); - resize(r.size()); + /* Get corresponding screen: */ + int iScreen = static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId); + /* Calculate working area: */ + QRect workingArea = vboxGlobal().availableGeometry(iScreen); + /* Move & resize to the appropriate values: */ + move(workingArea.topLeft()); + resize(workingArea.size()); } @@ -195,5 +199,8 @@ { #ifdef Q_WS_WIN - m_prevRegion = QApplication::desktop()->availableGeometry(static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId)); + /* Get corresponding screen: */ + int iScreen = static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId); + /* Prepare previous region: */ + m_prevRegion = vboxGlobal().availableGeometry(iScreen); #endif @@ -345,6 +352,7 @@ #ifdef Q_WS_MAC - /* Make sure it is really on the right place (especially on the Mac) */ - QRect r = QApplication::desktop()->availableGeometry(static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId)); + /* Make sure it is really on the right place (especially on the Mac): */ + int iScreen = static_cast(machineLogic())->hostScreenForGuestScreen(m_uScreenId); + QRect r = vboxGlobal().availableGeometry(iScreen); move(r.topLeft()); #endif /* Q_WS_MAC */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp (revision 27426) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp (revision 27427) @@ -217,5 +217,5 @@ if (aEvent->timerId() == mScrollTimer.timerId()) { - QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (window()) : + QRect screen = mSeamless ? vboxGlobal().availableGeometry (QApplication::desktop()->screenNumber(window())) : QApplication::desktop()->screenGeometry (window()); switch (mAlignment) @@ -383,5 +383,5 @@ void VBoxMiniToolBar::moveToBase() { - QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (window()) : + QRect screen = mSeamless ? vboxGlobal().availableGeometry (QApplication::desktop()->screenNumber(window())) : QApplication::desktop()->screenGeometry (window()); mPositionX = screen.x() + screen.width() / 2 - width() / 2; @@ -411,5 +411,5 @@ QPoint globalPosition = parentWidget()->mapFromGlobal (aPoint); QRect fullArea = QApplication::desktop()->screenGeometry (window()); - QRect realArea = mSeamless ? QApplication::desktop()->availableGeometry (window()) : + QRect realArea = mSeamless ? vboxGlobal().availableGeometry (QApplication::desktop()->screenNumber(window())) : QApplication::desktop()->screenGeometry (window()); QPoint shiftToReal (realArea.topLeft() - fullArea.topLeft());