X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Fgraphics%2Fx11%2Fwindow.cpp;h=07ff75588c824ad17ab1cdd22b09572a7cd279de;hp=7513d3ffb14ebb958efe5e7d9b33a9f65e0482e4;hb=95480fceabec2dd6354b87a200b4a219b39d4f0a;hpb=35d4d400521d30d84c20cd1434626e131cbf9304

diff --git a/source/graphics/x11/window.cpp b/source/graphics/x11/window.cpp
index 7513d3f..07ff755 100644
--- a/source/graphics/x11/window.cpp
+++ b/source/graphics/x11/window.cpp
@@ -111,7 +111,15 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 	XSetWMNormalHints(dpy, priv->window, &hints);
 
 	if(options.fullscreen)
-		XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height);
+	{
+		if(options.fullscreen_exclusive)
+			XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height);
+		else
+		{
+			const Monitor::Settings &ms = options.fullscreen_monitor->current_settings;
+			XMoveResizeWindow(dpy, priv->window, ms.x, ms.y, options.width, options.height);
+		}
+	}
 	else if(options.user_position)
 		XMoveResizeWindow(dpy, priv->window, options.x, options.y, options.width, options.height);
 	else
@@ -244,7 +252,7 @@ bool Window::event(const Event &evnt)
 			XSetInputFocus(display.get_private().display, priv->window, RevertToParent, CurrentTime);
 		break;
 	case MapNotify:
-		if(options.fullscreen)
+		if(options.fullscreen && options.fullscreen_exclusive)
 			XGrabPointer(display.get_private().display, priv->window, true, None, GrabModeAsync, GrabModeAsync, priv->window, None, CurrentTime);
 		break;
 	case Expose: