X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=b70c9a7c197866179a95b26bf4aae26d7e3d16bd;hb=8811d614b5deb1a0da4bef531db3fd6882469b99;hp=fe489ec86cf27760daecbb843497360759e87583;hpb=eb81125a81735eceef4a8be54a0bafcae6901e18;p=libs%2Fgui.git

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index fe489ec..b70c9a7 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -38,6 +38,7 @@ int x_error_handler(Display *display, XErrorEvent *event)
 	return 0;
 }
 
+#ifdef WITH_XRANDR
 inline Msp::Graphics::VideoRotation rotation_from_sys(Rotation r)
 {
 	switch(r)
@@ -60,12 +61,13 @@ inline Rotation rotation_to_sys(Msp::Graphics::VideoRotation r)
 	}
 }
 
-bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
+inline bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
 {
 	if(m1.desktop_mode && !m2.desktop_mode)
 		return true;
 	return m1.x<m2.x;
 }
+#endif
 
 inline unsigned mode_width(const Msp::Graphics::VideoMode &m, Msp::Graphics::VideoRotation r)
 {
@@ -145,8 +147,8 @@ Display::Display(const string &disp_name):
 					VideoMode mode(info->width, info->height);
 					mode.index = modes.size();
 					mode.monitor = &monitor;
-					mode.rate = info->dotClock/(info->hTotal*info->vTotal);
-					if(find_mode(mode))
+					mode.rate = static_cast<float>(info->dotClock)/(info->hTotal*info->vTotal);
+					if(find_mode(mode, 0.01f))
 						continue;
 
 					modes.push_back(mode);
@@ -300,6 +302,23 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 		{
 			XRROutputInfo *o = XRRGetOutputInfo(priv->display, res, priv->monitors[i->index]);
 			XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, x, y, priv->modes[i->current_mode->index], rotation_to_sys(i->current_rotation), &priv->monitors[i->index], 1);
+
+			XRRPanning panning;
+			panning.timestamp = CurrentTime;
+			panning.left = x;
+			panning.top = y;
+			panning.width = i->current_mode->width;
+			panning.height = i->current_mode->height;
+			panning.track_left = panning.left;
+			panning.track_top = panning.top;
+			panning.track_width = panning.width;
+			panning.track_height = panning.height;
+			panning.border_left = 0;
+			panning.border_top = 0;
+			panning.border_right = 0;
+			panning.border_bottom = 0;
+			XRRSetPanning(priv->display, res, o->crtc, &panning);
+
 			XRRFreeOutputInfo(o);
 
 			i->x = x;