X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=ba8d2532d914494e31ca847abdb5052926c2b6df;hp=a48f3f874f1a3600da402f9fd88a1138b7f80c89;hb=a8a9191481151f049781b670ea8883025a594a5f;hpb=2deed84c84e513ee1c2a2fbbcd3946c1d772fcbb

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index a48f3f8..ba8d253 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -63,9 +63,9 @@ inline Rotation rotation_to_sys(Msp::Graphics::VideoRotation r)
 
 inline bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
 {
-	if(m1.desktop_mode && !m2.desktop_mode)
+	if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
 		return true;
-	return m1.x<m2.x;
+	return m1.desktop_settings.x<m2.desktop_settings.x;
 }
 #endif
 
@@ -155,10 +155,9 @@ Display::Display(const string &disp_name):
 
 				if(crtc)
 				{
-					monitor.desktop_rotation = rotation_from_sys(crtc->rotation);
-					monitor.current_rotation = monitor.desktop_rotation;
-					monitor.x = crtc->x;
-					monitor.y = crtc->y;
+					monitor.desktop_settings.rotation = rotation_from_sys(crtc->rotation);
+					monitor.desktop_settings.x = crtc->x;
+					monitor.desktop_settings.y = crtc->y;
 				}
 
 				if(res->outputs[i]==primary)
@@ -184,12 +183,11 @@ Display::Display(const string &disp_name):
 					monitor.video_modes.push_back(&modes.back());
 
 					if(crtc && info->id==crtc->mode)
-					{
-						monitor.desktop_mode = &modes.back();
-						monitor.current_mode = monitor.desktop_mode;
-					}
+						monitor.desktop_settings.mode = &modes.back();
 				}
 
+				monitor.current_settings = monitor.desktop_settings;
+
 				XRRFreeOutputInfo(output);
 				if(crtc)
 					XRRFreeCrtcInfo(crtc);
@@ -200,7 +198,7 @@ Display::Display(const string &disp_name):
 			monitors.sort(monitor_x_compare);
 			Monitor *prev_enabled = 0;
 			for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
-				if(i->desktop_mode)
+				if(i->desktop_settings.mode)
 				{
 					i->next_left = prev_enabled;
 					if(prev_enabled)
@@ -208,14 +206,14 @@ Display::Display(const string &disp_name):
 					prev_enabled = &*i;
 				}
 
-			if(!primary_monitor || !primary_monitor->desktop_mode)
+			if(!primary_monitor || !primary_monitor->desktop_settings.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)
+					if(const VideoMode *desktop_mode = i->desktop_settings.mode)
 					{
-						unsigned size = i->desktop_mode->width*i->desktop_mode->height;
+						unsigned size = desktop_mode->width*desktop_mode->height;
 						if(size>largest)
 						{
 							largest = size;
@@ -244,7 +242,7 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 
 	VideoRotation requested_rotation = requested_mode.rotation;
 	if(requested_rotation==ROTATE_ANY)
-		requested_rotation = mode->monitor->desktop_rotation;
+		requested_rotation = mode->monitor->desktop_settings.rotation;
 
 	XRRScreenResources *res = XRRGetScreenResources(priv->display, priv->root_window);
 	RROutput output = priv->monitors[mode->monitor->index];
@@ -289,22 +287,23 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 					XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, 0, 0, 0, RR_Rotate_0, 0, 0);
 				XRRFreeOutputInfo(o);
 
-				i->current_mode = 0;
-				i->current_rotation = ROTATE_NORMAL;
-				i->x = 0;
-				i->y = 0;
+				i->current_settings.mode = 0;
+				i->current_settings.rotation = ROTATE_NORMAL;
+				i->current_settings.x = 0;
+				i->current_settings.y = 0;
 			}
 	}
 	else
 	{
 		const Monitor *left = mode->monitor->next_left;
-		while(left && !left->current_mode)
+		while(left && !left->current_settings.mode)
 			left = left->next_left;
 
 		if(left)
 		{
-			x = left->x+mode_width(*left->current_mode, left->current_rotation);
-			y = left->y;
+			const Monitor::Settings &cs = left->current_settings;
+			x = cs.x+mode_width(*cs.mode, cs.rotation);
+			y = cs.y;
 		}
 	}
 
@@ -314,10 +313,10 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 	for(i=monitors.begin(); i!=monitors.end(); ++i)
 		if(&*i==mode->monitor)
 		{
-			i->current_mode = mode;
-			i->current_rotation = requested_rotation;
-			i->x = x;
-			i->y = y;
+			i->current_settings.mode = mode;
+			i->current_settings.rotation = requested_rotation;
+			i->current_settings.x = x;
+			i->current_settings.y = y;
 
 			x += mode_width(*mode, requested_rotation);
 			++i;
@@ -325,17 +324,17 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 		}
 
 	for(; i!=monitors.end(); ++i)
-		if(i->current_mode)
+		if(i->current_settings.mode)
 		{
 			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);
+			XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, x, y, priv->modes[i->current_settings.mode->index], rotation_to_sys(i->current_settings.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.width = i->current_settings.mode->width;
+			panning.height = i->current_settings.mode->height;
 			panning.track_left = panning.left;
 			panning.track_top = panning.top;
 			panning.track_width = panning.width;
@@ -348,10 +347,10 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 
 			XRRFreeOutputInfo(o);
 
-			i->x = x;
-			i->y = y;
+			i->current_settings.x = x;
+			i->current_settings.y = y;
 
-			x += mode_width(*i->current_mode, i->current_rotation);
+			x += mode_width(*i->current_settings.mode, i->current_settings.rotation);
 		}
 
 	XRRFreeOutputInfo(output_info);