X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindow.cpp;h=d27f41fd6fda9980cbf9192329335388e918d8c0;hb=207eec91afc6b538753ddc44905ac9ddbc907ac0;hp=d116b691c14bcbf11592bca91d9edcb647eca792;hpb=9c7ae47da64904c2aa9a9969870ca8befebe7d02;p=libs%2Fgui.git

diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp
index d116b69..d27f41f 100644
--- a/source/graphics/window.cpp
+++ b/source/graphics/window.cpp
@@ -15,6 +15,8 @@ WindowOptions::WindowOptions():
 	width(640),
 	height(480),
 	fullscreen(false),
+	fullscreen_monitor(0),
+	fullscreen_exclusive(true),
 	resizable(false)
 { }
 
@@ -75,18 +77,31 @@ void Window::reconfigure(const WindowOptions &opts)
 	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;
@@ -105,7 +120,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);
 	}
 }