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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index e998950..2af6b83 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;
 	}
@@ -129,6 +131,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);
@@ -153,6 +170,7 @@ 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: