Fix Windows version check for touch input

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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index c07fbae671bd511693ca249b92f5307253cbce22..0e3365393e653ebdf829be465d6efb30d57ee169 100644 (file)
--- 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");
@@ -85,9 +86,6 @@ 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()
@@ -117,25 +115,25 @@ void Window::platform_reconfigure(bool fullscreen_changed)
                bool was_visible = visible;
                if(was_visible)
                        hide();
-               SetWindowLong(priv->window, GWL_EXSTYLE, exstyle);
-               SetWindowLong(priv->window, GWL_STYLE, style);
+               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, 0, options.x, options.y, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+               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)
 {
        priv->cursor_visible = s;
        if(priv->cursor_in_client_area && !s)
-               SetCursor(NULL);
+               SetCursor(nullptr);
 }
 
 void Window::warp_pointer(int, int)
@@ -144,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");
@@ -174,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:
@@ -222,7 +222,7 @@ bool Window::event(const Event &evnt)
        case WM_SETCURSOR:
                priv->cursor_in_client_area = (LOWORD(evnt.lparam)==HTCLIENT);
                if(priv->cursor_in_client_area && !priv->cursor_visible)
-                       SetCursor(NULL);
+                       SetCursor(nullptr);
                else
                        return false;
                break;