X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindows%2Fwindow.cpp;h=0e3365393e653ebdf829be465d6efb30d57ee169;hb=HEAD;hp=2d4d75bead21b6a3f5b6e8208c454379479adcad;hpb=f438f4d467fa96e1b484f70e25dc1d6389170393;p=libs%2Fgui.git

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 2d4d75b..0e33653 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -1,9 +1,10 @@
-#define _WIN32_WINNT 0x0601
+#define _WIN32_WINNT 0x0601  // Windows 7
+#include "window.h"
+#include "window_private.h"
 #include <windowsx.h>
+#include <versionhelpers.h>
 #include <msp/core/application.h>
 #include <msp/core/systemerror.h>
-#include "window.h"
-#include "window_private.h"
 
 using namespace std;
 
@@ -14,11 +15,11 @@ LRESULT CALLBACK wndproc_(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 	if(msg==WM_CREATE)
 	{
 		CREATESTRUCT *cs = reinterpret_cast<CREATESTRUCT *>(lparam);
-		SetWindowLong(hwnd, 0, reinterpret_cast<LONG>(cs->lpCreateParams));
+		SetWindowLongPtr(hwnd, 0, reinterpret_cast<LONG_PTR>(cs->lpCreateParams));
 	}
 	else
 	{
-		Msp::Graphics::Window *wnd = reinterpret_cast<Msp::Graphics::Window *>(GetWindowLong(hwnd, 0));
+		Msp::Graphics::Window *wnd = reinterpret_cast<Msp::Graphics::Window *>(GetWindowLongPtr(hwnd, 0));
 		Msp::Graphics::Window::Event ev;
 		ev.msg = msg;
 		ev.wparam = wparam;
@@ -50,12 +51,12 @@ void Window::platform_init()
 		wndcl.cbClsExtra = 0;
 		wndcl.cbWndExtra = sizeof(Window *);
 		wndcl.hInstance = reinterpret_cast<HINSTANCE>(Application::get_data());
-		wndcl.hIcon = 0;
-		wndcl.hCursor = LoadCursor(0, IDC_ARROW);
-		wndcl.hbrBackground = 0;
-		wndcl.lpszMenuName = 0;
+		wndcl.hIcon = nullptr;
+		wndcl.hCursor = LoadCursor(nullptr, IDC_ARROW);
+		wndcl.hbrBackground = nullptr;
+		wndcl.lpszMenuName = nullptr;
 		wndcl.lpszClassName = "mspgui";
-		wndcl.hIconSm = 0;
+		wndcl.hIconSm = nullptr;
 
 		if(!RegisterClassEx(&wndcl))
 			throw system_error("RegisterClassEx");
@@ -76,7 +77,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,
@@ -110,21 +112,28 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 
 	if(fullscreen_changed)
 	{
-		hide();
-		SetWindowLong(priv->window, GWL_EXSTYLE, exstyle);
-		SetWindowLong(priv->window, GWL_STYLE, style);
-		show();
+		bool was_visible = visible;
+		if(was_visible)
+			hide();
+		SetWindowLongPtr(priv->window, GWL_EXSTYLE, exstyle);
+		SetWindowLongPtr(priv->window, GWL_STYLE, style);
+		if(was_visible)
+			show();
 	}
 
 	if(options.fullscreen)
-		SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+		SetWindowPos(priv->window, nullptr, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+	else if(options.user_position)
+		SetWindowPos(priv->window, nullptr, 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);
+		SetWindowPos(priv->window, nullptr, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER);
 }
 
 void Window::show_cursor(bool s)
 {
-	ShowCursor(s);
+	priv->cursor_visible = s;
+	if(priv->cursor_in_client_area && !s)
+		SetCursor(nullptr);
 }
 
 void Window::warp_pointer(int, int)
@@ -133,8 +142,7 @@ void Window::warp_pointer(int, int)
 
 void Window::platform_set_touch_input()
 {
-	WORD winver = LOWORD(GetVersion);
-	if(winver<_WIN32_WINNT)
+	if(!IsWindows7OrGreater())
 	{
 		touch_input = false;
 		throw runtime_error("no touch support");
@@ -163,6 +171,9 @@ bool Window::event(const Event &evnt)
 	case WM_KEYDOWN:
 	case WM_KEYUP:
 	case WM_CHAR:
+	case WM_SYSKEYDOWN:
+	case WM_SYSKEYUP:
+	case WM_SYSCHAR:
 	case WM_LBUTTONDOWN:
 	case WM_LBUTTONUP:
 	case WM_MBUTTONDOWN:
@@ -171,7 +182,7 @@ bool Window::event(const Event &evnt)
 	case WM_RBUTTONUP:
 	case WM_MOUSEWHEEL:
 	case WM_MOUSEMOVE:
-	case WM_TOUCHMOVE:
+	case WM_TOUCH:
 		signal_input_event.emit(evnt);
 		break;
 	case WM_SIZE:
@@ -180,9 +191,41 @@ 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);
+
+			PAINTSTRUCT paint;
+			if(BeginPaint(priv->window, &paint))
+				EndPaint(priv->window, &paint);
+		}
+		break;
+	case WM_SETFOCUS:
+		signal_got_focus.emit();
+		break;
+	case WM_KILLFOCUS:
+		signal_lost_focus.emit();
+		break;
+	case WM_SETCURSOR:
+		priv->cursor_in_client_area = (LOWORD(evnt.lparam)==HTCLIENT);
+		if(priv->cursor_in_client_area && !priv->cursor_visible)
+			SetCursor(nullptr);
+		else
+			return false;
+		break;
 	default:
 		return false;
 	}