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

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 6f677c3..c23f46d 100644
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 #include <X11/Xlib.h>
 #ifdef WITH_XRANDR
 #include <X11/extensions/Xrandr.h>
@@ -38,6 +37,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 +60,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)
 {
@@ -83,7 +84,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);
@@ -94,6 +96,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;
@@ -103,9 +109,8 @@ 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);
 
 			map<RRMode, XRRModeInfo *> modes_by_id;
 			for(int i=0; i<res->nmode; ++i)
@@ -119,6 +124,7 @@ 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(crtc)
@@ -143,8 +149,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);
@@ -200,12 +206,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);
 
@@ -213,8 +220,7 @@ void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
 	if(requested_rotation==ROTATE_ANY)
 		requested_rotation = mode->monitor->desktop_rotation;
 
-	WindowHandle root = DefaultRootWindow(priv->display);
-	XRRScreenResources *res = XRRGetScreenResources(priv->display, root);
+	XRRScreenResources *res = XRRGetScreenResources(priv->display, priv->root_window);
 	RROutput output = priv->monitors[mode->monitor->index];
 	XRROutputInfo *output_info = XRRGetOutputInfo(priv->display, res, output);
 
@@ -297,6 +303,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;