X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindows%2Fwindow.cpp;h=8d7a342621635dd3e3c738abad67939ddf5c8ac0;hb=9c7ae47da64904c2aa9a9969870ca8befebe7d02;hp=2af6b83917e153664f8f82220ba56f0849f7e802;hpb=1d7113259625a91f5f6d2f53365aad22ae744689;p=libs%2Fgui.git

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 2af6b83..8d7a342 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -76,7 +76,8 @@ void Window::platform_init()
 		"mspgui",
 		"Window",
 		style,
-		CW_USEDEFAULT, CW_USEDEFAULT,
+		(options.user_position ? options.x : CW_USEDEFAULT),
+		(options.user_position ? options.y : CW_USEDEFAULT),
 		rect.right-rect.left, rect.bottom-rect.top,
 		0,
 		0,
@@ -118,6 +119,8 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 
 	if(options.fullscreen)
 		SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+	else if(options.user_position)
+		SetWindowPos(priv->window, 0, options.x, options.y, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
 	else
 		SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER);
 }
@@ -162,6 +165,7 @@ bool Window::event(const Event &evnt)
 	{
 	case WM_KEYDOWN:
 	case WM_KEYUP:
+	case WM_CHAR:
 	case WM_LBUTTONDOWN:
 	case WM_LBUTTONUP:
 	case WM_MBUTTONDOWN:
@@ -179,9 +183,24 @@ bool Window::event(const Event &evnt)
 		resizing = false;
 		signal_resize.emit(options.width, options.height);
 		break;
+	case WM_MOVE:
+		options.x = static_cast<short>(LOWORD(evnt.lparam));
+		options.y = static_cast<short>(HIWORD(evnt.lparam));
+		moving = false;
+		signal_move.emit(options.x, options.y);
+		break;
 	case WM_CLOSE:
 		signal_close.emit();
 		break;
+	case WM_PAINT:
+		{
+			RECT update_rect;
+			GetUpdateRect(priv->window, &update_rect, false);
+			unsigned width = update_rect.right-update_rect.left;
+			unsigned height = update_rect.bottom-update_rect.top;
+			signal_expose.emit(update_rect.left, update_rect.top, width, height, evnt);
+		}
+		break;
 	default:
 		return false;
 	}