#include <iostream>
#include <X11/Xlib.h>
-#ifdef WITH_XF86VIDMODE
-#include <X11/extensions/xf86vmode.h>
+#ifdef WITH_XRANDR
+#include <X11/extensions/Xrandr.h>
#endif
+#include <msp/io/print.h>
#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
#include "display.h"
string msg = Msp::format("Request %s failed with %s [%08X]", req, err, event->resourceid);
if(error_flag)
- cerr<<"Discarding error: "<<msg<<'\n';
+ Msp::IO::print(Msp::IO::cerr, "Discarding error: %s\n", msg);
else
{
- cerr<<msg<<'\n';
+ Msp::IO::print(Msp::IO::cerr, "%s\n", msg);
error_msg = msg;
error_flag = true;
}
return 0;
}
+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;
+ }
+}
+
+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;
+}
+
+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;
+}
+
}
namespace Graphics {
Display::Display(const string &disp_name):
+ primary_monitor(0),
priv(new Private)
{
if(disp_name.empty())
XSetErrorHandler(x_error_handler);
-#ifdef WITH_XF86VIDMODE
- int screen = DefaultScreen(priv->display);
+ err_dialog = new ErrorDialog(this);
- int nmodes;
- XF86VidModeModeInfo **infos;
- XF86VidModeGetAllModeLines(priv->display, screen, &nmodes, &infos);
- for(int i=0; i<nmodes; ++i)
+#ifdef WITH_XRANDR
+ int event_base;
+ int error_base;
+ if(XRRQueryExtension(priv->display, &event_base, &error_base))
{
- XF86VidModeModeInfo &info = *infos[i];
-
- VideoMode mode(info.hdisplay, info.vdisplay);
- if(info.htotal && info.vtotal)
- mode.rate = info.dotclock/(info.htotal*info.vtotal);
- modes.push_back(mode);
- }
+ int major, minor;
+ 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);
- XFree(infos);
+ map<RRMode, XRRModeInfo *> modes_by_id;
+ for(int i=0; i<res->nmode; ++i)
+ modes_by_id[res->modes[i].id] = &res->modes[i];
+
+ for(int i=0; i<res->noutput; ++i)
+ {
+ XRROutputInfo *output = XRRGetOutputInfo(priv->display, res, res->outputs[i]);
+ XRRCrtcInfo *crtc = (output->crtc ? XRRGetCrtcInfo(priv->display, res, output->crtc) : 0);
- XF86VidModeModeLine modeline;
- int dotclock;
- XF86VidModeGetModeLine(priv->display, screen, &dotclock, &modeline);
- orig_mode = VideoMode(modeline.hdisplay, modeline.vdisplay);
- if(modeline.htotal && modeline.vtotal)
- orig_mode.rate = dotclock/(modeline.htotal*modeline.vtotal);
+ monitors.push_back(Monitor());
+ Monitor &monitor = monitors.back();
+ monitor.index = monitors.size()-1;
+ priv->monitors.push_back(res->outputs[i]);
+
+ if(crtc)
+ {
+ monitor.desktop_rotation = rotation_from_sys(crtc->rotation);
+ monitor.current_rotation = monitor.desktop_rotation;
+ monitor.x = crtc->x;
+ monitor.y = crtc->y;
+ }
+
+ if(res->outputs[i]==primary)
+ primary_monitor = &monitor;
+
+ for(int j=0; j<output->nmode; ++j)
+ {
+ map<RRMode, XRRModeInfo *>::iterator k = modes_by_id.find(output->modes[j]);
+ if(k==modes_by_id.end())
+ continue;
+
+ XRRModeInfo *info = k->second;
+
+ VideoMode mode(info->width, info->height);
+ mode.index = modes.size();
+ mode.monitor = &monitor;
+ mode.rate = info->dotClock/(info->hTotal*info->vTotal);
+ if(find_mode(mode))
+ continue;
+
+ modes.push_back(mode);
+ priv->modes.push_back(info->id);
+ monitor.video_modes.push_back(&modes.back());
+
+ if(crtc && info->id==crtc->mode)
+ {
+ monitor.desktop_mode = &modes.back();
+ monitor.current_mode = monitor.desktop_mode;
+ }
+ }
+
+ 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_mode)
+ {
+ i->next_left = prev_enabled;
+ if(prev_enabled)
+ 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
}
{
XCloseDisplay(priv->display);
delete priv;
+ delete err_dialog;
}
-void Display::set_mode(const VideoMode &mode)
+void Display::set_mode(const VideoMode &requested_mode, bool exclusive)
{
-#ifdef WITH_XF86VIDMODE
- int screen = DefaultScreen(priv->display);
+#ifdef WITH_XRANDR
+ const VideoMode *mode = find_mode(requested_mode);
+ if(!mode)
+ throw unsupported_video_mode(requested_mode);
+
+ VideoRotation requested_rotation = requested_mode.rotation;
+ if(requested_rotation==ROTATE_ANY)
+ requested_rotation = mode->monitor->desktop_rotation;
+
+ WindowHandle root = DefaultRootWindow(priv->display);
+ XRRScreenResources *res = XRRGetScreenResources(priv->display, root);
+ RROutput output = priv->monitors[mode->monitor->index];
+ XRROutputInfo *output_info = XRRGetOutputInfo(priv->display, res, output);
+
+ // Check if the output already has a CRTC and find a free one if it doesn't
+ RRCrtc crtc = output_info->crtc;
+ XRRCrtcInfo *crtc_info = 0;
+ if(crtc)
+ crtc_info = XRRGetCrtcInfo(priv->display, res, crtc);
+ else
+ {
+ for(int i=0; i<res->ncrtc; ++i)
+ {
+ crtc_info = XRRGetCrtcInfo(priv->display, res, res->crtcs[i]);
+ if(!crtc_info->noutput)
+ {
+ crtc = res->crtcs[i];
+ break;
+ }
+ XRRFreeCrtcInfo(crtc_info);
+ }
+
+ if(!crtc)
+ {
+ XRRFreeOutputInfo(output_info);
+ throw unsupported_video_mode(requested_mode);
+ }
+ }
+
+ int x = 0;
+ int y = 0;
+
+ if(exclusive)
+ {
+ // Disable other outputs for exclusive mode
+ for(list<Monitor>::iterator i=monitors.begin(); i!=monitors.end(); ++i)
+ if(&*i!=mode->monitor)
+ {
+ 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);
- int nmodes;
- XF86VidModeModeInfo **infos;
- XF86VidModeGetAllModeLines(priv->display, screen, &nmodes, &infos);
- for(int i=0; i<nmodes; ++i)
+ i->current_mode = 0;
+ i->current_rotation = ROTATE_NORMAL;
+ i->x = 0;
+ i->y = 0;
+ }
+ }
+ else
{
- XF86VidModeModeInfo &info = *infos[i];
+ const Monitor *left = mode->monitor->next_left;
+ while(left && !left->current_mode)
+ left = left->next_left;
- unsigned rate = 0;
- if(info.htotal && info.vtotal)
- rate = info.dotclock/(info.htotal*info.vtotal);
- if(info.hdisplay==mode.width && info.vdisplay==mode.height && (mode.rate==0 || rate==mode.rate))
+ if(left)
{
- XF86VidModeSwitchToMode(priv->display, screen, &info);
- XF86VidModeSetViewPort(priv->display, screen, 0, 0);
- return;
+ x = left->x+mode_width(*left->current_mode, left->current_rotation);
+ y = left->y;
}
}
- throw unsupported_video_mode(mode);
+ XRRSetCrtcConfig(priv->display, res, crtc, CurrentTime, x, y, priv->modes[mode->index], rotation_to_sys(requested_rotation), &output, 1);
+
+ list<Monitor>::iterator i;
+ 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;
+
+ x += mode_width(*mode, requested_rotation);
+ ++i;
+ break;
+ }
+
+ for(; i!=monitors.end(); ++i)
+ if(i->current_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);
+
+ 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;
+ i->y = y;
+
+ x += mode_width(*i->current_mode, i->current_rotation);
+ }
+
+ XRRFreeOutputInfo(output_info);
+ XRRFreeCrtcInfo(crtc_info);
+ XRRFreeScreenResources(res);
#else
- (void)mode;
- throw runtime_error("no xf86vidmode support");
+ (void)requested_mode;
+ (void)exclusive;
+ throw runtime_error("no xrandr support");
#endif
}
projects / libs / gui.git / blobdiff