Merge ae04c86c42 into 6c421f131d

.gitignore

@@ -82,3 +82,4 @@ tests/title
 tests/vulkan
 tests/windows
 
+/build

include/GLFW/glfw3.h

@@ -1318,6 +1318,24 @@ typedef void (* GLFWwindowcontentscalefun)(GLFWwindow*,float,float);
  */
 typedef void (* GLFWmousebuttonfun)(GLFWwindow*,int,int,int);
 
+/*! @brief The function signature for pen callbacks.
+*
+*  This is the function signature for pen callback functions.
+*
+*  @param[in] window The window that received the event.
+*  @param[in] pressure The [pen pressure](@ref pressure) that was pressed or
+*  released.
+*  @param[in] the x (horizontal point) coordinate of the point location of the pen.
+*  @param[in] the y (vertical point) coordinate of the point location of the pen.
+*  *
+*  @sa @ref input_pen_pressure
+*  @sa @ref glfwSetPenPressureCallback
+*
+*  @ingroup input
+*/
+
+typedef void(*GLFWpenpressurefun)(GLFWwindow*, double, int, int);
+
 /*! @brief The function signature for cursor position callbacks.
  *
  *  This is the function signature for cursor position callback functions.
@@ -1390,6 +1408,7 @@ typedef void (* GLFWscrollfun)(GLFWwindow*,double,double);
  *
  *  @ingroup input
  */
+
 typedef void (* GLFWkeyfun)(GLFWwindow*,int,int,int,int);
 
 /*! @brief The function signature for Unicode character callbacks.
@@ -4014,7 +4033,32 @@ GLFWAPI int glfwGetKey(GLFWwindow* window, int key);
  *
  *  @ingroup input
  */
-GLFWAPI int glfwGetMouseButton(GLFWwindow* window, int button);
+GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button);
+
+/*! @brief Returns the last reported state of a pen button for the specified
+*  window.
+*
+*  This function returns the last state reported for the specified pen button
+*  to the specified window.  The returned state is one of `GLFW_PRESS` or
+*  `GLFW_RELEASE`.
+*
+*  @param[in] window The desired window.
+*  @param[in] button The desired [pen button](@ref pen buttons).
+*  @return One of `GLFW_PRESS` or `GLFW_RELEASE`.
+*
+*  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
+*  GLFW_INVALID_ENUM.
+*
+*  @thread_safety This function must only be called from the main thread.
+*
+*  @sa @ref input_pen_button
+*
+*  @since Added in version 1.0.
+*  @glfw3 Added window handle parameter.
+*
+*  @ingroup input
+*/
+GLFWAPI double glfwGetPenPressure(GLFWwindow* handle);
 
 /*! @brief Retrieves the position of the cursor relative to the client area of
  *  the window.
@@ -4354,6 +4398,27 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmods
  *  @ingroup input
  */
 GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* window, GLFWmousebuttonfun cbfun);
+/*! @brief Sets the pen callback.
+*
+*  This function sets the pen callback of the specified window, which
+*  is called when a pen is pressed or released.
+**
+*  @param[in] window The window whose callback to set.
+*  @param[in] cbfun The new callback, or `NULL` to remove the currently set
+*  callback.
+*  @return The previously set callback, or `NULL` if no callback was set or the
+*  library had not been [initialized](@ref intro_init).
+*
+*  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
+*
+*  @thread_safety This function must only be called from the main thread.
+*
+*  @sa @ref input_pen_pressure
+*
+*
+*  @ingroup input
+*/
+GLFWAPI GLFWpenpressurefun glfwSetPenPressureCallback(GLFWwindow* window, GLFWpenpressurefun cbfun);
 
 /*! @brief Sets the cursor position callback.
  *

src/input.c

@@ -293,6 +293,16 @@ void _glfwInputMouseClick(_GLFWwindow* window, int button, int action, int mods)
         window->callbacks.mouseButton((GLFWwindow*) window, button, action, mods);
 }
 
+void _glfwInputPenPressure(_GLFWwindow* window, double pressure, int x, int y)
+{
+    window->penPressure = pressure;
+    window->penXposition = x;
+    window->penYposition = y;
+
+    if (window->callbacks.penPressure)
+        window->callbacks.penPressure((GLFWwindow*)window, pressure, x, y);
+}
+
 void _glfwInputCursorPos(_GLFWwindow* window, double xpos, double ypos)
 {
     if (window->virtualCursorPosX == xpos && window->virtualCursorPosY == ypos)
@@ -578,6 +588,19 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button)
     return (int) window->mouseButtons[button];
 }
 
+
+/***************************PEN**************************************************/
+GLFWAPI double glfwGetPenPressure(GLFWwindow* handle)
+{
+    _GLFWwindow* window = (_GLFWwindow*)handle;
+    assert(window != NULL);
+
+    _GLFW_REQUIRE_INIT_OR_RETURN(0);
+
+    return window->penPressure;
+}
+/**************************PEN***************************************************/
+
 GLFWAPI void glfwGetCursorPos(GLFWwindow* handle, double* xpos, double* ypos)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
@@ -773,6 +796,17 @@ GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* handle,
     return cbfun;
 }
 
