Improve cursor hiding logic on Windows

[libs/gui.git] / source / graphics / windows / window.cpp

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 2af6b83917e153664f8f82220ba56f0849f7e802..3f564dec68ef5a28221bd8c20691f0e37370f7f8 100644 (file)
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -76,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,
@@ -84,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()
@@ -118,13 +122,17 @@ 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);
 }
 
 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)
@@ -162,6 +170,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:
@@ -170,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:
@@ -179,9 +188,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(NULL);
+               else
+                       return false;
+               break;
        default:
                return false;
        }