X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=c2a4eaf26371d1a190f8051f9e198590192d95a4;hb=b1a6dffafa27d689389b512668fd5c34757dbd1d;hp=368b67cecdc5b6953db9e113664e16f30bed9889;hpb=0913ba6fdd0e28740e0b521f275b9ce82c4a1b7a;p=libs%2Fgui.git

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 368b67c..c2a4eaf 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -94,6 +94,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 +146,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);
@@ -175,6 +177,22 @@ Display::Display(const string &disp_name):
 						prev_enabled->next_right = &*i;
 					prev_enabled = &*i;
 				}
+
+			if(!primary_monitor || !primary_monitor->desktop_mode)
+			{
+				// XRandR didn't give a sensible primary monitor.  Try to guess one.
+				unsigned largest = 0;
+				for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
+					if(i->desktop_mode)
+					{
+						unsigned size = i->desktop_mode->width*i->desktop_mode->height;
+						if(size>largest)
+						{
+							largest = size;
+							primary_monitor = &*i;
+						}
+					}
+			}
 		}
 	}
 #endif
@@ -184,12 +202,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);
 
@@ -281,6 +300,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;