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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 8d7a342..3f564de 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -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()
@@ -127,7 +130,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)
@@ -174,7 +179,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 +204,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;
 	}