X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fdisplay.cpp;h=972cc8236f25024eec7fee0167811a4aeb76814b;hb=35d4d400521d30d84c20cd1434626e131cbf9304;hp=2f276a32d5246666aeae56b722379fd46dff2d34;hpb=9bc0825e93b1385a4aaf9f90d666a1ac409ffb17;p=libs%2Fgui.git

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 2f276a3..972cc82 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -1,5 +1,5 @@
-#include <iostream>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #ifdef WITH_XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -38,6 +38,45 @@ int x_error_handler(Display *display, XErrorEvent *event)
 	return 0;
 }
 
+#ifdef WITH_XRANDR
+inline Msp::Graphics::VideoRotation rotation_from_sys(Rotation r)
+{
+	switch(r)
+	{
+	case RR_Rotate_90: return Msp::Graphics::ROTATE_RIGHT;
+	case RR_Rotate_180: return Msp::Graphics::ROTATE_INVERTED;
+	case RR_Rotate_270: return Msp::Graphics::ROTATE_LEFT;
+	default: return Msp::Graphics::ROTATE_NORMAL;
+	}
+}
+
+inline Rotation rotation_to_sys(Msp::Graphics::VideoRotation r)
+{
+	switch(r)
+	{
+	case Msp::Graphics::ROTATE_RIGHT: return RR_Rotate_90;
+	case Msp::Graphics::ROTATE_INVERTED: return RR_Rotate_180;
+	case Msp::Graphics::ROTATE_LEFT: return RR_Rotate_270;
+	default: return RR_Rotate_0;
+	}
+}
+
+inline bool monitor_x_compare(const Msp::Graphics::Monitor &m1, const Msp::Graphics::Monitor &m2)
+{
+	if(m1.desktop_settings.mode && !m2.desktop_settings.mode)
+		return true;
+	return m1.desktop_settings.x<m2.desktop_settings.x;
+}
+#endif
+
+inline unsigned mode_width(const Msp::Graphics::VideoMode &m, Msp::Graphics::VideoRotation r)
+{
+	if(r==Msp::Graphics::ROTATE_RIGHT || r==Msp::Graphics::ROTATE_LEFT)
+		return m.height;
+	else
+		return m.width;
+}
+
 }
 
 
@@ -46,7 +85,8 @@ namespace Graphics {
 
 Display::Display(const string &disp_name):
 	primary_monitor(0),
-	priv(new Private)
+	priv(new Private),
+	focus_window(0)
 {
 	if(disp_name.empty())
 		priv->display = XOpenDisplay(0);
@@ -57,6 +97,10 @@ Display::Display(const string &disp_name):
 
 	XSetErrorHandler(x_error_handler);
 
+	priv->root_window = DefaultRootWindow(priv->display);
+
+	err_dialog = new ErrorDialog(this);
+
 #ifdef WITH_XRANDR
 	int event_base;
 	int error_base;
@@ -66,9 +110,9 @@ Display::Display(const string &disp_name):
 		XRRQueryVersion(priv->display, &major, &minor);
 		if(major>1 || (major==1 && minor>=2))
 		{
-			WindowHandle root = DefaultRootWindow(priv->display);
-			XRRScreenResources *res = XRRGetScreenResources(priv->display, root);
-			RROutput primary = XRRGetOutputPrimary(priv->display, root);
+			XRRScreenResources *res = XRRGetScreenResources(priv->display, priv->root_window);
+			RROutput primary = XRRGetOutputPrimary(priv->display, priv->root_window);
+			Atom edid_prop = XInternAtom(priv->display, RR_PROPERTY_RANDR_EDID, true);
 
 			map<RRMode, XRRModeInfo *> modes_by_id;
 			for(int i=0; i<res->nmode; ++i)
@@ -82,8 +126,40 @@ Display::Display(const string &disp_name):
 				monitors.push_back(Monitor());
 				Monitor &monitor = monitors.back();
 				monitor.index = monitors.size()-1;
+				monitor.name.assign(output->name, output->nameLen);
 				priv->monitors.push_back(res->outputs[i]);
 
+				if(edid_prop)
+				{
+					Atom prop_type;
+					int prop_format;
+					unsigned long length;
+					unsigned long overflow;
+					unsigned char *edid = 0;
+					XRRGetOutputProperty(priv->display, res->outputs[i], edid_prop, 0, 32, false, false, XA_INTEGER, &prop_type, &prop_format, &length, &overflow, &edid);
+					if(prop_type==XA_INTEGER && prop_format==8)
+					{
+						for(unsigned j=0; j<4; ++j)
+						{
+							unsigned offset = 54+j*18;
+							if(edid[offset]==0 && edid[offset+1]==0 && edid[offset+3]==0xFC)
+							{
+								unsigned k;
+								for(k=0; (k<13 && edid[offset+5+k]!=0x0A); ++k) ;
+								monitor.name.assign(reinterpret_cast<char *>(edid+offset+5), k);
+							}
+						}
+					}
+					XFree(edid);
+				}
+
+				if(crtc)
+				{
+					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)
 					primary_monitor = &monitor;
 
@@ -98,8 +174,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_matching_mode(mode))
+					mode.rate = static_cast<float>(info->dotClock)/(info->hTotal*info->vTotal);
+					if(find_mode(mode, 0.01f))
 						continue;
 
 					modes.push_back(mode);
@@ -107,15 +183,44 @@ 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.desktop_settings.mode = &modes.back();
 				}
 
+				monitor.current_settings = monitor.desktop_settings;
+
 				XRRFreeOutputInfo(output);
 				if(crtc)
 					XRRFreeCrtcInfo(crtc);
 			}
 
 			XRRFreeScreenResources(res);
