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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index c5cdc62..8d7a342 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -1,3 +1,4 @@
+#define _WIN32_WINNT 0x0601
 #include <windowsx.h>
 #include <msp/core/application.h>
 #include <msp/core/systemerror.h>
@@ -22,6 +23,7 @@ LRESULT CALLBACK wndproc_(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 		ev.msg = msg;
 		ev.wparam = wparam;
 		ev.lparam = lparam;
+		ev.extra = GetMessageExtraInfo();
 		if(wnd && wnd->event(ev))
 			return 0;
 	}
@@ -74,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,
@@ -116,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);
 }
@@ -129,6 +134,21 @@ void Window::warp_pointer(int, int)
 {
 }
 
+void Window::platform_set_touch_input()
+{
+	WORD winver = LOWORD(GetVersion);
+	if(winver<_WIN32_WINNT)
+	{
+		touch_input = false;
+		throw runtime_error("no touch support");
+	}
+
+	if(touch_input)
+		RegisterTouchWindow(priv->window, 3);  // TWF_FINETOUCH|TWF_WANTPALM
+	else
+		UnregisterTouchWindow(priv->window);
+}
+
 void Window::platform_show()
 {
 	ShowWindow(priv->window, SW_SHOWNORMAL);
@@ -145,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:
@@ -153,16 +174,33 @@ bool Window::event(const Event &evnt)
 	case WM_RBUTTONUP:
 	case WM_MOUSEWHEEL:
 	case WM_MOUSEMOVE:
+	case WM_TOUCHMOVE:
 		signal_input_event.emit(evnt);
 		break;
 	case WM_SIZE:
 		options.width = LOWORD(evnt.lparam);
 		options.height = HIWORD(evnt.lparam);
+		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;
 	}