+GLFWAPI GLFWpenpressurefun glfwSetPenPressureCallback(GLFWwindow* handle,
+    GLFWpenpressurefun cbfun)
+{
+    _GLFWwindow* window = (_GLFWwindow*)handle;
+    assert(window != NULL);
+
+    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
+    _GLFW_SWAP_POINTERS(window->callbacks.penPressure, cbfun);
+    return cbfun;
+}
+
 GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* handle,
                                                   GLFWcursorposfun cbfun)
 {

src/internal.h

@@ -419,7 +419,13 @@ struct _GLFWwindow
 
     GLFWbool            stickyKeys;
     GLFWbool            stickyMouseButtons;
+
+    double              penPressure;
+    int                 penXposition;
+    int                 penYposition;
+
     GLFWbool            lockKeyMods;
+
     int                 cursorMode;
     char                mouseButtons[GLFW_MOUSE_BUTTON_LAST + 1];
     char                keys[GLFW_KEY_LAST + 1];
@@ -439,6 +445,7 @@ struct _GLFWwindow
         GLFWframebuffersizefun  fbsize;
         GLFWwindowcontentscalefun scale;
         GLFWmousebuttonfun      mouseButton;
+        GLFWpenpressurefun      penPressure;
         GLFWcursorposfun        cursorPos;
         GLFWcursorenterfun      cursorEnter;
         GLFWscrollfun           scroll;
@@ -835,6 +842,15 @@ void _glfwInputScroll(_GLFWwindow* window, double xoffset, double yoffset);
  */
 void _glfwInputMouseClick(_GLFWwindow* window, int button, int action, int mods);
 
+/*! @brief Notifies shared code of a pen click event.
+*  @param[in] window The window that received the event.
+*  @param[in] pressure when the pen was pressed.
+*  @param[in] x (horizontal point) coordinate of the point location of the pen.
+*  @param[in] y (vertical point) coordinate of the point location of the pen.
+*  @ingroup event
+*/
+void _glfwInputPenPressure(_GLFWwindow* window, double pressure, int x, int y);
+
 /*! @brief Notifies shared code of a cursor motion event.
  *  @param[in] window The window that received the event.
  *  @param[in] xpos The new x-coordinate of the cursor, relative to the left

src/win32_platform.h

@@ -104,6 +104,89 @@
  #define _WIN32_WINNT_WINBLUE 0x0602
 #endif
 
+#if WINVER < 0x0604
+#define WM_POINTERUPDATE                0x0245
+#define WM_POINTERDOWN                  0x0246
+#define WM_POINTERUP                    0x0247
+#define POINTER_MESSAGE_FLAG_INCONTACT          0x00000004 // Pointer is in contact
+
+#define GET_POINTERID_WPARAM(wParam)                (LOWORD(wParam))
+#define IS_POINTER_INCONTACT_WPARAM(wParam)         IS_POINTER_FLAG_SET_WPARAM(wParam, POINTER_MESSAGE_FLAG_INCONTACT)
+#define IS_POINTER_FLAG_SET_WPARAM(wParam, flag)    (((DWORD)HIWORD(wParam) & (flag)) == (flag))
+
+typedef enum
+{
+    POINTER_CHANGE_NONE,
+    POINTER_CHANGE_FIRSTBUTTON_DOWN,
+    POINTER_CHANGE_FIRSTBUTTON_UP,
+    POINTER_CHANGE_SECONDBUTTON_DOWN,
+    POINTER_CHANGE_SECONDBUTTON_UP,
+    POINTER_CHANGE_THIRDBUTTON_DOWN,
+    POINTER_CHANGE_THIRDBUTTON_UP,
+    POINTER_CHANGE_FOURTHBUTTON_DOWN,
+    POINTER_CHANGE_FOURTHBUTTON_UP,
+    POINTER_CHANGE_FIFTHBUTTON_DOWN,
+    POINTER_CHANGE_FIFTHBUTTON_UP,
+} POINTER_BUTTON_CHANGE_TYPE;
+
+typedef struct
+{
+    DWORD           pointerType;
+    UINT32          pointerId;
+    UINT32          frameId;
+    UINT32          pointerFlags;
+    HANDLE          sourceDevice;
+    HWND            hwndTarget;
+    POINT           ptPixelLocation;
+    POINT           ptHimetricLocation;
+    POINT           ptPixelLocationRaw;
+    POINT           ptHimetricLocationRaw;
+    DWORD           dwTime;
+    UINT32          historyCount;
+    INT32           InputData;
+    DWORD           dwKeyStates;
+    UINT64          PerformanceCount;
+    POINTER_BUTTON_CHANGE_TYPE ButtonChangeType;
+} POINTER_INFO;
+
+typedef struct
+{
+    POINTER_INFO    pointerInfo;
+    UINT32          penFlags;
+    UINT32          penMask;
+    UINT32          pressure;
+    UINT32          rotation;
+    INT32           tiltX;
+    INT32           tiltY;
+} POINTER_PEN_INFO;
+
+typedef struct
+{
+    POINTER_INFO    pointerInfo;
+    UINT32          touchFlags;
+    UINT32          touchMask;
+    RECT            rcContact;
+    RECT            rcContactRaw;
+    UINT32          orientation;
+    UINT32          pressure;
+} POINTER_TOUCH_INFO;
+
+enum {
+    PT_POINTER  = 0x00000001,   // Generic pointer
+    PT_TOUCH    = 0x00000002,   // Touch
+    PT_PEN      = 0x00000003,   // Pen
+    PT_MOUSE    = 0x00000004,   // Mouse
+#if WINVER >= 0x0603
+    PT_TOUCHPAD = 0x00000005,   // Touchpad
+#endif /* WINVER >= 0x0603 */
+};
+
+WINUSERAPI BOOL WINAPI GetPointerType(UINT32,DWORD*);
+WINUSERAPI BOOL WINAPI GetPointerPenInfo(UINT32,POINTER_PEN_INFO*);
+WINUSERAPI BOOL WINAPI GetPointerInfo(UINT32,POINTER_INFO*);
+
+#endif /*Windows 8 and above*/
+
 #if WINVER < 0x0601
 typedef struct
 {

src/win32_window.c

@@ -31,8 +31,10 @@
 #include <stdlib.h>
 #include <malloc.h>
 #include <string.h>
+#include <WinUser.h>
 #include <windowsx.h>
 #include <shellapi.h>
+#include <stdio.h>
 
 #define _GLFW_KEY_INVALID -2
 
@@ -569,6 +571,67 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
         break;
     }
 