+
+			monitors.sort(monitor_x_compare);
+			Monitor *prev_enabled = 0;
+			for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
+				if(i->desktop_settings.mode)
+				{
+					i->next_left = prev_enabled;
+					if(prev_enabled)
+						prev_enabled->next_right = &*i;
+					prev_enabled = &*i;
+				}
+
+			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(const VideoMode *desktop_mode = i->desktop_settings.mode)
+					{
+						unsigned size = desktop_mode->width*desktop_mode->height;
+						if(size>largest)
+						{
+							largest = size;
+							primary_monitor = &*i;
+						}
+					}
+			}
 		}
 	}
 #endif
@@ -125,17 +230,21 @@ 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);
 
-	WindowHandle root = DefaultRootWindow(priv->display);
-	XRRScreenResources *res = XRRGetScreenResources(priv->display, root);
+	VideoRotation requested_rotation = requested_mode.rotation;
+	if(requested_rotation==ROTATE_ANY)
+		requested_rotation = mode->monitor->desktop_settings.rotation;
+
+	XRRScreenResources *res = XRRGetScreenResources(priv->display, priv->root_window);
 	RROutput output = priv->monitors[mode->monitor->index];
 	XRROutputInfo *output_info = XRRGetOutputInfo(priv->display, res, output);
 
@@ -164,20 +273,43 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 		}
 	}
 
+	/* Due to the semantics of find_mode, the mode's monitor pointer must point
+	to one of the elements of the monitors list, which is non-const here. */
+	Monitor *monitor = const_cast<Monitor *>(mode->monitor);
+
 	if(exclusive)
 	{
+		monitor->current_settings.mode = mode;
+		monitor->current_settings.rotation = requested_rotation;
+		monitor->current_settings.x = 0;
+		monitor->current_settings.y = 0;
+
 		// Disable other outputs for exclusive mode
-		for(unsigned i=0; i<priv->monitors.size(); ++i)
-			if(i!=mode->monitor->index)
+		for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
+			if(&*i!=mode->monitor)
 			{
-				XRROutputInfo *o = XRRGetOutputInfo(priv->display, res, priv->monitors[i]);
+				XRROutputInfo *o = XRRGetOutputInfo(priv->display, res, priv->monitors[i->index]);
 				if(o->crtc)
 					XRRSetCrtcConfig(priv->display, res, o->crtc, CurrentTime, 0, 0, 0, RR_Rotate_0, 0, 0);
 				XRRFreeOutputInfo(o);
+
+				i->current_settings.mode = 0;
+				i->current_settings.rotation = ROTATE_NORMAL;
+				i->current_settings.x = 0;
+				i->current_settings.y = 0;
 			}
 	}
+	else
+	{
+		monitor->current_settings.x = monitor->desktop_settings.x;
+		monitor->current_settings.y = monitor->desktop_settings.y;
+	}
 
-	XRRSetCrtcConfig(priv->display, res, crtc, CurrentTime, 0, 0, priv->modes[mode->index], RR_Rotate_0, &output, 1);
+	RRMode mode_id = priv->modes[mode->index];
+	int x = monitor->current_settings.x;
+	int y = monitor->current_settings.y;
+	Rotation sys_rot = rotation_to_sys(requested_rotation);
+	XRRSetCrtcConfig(priv->display, res, crtc, CurrentTime, x, y, mode_id, sys_rot, &output, 1);
 
 	XRRFreeOutputInfo(output_info);
 	XRRFreeCrtcInfo(crtc_info);