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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 8d7a342..a92281d 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -1,9 +1,9 @@
 #define _WIN32_WINNT 0x0601
+#include "window.h"
+#include "window_private.h"
 #include <windowsx.h>
 #include <msp/core/application.h>
 #include <msp/core/systemerror.h>
-#include "window.h"
-#include "window_private.h"
 
 using namespace std;
 
@@ -14,11 +14,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;
@@ -85,6 +85,9 @@ void Window::platform_init()
 		this);
 	if(!priv->window)
 		throw system_error("CreateWindowEx");
+
+	priv->cursor_in_client_area = false;
+	priv->cursor_visible = true;
 }
 
 void Window::platform_cleanup()
@@ -111,10 +114,13 @@ 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)
@@ -127,7 +133,9 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 
 void Window::show_cursor(bool s)
 {
-	ShowCursor(s);
+	priv->cursor_visible = s;
+	if(priv->cursor_in_client_area && !s)
+		SetCursor(NULL);
 }
 
 void Window::warp_pointer(int, int)
@@ -166,6 +174,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:
@@ -174,7 +185,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:
@@ -199,8 +210,25 @@ bool Window::event(const Event &evnt)
 			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(NULL);
+		else
+			return false;
+		break;
 	default:
 		return false;
 	}