From b1c3f00d9b0ef6c91b0209c13531bd1f9d63c1e0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 25 Apr 2012 15:08:53 +0200 Subject: rhbz#809019 count mirrored monitors as one Change-Id: I I I184541e99ab4e04b8534dd0341bc2f3630094e9c --- vcl/unx/gtk/app/gtkdata.cxx | 2 ++ vcl/unx/gtk/app/gtksys.cxx | 85 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 69 insertions(+), 18 deletions(-) (limited to 'vcl/unx/gtk/app') diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 518917490ce3..4d58110cd21f 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -197,12 +197,14 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event, void GtkSalDisplay::screenSizeChanged( GdkScreen* pScreen ) { + m_pSys->countScreenMonitors(); if (pScreen) emitDisplayChanged(); } void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen ) { + m_pSys->countScreenMonitors(); if (pScreen) emitDisplayChanged(); } diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 538107f3f579..25578b3264d7 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -49,6 +49,7 @@ SalSystem *GtkInstance::CreateSalSystem() GtkSalSystem::GtkSalSystem() : SalGenericSystem() { mpDisplay = gdk_display_get_default(); + countScreenMonitors(); } GtkSalSystem::~GtkSalSystem() @@ -61,6 +62,52 @@ GtkSalSystem::GetDisplayXScreenCount() return gdk_display_get_n_screens (mpDisplay); } +namespace +{ + +struct GdkRectangleEqual +{ + bool operator()(GdkRectangle const& rLeft, GdkRectangle const& rRight) + { + return + rLeft.x == rRight.x + && rLeft.y == rRight.y + && rLeft.width == rRight.width + && rLeft.height == rRight.height + ; + } +}; + +} + +void +GtkSalSystem::countScreenMonitors() +{ + maScreenMonitors.clear(); + for (gint i = 0; i < gdk_display_get_n_screens(mpDisplay); i++) + { + GdkScreen* const pScreen(gdk_display_get_screen(mpDisplay, i)); + gint nMonitors(pScreen ? gdk_screen_get_n_monitors(pScreen) : 0); + if (nMonitors > 1) + { + std::vector aGeometries; + aGeometries.reserve(nMonitors); + for (gint j(0); j != nMonitors; ++j) + { + GdkRectangle aGeometry; + gdk_screen_get_monitor_geometry(pScreen, j, &aGeometry); + aGeometries.push_back(aGeometry); + } + GdkRectangleEqual aCmp; + std::sort(aGeometries.begin(), aGeometries.end(), aCmp); + const std::vector::iterator aUniqueEnd( + std::unique(aGeometries.begin(), aGeometries.end(), aCmp)); + nMonitors = std::distance(aGeometries.begin(), aUniqueEnd); + } + maScreenMonitors.push_back(std::make_pair(pScreen, nMonitors)); + } +} + // Including gdkx.h kills us with the Window / XWindow conflict extern "C" { GType gdk_x11_display_get_type (void); @@ -73,7 +120,7 @@ GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen) gint nMonitor; GdkScreen *pScreen = NULL; - pScreen = getScreenMonitorFromIdx (mpDisplay, nScreen, nMonitor); + pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) return SalX11Screen (0); #if GTK_CHECK_VERSION(3,0,0) @@ -84,16 +131,16 @@ GtkSalSystem::getXScreenFromDisplayScreen(unsigned int nScreen) } GdkScreen * -GtkSalSystem::getScreenMonitorFromIdx (GdkDisplay *pDisplay, int nIdx, gint &nMonitor) +GtkSalSystem::getScreenMonitorFromIdx (int nIdx, gint &nMonitor) { GdkScreen *pScreen = NULL; - for (gint i = 0; i < gdk_display_get_n_screens (pDisplay); i++) + for (ScreenMonitors_t::const_iterator aIt(maScreenMonitors.begin()), aEnd(maScreenMonitors.end()); aIt != aEnd; ++aIt) { - pScreen = gdk_display_get_screen (pDisplay, i); + pScreen = aIt->first; if (!pScreen) break; - if (nIdx >= gdk_screen_get_n_monitors (pScreen)) - nIdx -= gdk_screen_get_n_monitors (pScreen); + if (nIdx >= aIt->second) + nIdx -= aIt->second; else break; } @@ -102,32 +149,34 @@ GtkSalSystem::getScreenMonitorFromIdx (GdkDisplay *pDisplay, int nIdx, gint &nMo } int -GtkSalSystem::getScreenIdxFromPtr (GdkDisplay *pDisplay, GdkScreen *pScreen) +GtkSalSystem::getScreenIdxFromPtr (GdkScreen *pScreen) { int nIdx = 0; - for (gint i = 0; i < gdk_display_get_n_screens (pDisplay); i++) + for (ScreenMonitors_t::const_iterator aIt(maScreenMonitors.begin()), aEnd(maScreenMonitors.end()); aIt != aEnd; ++aIt) { - GdkScreen *pCmp = gdk_display_get_screen (pDisplay, i); - if (pCmp == pScreen) + if (aIt->first == pScreen) return nIdx; - nIdx += gdk_screen_get_n_monitors (pCmp); + nIdx += aIt->second; } g_warning ("failed to find screen %p", pScreen); return 0; } -int GtkSalSystem::getScreenMonitorIdx (GdkDisplay *pDisplay, - GdkScreen *pScreen, +int GtkSalSystem::getScreenMonitorIdx (GdkScreen *pScreen, int nX, int nY) { - return getScreenIdxFromPtr (pDisplay, pScreen) + + // TODO: this will fail horribly for exotic combinations like two + // monitors in mirror mode and one extra. Hopefully such + // abominations are not used (or, even better, not possible) in + // practice .-) + return getScreenIdxFromPtr (pScreen) + gdk_screen_get_monitor_at_point (pScreen, nX, nY); } unsigned int GtkSalSystem::GetDisplayScreenCount() { gint nMonitor; - (void)getScreenMonitorFromIdx (mpDisplay, G_MAXINT, nMonitor); + (void)getScreenMonitorFromIdx (G_MAXINT, nMonitor); return G_MAXINT - nMonitor; } @@ -183,7 +232,7 @@ static int _get_primary_monitor (GdkScreen *pScreen) unsigned int GtkSalSystem::GetDisplayDefaultScreen() { GdkScreen *pDefault = gdk_display_get_default_screen (mpDisplay); - int idx = getScreenIdxFromPtr (mpDisplay, pDefault); + int idx = getScreenIdxFromPtr (pDefault); return idx + _get_primary_monitor (pDefault); } @@ -192,7 +241,7 @@ Rectangle GtkSalSystem::GetDisplayScreenPosSizePixel (unsigned int nScreen) gint nMonitor; GdkScreen *pScreen; GdkRectangle aRect; - pScreen = getScreenMonitorFromIdx (mpDisplay, nScreen, nMonitor); + pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) return Rectangle(); gdk_screen_get_monitor_geometry (pScreen, nMonitor, &aRect); @@ -212,7 +261,7 @@ rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) gchar *pStr; gint nMonitor; GdkScreen *pScreen; - pScreen = getScreenMonitorFromIdx (mpDisplay, nScreen, nMonitor); + pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) return rtl::OUString(); -- cgit v1.2.3