Track the currently focused window in Display

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

diff --git a/source/graphics/windows/display.cpp b/source/graphics/windows/display.cpp
index 7b616662ae9e06585c874f4e36c24af027d3f808..d767bebd2e8ea11e67ddfd8a442f22ad1c539522 100644 (file)
--- a/source/graphics/windows/display.cpp
+++ b/source/graphics/windows/display.cpp
@@ -9,7 +9,8 @@ namespace Graphics {
 
 Display::Display(const string &):
        primary_monitor(0),
-       priv(new Private)
+       priv(new Private),
+       focus_window(0)
 {
        static ErrorDialog err_dlg(0);
 
@@ -26,6 +27,7 @@ Display::Display(const string &):
                monitors.push_back(Monitor());
                Monitor &monitor = monitors.back();
                monitor.index = monitors.size()-1;
+               monitor.name = adapter_dev.DeviceString;
                priv->monitors.push_back(adapter_dev.DeviceName);
 
                if(adapter_dev.StateFlags&DISPLAY_DEVICE_PRIMARY_DEVICE)
@@ -44,7 +46,7 @@ Display::Display(const string &):
                        mode.index = modes.size();
                        mode.monitor = &monitor;
                        mode.rate = info.dmDisplayFrequency;
-                       if(find_matching_mode(mode))
+                       if(find_mode(mode))
                                continue;
 
                        modes.push_back(mode);
@@ -62,12 +64,16 @@ Display::~Display()
 
 void Display::set_mode(const VideoMode &requested_mode, bool)
 {
-       const VideoMode *mode = find_matching_mode(requested_mode);
+       const VideoMode *mode = find_mode(requested_mode);
        if(!mode)
                throw unsupported_video_mode(requested_mode);
 
        DEVMODE info;
+       info.dmDeviceName[0] = 0;
+       info.dmSpecVersion = DM_SPECVERSION;
+       info.dmDriverVersion = 0;
        info.dmSize = sizeof(DEVMODE);
+       info.dmDriverExtra = 0;
        info.dmFields = DM_PELSWIDTH|DM_PELSHEIGHT;
        info.dmPelsWidth = mode->width;
        info.dmPelsHeight = mode->height;
@@ -91,6 +97,7 @@ bool Display::process_events()
        MSG msg;
        if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
        {
+               TranslateMessage(&msg);
                DispatchMessage(&msg);
                return true;
        }