-#include <iostream>
#include <X11/Xlib.h>
#ifdef WITH_XRANDR
#include <X11/extensions/Xrandr.h>
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);
XSetErrorHandler(x_error_handler);
+ priv->root_window = DefaultRootWindow(priv->display);
+
err_dialog = new ErrorDialog(this);
#ifdef WITH_XRANDR
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)
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)
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))
+ mode.rate = static_cast<float>(info->dotClock)/(info->hTotal*info->vTotal);
+ if(find_mode(mode, 0.01f))
continue;
modes.push_back(mode);
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);