Track the currently focused window in Display

[libs/gui.git] / source / graphics / x11 / display.cpp

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 50c6d57a706ee707f24085754c87eebb3672a016..c23f46d26a21417cb14483c562401f3bbe7d9575 100644 (file)
--- 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>
@@ -85,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);
@@ -96,6 +96,8 @@ Display::Display(const string &disp_name):
 
        XSetErrorHandler(x_error_handler);
 
+       priv->root_window = DefaultRootWindow(priv->display);
+
        err_dialog = new ErrorDialog(this);
 
 #ifdef WITH_XRANDR
@@ -107,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)
@@ -123,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)
@@ -148,7 +150,7 @@ Display::Display(const string &disp_name):
                                        mode.index = modes.size();
                                        mode.monitor = &monitor;
                                        mode.rate = static_cast<float>(info->dotClock)/(info->hTotal*info->vTotal);
-                                       if(find_mode(mode))
+                                       if(find_mode(mode, 0.01f))
                                                continue;
 
                                        modes.push_back(mode);
@@ -218,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);