glfw · jedenastka · Oct 31, 2023 · Nov 18, 2023 · Nov 18, 2023 · Dec 8, 2023
@@ -284,6  284,7 @@ video tutorials.
  - Jonas Ådahl
  - Lasse Öörni
  - Leonard König
  - Grzesiek11
  - All the unmentioned and anonymous contributors in the GLFW community, for bug
    reports, patches, feedback, testing and encouragement
 
@@ -155,6  155,8 @@ information on what to include when reporting a bug.
  - Added `GLFW_X11_XCB_VULKAN_SURFACE` init hint for selecting X11 Vulkan
    surface extension (#1793)
  - Added `GLFW_WIN32_KEYBOARD_MENU` window hint for enabling access to the window menu
  - Added `GLFW_DISABLE_MOUSE_BUTTON_LIMIT` input mode that disables the limit of
    reported mouse buttons to only those with associated mouse button tokens (#2423)
  - Added `GLFW_NATIVE_INCLUDE_NONE` for disabling inclusion of native headers (#1348)
  - Added `GLFW_BUILD_WIN32` CMake option for enabling Win32 support (#1958)
  - Added `GLFW_BUILD_COCOA` CMake option for enabling Cocoa support (#1958)

@@ -494,6  494,20 @@ a mouse button callback.
 glfwSetMouseButtonCallback(window, mouse_button_callback);
 @endcode
 
 @anchor GLFW_DISABLE_MOUSE_BUTTON_LIMIT
 To handle all mouse buttons, instead of only ones with associated
 [button tokens](@ref buttons), set the @ref GLFW_DISABLE_MOUSE_BUTTON_LIMIT
 input mode.
 
 @code
 glfwSetInputMode(window, GLFW_DISABLE_MOUSE_BUTTON_LIMIT, GLFW_TRUE);
 @endcode
 
 When this input mode is enabled, GLFW doesn't limit the reported mouse buttons
 to only those that have an associated button token, for compatibility with
 earlier versions of GLFW, which never reported any buttons over
 @ref GLFW_MOUSE_BUTTON_LAST, on which users could have relied on.
 
 The callback function receives the [mouse button](@ref buttons), button action
 and [modifier bits](@ref mods).
 
@@ -505,9  519,13 @@ void mouse_button_callback(GLFWwindow* window, int button, int action, int mods)
 }
 @endcode
 
 The mouse button is an integer that can be one of the
 [mouse button tokens](@ref buttons) or, if the
 @ref GLFW_DISABLE_MOUSE_BUTTON_LIMIT input mode is set, any other value.
 
 The action is one of `GLFW_PRESS` or `GLFW_RELEASE`.
 
-The last reported state for every [supported mouse button](@ref buttons) is also
 The last reported state for every [mouse button token](@ref buttons) is also
 saved in per-window state arrays that can be polled with @ref
 glfwGetMouseButton.
 
@@ -542,7  560,7 @@ had been processed in the meantime, the state will reset to `GLFW_RELEASE`,
 otherwise it will remain `GLFW_PRESS`.
 
 The `GLFW_MOUSE_BUTTON_LAST` constant holds the highest value of any
-[supported mouse button](@ref buttons).
 [mouse button token](@ref buttons).
 
 
 @subsection scrolling Scroll input

@@ -103,6  103,15 @@ Alt-and-then-Space shortcuts.  This may be useful for more GUI-oriented
 applications.
 
 
 @subsubsection features_34_disable_mouse_button_limit Allow disabling the mouse button limit
 
 GLFW now allows disabling the limit of reported mouse buttons to only those with
 associated [button tokens](@ref buttons). This allows using mouse buttons with
 values over 8. For compatibility with older versions, the
 @ref GLFW_DISABLE_MOUSE_BUTTON_LIMIT input mode needs to be set to make use of
 this.
 
 
 @subsection caveats Caveats for version 3.4
 
 @subsubsection native_34 Multiple sets of native access functions

@@ -1139,11  1139,12 @@ extern "C" {
 #define GLFW_OPENGL_CORE_PROFILE    0x00032001
 #define GLFW_OPENGL_COMPAT_PROFILE  0x00032002
 
-#define GLFW_CURSOR                 0x00033001
-#define GLFW_STICKY_KEYS            0x00033002
-#define GLFW_STICKY_MOUSE_BUTTONS   0x00033003
-#define GLFW_LOCK_KEY_MODS          0x00033004
-#define GLFW_RAW_MOUSE_MOTION       0x00033005
 #define GLFW_CURSOR                     0x00033001
 #define GLFW_STICKY_KEYS                0x00033002
 #define GLFW_STICKY_MOUSE_BUTTONS       0x00033003
 #define GLFW_LOCK_KEY_MODS              0x00033004
 #define GLFW_RAW_MOUSE_MOTION           0x00033005
 #define GLFW_DISABLE_MOUSE_BUTTON_LIMIT 0x00033006
 
 #define GLFW_CURSOR_NORMAL          0x00034001
 #define GLFW_CURSOR_HIDDEN          0x00034002
@@ -5193,10  5194,15 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmods
  *  is called when a mouse button is pressed or released.
  *
  *  When a window loses input focus, it will generate synthetic mouse button
- *  release events for all pressed mouse buttons.  You can tell these events
- *  from user-generated events by the fact that the synthetic ones are generated
- *  after the focus loss event has been processed, i.e. after the
- *  [window focus callback](@ref glfwSetWindowFocusCallback) has been called.
  *  release events for all pressed mouse buttons with associated button tokens.
  *  You can tell these events from user-generated events by the fact that the
  *  synthetic ones are generated after the focus loss event has been processed,
  *  i.e. after the [window focus callback](@ref glfwSetWindowFocusCallback) has
  *  been called.
  *
  *  The reported `button` value can be higher than `GLFW_MOUSE_BUTTON_LAST` if
  *  the button does not have an associated [button token](@ref buttons) and the
  *  @ref GLFW_MOUSE_BUTTON_LIMIT input mode is set.
  *
  *  @param[in] window The window whose callback to set.
  *  @param[in] callback The new callback, or `NULL` to remove the currently set

@@ -348,20  348,22 @@ void _glfwInputMouseClick(_GLFWwindow* window, int button, int action, int mods)
 {
     assert(window != NULL);
     assert(button >= 0);
-    assert(button <= GLFW_MOUSE_BUTTON_LAST);
     assert(action == GLFW_PRESS || action == GLFW_RELEASE);
     assert(mods == (mods & GLFW_MOD_MASK));
 
-    if (button < 0 || button > GLFW_MOUSE_BUTTON_LAST)
     if (button < 0 || (!window->disableMouseButtonLimit && button > GLFW_MOUSE_BUTTON_LAST))
         return;
 
     if (!window->lockKeyMods)
         mods &= ~(GLFW_MOD_CAPS_LOCK | GLFW_MOD_NUM_LOCK);
 
-    if (action == GLFW_RELEASE && window->stickyMouseButtons)
-        window->mouseButtons[button] = _GLFW_STICK;
-    else
-        window->mouseButtons[button] = (char) action;
     if (button <= GLFW_MOUSE_BUTTON_LAST)
     {
         if (action == GLFW_RELEASE && window->stickyMouseButtons)
             window->mouseButtons[button] = _GLFW_STICK;
         else
             window->mouseButtons[button] = (char) action;
     }
 
     if (window->callbacks.mouseButton)
         window->callbacks.mouseButton((GLFWwindow*) window, button, action, mods);
@@ -576,6  578,8 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* handle, int mode)
             return window->lockKeyMods;
         case GLFW_RAW_MOUSE_MOTION:
             return window->rawMouseMotion;
         case GLFW_DISABLE_MOUSE_BUTTON_LIMIT:
             return window->disableMouseButtonLimit;
     }
 
     _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0xX", mode);
@@ -683,6  687,12 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
             _glfw.platform.setRawMouseMotion(window, value);
             return;
         }
 
         case GLFW_DISABLE_MOUSE_BUTTON_LIMIT:
         {
             window->disableMouseButtonLimit = value ? GLFW_TRUE : GLFW_FALSE;
             return;
         }
     }
 
     _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0xX", mode);

@@ -539,6  539,7 @@ struct _GLFWwindow
     GLFWbool            stickyKeys;
     GLFWbool            stickyMouseButtons;
     GLFWbool            lockKeyMods;
     GLFWbool            disableMouseButtonLimit;
     int                 cursorMode;
     char                mouseButtons[GLFW_MOUSE_BUTTON_LAST   1];
     char                keys[GLFW_KEY_LAST   1];

@@ -630,6  630,7 @@ int main(int argc, char** argv)
             glfwTerminate();
             exit(EXIT_FAILURE);
         }
         glfwSetInputMode(slots[i].window, GLFW_DISABLE_MOUSE_BUTTON_LIMIT, GLFW_TRUE);
 
         glfwSetWindowUserPointer(slots[i].window, slots   i);
 

@@ -77,6  77,7 @@ int main(int argc, char** argv)
         glfwTerminate();
         exit(EXIT_FAILURE);
     }
     glfwSetInputMode(window, GLFW_DISABLE_MOUSE_BUTTON_LIMIT, GLFW_TRUE);
 
     glfwMakeContextCurrent(window);
     gladLoadGL(glfwGetProcAddress);