X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=15c69a9c604495132718adb1d526408f4a209441;hb=5b06f17bd09b4aaaa295f167566ca52f70db5c27;hp=6f677c3048d7a7ee96b1db5f585847490503f7f8;hpb=e3edc65a604e02dbb3d9c8f8a66b59e73b0ce09f;p=libs%2Fgui.git

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 6f677c3..15c69a9 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)
 {
@@ -94,6 +96,8 @@ Display::Display(const string &disp_name):
 
 	XSetErrorHandler(x_error_handler);
 
+	err_dialog = new ErrorDialog(this);
+
 #ifdef WITH_XRANDR
 	int event_base;
 	int error_base;
@@ -144,7 +148,7 @@ Display::Display(const string &disp_name):
 					mode.index = modes.size();
 					mode.monitor = &monitor;
 					mode.rate = info->dotClock/(info->hTotal*info->vTotal);
-					if(find_matching_mode(mode))
+					if(find_mode(mode))
 						continue;
 
 					modes.push_back(mode);
@@ -200,12 +204,13 @@ Display::~Display()
 {
 	XCloseDisplay(priv->display);
 	delete priv;
+	delete err_dialog;
 }
 
 void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 {
 #ifdef WITH_XRANDR
-	const VideoMode *mode = find_matching_mode(requested_mode);
+	const VideoMode *mode = find_mode(requested_mode);
 	if(!mode)
 		throw unsupported_video_mode(requested_mode);
 
@@ -297,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;