X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgbase%2Fwindow.cpp;h=3ba8d767a90e9edf5b9392bd2ef5d3d5b4f62e2d;hb=881ad898c45954f95972091554af25d775b8c2a8;hp=4a14441e9c3704507520135239ac63ae729ea14d;hpb=1238b80d08c1983dfa8914f78b294cd44b1a275b;p=libs%2Fgui.git

diff --git a/source/gbase/window.cpp b/source/gbase/window.cpp
index 4a14441..3ba8d76 100644
--- a/source/gbase/window.cpp
+++ b/source/gbase/window.cpp
@@ -85,15 +85,32 @@ void Window::reconfigure(const WindowOptions &opts)
 	options=opts;
 
 #ifdef WIN32
-	// XXX Preserve position
-	MoveWindow(window, 0, 0, options.width, options.height, false);
+	RECT rect;
+	SetRect(&rect, 0, 0, options.width, options.height);
+
+	int style=(options.fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW);
+	if(!options.resizable)
+		style&=~WS_THICKFRAME;
+	int exstyle=(options.fullscreen ? WS_EX_APPWINDOW : WS_EX_OVERLAPPEDWINDOW);
+	AdjustWindowRectEx(&rect, style, false, exstyle);
+
+	if(fullscreen_changed)
+	{
+		hide();
+		SetWindowLong(window, GWL_EXSTYLE, exstyle);
+		SetWindowLong(window, GWL_STYLE, style);
+		show();
+	}
+
+	if(options.fullscreen)
+		SetWindowPos(window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+	else
+		SetWindowPos(window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER);
 
 	(void)fullscreen_changed;
 #else
 	::Display *dpy=display.get_display();
 
-	XMoveResizeWindow(dpy, window, 0, 0, options.width, options.height);
-
 	if(fullscreen_changed)
 	{
 		hide();
@@ -103,11 +120,27 @@ void Window::reconfigure(const WindowOptions &opts)
 		show();
 	}
 
+	XSizeHints hints;
+	if(options.resizable)
+		hints.flags=0;
+	else
+	{
+		hints.flags=PMinSize|PMaxSize;
+		hints.min_width=hints.max_width=options.width;
+		hints.min_height=hints.max_height=options.height;
+	}
+	XSetWMNormalHints(dpy, window, &hints);
+
+	if(options.fullscreen)
+		XMoveResizeWindow(dpy, window, 0, 0, options.width, options.height);
+	else
+		XResizeWindow(dpy, window, options.width, options.height);
+#endif
+
 	if(options.fullscreen)
 		display.set_mode(VideoMode(options.width, options.height));
 	else if(fullscreen_changed)
 		display.restore_mode();
-#endif
 }
 
 void Window::show()
@@ -159,16 +192,18 @@ void Window::init()
 	}
 
 	RECT rect;
-	rect.left=0;
-	rect.top=0;
-	rect.right=options.width;
-	rect.bottom=options.height;
-	AdjustWindowRectEx(&rect, WS_OVERLAPPEDWINDOW, false, WS_EX_OVERLAPPEDWINDOW);
+	SetRect(&rect, 0, 0, options.width, options.height);
 
-	window=CreateWindowEx(WS_EX_OVERLAPPEDWINDOW,
+	int style=(options.fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW);
+	if(!options.resizable)
+		style&=~WS_THICKFRAME;
+	int exstyle=(options.fullscreen ? WS_EX_APPWINDOW : WS_EX_OVERLAPPEDWINDOW);
+	AdjustWindowRectEx(&rect, style, false, exstyle);
+
+	window=CreateWindowEx(exstyle,
 		"mspgbase",
 		"Window",
-		WS_OVERLAPPEDWINDOW,
+		style,
 		CW_USEDEFAULT, CW_USEDEFAULT,
 		rect.right-rect.left, rect.bottom-rect.top,
 		0,
@@ -178,6 +213,9 @@ void Window::init()
 	if(!window)
 		throw Exception("CreateWindowEx failed");
 
+	if(options.fullscreen)
+		display.set_mode(VideoMode(options.width, options.height));
+
 #else
 	::Display *dpy=display.get_display();
 
@@ -199,6 +237,15 @@ void Window::init()
 
 	XSetWMProtocols(dpy, window, &wm_delete_window, 1);
 
+	if(!options.resizable)
+	{
+		XSizeHints hints;
+		hints.flags=PMinSize|PMaxSize;
+		hints.min_width=hints.max_width=options.width;
+		hints.min_height=hints.max_height=options.height;
+		XSetWMNormalHints(dpy, window, &hints);
+	}
+
 	if(options.fullscreen)
 	{
 		display.set_mode(VideoMode(options.width, options.height));
@@ -288,6 +335,11 @@ int Window::wndproc(UINT msg, WPARAM wp, LPARAM lp)
 	case WM_MOUSEMOVE:
 		signal_pointer_motion.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp));
 		break;
+	case WM_SIZE:
+		options.width=LOWORD(lp);
+		options.height=HIWORD(lp);
+		signal_resize.emit(options.width, options.height);
+		break;
 	case WM_CLOSE:
 		signal_close.emit();
 		break;