+    case WM_POINTERDOWN:
+    case WM_POINTERUPDATE:
+    case WM_POINTERUP:
+    {
+        POINTER_PEN_INFO     penInfo;
+        POINTER_INFO         pointerInfo;
+        UINT32               pointerId = GET_POINTERID_WPARAM(wParam);
+        DWORD                pointerType = PT_POINTER;
+
+        // default to unhandled to enable call to DefWindowProc
+        BOOL fHandled = FALSE;
+
+        // Retrieve common pointer information
+        if (!GetPointerType(pointerId, &pointerType))
+        {
+            // failure, call 
+            GetLastError();
+            // set PT_POINTER to fall to default case below
+            pointerType = PT_POINTER;
+        }
+
+        switch (pointerType)
+        {
+        case (PT_PEN):
+            //Retrieve pen information
+            if (!GetPointerPenInfo(pointerId, &penInfo))
+            {
+                // failure, call 
+                GetLastError();
+            }
+            else
+            {
+                // success, process penInfo
+                // We change the pen pressure which is given normalized to a range between 0 and 1024
+                // to a normalized value in [0..1]
+                double pressure = (double)penInfo.pressure /(double) 1024;
+                int xPos = GET_X_LPARAM(lParam);
+                int yPos = GET_Y_LPARAM(lParam);
+                if (IS_POINTER_INCONTACT_WPARAM(wParam))
+                {
+                    _glfwInputPenPressure(window, pressure, xPos, yPos);
+                }
+                // mark as handled to skip call to DefWindowProc
+                fHandled = TRUE;
+            }
+            break;
+        }
+    default:
+        if (!GetPointerInfo(pointerId, &pointerInfo))
+        {
+            // failure.
+            GetLastError();
+        }
+        else
+        {
+            // success, proceed with pointerInfo.
+            //          fHandled = HandleGenericPointerMessage(&pointerInfo);
+        }
+        break;
+    }
+
     case WM_CAPTURECHANGED:
     {
         // HACK: Disable the cursor once the caption button action has been

src/window.c

@@ -27,7 +27,6 @@
 //========================================================================
 
 #include "internal.h"
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>

tests/events.c

@@ -354,6 +354,17 @@ static void mouse_button_callback(GLFWwindow* window, int button, int action, in
            get_action_name(action));
 }
 
+static void pen_callback(GLFWwindow* window, double pressure, int x, int y)
+{
+    Slot* slot = glfwGetWindowUserPointer(window);
+    printf("%08x to %i at %0.3f: Pen position: %i %i Pressure: %f\n", 
+           counter++, slot->number, glfwGetTime(), x, y, pressure);
+    /*
+    fprintf(stderr, "pressure -- %f --\n", pressure);
+    fprintf(stderr, "xPosition -- %d --\n", x);
+    fprintf(stderr, "yPosition -- %d --\n", y);*/
+}
+
 static void cursor_position_callback(GLFWwindow* window, double x, double y)
 {
     Slot* slot = glfwGetWindowUserPointer(window);
@@ -613,6 +624,7 @@ int main(int argc, char** argv)
         glfwSetWindowIconifyCallback(slots[i].window, window_iconify_callback);
         glfwSetWindowMaximizeCallback(slots[i].window, window_maximize_callback);
         glfwSetMouseButtonCallback(slots[i].window, mouse_button_callback);
+        glfwSetPenPressureCallback(slots[i].window, pen_callback);
         glfwSetCursorPosCallback(slots[i].window, cursor_position_callback);
         glfwSetCursorEnterCallback(slots[i].window, cursor_enter_callback);
         glfwSetScrollCallback(slots[i].window, scroll_callback);