Put Window on the correcte monitor when initially created

[libs/gui.git] / source / graphics / window.cpp

diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp
index ebdc578e14d44524f982c74e29beb2503a7c0c99..6cadf3ec9f4becb047c35033b7d70be5f919a770 100644 (file)
--- a/source/graphics/window.cpp
+++ b/source/graphics/window.cpp
@@ -9,9 +9,14 @@ namespace Msp {
 namespace Graphics {
 
 WindowOptions::WindowOptions():
+       x(0),
+       y(0),
+       user_position(false),
        width(640),
        height(480),
        fullscreen(false),
+       fullscreen_monitor(0),
+       fullscreen_exclusive(true),
        resizable(false)
 { }
 
@@ -37,9 +42,14 @@ void Window::init()
 {
        visible = false;
        kbd_autorepeat = true;
+       touch_input = false;
        resizing = false;
+       moving = false;
        priv = new Private;
 
+       if(options.fullscreen && !options.fullscreen_monitor)
+               options.fullscreen_monitor = display.get_desktop_mode().monitor;
+
        platform_init();
 
        display.add_window(*this);
@@ -67,24 +77,45 @@ void Window::reconfigure(const WindowOptions &opts)
        bool fullscreen_changed = (opts.fullscreen!=options.fullscreen);
        if(opts.width!=options.width || opts.height!=options.height)
                resizing = true;
+       if(opts.x!=options.x || opts.y!=options.y)
+               moving = true;
+
+       options = opts;
 
        if(visible)
        {
-               if(opts.fullscreen)
-                       display.set_mode(VideoMode(opts.width, opts.height));
+               if(options.fullscreen)
+                       set_fullscreen_mode();
                else if(fullscreen_changed)
                        display.restore_mode();
        }
 
-       options = opts;
        platform_reconfigure(fullscreen_changed);
 }
 
+void Window::set_fullscreen_mode()
+{
+       if(!options.fullscreen_monitor)
+               options.fullscreen_monitor = display.get_desktop_mode().monitor;
+       VideoMode mode(options.width, options.height);
+       mode.monitor = options.fullscreen_monitor;
+       mode.rotation = mode.monitor->desktop_settings.rotation;
+       if(mode.rotation==ROTATE_LEFT || mode.rotation==ROTATE_RIGHT)
+               swap(mode.width, mode.height);
+       display.set_mode(mode, options.fullscreen_exclusive);
+}
+
 void Window::set_keyboard_autorepeat(bool r)
 {
        kbd_autorepeat = r;
 }
 
+void Window::set_touch_input(bool t)
+{
+       touch_input = t;
+       platform_set_touch_input();
+}
+
 void Window::show()
 {
        platform_show();
@@ -92,7 +123,7 @@ void Window::show()
 
        if(options.fullscreen)
        {
-               display.set_mode(VideoMode(options.width, options.height), true);
+               set_fullscreen_mode();
                warp_pointer(options.width/2, options.height/2);
        }
 }