aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2014-08-21 12:42:34 +0200
committerRainer Hochecker <fernetmenta@online.de>2014-08-21 12:42:34 +0200
commitf735be9d05108b30298b5ecfa83024e99c193092 (patch)
tree7c53bca63af629a03912c63fedbc96af6b1ffe98
parent92ecdb03d0e4e8d47c97d6e751ead08ad8af449d (diff)
parent6e7bc91d28c232676ae41abf4d819e598c019bdd (diff)
Merge pull request #5256 from FernetMenta/X11
X11: fix multi-monitor setups after recent changes of X servers
-rw-r--r--xbmc/windowing/X11/WinSystemX11.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index 018a4d2ebb..60761ec050 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -776,6 +776,8 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
bool mouseActive = false;
float mouseX = 0;
float mouseY = 0;
+ int x0 = 0;
+ int y0 = 0;
if (m_mainWindow && ((m_bFullScreen != fullscreen) || m_currentOutput.compare(output) != 0 || m_windowDirty))
{
@@ -823,8 +825,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
Colormap cmap;
XSetWindowAttributes swa;
XVisualInfo *vi;
- int x0 = 0;
- int y0 = 0;
XOutput *out = g_xrandr.GetOutput(output);
if (!out)
@@ -944,6 +944,10 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
}
XMapRaised(m_dpy, m_glWindow);
XMapRaised(m_dpy, m_mainWindow);
+
+ if (fullscreen)
+ XMoveWindow(m_dpy, m_mainWindow, x0, y0);
+
XSync(m_dpy,TRUE);
if (changeWindow && mouseActive)