2025-12-20 06:01:56 +00:00
89 changed files with 4482 additions and 1340 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -29,7 +29,7 @@ for:
        only:
            - GENERATOR: MinGW Makefiles
    build_script:
-        - set PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin=%
+        - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin%
        - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
        - cmake --build build
 -
--- a/.editorconfig
+++ b/.editorconfig
@ -41,6 +41,12 @@ indent_size = 2
 indent_style = tab
 indent_size = unset
 [deps/mingw/*.h]
 indent_style = space
 indent_size = 4
 tab_width = 8
 trim_trailing_whitespace = false
 [deps/getopt.{c,h}]
 indent_style = space
 indent_size = 2
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -54,7 +54,7 @@ jobs:
        timeout-minutes: 4
        env:
            CFLAGS: -Werror
-            MACOSX_DEPLOYMENT_TARGET: 10.11
+            MACOSX_DEPLOYMENT_TARGET: 10.8
            CMAKE_OSX_ARCHITECTURES: x86_64;arm64
        steps:
            - uses: actions/checkout@v4
--- a/.gitignore
+++ b/.gitignore
@ -57,11 +57,11 @@ src/glfw3ConfigVersion.cmake
 # Compiled binaries
 src/libglfw.so
 src/libglfw.so.3
-src/libglfw.so.3.5
+src/libglfw.so.3.4
 src/libglfw.dylib
 src/libglfw.dylib
 src/libglfw.3.dylib
-src/libglfw.3.5.dylib
+src/libglfw.3.4.dylib
 src/libglfw3.a
 src/glfw3.lib
 src/glfw3.dll
--- a/CMake/GenerateMappings.cmake
+++ b/CMake/GenerateMappings.cmake
@ -1,8 +1,6 @@
 # Usage:
 # cmake -P GenerateMappings.cmake <path/to/mappings.h.in> <path/to/mappings.h>
 cmake_policy(VERSION 3.16)
 set(source_url "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt")
 set(source_path "${CMAKE_CURRENT_BINARY_DIR}/gamecontrollerdb.txt")
 set(template_path "${CMAKE_ARGV3}")
@ -24,24 +22,24 @@ if (status_code)
 endif()
 file(STRINGS "${source_path}" lines)
-list(FILTER lines INCLUDE REGEX "^[0-9a-fA-F]")
+foreach(line ${lines})
-
+    if (line MATCHES "^[0-9a-fA-F]")
-foreach(line IN LISTS lines)
+        if (line MATCHES "platform:Windows")
-    if (line MATCHES "platform:Windows")
+            if (GLFW_WIN32_MAPPINGS)
-        if (GLFW_WIN32_MAPPINGS)
+                string(APPEND GLFW_WIN32_MAPPINGS "\n")
-            string(APPEND GLFW_WIN32_MAPPINGS "\n")
+            endif()
            string(APPEND GLFW_WIN32_MAPPINGS "\"${line}\",")
        elseif (line MATCHES "platform:Mac OS X")
            if (GLFW_COCOA_MAPPINGS)
                string(APPEND GLFW_COCOA_MAPPINGS "\n")
            endif()
            string(APPEND GLFW_COCOA_MAPPINGS "\"${line}\",")
        elseif (line MATCHES "platform:Linux")
            if (GLFW_LINUX_MAPPINGS)
                string(APPEND GLFW_LINUX_MAPPINGS "\n")
            endif()
            string(APPEND GLFW_LINUX_MAPPINGS "\"${line}\",")
        endif()
        string(APPEND GLFW_WIN32_MAPPINGS "\"${line}\",")
    elseif (line MATCHES "platform:Mac OS X")
        if (GLFW_COCOA_MAPPINGS)
            string(APPEND GLFW_COCOA_MAPPINGS "\n")
        endif()
        string(APPEND GLFW_COCOA_MAPPINGS "\"${line}\",")
    elseif (line MATCHES "platform:Linux")
        if (GLFW_LINUX_MAPPINGS)
            string(APPEND GLFW_LINUX_MAPPINGS "\n")
        endif()
        string(APPEND GLFW_LINUX_MAPPINGS "\"${line}\",")
    endif()
 endforeach()
--- a/CMake/modules/FindOSMesa.cmake
+++ b/CMake/modules/FindOSMesa.cmake
@ -0,0 +1,18 @@
 # Try to find OSMesa on a Unix system
 #
 # This will define:
 #
 #   OSMESA_LIBRARIES   - Link these to use OSMesa
 #   OSMESA_INCLUDE_DIR - Include directory for OSMesa
 #
 # Copyright (c) 2014 Brandon Schaefer <brandon.schaefer@canonical.com>
 if (NOT WIN32)
  find_package (PkgConfig)
  pkg_check_modules (PKG_OSMESA QUIET osmesa)
  set (OSMESA_INCLUDE_DIR ${PKG_OSMESA_INCLUDE_DIRS})
  set (OSMESA_LIBRARIES   ${PKG_OSMESA_LIBRARIES})
 endif ()
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,14 @@
-cmake_minimum_required(VERSION 3.16...3.28 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.4...3.28 FATAL_ERROR)
-project(GLFW VERSION 3.5.0 LANGUAGES C HOMEPAGE_URL "https://www.glfw.org/")
+project(GLFW VERSION 3.4.0 LANGUAGES C)
 if (POLICY CMP0069)
    cmake_policy(SET CMP0069 NEW)
 endif()
 if (POLICY CMP0077)
    cmake_policy(SET CMP0077 NEW)
 endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@ -38,7 +46,11 @@ set(GLFW_LIBRARY_TYPE "${GLFW_LIBRARY_TYPE}" CACHE STRING
    "Library type override for GLFW (SHARED, STATIC, OBJECT, or empty to follow BUILD_SHARED_LIBS)")
 if (GLFW_LIBRARY_TYPE)
-    string(COMPARE EQUAL "${GLFW_LIBRARY_TYPE}" "SHARED" GLFW_BUILD_SHARED_LIBRARY)
+    if (GLFW_LIBRARY_TYPE STREQUAL "SHARED")
        set(GLFW_BUILD_SHARED_LIBRARY TRUE)
    else()
        set(GLFW_BUILD_SHARED_LIBRARY FALSE)
    endif()
 else()
    set(GLFW_BUILD_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
 endif()
@ -68,7 +80,24 @@ endif()
 # This is here because it also applies to tests and examples
 #--------------------------------------------------------------------
 if (MSVC AND NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    if (CMAKE_VERSION VERSION_LESS 3.15)
        foreach (flag CMAKE_C_FLAGS
                      CMAKE_C_FLAGS_DEBUG
                      CMAKE_C_FLAGS_RELEASE
                      CMAKE_C_FLAGS_MINSIZEREL
                      CMAKE_C_FLAGS_RELWITHDEBINFO)
            if (flag MATCHES "/MD")
                string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
            endif()
            if (flag MATCHES "/MDd")
                string(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
            endif()
        endforeach()
    else()
        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
    endif()
 endif()
 #--------------------------------------------------------------------
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -23,7 +23,6 @@ video tutorials.
 - Denis Bernard
 - BiBi
 - Doug Binks
 - bitb4ker
 - blanco
 - Waris Boonyasiriwat
 - Kyle Brenneman
@ -34,7 +33,6 @@ video tutorials.
 - Nicolas Caramelli
 - David Carlier
 - Arturo Castro
 - Jose Luis Cercós Pita
 - Chi-kwan Chan
 - Victor Chernyakin
 - TheChocolateOre
@ -50,13 +48,11 @@ video tutorials.
 - Andrew Corrigan
 - Bailey Cosier
 - Noel Cower
 - James Cowgill
 - CuriouserThing
 - Bill Currie
 - Jason Daly
 - danhambleton
 - Jarrod Davis
 - decce
 - Olivier Delannoy
 - Paul R. Deppe
 - Michael Dickens
@ -69,8 +65,6 @@ video tutorials.
 - Robin Eklind
 - Jan Ekström
 - Siavash Eliasi
 - er-azh
 - Jan Hendrik Farr
 - Ahmad Fatoum
 - Nikita Fediuchin
 - Felipe Ferreira
@ -124,7 +118,6 @@ video tutorials.
 - Josh Kilmer
 - Byunghoon Kim
 - Cameron King
 - knokko
 - Peter Knut
 - Christoph Kubisch
 - Yuri Kunde Schlesner
@ -162,7 +155,6 @@ video tutorials.
 - Marcel Metz
 - Liam Middlebrook
 - mightgoyardstill
 - Mihail
 - Ave Milia
 - Icyllis Milica
 - Jonathan Miller
@ -234,7 +226,7 @@ video tutorials.
 - Brandon Schaefer
 - Sebastian Schuberth
 - Scr3amer
- - Jan Schürkamp
+ - Jan Schuerkamp
 - Christian Sdunek
 - Matt Sealey
 - Steve Sexton
@ -283,12 +275,10 @@ video tutorials.
 - Corentin Wallez
 - Torsten Walluhn
 - Patrick Walton
 - Ivor Wanders
 - Jim Wang
 - Xo Wang
 - Andre Weissflog
 - Jay Weisskopf
 - Drew Weymouth
 - Frank Wille
 - Andy Williams
 - Joel Winarske
--- a/README.md
+++ b/README.md
@ -9,28 +9,34 @@ GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan
 application development.  It provides a simple, platform-independent API for
 creating windows, contexts and surfaces, reading input, handling events, etc.
-GLFW is written primarily in C99, with parts of macOS support being written in
+GLFW natively supports Windows, macOS and Linux and other Unix-like systems.  On
-Objective-C.
+Linux both Wayland and X11 are supported.
 GLFW supports Windows, macOS and Linux, and also works on many other Unix-like
 systems.  On Linux both Wayland and X11 are supported.
 GLFW is licensed under the [zlib/libpng
 license](https://www.glfw.org/license.html).
 You can [download](https://www.glfw.org/download.html) the latest stable release
-as source or Windows and macOS binaries.  There are [release
+as source or Windows binaries.  Each release starting with 3.0 also has
-tags](https://github.com/glfw/glfw/releases) with source and binary archives
+a corresponding [annotated tag](https://github.com/glfw/glfw/releases) with
-attached for every version since 3.0.
+source and binary archives.
 The [documentation](https://www.glfw.org/docs/latest/) is available online and is
-also included in source and binary archives, except those generated
+included in all source and binary archives.  See the [release
-automatically by Github.  The documentation contains guides, a tutorial and the
+notes](https://www.glfw.org/docs/latest/news.html) for new features, caveats and
-API reference.  The [release
+deprecations in the latest release.  For more details see the [version
-notes](https://www.glfw.org/docs/latest/news.html) list the new features,
+history](https://www.glfw.org/changelog.html).
-caveats and deprecations in the latest release.  The [version
+
-history](https://www.glfw.org/changelog.html) lists every user-visible change
+The `master` branch is the stable integration branch and _should_ always compile
-for every release.
+and run on all supported platforms, although details of newly added features may
 change until they have been included in a release.  New features and many bug
 fixes live in [other branches](https://github.com/glfw/glfw/branches/all) until
 they are stable enough to merge.
 If you are new to GLFW, you may find the
 [tutorial](https://www.glfw.org/docs/latest/quick.html) for GLFW 3 useful.  If
 you have used GLFW 2 in the past, there is a [transition
 guide](https://www.glfw.org/docs/latest/moving.html) for moving to the GLFW
 3 API.
 GLFW exists because of the contributions of [many people](CONTRIBUTORS.md)
 around the world, whether by reporting bugs, providing community support, adding
@ -38,37 +44,57 @@ features, reviewing or testing code, debugging, proofreading docs, suggesting
 features or fixing bugs.
 ## System requirements
 GLFW supports Windows 7 and later and macOS 10.11 and later.  On GNOME Wayland,
 window decorations will be very basic unless the
 [libdecor](https://gitlab.freedesktop.org/libdecor/libdecor) package is
 installed.  Linux and other Unix-like systems running X11 are supported even
 without a desktop environment or modern extensions, although some features
 require a clipboard manager or a modern window manager.
 See the [compatibility guide](https://www.glfw.org/docs/latest/compat.html)
 for more detailed information.
 ## Compiling GLFW
-GLFW supports compilation with Visual C++ (2013 and later), GCC and Clang.  Both
+GLFW is written primarily in C99, with parts of macOS support being written in
-Clang-CL and MinGW-w64 are supported.  Other C99 compilers will likely also
+Objective-C.  GLFW itself requires only the headers and libraries for your OS
-work, but this is not regularly tested.
+and window system.  It does not need any additional headers for context creation
 APIs (WGL, GLX, EGL, NSGL, OSMesa) or rendering APIs (OpenGL, OpenGL ES, Vulkan)
 to enable support for them.
-There are [pre-compiled binaries](https://www.glfw.org/download.html)
+GLFW supports compilation on Windows with Visual C++ 2013 and later, MinGW and
-available for Windows and macOS.
+MinGW-w64, on macOS with Clang and on Linux and other Unix-like systems with GCC
 and Clang.  It will likely compile in other environments as well, but this is
 not regularly tested.
-GLFW itself needs only CMake and the headers and libraries for your operating
+There are [pre-compiled binaries](https://www.glfw.org/download.html) available
-system and window system.  No other SDKs are required.
+for all supported compilers on Windows and macOS.
 See the [compilation guide](https://www.glfw.org/docs/latest/compile.html) for
-more information about compiling GLFW and the exact dependencies required for
+more information about how to compile GLFW yourself.
-each window system.
+
 ## Using GLFW
 See the [documentation](https://www.glfw.org/docs/latest/) for tutorials, guides
 and the API reference.
 ## Contributing to GLFW
 See the [contribution
 guide](https://github.com/glfw/glfw/blob/master/docs/CONTRIBUTING.md) for
 more information.
 ## System requirements
 GLFW supports Windows XP and later and macOS 10.8 and later.  Linux and other
 Unix-like systems running the X Window System are supported even without
 a desktop environment or modern extensions, although some features require
 a running window or clipboard manager.  The OSMesa backend requires Mesa 6.3.
 See the [compatibility guide](https://www.glfw.org/docs/latest/compat.html)
 in the documentation for more information.
 ## Dependencies
 GLFW itself needs only CMake 3.1 or later and the headers and libraries for your
 OS and window system.
 The examples and test programs depend on a number of tiny libraries.  These are
-bundled in the `deps/` directory.  The repository has no submodules.
+located in the `deps/` directory.
 - [getopt\_port](https://github.com/kimgr/getopt_port/) for examples
   with command-line options
@ -81,33 +107,8 @@ bundled in the `deps/` directory.  The repository has no submodules.
 - [Nuklear](https://github.com/Immediate-Mode-UI/Nuklear) for test and example UI
 - [stb\_image\_write](https://github.com/nothings/stb) for writing images to disk
-The documentation is generated with [Doxygen](https://doxygen.org/) when the
+The documentation is generated with [Doxygen](https://doxygen.org/) if CMake can
-library is built, provided CMake could find a sufficiently new version of it
+find that tool.
 during configuration.
 ## Using GLFW
 See the [HTML documentation](https://www.glfw.org/docs/latest/) for a tutorial,
 guides and the API reference.
 ## Contributing to GLFW
 See the [contribution
 guide](https://github.com/glfw/glfw/blob/master/docs/CONTRIBUTING.md) for
 more information.
 The `master` branch is the stable integration branch and _should_ always compile
 and run on all supported platforms.  Details of a newly added feature,
 including the public API, may change until it has been included in a release.
 The `latest` branch is equivalent to the [highest numbered](https://semver.org/)
 release, although it may not always point to the same commit as the tag for that
 release.
 The `ci` branch is used to trigger continuous integration jobs for code under
 testing and should never be relied on for any purpose.
 ## Reporting bugs
@ -118,46 +119,326 @@ guide](https://github.com/glfw/glfw/blob/master/docs/CONTRIBUTING.md) for
 information on what to include when reporting a bug.
-## Changelog since 3.4
+## Changelog since 3.3.10
- - Added `GLFW_UNLIMITED_MOUSE_BUTTONS` input mode that allows mouse buttons beyond
+ - Added `GLFW_PLATFORM` init hint for runtime platform selection (#1958)
-   the limit of the mouse button tokens to be reported (#2423)
+ - Added `GLFW_ANY_PLATFORM`, `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`,
- - Added `glfwGetEGLConfig` function to query the `EGLConfig` of a window (#2045)
+   `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` and `GLFW_PLATFORM_NULL` symbols to
- - Added `glfwGetGLXFBConfig` function to query the `GLXFBConfig` of a window (#1925)
+   specify the desired platform (#1958)
- - Updated minimum CMake version to 3.16 (#2541)
+ - Added `glfwGetPlatform` function to query what platform was selected (#1655,#1958)
- - Removed support for building with original MinGW (#2540)
+ - Added `glfwPlatformSupported` function to query if a platform is supported
- - [Win32] Removed support for Windows XP and Vista (#2505)
+   (#1655,#1958)
- - [Cocoa] Added `QuartzCore` framework as link-time dependency
+ - Added `glfwInitAllocator` for setting a custom memory allocator (#544,#1628,#1947)
- - [Cocoa] Removed support for OS X 10.10 Yosemite and earlier (#2506)
+ - Added `GLFWallocator` struct and `GLFWallocatefun`, `GLFWreallocatefun` and
- - [Wayland] Bugfix: The fractional scaling related objects were not destroyed
+   `GLFWdeallocatefun` types (#544,#1628,#1947)
- - [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
+ - Added `glfwGetWindowTitle` function for querying window title (#1448,#1909,#2482)
- - [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
+ - Added `glfwInitVulkanLoader` for using a non-default Vulkan loader (#1374,#1890)
- - [Wayland] Bugfix: Ignore key repeat events when no window has keyboard focus (#2727)
+ - Added `GLFW_RESIZE_NWSE_CURSOR`, `GLFW_RESIZE_NESW_CURSOR`,
- - [Wayland] Bugfix: Reset key repeat timer when window destroyed (#2741,#2727)
+   `GLFW_RESIZE_ALL_CURSOR` and `GLFW_NOT_ALLOWED_CURSOR` cursor shapes (#427)
- - [Wayland] Bugfix: Memory would leak if reading a data offer failed midway
+ - Added `GLFW_RESIZE_EW_CURSOR` alias for `GLFW_HRESIZE_CURSOR` (#427)
- - [Wayland] Bugfix: Retrieved cursor position would be incorrect when hovering over
+ - Added `GLFW_RESIZE_NS_CURSOR` alias for `GLFW_VRESIZE_CURSOR` (#427)
-                     fallback decorations
+ - Added `GLFW_POINTING_HAND_CURSOR` alias for `GLFW_HAND_CURSOR` (#427)
- - [Wayland] Bugfix: Fallback decorations would report scroll events
+ - Added `GLFW_MOUSE_PASSTHROUGH` window hint for letting mouse input pass
- - [Wayland] Bugfix: Keyboard repeat events halted when any key is released (#2568)
+   through the window (#1236,#1568)
- - [Wayland] Bugfix: Fallback decorations would show menu at wrong position
+ - Added `GLFW_CURSOR_CAPTURED` cursor mode to confine the cursor to the window
- - [Wayland] Bugfix: The cursor was not updated when clicking through from
+   content area (#58)
-   a modal to a fallback decoration
+ - Added `GLFW_POSITION_X` and `GLFW_POSITION_Y` window hints for initial position
- - [Wayland] Bugfix: The cursor position was not updated when clicking through
+   (#1603,#1747)
-   from a modal to the content area
+ - Added `GLFW_SCALE_FRAMEBUFFER` window hint for Wayland and macOS scaling (#2457)
- - [Wayland] Bugfix: free modules at end of terminate function to resolve
+ - Added `GLFW_ANY_POSITION` hint value for letting the window manager choose (#1603,#1747)
-   potential segmentation fault (#2744)
+ - Added `GLFW_PLATFORM_UNAVAILABLE` error for platform detection failures (#1958)
- - [Wayland] Bugfix: Confining or disabling the cursor could segfault on
+ - Added `GLFW_FEATURE_UNAVAILABLE` error for platform limitations (#1692)
-   compositors without `pointer-constraints-unstable-v1`
+ - Added `GLFW_FEATURE_UNIMPLEMENTED` error for incomplete backends (#1692)
- - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
+ - Added `GLFW_WAYLAND_APP_ID` window hint string for Wayland app\_id selection
- - [X11] Bugfix: Occasional crash when an idle display awakes (#2766) 
+   (#2121,#2122)
- - [X11] Bugfix: Prevent BadWindow when creating small windows with a content scale
+ - Added `GLFW_ANGLE_PLATFORM_TYPE` init hint and `GLFW_ANGLE_PLATFORM_TYPE_*`
-   less than 1 (#2754)
+   values to select ANGLE backend (#1380)
- - [X11] Bugfix: Clamp width and height to >= 1 to prevent BadValue error and app exit
+ - Added `GLFW_X11_XCB_VULKAN_SURFACE` init hint for selecting X11 Vulkan
- - [Linux] Bugfix: The header for `ioctl` was only implicitly included (#2778)
+   surface extension (#1793)
- - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
+ - Added `GLFW_WIN32_KEYBOARD_MENU` window hint for enabling access to the window menu
- - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
+ - Added `GLFW_WIN32_SHOWDEFAULT` window hint for applying the parent process
- - [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
+   show command (#2359)
-   `GLFW_NATIVE_CONTEXT_API` (#2518)
+ - 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)
 - Added `GLFW_BUILD_X11` CMake option for enabling X11 support (#1958)
 - Added `GLFW_LIBRARY_TYPE` CMake variable for overriding the library type
   (#279,#1307,#1497,#1574,#1928)
 - Added support for `XDG_SESSION_TYPE` environment variable
 - Added `GLFW_PKG_CONFIG_REQUIRES_PRIVATE` and `GLFW_PKG_CONFIG_LIBS_PRIVATE` CMake
   variables exposing pkg-config dependencies (#1307)
 - Made joystick subsystem initialize at first use (#1284,#1646)
 - Made `GLFW_DOUBLEBUFFER` a read-only window attribute
 - Made Wayland the preferred platform over X11 if both are available (#2035)
 - Updated the minimum required CMake version to 3.4
 - Updated gamepad mappings from upstream
 - Renamed `GLFW_USE_WAYLAND` CMake option to `GLFW_BUILD_WAYLAND` (#1958)
 - Disabled tests and examples by default when built as a CMake subdirectory
 - Removed `GLFW_USE_OSMESA` CMake option enabling the Null platform (#1958)
 - Removed CMake generated configuration header
 - Bugfix: `glfwGetVideoMode` returned an invalid mode on error (#1292)
 - [Win32] Added a version info resource to the GLFW DLL
 - [Win32] Made hidden helper window use its own window class
 - [Win32] Bugfix: The foreground lock timeout was overridden, ignoring the user
 - [Cocoa] Added `glfwGetCocoaView` native access function (#2235)
 - [Cocoa] Moved main menu creation to GLFW initialization time (#1649)
 - [Cocoa] Bugfix: Touching event queue from secondary thread before main thread
   would abort (#1649)
 - [Wayland] Added support for `glfwRequestWindowAttention` (#2287)
 - [Wayland] Added support for `glfwFocusWindow`
 - [Wayland] Added support for `GLFW_RESIZABLE` (#2203)
 - [Wayland] Added support for fractional scaling of window contents
 - [Wayland] Added dynamic loading of all Wayland libraries
 - [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled
 - [Wayland] Bugfix: `GLFW_HOVERED` was true when the cursor was over any
   fallback window decoration
 - [Wayland] Bugfix: Fallback decorations allowed resizing to invalid size
   (#2204)
 - [X11] Bugfix: Termination would segfault if the IM had been destroyed
 - [X11] Bugfix: Any IM started after initialization would not be detected
 - [Linux] Bugfix: Joystick evdev fds remained open in forks (#2446)
 - [POSIX] Removed use of deprecated function `gettimeofday`
 - [POSIX] Bugfix: `CLOCK_MONOTONIC` was not correctly tested for or enabled
 - [WGL] Disabled the DWM swap interval hack for Windows 8 and later (#1072)
 - [NSGL] Removed enforcement of forward-compatible flag for core contexts
 - [NSGL] Bugfix: A core profile OpenGL context was returned if 3.2+
   compatibility profile was requested
 - [EGL] Added platform selection via the `EGL_EXT_platform_base` extension
   (#442)
 - [EGL] Added ANGLE backend selection via `EGL_ANGLE_platform_angle` extension
   (#1380)
 ## Changelog since 3.3
 - Added `GLFW_WAYLAND_LIBDECOR` init hint for disabling libdecor support (#1639,#1693)
 - Bugfix: The CMake config-file package used an absolute path and was not
   relocatable (#1470)
 - Bugfix: Video modes with a duplicate screen area were discarded (#1555,#1556)
 - Bugfix: Compiling with -Wextra-semi caused warnings (#1440)
 - Bugfix: Built-in mappings failed because some OEMs re-used VID/PID (#1583)
 - Bugfix: Some extension loader headers did not prevent default OpenGL header
   inclusion (#1695)
 - Bugfix: Buffers were swapped at creation on single-buffered windows (#1873)
 - Bugfix: Gamepad mapping updates could spam `GLFW_INVALID_VALUE` due to
   incompatible controllers sharing hardware ID (#1763)
 - Bugfix: Native access functions for context handles did not check that the API matched
 - Bugfix: `glfwMakeContextCurrent` would access TLS slot before initialization
 - Bugfix: `glfwSetGammaRamp` could emit `GLFW_INVALID_VALUE` before initialization
 - Bugfix: `glfwGetJoystickUserPointer` returned `NULL` during disconnection (#2092)
 - Bugfix: `glfwGetKeyScancode` returned `0` on error when initialized instead of `-1`
 - Bugfix: Failure to make a newly created context current could cause segfault (#2327)
 - [Win32] Disabled framebuffer transparency on Windows 7 when DWM windows are
   opaque (#1512)
 - [Win32] Bugfix: `GLFW_INCLUDE_VULKAN` plus `VK_USE_PLATFORM_WIN32_KHR` caused
   symbol redefinition (#1524)
 - [Win32] Bugfix: The cursor position event was emitted before its cursor enter
   event (#1490)
 - [Win32] Bugfix: The window hint `GLFW_MAXIMIZED` did not move or resize the
   window (#1499)
 - [Win32] Bugfix: Disabled cursor mode interfered with some non-client actions
 - [Win32] Bugfix: Super key was not released after Win+V hotkey (#1622)
 - [Win32] Bugfix: `glfwGetKeyName` could access out of bounds and return an
   invalid pointer
 - [Win32] Bugfix: Some synthetic key events were reported as `GLFW_KEY_UNKNOWN`
   (#1623)
 - [Win32] Bugfix: Non-BMP Unicode codepoint input was reported as UTF-16
 - [Win32] Bugfix: Monitor functions could return invalid values after
   configuration change (#1761)
 - [Win32] Bugfix: Initialization would segfault on Windows 8 (not 8.1) (#1775)
 - [Win32] Bugfix: Duplicate size events were not filtered (#1610)
 - [Win32] Bugfix: Full screen windows were incorrectly resized by DPI changes
   (#1582)
 - [Win32] Bugfix: `GLFW_SCALE_TO_MONITOR` had no effect on systems older than
   Windows 10 version 1703 (#1511)
 - [Win32] Bugfix: `USE_MSVC_RUNTIME_LIBRARY_DLL` had no effect on CMake 3.15 or
   later (#1783,#1796)
 - [Win32] Bugfix: Compilation with LLVM for Windows failed (#1807,#1824,#1874)
 - [Win32] Bugfix: Content scale queries could fail silently (#1615)
 - [Win32] Bugfix: Content scales could have garbage values if monitor was recently
   disconnected (#1615)
 - [Win32] Bugfix: A window created maximized and undecorated would cover the whole
   monitor (#1806)
 - [Win32] Bugfix: The default restored window position was lost when creating a maximized
   window
 - [Win32] Bugfix: `glfwMaximizeWindow` would make a hidden window visible
 - [Win32] Bugfix: `Alt+PrtSc` would emit `GLFW_KEY_UNKNOWN` and a different
   scancode than `PrtSc` (#1993)
 - [Win32] Bugfix: `GLFW_KEY_PAUSE` scancode from `glfwGetKeyScancode` did not
   match event scancode (#1993)
 - [Win32] Bugfix: Instance-local operations used executable instance (#469,#1296,#1395)
 - [Win32] Bugfix: The OSMesa library was not unloaded on termination
 - [Win32] Bugfix: Right shift emitted `GLFW_KEY_UNKNOWN` when using a CJK IME (#2050)
 - [Win32] Bugfix: `glfwWaitEventsTimeout` did not return for some sent messages (#2408)
 - [Win32] Bugfix: Fix pkg-config for dynamic library on Windows (#2386, #2420)
 - [Win32] Bugfix: XInput could reportedly provide invalid DPad bit masks (#2291)
 - [Win32] Bugfix: Rapid clipboard calls could fail due to Clipboard History
 - [Win32] Bugfix: Disabled cursor mode doesn't work right when connected over RDP (#1276,#1279,#2431)
 - [Cocoa] Added support for `VK_EXT_metal_surface` (#1619)
 - [Cocoa] Added locating the Vulkan loader at runtime in an application bundle
 - [Cocoa] Changed `EGLNativeWindowType` from `NSView` to `CALayer` (#1169)
 - [Cocoa] Changed F13 key to report Print Screen for cross-platform consistency
   (#1786)
 - [Cocoa] Disabled macOS fullscreen when `GLFW_RESIZABLE` is false
 - [Cocoa] Removed dependency on the CoreVideo framework
 - [Cocoa] Bugfix: `glfwSetWindowSize` used a bottom-left anchor point (#1553)
 - [Cocoa] Bugfix: Window remained on screen after destruction until event poll
   (#1412)
 - [Cocoa] Bugfix: Event processing before window creation would assert (#1543)
 - [Cocoa] Bugfix: Undecorated windows could not be iconified on recent macOS
 - [Cocoa] Bugfix: Non-BMP Unicode codepoint input was reported as UTF-16
   (#1635)
 - [Cocoa] Bugfix: Failing to retrieve the refresh rate of built-in displays
   could leak memory
 - [Cocoa] Bugfix: Objective-C files were compiled as C with CMake 3.19 (#1787)
 - [Cocoa] Bugfix: Duplicate video modes were not filtered out (#1830)
 - [Cocoa] Bugfix: Menu bar was not clickable on macOS 10.15+ until it lost and
   regained focus (#1648,#1802)
 - [Cocoa] Bugfix: Monitor name query could segfault on macOS 11 (#1809,#1833)
 - [Cocoa] Bugfix: The install name of the installed dylib was relative (#1504)
 - [Cocoa] Bugfix: The MoltenVK layer contents scale was updated only after
   related events were emitted
 - [Cocoa] Bugfix: Moving the cursor programmatically would freeze it for
   a fraction of a second (#1962)
 - [Cocoa] Bugfix: `kIOMasterPortDefault` was deprecated in macOS 12.0 (#1980)
 - [Cocoa] Bugfix: `kUTTypeURL` was deprecated in macOS 12.0 (#2003)
 - [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791)
 - [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination
 - [Cocoa] Bugfix: `GLFW_MAXIMIZED` was always true when `GLFW_RESIZABLE` was false
 - [Cocoa] Bugfix: Changing `GLFW_DECORATED` in macOS fullscreen would abort
   application (#1886)
 - [Cocoa] Bugfix: Setting a monitor from macOS fullscreen would abort
   application (#2110)
 - [Cocoa] Bugfix: The Vulkan loader was not loaded from the `Frameworks` bundle
   subdirectory (#2113,#2120)
 - [Cocoa] Bugfix: Compilation failed on OS X 10.8 due to unconditional use of 10.9+
   symbols (#2161)
 - [Cocoa] Bugfix: Querying joystick elements could reportedly segfault on macOS
   13 Ventura (#2320)
 - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
 - [X11] Bugfix: Key names were not updated when the keyboard layout changed
   (#1462,#1528)
 - [X11] Bugfix: Decorations could not be enabled after window creation (#1566)
 - [X11] Bugfix: Content scale fallback value could be inconsistent (#1578)
 - [X11] Bugfix: `glfwMaximizeWindow` had no effect on hidden windows
 - [X11] Bugfix: Clearing `GLFW_FLOATING` on a hidden window caused invalid read
 - [X11] Bugfix: Changing `GLFW_FLOATING` on a hidden window could silently fail
 - [X11] Bugfix: Disabled cursor mode was interrupted by indicator windows
 - [X11] Bugfix: Monitor physical dimensions could be reported as zero mm
 - [X11] Bugfix: Window position events were not emitted during resizing (#1613)
 - [X11] Bugfix: `glfwFocusWindow` could terminate on older WMs or without a WM
 - [X11] Bugfix: Querying a disconnected monitor could segfault (#1602)
 - [X11] Bugfix: IME input of CJK was broken for "C" locale (#1587,#1636)
 - [X11] Bugfix: Xlib errors caused by other parts of the application could be
   reported as GLFW errors
 - [X11] Bugfix: A handle race condition could cause a `BadWindow` error (#1633)
 - [X11] Bugfix: XKB path used keysyms instead of physical locations for
   non-printable keys (#1598)
 - [X11] Bugfix: Function keys were mapped to `GLFW_KEY_UNKNOWN` for some layout
   combinations (#1598)
 - [X11] Bugfix: Keys pressed simultaneously with others were not always
   reported (#1112,#1415,#1472,#1616)
 - [X11] Bugfix: Some window attributes were not applied on leaving fullscreen
   (#1863)
 - [X11] Bugfix: Changing `GLFW_FLOATING` could leak memory
 - [X11] Bugfix: Icon pixel format conversion worked only by accident, relying on
   undefined behavior (#1986)
 - [X11] Bugfix: Dynamic loading on OpenBSD failed due to soname differences
 - [X11] Bugfix: Waiting for events would fail if file descriptor was too large
   (#2024)
 - [X11] Bugfix: Joystick events could lead to busy-waiting (#1872)
 - [X11] Bugfix: `glfwWaitEvents*` did not continue for joystick events
 - [X11] Bugfix: `glfwPostEmptyEvent` could be ignored due to race condition
   (#379,#1281,#1285,#2033)
 - [X11] Bugfix: Dynamic loading on NetBSD failed due to soname differences
 - [X11] Bugfix: Left shift of int constant relied on undefined behavior (#1951)
 - [X11] Bugfix: The OSMesa libray was not unloaded on termination
 - [X11] Bugfix: A malformed response during selection transfer could cause a segfault
 - [X11] Bugfix: Some calls would reset Xlib to the default error handler (#2108)
 - [Wayland] Added improved fallback window decorations via libdecor (#1639,#1693)
 - [Wayland] Added support for key names via xkbcommon
 - [Wayland] Added support for file path drop events (#2040)
 - [Wayland] Added support for more human-readable monitor names where available
 - [Wayland] Disabled alpha channel for opaque windows on systems lacking
   `EGL_EXT_present_opaque` (#1895)
 - [Wayland] Removed support for `wl_shell` (#1443)
 - [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432)
 - [Wayland] Bugfix: Repeated keys could be reported with `NULL` window (#1704)
 - [Wayland] Bugfix: Retrieving partial framebuffer size would segfault
 - [Wayland] Bugfix: Scrolling offsets were inverted compared to other platforms
   (#1463)
 - [Wayland] Bugfix: Client-Side Decorations were destroyed in the wrong order
   (#1798)
 - [Wayland] Bugfix: Monitors physical size could report zero (#1784,#1792)
 - [Wayland] Bugfix: Some keys were not repeating in Wayland (#1908)
 - [Wayland] Bugfix: Non-arrow cursors are offset from the hotspot (#1706,#1899)
 - [Wayland] Bugfix: The `O_CLOEXEC` flag was not defined on FreeBSD
 - [Wayland] Bugfix: Key repeat could lead to a race condition (#1710)
 - [Wayland] Bugfix: Activating a window would emit two input focus events
 - [Wayland] Bugfix: Disable key repeat mechanism when window loses input focus
 - [Wayland] Bugfix: Window hiding and showing did not work (#1492,#1731)
 - [Wayland] Bugfix: A key being repeated was not released when window lost focus
 - [Wayland] Bugfix: Showing a hidden window did not emit a window refresh event
 - [Wayland] Bugfix: Full screen window creation did not ignore `GLFW_VISIBLE`
 - [Wayland] Bugfix: Some keys were reported as wrong key or `GLFW_KEY_UNKNOWN`
 - [Wayland] Bugfix: Text input did not repeat along with key repeat
 - [Wayland] Bugfix: `glfwPostEmptyEvent` sometimes had no effect (#1520,#1521)
 - [Wayland] Bugfix: `glfwSetClipboardString` would fail if set to result of
   `glfwGetClipboardString`
 - [Wayland] Bugfix: Data source creation error would cause double free at termination
 - [Wayland] Bugfix: Partial writes of clipboard string would cause beginning to repeat
 - [Wayland] Bugfix: Some errors would cause clipboard string transfer to hang
 - [Wayland] Bugfix: Drag and drop data was misinterpreted as clipboard string
 - [Wayland] Bugfix: MIME type matching was not performed for clipboard string
 - [Wayland] Bugfix: The OSMesa library was not unloaded on termination
 - [Wayland] Bugfix: `glfwCreateWindow` could emit `GLFW_FEATURE_UNAVAILABLE`
 - [Wayland] Bugfix: Lock key modifier bits were only set when lock keys were pressed
 - [Wayland] Bugfix: A window leaving full screen mode would be iconified (#1995)
 - [Wayland] Bugfix: A window leaving full screen mode ignored its desired size
 - [Wayland] Bugfix: `glfwSetWindowMonitor` did not update windowed mode size
 - [Wayland] Bugfix: `glfwRestoreWindow` would make a full screen window windowed
 - [Wayland] Bugfix: A window maximized or restored by the user would enter an
   inconsistent state
 - [Wayland] Bugfix: Window maximization events were not emitted
 - [Wayland] Bugfix: `glfwRestoreWindow` assumed it was always in windowed mode
 - [Wayland] Bugfix: `glfwSetWindowSize` would resize a full screen window
 - [Wayland] Bugfix: A window content scale event would be emitted every time
   the window resized
 - [Wayland] Bugfix: If `glfwInit` failed it would close stdin
 - [Wayland] Bugfix: Manual resizing with fallback decorations behaved erratically
   (#1991,#2115,#2127)
 - [Wayland] Bugfix: Size limits included frame size for fallback decorations
 - [Wayland] Bugfix: Updating `GLFW_DECORATED` had no effect on server-side
   decorations
 - [Wayland] Bugfix: A monitor would be reported as connected again if its scale
   changed
 - [Wayland] Bugfix: `glfwTerminate` would segfault if any monitor had changed
   scale
 - [Wayland] Bugfix: Window content scale events were not emitted when monitor
   scale changed
 - [Wayland] Bugfix: `glfwSetWindowAspectRatio` reported an error instead of
   applying the specified ratio
 - [Wayland] Bugfix: `GLFW_MAXIMIZED` window hint had no effect
 - [Wayland] Bugfix: `glfwRestoreWindow` had no effect before first show
 - [Wayland] Bugfix: Hiding and then showing a window caused program abort on
   wlroots compositors (#1268)
 - [Wayland] Bugfix: `GLFW_DECORATED` was ignored when showing a window with XDG
   decorations
 - [Wayland] Bugfix: Connecting a mouse after `glfwInit` would segfault (#1450)
 - [Wayland] Bugfix: Joysticks connected after `glfwInit` were not detected (#2198)
 - [Wayland] Bugfix: Fallback decorations emitted `GLFW_CURSOR_UNAVAILABLE` errors
 - [Linux] Bugfix: Joysticks without buttons were ignored (#2042,#2043)
 - [Linux] Bugfix: A small amount of memory could leak if initialization failed (#2229)
 - [NSGL] Bugfix: `GLFW_COCOA_RETINA_FRAMEBUFFER` had no effect on newer
   macOS versions (#1442)
 - [NSGL] Bugfix: Workaround for swap interval on 10.14 broke on 10.12 (#1483)
 - [NSGL] Bugfix: Defining `GL_SILENCE_DEPRECATION` externally caused
   a duplicate definition warning (#1840)
 - [EGL] Added loading of glvnd `libOpenGL.so.0` where available for OpenGL
 - [EGL] Bugfix: The `GLFW_DOUBLEBUFFER` context attribute was ignored (#1843)
 - [EGL] Bugfix: Setting `GLFW_CONTEXT_DEBUG` caused creation to fail (#2348)
 - [GLX] Added loading of glvnd `libGLX.so.0` where available
 - [GLX] Bugfix: Context creation failed if GLX 1.4 was not exported by GLX library
 ## Contact
--- a/deps/mingw/_mingw_dxhelper.h
+++ b/deps/mingw/_mingw_dxhelper.h
@ -0,0 +1,117 @@
 /**
 * This file has no copyright assigned and is placed in the Public Domain.
 * This file is part of the mingw-w64 runtime package.
 * No warranty is given; refer to the file DISCLAIMER within this package.
 */
 #if defined(_MSC_VER) && !defined(_MSC_EXTENSIONS)
 #define NONAMELESSUNION		1
 #endif
 #if defined(NONAMELESSSTRUCT) && \
   !defined(NONAMELESSUNION)
 #define NONAMELESSUNION		1
 #endif
 #if defined(NONAMELESSUNION)  && \
   !defined(NONAMELESSSTRUCT)
 #define NONAMELESSSTRUCT	1
 #endif
 #if !defined(__GNU_EXTENSION)
 #if defined(__GNUC__) || defined(__GNUG__)
 #define __GNU_EXTENSION		__extension__
 #else
 #define __GNU_EXTENSION
 #endif
 #endif /* __extension__ */
 #ifndef __ANONYMOUS_DEFINED
 #define __ANONYMOUS_DEFINED
 #if defined(__GNUC__) || defined(__GNUG__)
 #define _ANONYMOUS_UNION	__extension__
 #define _ANONYMOUS_STRUCT	__extension__
 #else
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif
 #ifndef NONAMELESSUNION
 #define _UNION_NAME(x)
 #define _STRUCT_NAME(x)
 #else /* NONAMELESSUNION */
 #define _UNION_NAME(x)  x
 #define _STRUCT_NAME(x) x
 #endif
 #endif	/* __ANONYMOUS_DEFINED */
 #ifndef DUMMYUNIONNAME
 # ifdef NONAMELESSUNION
 #  define DUMMYUNIONNAME  u
 #  define DUMMYUNIONNAME1 u1	/* Wine uses this variant */
 #  define DUMMYUNIONNAME2 u2
 #  define DUMMYUNIONNAME3 u3
 #  define DUMMYUNIONNAME4 u4
 #  define DUMMYUNIONNAME5 u5
 #  define DUMMYUNIONNAME6 u6
 #  define DUMMYUNIONNAME7 u7
 #  define DUMMYUNIONNAME8 u8
 #  define DUMMYUNIONNAME9 u9
 # else /* NONAMELESSUNION */
 #  define DUMMYUNIONNAME
 #  define DUMMYUNIONNAME1	/* Wine uses this variant */
 #  define DUMMYUNIONNAME2
 #  define DUMMYUNIONNAME3
 #  define DUMMYUNIONNAME4
 #  define DUMMYUNIONNAME5
 #  define DUMMYUNIONNAME6
 #  define DUMMYUNIONNAME7
 #  define DUMMYUNIONNAME8
 #  define DUMMYUNIONNAME9
 # endif
 #endif	/* DUMMYUNIONNAME */
 #if !defined(DUMMYUNIONNAME1)	/* MinGW does not define this one */
 # ifdef NONAMELESSUNION
 #  define DUMMYUNIONNAME1 u1	/* Wine uses this variant */
 # else
 #  define DUMMYUNIONNAME1	/* Wine uses this variant */
 # endif
 #endif	/* DUMMYUNIONNAME1 */
 #ifndef DUMMYSTRUCTNAME
 # ifdef NONAMELESSUNION
 #  define DUMMYSTRUCTNAME  s
 #  define DUMMYSTRUCTNAME1 s1	/* Wine uses this variant */
 #  define DUMMYSTRUCTNAME2 s2
 #  define DUMMYSTRUCTNAME3 s3
 #  define DUMMYSTRUCTNAME4 s4
 #  define DUMMYSTRUCTNAME5 s5
 # else
 #  define DUMMYSTRUCTNAME
 #  define DUMMYSTRUCTNAME1	/* Wine uses this variant */
 #  define DUMMYSTRUCTNAME2
 #  define DUMMYSTRUCTNAME3
 #  define DUMMYSTRUCTNAME4
 #  define DUMMYSTRUCTNAME5
 # endif
 #endif /* DUMMYSTRUCTNAME */
 /* These are for compatibility with the Wine source tree */
 #ifndef WINELIB_NAME_AW
 # ifdef __MINGW_NAME_AW
 #   define WINELIB_NAME_AW  __MINGW_NAME_AW
 # else
 #  ifdef UNICODE
 #   define WINELIB_NAME_AW(func) func##W
 #  else
 #   define WINELIB_NAME_AW(func) func##A
 #  endif
 # endif
 #endif	/* WINELIB_NAME_AW */
 #ifndef DECL_WINELIB_TYPE_AW
 # ifdef __MINGW_TYPEDEF_AW
 #  define DECL_WINELIB_TYPE_AW  __MINGW_TYPEDEF_AW
 # else
 #  define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
 # endif
 #endif	/* DECL_WINELIB_TYPE_AW */
--- a/deps/mingw/dinput.h
+++ b/deps/mingw/dinput.h
--- a/deps/mingw/xinput.h
+++ b/deps/mingw/xinput.h
@ -0,0 +1,239 @@
 /*
 * The Wine project - Xinput Joystick Library
 * Copyright 2008 Andrew Fenn
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */
 #ifndef __WINE_XINPUT_H
 #define __WINE_XINPUT_H
 #include <windef.h>
 /*
 * Bitmasks for the joysticks buttons, determines what has
 * been pressed on the joystick, these need to be mapped
 * to whatever device you're using instead of an xbox 360
 * joystick
 */
 #define XINPUT_GAMEPAD_DPAD_UP          0x0001
 #define XINPUT_GAMEPAD_DPAD_DOWN        0x0002
 #define XINPUT_GAMEPAD_DPAD_LEFT        0x0004
 #define XINPUT_GAMEPAD_DPAD_RIGHT       0x0008
 #define XINPUT_GAMEPAD_START            0x0010
 #define XINPUT_GAMEPAD_BACK             0x0020
 #define XINPUT_GAMEPAD_LEFT_THUMB       0x0040
 #define XINPUT_GAMEPAD_RIGHT_THUMB      0x0080
 #define XINPUT_GAMEPAD_LEFT_SHOULDER    0x0100
 #define XINPUT_GAMEPAD_RIGHT_SHOULDER   0x0200
 #define XINPUT_GAMEPAD_A                0x1000
 #define XINPUT_GAMEPAD_B                0x2000
 #define XINPUT_GAMEPAD_X                0x4000
 #define XINPUT_GAMEPAD_Y                0x8000
 /*
 * Defines the flags used to determine if the user is pushing
 * down on a button, not holding a button, etc
 */
 #define XINPUT_KEYSTROKE_KEYDOWN        0x0001
 #define XINPUT_KEYSTROKE_KEYUP          0x0002
 #define XINPUT_KEYSTROKE_REPEAT         0x0004
 /*
 * Defines the codes which are returned by XInputGetKeystroke
 */
 #define VK_PAD_A                        0x5800
 #define VK_PAD_B                        0x5801
 #define VK_PAD_X                        0x5802
 #define VK_PAD_Y                        0x5803
 #define VK_PAD_RSHOULDER                0x5804
 #define VK_PAD_LSHOULDER                0x5805
 #define VK_PAD_LTRIGGER                 0x5806
 #define VK_PAD_RTRIGGER                 0x5807
 #define VK_PAD_DPAD_UP                  0x5810
 #define VK_PAD_DPAD_DOWN                0x5811
 #define VK_PAD_DPAD_LEFT                0x5812
 #define VK_PAD_DPAD_RIGHT               0x5813
 #define VK_PAD_START                    0x5814
 #define VK_PAD_BACK                     0x5815
 #define VK_PAD_LTHUMB_PRESS             0x5816
 #define VK_PAD_RTHUMB_PRESS             0x5817
 #define VK_PAD_LTHUMB_UP                0x5820
 #define VK_PAD_LTHUMB_DOWN              0x5821
 #define VK_PAD_LTHUMB_RIGHT             0x5822
 #define VK_PAD_LTHUMB_LEFT              0x5823
 #define VK_PAD_LTHUMB_UPLEFT            0x5824
 #define VK_PAD_LTHUMB_UPRIGHT           0x5825
 #define VK_PAD_LTHUMB_DOWNRIGHT         0x5826
 #define VK_PAD_LTHUMB_DOWNLEFT          0x5827
 #define VK_PAD_RTHUMB_UP                0x5830
 #define VK_PAD_RTHUMB_DOWN              0x5831
 #define VK_PAD_RTHUMB_RIGHT             0x5832
 #define VK_PAD_RTHUMB_LEFT              0x5833
 #define VK_PAD_RTHUMB_UPLEFT            0x5834
 #define VK_PAD_RTHUMB_UPRIGHT           0x5835
 #define VK_PAD_RTHUMB_DOWNRIGHT         0x5836
 #define VK_PAD_RTHUMB_DOWNLEFT          0x5837
 /*
 * Deadzones are for analogue joystick controls on the joypad
 * which determine when input should be assumed to be in the
 * middle of the pad. This is a threshold to stop a joypad
 * controlling the game when the player isn't touching the
 * controls.
 */
 #define XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE  7849
 #define XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689
 #define XINPUT_GAMEPAD_TRIGGER_THRESHOLD    30
 /*
 * Defines what type of abilities the type of joystick has
 * DEVTYPE_GAMEPAD is available for all joysticks, however
 * there may be more specific identifiers for other joysticks
 * which are being used.
 */
 #define XINPUT_DEVTYPE_GAMEPAD          0x01
 #define XINPUT_DEVSUBTYPE_GAMEPAD       0x01
 #define XINPUT_DEVSUBTYPE_WHEEL         0x02
 #define XINPUT_DEVSUBTYPE_ARCADE_STICK  0x03
 #define XINPUT_DEVSUBTYPE_FLIGHT_SICK   0x04
 #define XINPUT_DEVSUBTYPE_DANCE_PAD     0x05
 #define XINPUT_DEVSUBTYPE_GUITAR        0x06
 #define XINPUT_DEVSUBTYPE_DRUM_KIT      0x08
 /*
 * These are used with the XInputGetCapabilities function to
 * determine the abilities to the joystick which has been
 * plugged in.
 */
 #define XINPUT_CAPS_VOICE_SUPPORTED     0x0004
 #define XINPUT_FLAG_GAMEPAD             0x00000001
 /*
 * Defines the status of the battery if one is used in the
 * attached joystick. The first two define if the joystick
 * supports a battery. Disconnected means that the joystick
 * isn't connected. Wired shows that the joystick is a wired
 * joystick.
 */
 #define BATTERY_DEVTYPE_GAMEPAD         0x00
 #define BATTERY_DEVTYPE_HEADSET         0x01
 #define BATTERY_TYPE_DISCONNECTED       0x00
 #define BATTERY_TYPE_WIRED              0x01
 #define BATTERY_TYPE_ALKALINE           0x02
 #define BATTERY_TYPE_NIMH               0x03
 #define BATTERY_TYPE_UNKNOWN            0xFF
 #define BATTERY_LEVEL_EMPTY             0x00
 #define BATTERY_LEVEL_LOW               0x01
 #define BATTERY_LEVEL_MEDIUM            0x02
 #define BATTERY_LEVEL_FULL              0x03
 /*
 * How many joysticks can be used with this library. Games that
 * use the xinput library will not go over this number.
 */
 #define XUSER_MAX_COUNT                 4
 #define XUSER_INDEX_ANY                 0x000000FF
 /*
 * Defines the structure of an xbox 360 joystick.
 */
 typedef struct _XINPUT_GAMEPAD {
    WORD wButtons;
    BYTE bLeftTrigger;
    BYTE bRightTrigger;
    SHORT sThumbLX;
    SHORT sThumbLY;
    SHORT sThumbRX;
    SHORT sThumbRY;
 } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD;
 typedef struct _XINPUT_STATE {
    DWORD dwPacketNumber;
    XINPUT_GAMEPAD Gamepad;
 } XINPUT_STATE, *PXINPUT_STATE;
 /*
 * Defines the structure of how much vibration is set on both the
 * right and left motors in a joystick. If you're not using a 360
 * joystick you will have to map these to your device.
 */
 typedef struct _XINPUT_VIBRATION {
    WORD wLeftMotorSpeed;
    WORD wRightMotorSpeed;
 } XINPUT_VIBRATION, *PXINPUT_VIBRATION;
 /*
 * Defines the structure for what kind of abilities the joystick has
 * such abilities are things such as if the joystick has the ability
 * to send and receive audio, if the joystick is in fact a driving
 * wheel or perhaps if the joystick is some kind of dance pad or
 * guitar.
 */
 typedef struct _XINPUT_CAPABILITIES {
    BYTE Type;
    BYTE SubType;
    WORD Flags;
    XINPUT_GAMEPAD Gamepad;
    XINPUT_VIBRATION Vibration;
 } XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES;
 /*
 * Defines the structure for a joystick input event which is
 * retrieved using the function XInputGetKeystroke
 */
 typedef struct _XINPUT_KEYSTROKE {
    WORD VirtualKey;
    WCHAR Unicode;
    WORD Flags;
    BYTE UserIndex;
    BYTE HidCode;
 } XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE;
 typedef struct _XINPUT_BATTERY_INFORMATION
 {
    BYTE BatteryType;
    BYTE BatteryLevel;
 } XINPUT_BATTERY_INFORMATION, *PXINPUT_BATTERY_INFORMATION;
 #ifdef __cplusplus
 extern "C" {
 #endif
 void WINAPI XInputEnable(WINBOOL);
 DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*);
 DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*);
 DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE);
 DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*);
 DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*);
 DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);
 #ifdef __cplusplus
 }
 #endif
 #endif /* __WINE_XINPUT_H */
--- a/deps/nuklear.h
+++ b/deps/nuklear.h
@ -423,11 +423,6 @@ NK_STATIC_ASSERT(sizeof(nk_rune) >= 4);
 NK_STATIC_ASSERT(sizeof(nk_size) >= sizeof(void*));
 NK_STATIC_ASSERT(sizeof(nk_ptr) >= sizeof(void*));
 #if defined(_MSC_VER)
 /* disable `operands are different enum types` warning on MSVC */ 
 #pragma warning( disable: 5287 )
 #endif
 /* ============================================================================
 *
 *                                  API
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@ -1,8 +1,4 @@
 # Because of bugs and limitations in its Markdown support, only fairly recent
 # versions of Doxygen can produce acceptable output
 set(MINIMUM_DOXYGEN_VERSION 1.9.8)
 # NOTE: The order of this list determines the order of items in the Guides
 #       (i.e. Pages) list in the generated documentation
 set(source_files
@ -36,10 +32,10 @@ foreach(file IN LISTS source_files)
 endforeach()
 set(DOXYGEN_SKIP_DOT TRUE)
-find_package(Doxygen ${MINIMUM_DOXYGEN_VERSION} QUIET)
+find_package(Doxygen)
-if (NOT DOXYGEN_FOUND)
+if (NOT DOXYGEN_FOUND OR DOXYGEN_VERSION VERSION_LESS "1.9.8")
-    message(STATUS "Documentation generation requires Doxygen ${MINIMUM_DOXYGEN_VERSION} or later")
+    message(STATUS "Documentation generation requires Doxygen 1.9.8 or later")
 else()
    configure_file(Doxyfile.in Doxyfile @ONLY)
    add_custom_command(OUTPUT "html/index.html"
@ -50,7 +46,7 @@ else()
                       COMMENT "Generating HTML documentation"
                       VERBATIM)
-    add_custom_target(docs ALL SOURCES ${source_files} DEPENDS "html/index.html")
+    add_custom_target(docs ALL SOURCES "html/index.html")
    set_target_properties(docs PROPERTIES FOLDER "GLFW3")
    if (GLFW_INSTALL)
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@ -278,7 +278,13 @@ ALIASES                = "thread_safety=@par Thread safety^^" \
                         "analysis=@par Analysis^^" \
                         "reentrancy=@par Reentrancy^^" \
                         "errors=@par Errors^^" \
-                         "callback_signature=@par Callback signature^^"
+                         "callback_signature=@par Callback signature^^" \
                         "glfw3=__GLFW 3:__" \
                         "x11=__X11:__" \
                         "wayland=__Wayland:__" \
                         "win32=__Windows:__" \
                         "macos=__macOS:__" \
                         "linux=__Linux:__"
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
--- a/docs/build.md
+++ b/docs/build.md
@ -310,7 +310,7 @@ With a few changes to your `CMakeLists.txt` you can locate the package and
 target files generated when GLFW is installed.
 ```cmake
-find_package(glfw3 3.5 REQUIRED)
+find_package(glfw3 3.4 REQUIRED)
 ```
 Once GLFW has been added to the project, link against it with the `glfw` target.
@ -390,8 +390,8 @@ If you are using the dynamic library version of GLFW, add it to the project
 dependencies.
 If you are using the static library version of GLFW, add it and the Cocoa,
-OpenGL, IOKit and QuartzCore frameworks to the project as dependencies.  They
+OpenGL and IOKit frameworks to the project as dependencies.  They can all be
-can all be found in `/System/Library/Frameworks`.
+found in `/System/Library/Frameworks`.
 ### With command-line or makefile on macOS {#build_link_osx}
@ -405,7 +405,7 @@ command-line yourself using the `-l` and `-framework` switches.
 If you are using the dynamic GLFW library, which is named `libglfw.3.dylib`, do:
 ```sh
-cc -o myprog myprog.c -lglfw -framework Cocoa -framework OpenGL -framework IOKit -framework QuartzCore
+cc -o myprog myprog.c -lglfw -framework Cocoa -framework OpenGL -framework IOKit
 ```
 If you are using the static library, named `libglfw3.a`, substitute `-lglfw3`
--- a/docs/compat.md
+++ b/docs/compat.md
@ -50,11 +50,10 @@ compositing window manager to un-redirect full screen GLFW windows.  If the
 running window manager uses compositing but does not support this property then
 additional copying may be performed for each buffer swap of full screen windows.
-GLFW uses the [clipboard manager protocol][ClipboardManager] to keep the
+GLFW uses the [clipboard manager protocol][ClipboardManager] to push a clipboard
-clipboard string availble for the user after the libary has been terminated.  If
+string (i.e. selection) owned by a GLFW window about to be destroyed to the
-there is no running clipboard manager and the clipboard contents has been set
+clipboard manager.  If there is no running clipboard manager, the clipboard
-with @ref glfwSetClipboardString, the clipboard will be emptied when the library
+string will be unavailable once the window has been destroyed.
 is terminated.
 [clipboardManager]: https://www.freedesktop.org/wiki/ClipboardManager/
@ -243,27 +242,24 @@ extensions are unavailable, the `GLFW_SRGB_CAPABLE` hint will have no effect.
 ## OpenGL on macOS {#compat_osx}
-macOS (as of version 14) still provides OpenGL but it has been deprecated by
+Support for OpenGL 3.2 and above was introduced with OS X 10.7 and even then
-Apple.  While the API is still available, it is poorly maintained and frequently
+only forward-compatible, core profile contexts are supported.  Support for
-develops new issues.  On modern systems, OpenGL is implemented on top of Metal
+OpenGL 4.1 was introduced with OS X 10.9, also limited to forward-compatible,
-and is not fully thread-safe.
+core profile contexts.  There is also still no mechanism for requesting debug
 contexts or no-error contexts.  Versions of Mac OS X earlier than 10.7 support
 at most OpenGL version 2.1.
-macOS does not support OpenGL stereo rendering.  If the `GLFW_STEREO` hint is
+Because of this, on OS X 10.7 and later, the `GLFW_CONTEXT_VERSION_MAJOR` and
-set to true, OpenGL context creation will always fail.
+`GLFW_CONTEXT_VERSION_MINOR` hints will cause @ref glfwCreateWindow to fail if
 given version 3.0 or 3.1.  The `GLFW_OPENGL_PROFILE` hint must be set to
 `GLFW_OPENGL_CORE_PROFILE` when creating OpenGL 3.2 and later contexts.  The
 `GLFW_CONTEXT_DEBUG` and `GLFW_CONTEXT_NO_ERROR` hints are ignored.
-macOS only supports OpenGL core profile contexts that are forward-compatible,
+Also, on Mac OS X 10.6 and below, the `GLFW_CONTEXT_VERSION_MAJOR` and
-but the `GLFW_OPENGL_FORWARD_COMPAT` hint is ignored since GLFW 3.4.  Even if
+`GLFW_CONTEXT_VERSION_MINOR` hints will fail if given a version above 2.1,
-this hint is set to false (the default), a forward-compatible context will be
+setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT` hints to
-returned if available.
+a non-default value will cause @ref glfwCreateWindow to fail and the
-
+`GLFW_CONTEXT_DEBUG` hint is ignored.
 macOS does not support OpenGL debug contexts, no-error contexts or robustness.
 The `GLFW_CONTEXT_DEBUG`, `GLFW_CONTEXT_NO_ERROR` and `GLFW_CONTEXT_ROBUSTNESS`
 hints will be ignored and a context without these features will be returned.
 macOS does not flush OpenGL contexts when they are made non-current.  The
 `GLFW_CONTEXT_RELEASE_BEHAVIOR` hint is ignored and the release behavior will
 always be the equivalent of `GLFW_RELEASE_BEHAVIOR_NONE`.  If you need a context
 to be flushed, call `glFlush` before making it non-current.
 ## Vulkan loader and API {#compat_vulkan}
--- a/docs/compile.md
+++ b/docs/compile.md
@ -36,9 +36,9 @@ specific to GLFW.  It may be a useful companion to this one.
 ### Installing dependencies {#compile_deps}
-The C/C++ development environments in Visual Studio, Xcode and MinGW-w64 come
+The C/C++ development environments in Visual Studio, Xcode and MinGW come with
-with all necessary dependencies for compiling GLFW, but on Unix-like systems
+all necessary dependencies for compiling GLFW, but on Unix-like systems like
-like Linux and FreeBSD you will need a few extra packages.
+Linux and FreeBSD you will need a few extra packages.
 #### Dependencies for Wayland and X11 {#compile_deps_wayland}
@ -180,7 +180,7 @@ cd path/to/build
 make
 ```
-With MinGW-w64, it is `mingw32-make`.
+With MinGW, it is `mingw32-make`.
 ```sh
 cd path/to/build
@ -264,8 +264,8 @@ __USE_MSVC_RUNTIME_LIBRARY_DLL__ determines whether to use the DLL version or th
 static library version of the Visual C++ runtime library.  When enabled, the
 DLL version of the Visual C++ library is used.  This is enabled by default.
-It is recommended to set the standard CMake variable [CMAKE_MSVC_RUNTIME_LIBRARY][]
+On CMake 3.15 and later you can set the standard CMake [CMAKE_MSVC_RUNTIME_LIBRARY][]
-instead of this GLFW-specific option.
+variable instead of this GLFW-specific option.
 [CMAKE_MSVC_RUNTIME_LIBRARY]: https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
@ -299,12 +299,12 @@ library.  This option is only available when compiling for Linux and other Unix-
 systems other than macOS.  This is enabled by default.
-## Cross-compilation with CMake and MinGW-w64 {#compile_mingw_cross}
+## Cross-compilation with CMake and MinGW {#compile_mingw_cross}
-Both Cygwin and many Linux distributions have MinGW-w64 packages.  For example,
+Both Cygwin and many Linux distributions have MinGW or MinGW-w64 packages.  For
-Cygwin has the `mingw64-i686-gcc` and `mingw64-x86_64-gcc` packages for 32- and
+example, Cygwin has the `mingw64-i686-gcc` and `mingw64-x86_64-gcc` packages
-64-bit version of MinGW-w64, while Debian GNU/Linux and derivatives like Ubuntu
+for 32- and 64-bit version of MinGW-w64, while Debian GNU/Linux and derivatives
-have the `mingw-w64` package for both.
+like Ubuntu have the `mingw-w64` package for both.
 GLFW has CMake toolchain files in the `CMake` subdirectory that set up
 cross-compilation of Windows binaries.  To use these files you set the
@ -315,9 +315,9 @@ configuring and generating the build files.
 cmake -S path/to/glfw -B path/to/build -D CMAKE_TOOLCHAIN_FILE=path/to/file
 ```
-The exact toolchain file to use depends on the prefix used by the MinGW-w64
+The exact toolchain file to use depends on the prefix used by the MinGW or
-binaries on your system.  You can usually see this in the /usr directory.  For
+MinGW-w64 binaries on your system.  You can usually see this in the /usr
-example, both the Ubuntu and Cygwin MinGW-w64 packages have
+directory.  For example, both the Ubuntu and Cygwin MinGW-w64 packages have
 `/usr/x86_64-w64-mingw32` for the 64-bit compilers, so the correct invocation
 would be:
--- a/docs/input.md
+++ b/docs/input.md
@ -492,20 +492,6 @@ a mouse button callback.
 glfwSetMouseButtonCallback(window, mouse_button_callback);
 ```
@anchor GLFW_UNLIMITED_MOUSE_BUTTONS
 To handle all mouse buttons in the callback, instead of only ones with associated
 [button tokens](@ref buttons), set the @ref GLFW_UNLIMITED_MOUSE_BUTTONS
 input mode.
 ```c
 glfwSetInputMode(window, GLFW_UNLIMITED_MOUSE_BUTTONS, GLFW_TRUE);
 ```
 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).
@ -517,16 +503,11 @@ void mouse_button_callback(GLFWwindow* window, int button, int action, int mods)
 }
 ```
 The mouse button is an integer that can be one of the
 [mouse button tokens](@ref buttons) or, if the
@ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode is set, any other positive value.
 The action is one of `GLFW_PRESS` or `GLFW_RELEASE`.
-The last reported state for every [mouse button token](@ref buttons) is also
+The last reported state for every [supported mouse button](@ref buttons) is also
 saved in per-window state arrays that can be polled with @ref
-glfwGetMouseButton. This is not effected by the @ref GLFW_UNLIMITED_MOUSE_BUTTONS
+glfwGetMouseButton.
 input mode.
 ```c
 int state = glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_LEFT);
@ -559,7 +540,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
-[mouse button token](@ref buttons).
+[supported mouse button](@ref buttons).
 ### Scroll input {#scrolling}
--- a/docs/intro.md
+++ b/docs/intro.md
@ -63,7 +63,7 @@ before the application exits.  Modern systems are very good at freeing resources
 allocated by programs that exit, but GLFW sometimes has to change global system
 settings and these might not be restored without termination.
-__macOS:__ When the library is initialized the main menu and dock icon are created.
+@macos When the library is initialized the main menu and dock icon are created.
 These are not desirable for a command-line only program.  The creation of the
 main menu and dock icon can be disabled with the @ref GLFW_COCOA_MENUBAR init
 hint.
@ -621,17 +621,17 @@ The format of the string is as follows:
 - The names of the always supported context creation APIs EGL and OSMesa
 - Any additional compile-time options, APIs and (on Windows) what compiler was used
-For example, compiling GLFW 3.5 with MinGW-64 as a DLL for Windows, may result
+For example, compiling GLFW 3.4 with MinGW as a DLL for Windows, may result in a version string
-in a version string like this:
+like this:
 ```c
-3.5.0 Win32 WGL Null EGL OSMesa MinGW-w64 DLL
+3.4.0 Win32 WGL Null EGL OSMesa MinGW DLL
 ```
 Compiling GLFW as a static library for Linux, with both Wayland and X11 enabled, may
 result in a version string like this:
 ```c
-3.5.0 Wayland X11 GLX Null EGL OSMesa monotonic
+3.4.0 Wayland X11 GLX Null EGL OSMesa monotonic
 ```
--- a/docs/monitor.md
+++ b/docs/monitor.md
@ -255,7 +255,3 @@ hardware gamma correction, which today is typically an approximation of sRGB
 gamma.  This means that setting a perfectly linear ramp, or gamma 1.0, will
 produce the default (usually sRGB-like) behavior.
@note __Wayland:__ An application cannot read or modify the monitor gamma ramp.
 The @ref glfwGetGammaRamp, @ref glfwSetGammaRamp and @ref glfwSetGamma functions
 emit @ref GLFW_FEATURE_UNAVAILABLE.
--- a/docs/news.md
+++ b/docs/news.md
@ -1,70 +1,400 @@
-# Release notes for version 3.5 {#news}
+# Release notes for version 3.4 {#news}
 [TOC]
 ## New features {#features}
-### Unlimited mouse buttons {#unlimited_mouse_buttons}
+### Runtime platform selection {#runtime_platform_selection}
-GLFW now has an input mode which allows an unlimited number of mouse buttons to
+GLFW now supports being compiled for multiple backends and selecting between
-be reported by the mouse buttton callback, rather than just the associated
+them at runtime with the @ref GLFW_PLATFORM init hint.  After initialization the
-[mouse button tokens](@ref buttons). This allows using mouse buttons with
+selected platform can be queried with @ref glfwGetPlatform.  You can check if
-values over 8. For compatibility with older versions, the
+support for a given platform is compiled in with @ref glfwPlatformSupported.
-@ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode needs to be set to make use of
+
-this.
+For more information see @ref platform.
-### EGLConfig native access function {#eglconfig}
+### More standard cursor shapes {#more_cursor_shapes}
-GLFW now provides the @ref glfwGetEGLConfig native access function for querying
+GLFW now provides the standard cursor shapes @ref GLFW_RESIZE_NWSE_CURSOR and
-the `EGLConfig` of a window that has a `EGLSurface`.
+@ref GLFW_RESIZE_NESW_CURSOR for diagonal resizing, @ref GLFW_RESIZE_ALL_CURSOR
 for omnidirectional resizing and @ref GLFW_NOT_ALLOWED_CURSOR for showing an
 action is not allowed.
 Unlike the original set, these shapes may not be available everywhere and
 creation will then fail with the new @ref GLFW_CURSOR_UNAVAILABLE error.
 The cursors for horizontal and vertical resizing are now referred to as @ref
 GLFW_RESIZE_EW_CURSOR and @ref GLFW_RESIZE_NS_CURSOR, and the pointing hand
 cursor is now referred to as @ref GLFW_POINTING_HAND_CURSOR.  The older names
 are still available.
 For more information see @ref cursor_standard.
-### GLXFBConfig native access function {#glxfbconfig}
+### Mouse event passthrough {#mouse_input_passthrough}
-GLFW now provides the @ref glfwGetGLXFBConfig native access function for
+GLFW now provides the [GLFW_MOUSE_PASSTHROUGH](@ref GLFW_MOUSE_PASSTHROUGH_hint)
-querying the `GLXFBConfig` of a window that has a `GLXWindow`.
+window hint for making a window transparent to mouse input, lettings events pass
 to whatever window is behind it.  This can also be changed after window
 creation with the matching [window attribute](@ref GLFW_MOUSE_PASSTHROUGH_attrib).
 ### Ability to get window title {#window_title_function}
 GLFW now supports querying the title of a window with the @ref glfwGetWindowTitle
 function.
 For more information see @ref window_title.
 ### Captured cursor mode {#captured_cursor_mode}
 GLFW now supports confining the cursor to the window content area with the @ref
 GLFW_CURSOR_CAPTURED cursor mode.
 For more information see @ref cursor_mode.
 ### Support for custom heap memory allocator {#custom_heap_allocator}
 GLFW now supports plugging a custom heap memory allocator at initialization with
@ref glfwInitAllocator.  The allocator is a struct of type @ref GLFWallocator
 with function pointers corresponding to the standard library functions `malloc`,
 `realloc` and `free`.
 For more information see @ref init_allocator.
 ### Window hint for framebuffer scaling {#scale_framebuffer_hint}
 GLFW now allows provides the
 [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint) window hint for
 controlling framebuffer scaling on platforms that handle scaling by keeping the
 window size the same while resizing the framebuffer.  The default value is to
 allow framebuffer scaling.
 This was already possible on macOS via the
 [GLFW_COCOA_RETINA_FRAMEBUFFER](@ref GLFW_COCOA_RETINA_FRAMEBUFFER_hint) window
 hint.  This is now another name for the same hint value.
 For more information see @ref window_scale.
 ### Window hints for initial window position {#window_position_hint}
 GLFW now provides the @ref GLFW_POSITION_X and @ref GLFW_POSITION_Y window hints for
 specifying the initial position of the window.  This removes the need to create a hidden
 window, move it and then show it.  The default value of these hints is
 `GLFW_ANY_POSITION`, which selects the previous behavior.
 For more information see @ref window_pos.
 ### ANGLE rendering backend hint {#angle_renderer_hint}
 GLFW now provides the
 [GLFW_ANGLE_PLATFORM_TYPE](@ref GLFW_ANGLE_PLATFORM_TYPE_hint) init hint for
 requesting a specific rendering backend when using [ANGLE][] to create OpenGL ES
 contexts.
 [ANGLE]: https://chromium.googlesource.com/angle/angle/
 ### Windows window menu keyboard access hint {#win32_keymenu_hint}
 GLFW now provides the
 [GLFW_WIN32_KEYBOARD_MENU](@ref GLFW_WIN32_KEYBOARD_MENU_hint) window hint for
 enabling keyboard access to the window menu via the Alt+Space and
 Alt-and-then-Space shortcuts.  This may be useful for more GUI-oriented
 applications.
 ### Windows STARTUPINFO show command hint {#win32_showdefault_hint}
 GLFW now provides the [GLFW_WIN32_SHOWDEFAULT](@ref GLFW_WIN32_SHOWDEFAULT_hint) window
 hint for applying the show command in the program's `STARTUPINFO` when showing the window
 for the first time.  This may be useful for the main window of a windowed-mode tool.
 ### Cocoa NSView native access function {#cocoa_nsview_function}
 GLFW now provides the @ref glfwGetCocoaView native access function
 for returning the Cocoa NSView.
 ### Wayland libdecor decorations {#wayland_libdecor_decorations}
 GLFW now supports improved client-side window decorations via
 [libdecor](https://gitlab.freedesktop.org/libdecor/libdecor).  This provides
 fully featured window decorations on desktop environments like GNOME.
 Support for libdecor can be toggled before GLFW is initialized with the
 [GLFW_WAYLAND_LIBDECOR](@ref GLFW_WAYLAND_LIBDECOR_hint) init hint.  It is
 enabled by default.
 This feature has also been available in GLFW 3.3 since 3.3.9.
 ### Wayland surface app_id hint {#wayland_app_id_hint}
 GLFW now supports specifying the app_id for a Wayland window using the
 [GLFW_WAYLAND_APP_ID](@ref GLFW_WAYLAND_APP_ID_hint) window hint string.
 ### X11 Vulkan window surface hint {#x11_xcb_vulkan_surface}
 GLFW now supports disabling the use of `VK_KHR_xcb_surface` over
 `VK_KHR_xlib_surface` where available, with the
 [GLFW_X11_XCB_VULKAN_SURFACE](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint) init hint.
 This affects @ref glfwGetRequiredInstanceExtensions and @ref
 glfwCreateWindowSurface.
 ## Caveats {#caveats}
 ### Multiple sets of native access functions {#multiplatform_caveat}
 Because GLFW now supports runtime selection of platform (window system), a library binary
 may export native access functions for multiple platforms.  Starting with version 3.4 you
 must not assume that GLFW is running on a platform just because it exports native access
 functions for it.  After initialization, you can query the selected platform with @ref
 glfwGetPlatform.
 ### Version string format has been changed {#version_string_caveat}
 Because GLFW now supports runtime selection of platform (window system), the version
 string returned by @ref glfwGetVersionString has been expanded.  It now contains the names
 of all APIs for all the platforms that the library binary supports.
 The version string is intended for bug reporting and should not be parsed.  See
@ref glfwGetVersion and @ref glfwPlatformSupported instead.
 ### Joystick support is initialized on demand {#joystick_init_caveat}
 The joystick part of GLFW is now initialized when first used, primarily to work
 around faulty Windows drivers that cause DirectInput to take up to several
 seconds to enumerate devices.
 This change is mostly not observable.  However, if your application waits for
 events without having first called any joystick function or created any visible
 windows, the wait may never unblock as GLFW may not yet have subscribed to
 joystick related OS events.
 To work around this, call any joystick function before waiting for events, for
 example by setting a [joystick callback](@ref joystick_event).
 ### Tests and examples are disabled when built as a subproject {#standalone_caveat}
 GLFW now by default does not build the tests or examples when it is added as
 a subdirectory of another CMake project.  If you were setting @ref
 GLFW_BUILD_TESTS or @ref GLFW_BUILD_EXAMPLES to false in your CMake files, you
 can now remove this.
 If you do want these to be built, set @ref GLFW_BUILD_TESTS and @ref
 GLFW_BUILD_EXAMPLES in your CMake files before adding the GLFW subdirectory.
 ```cmake
 set(GLFW_BUILD_EXAMPLES ON CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
 add_subdirectory(path/to/glfw)
 ```
 ### Configuration header is no longer generated {#config_header_caveat}
 The `glfw_config.h` configuration header is no longer generated by CMake and the
 platform selection macros are now part of the GLFW CMake target.  The
 `_GLFW_USE_CONFIG_H` macro is still supported in case you are generating
 a configuration header in a custom build setup.
 ### Documentation generation requires Doxygen 1.9.8 or later {#docs_target_caveat}
 Doxygen 1.9.8 or later is now required for the `docs` CMake target to be
 generated.  This is because the documentation now uses more of the Markdown
 support in Doxygen and this support has until recently been relatively unstable.
 ### Windows 7 framebuffer transparency requires DWM transparency {#win7_framebuffer_caveat}
 GLFW no longer supports per-pixel framebuffer transparency via @ref
 GLFW_TRANSPARENT_FRAMEBUFFER on Windows 7 if DWM transparency is off
 (the Transparency setting under Personalization > Window Color).
 ### macOS main menu now created at initialization {#macos_menu_caveat}
 GLFW now creates the main menu and completes the initialization of NSApplication
 during initialization.  Programs that do not want a main menu can disable it
 with the [GLFW_COCOA_MENUBAR](@ref GLFW_COCOA_MENUBAR_hint) init hint.
 ### macOS CoreVideo dependency has been removed {#corevideo_caveat}
 GLFW no longer depends on the CoreVideo framework on macOS and it no longer
 needs to be specified during compilation or linking.
 ### Wayland framebuffer may lack alpha channel on older systems {#wayland_alpha_caveat}
 On Wayland, when creating an EGL context on a machine lacking the new
 `EGL_EXT_present_opaque` extension, the @ref GLFW_ALPHA_BITS window hint will be
 ignored and the framebuffer will not have an alpha channel.  This is because
 some Wayland compositors treat any buffer with an alpha channel as per-pixel
 transparent.
 If you want a per-pixel transparent window, see the
 [GLFW_TRANSPARENT_FRAMEBUFFER](@ref GLFW_TRANSPARENT_FRAMEBUFFER_hint) window
 hint.
 ### X11 empty events no longer round-trip to server {#x11_emptyevent_caveat}
 Events posted with @ref glfwPostEmptyEvent now use a separate unnamed pipe
 instead of sending an X11 client event to the helper window.
 ## Deprecations {#deprecations}
 ### Windows XP and Vista support is deprecated {#winxp_deprecated}
 Support for Windows XP and Vista has been deprecated and will be removed in
 a future release.  Windows XP has been out of extended support since 2014.
 ### Original MinGW support is deprecated {#mingw_deprecated}
 Support for the now unmaintained original MinGW distribution has been deprecated
 and will be removed in a future release.
 This does not apply to the much more capable MinGW-w64, which remains fully
 supported, actively maintained and available on many platforms.
 ### OS X Yosemite support is deprecated {#yosemite_deprecated}
 Support for OS X 10.10 Yosemite and earlier has been deprecated and will be
 removed in a future release.  OS X 10.10 has been out of support since 2017.
 ## Removals {#removals}
-### Windows XP and Vista support has been removed {#winxp_vista}
+### GLFW_VULKAN_STATIC CMake option has been removed {#vulkan_static_removed}
-Support for Windows XP and Vista has been removed.  Windows XP has been out of extended
+This option was used to compile GLFW directly linked with the Vulkan loader, instead of
-support since 2014.
+using dynamic loading to get hold of `vkGetInstanceProcAddr` at initialization.  This is
 now done by calling the @ref glfwInitVulkanLoader function before initialization.
 If you need backward compatibility, this macro can still be defined for GLFW 3.4 and will
 have no effect.  The call to @ref glfwInitVulkanLoader can be conditionally enabled in
 your code by checking the @ref GLFW_VERSION_MAJOR and @ref GLFW_VERSION_MINOR macros.
-### Original MinGW support has been removed {#original_mingw}
+### GLFW_USE_WAYLAND CMake option has been removed {#use_wayland_removed}
-Support for the now unmaintained original MinGW distribution has been removed.
+This option was used to compile GLFW for Wayland instead of X11.  GLFW now
 supports selecting the platform at run-time.  By default GLFW is compiled for
 both Wayland and X11 on Linux and other Unix-like systems.
-This does not apply to the much more capable [MinGW-w64](https://www.mingw-w64.org/),
+To disable Wayland or X11 or both, set the @ref GLFW_BUILD_WAYLAND and @ref
-which remains fully supported.  MinGW-w64 can build both 32- and 64-bit binaries, is
+GLFW_BUILD_X11 CMake options.
-actively maintained and available on many platforms.
+
 The `GLFW_USE_WAYLAND` CMake variable must not be present in the CMake cache at
 all, or GLFW will fail to configure.  If you are getting this error, delete the
 CMake cache for GLFW and configure again.
 ### GLFW_USE_OSMESA CMake option has been removed {#use_osmesa_removed}
 This option was used to compile GLFW for the Null platform.  The Null platform
 is now always available.  To produce a library binary that only supports this
 platform, the way this CMake option used to do, you will instead need to disable
 the default platforms for the target OS.  This means setting the @ref
 GLFW_BUILD_WIN32, @ref GLFW_BUILD_COCOA or @ref GLFW_BUILD_WAYLAND and @ref
 GLFW_BUILD_X11 CMake options to false.
 You can set all of them to false and the ones that don't apply for the target OS
 will be ignored.
 ### wl_shell protocol support has been removed {#wl_shell_removed}
 Support for the deprecated wl_shell protocol has been removed and GLFW now only
 supports the XDG-Shell protocol.  If your Wayland compositor does not support
 XDG-Shell then GLFW will fail to initialize.
 ## New symbols {#new_symbols}
 ### New functions {#new_functions}
- - @ref glfwGetEGLConfig
+ - @ref glfwInitAllocator
- - @ref glfwGetGLXFBConfig
+ - @ref glfwGetPlatform
 - @ref glfwPlatformSupported
 - @ref glfwInitVulkanLoader
 - @ref glfwGetWindowTitle
 - @ref glfwGetCocoaView
 ### New types {#new_types}
 - @ref GLFWallocator
 - @ref GLFWallocatefun
 - @ref GLFWreallocatefun
 - @ref GLFWdeallocatefun
 ### New constants {#new_constants}
- @ref GLFW_UNLIMITED_MOUSE_BUTTONS
+ - @ref GLFW_PLATFORM
 - @ref GLFW_ANY_PLATFORM
 - @ref GLFW_PLATFORM_WIN32
 - @ref GLFW_PLATFORM_COCOA
 - @ref GLFW_PLATFORM_WAYLAND
 - @ref GLFW_PLATFORM_X11
 - @ref GLFW_PLATFORM_NULL
 - @ref GLFW_PLATFORM_UNAVAILABLE
 - @ref GLFW_POINTING_HAND_CURSOR
 - @ref GLFW_RESIZE_EW_CURSOR
 - @ref GLFW_RESIZE_NS_CURSOR
 - @ref GLFW_RESIZE_NWSE_CURSOR
 - @ref GLFW_RESIZE_NESW_CURSOR
 - @ref GLFW_RESIZE_ALL_CURSOR
 - @ref GLFW_MOUSE_PASSTHROUGH
 - @ref GLFW_NOT_ALLOWED_CURSOR
 - @ref GLFW_CURSOR_UNAVAILABLE
 - @ref GLFW_WIN32_KEYBOARD_MENU
 - @ref GLFW_WIN32_SHOWDEFAULT
 - @ref GLFW_CONTEXT_DEBUG
 - @ref GLFW_FEATURE_UNAVAILABLE
 - @ref GLFW_FEATURE_UNIMPLEMENTED
 - @ref GLFW_ANGLE_PLATFORM_TYPE
 - @ref GLFW_ANGLE_PLATFORM_TYPE_NONE
 - @ref GLFW_ANGLE_PLATFORM_TYPE_OPENGL
 - @ref GLFW_ANGLE_PLATFORM_TYPE_OPENGLES
 - @ref GLFW_ANGLE_PLATFORM_TYPE_D3D9
 - @ref GLFW_ANGLE_PLATFORM_TYPE_D3D11
 - @ref GLFW_ANGLE_PLATFORM_TYPE_VULKAN
 - @ref GLFW_ANGLE_PLATFORM_TYPE_METAL
 - @ref GLFW_X11_XCB_VULKAN_SURFACE
 - @ref GLFW_CURSOR_CAPTURED
 - @ref GLFW_POSITION_X
 - @ref GLFW_POSITION_Y
 - @ref GLFW_ANY_POSITION
 - @ref GLFW_WAYLAND_APP_ID
 - @ref GLFW_WAYLAND_LIBDECOR
 - @ref GLFW_WAYLAND_PREFER_LIBDECOR
 - @ref GLFW_WAYLAND_DISABLE_LIBDECOR
 - @ref GLFW_SCALE_FRAMEBUFFER
 ## Release notes for earlier versions {#news_archive}
 - [Release notes for 3.4](https://www.glfw.org/docs/3.4/news.html)
 - [Release notes for 3.3](https://www.glfw.org/docs/3.3/news.html)
 - [Release notes for 3.2](https://www.glfw.org/docs/3.2/news.html)
 - [Release notes for 3.1](https://www.glfw.org/docs/3.1/news.html)
--- a/docs/vulkan.md
+++ b/docs/vulkan.md
@ -35,7 +35,7 @@ By default, GLFW will load the Vulkan loader dynamically at runtime via its stan
 `vulkan-1.dll` on Windows, `libvulkan.so.1` on Linux and other Unix-like systems and
 `libvulkan.1.dylib` on macOS.
-__macOS:__ GLFW will also look up and search the `Frameworks` subdirectory of your
+@macos GLFW will also look up and search the `Frameworks` subdirectory of your
 application bundle.
 If your code is using a Vulkan loader with a different name or in a non-standard location
@ -47,7 +47,7 @@ entry point retrieval.  This prevents GLFW from dynamically loading the Vulkan l
 glfwInitVulkanLoader(vkGetInstanceProcAddr);
 ```
-__macOS:__ To make your application be redistributable you will need to set up the application
+@macos To make your application be redistributable you will need to set up the application
 bundle according to the LunarG SDK documentation.  This is explained in more detail in the
 [SDK documentation for macOS](https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html).
@ -186,7 +186,7 @@ check whether any extensions you wish to enable are already in the returned
 array, as it is an error to specify an extension more than once in the
 `VkInstanceCreateInfo` struct.
-__macOS:__ MoltenVK is (as of July 2022) not yet a fully conformant implementation
+@macos MoltenVK is (as of July 2022) not yet a fully conformant implementation
 of Vulkan.  As of Vulkan SDK 1.3.216.0, this means you must also enable the
 `VK_KHR_portability_enumeration` instance extension and set the
 `VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR` bit in the instance creation
--- a/docs/window.md
+++ b/docs/window.md
@ -363,10 +363,10 @@ which API was used to create the current context may fail if you change this
 hint.  This can be resolved by having it load functions via @ref
 glfwGetProcAddress.
-@note __Wayland:__ The EGL API _is_ the native context creation API, so this hint
+@note @wayland The EGL API _is_ the native context creation API, so this hint
 will have no effect.
-@note __X11:__ On some Linux systems, creating contexts via both the native and EGL
+@note @x11 On some Linux systems, creating contexts via both the native and EGL
 APIs in a single process will cause the application to segfault.  Stick to one
 API or the other on Linux for now.
@ -400,7 +400,7 @@ requested.  Additionally, OpenGL ES 1.x cannot be returned if 2.0 or later was
 requested, and vice versa.  This is because OpenGL ES 3.x is backward compatible
 with 2.0, but OpenGL ES 2.0 is not backward compatible with 1.x.
-@note __macOS:__ The OS only supports core profile contexts for OpenGL versions 3.2
+@note @macos The OS only supports core profile contexts for OpenGL versions 3.2
 and later.  Before creating an OpenGL context of version 3.2 or later you must
 set the [GLFW_OPENGL_PROFILE](@ref GLFW_OPENGL_PROFILE_hint) hint accordingly.
 OpenGL 3.0 and 3.1 contexts are not supported at all on macOS.
@ -893,12 +893,6 @@ int xpos, ypos;
 glfwGetWindowPos(window, &xpos, &ypos);
 ```
@note __Wayland:__ An applications cannot know the positions of its windows or
 whether one has been moved.  The @ref GLFW_POSITION_X and @ref GLFW_POSITION_Y
 window hints are ignored.  The @ref glfwGetWindowPos and @ref glfwSetWindowPos
 functions emit @ref GLFW_FEATURE_UNAVAILABLE.  The window position callback will
 not be called.
 ### Window title {#window_title}
@ -1044,12 +1038,6 @@ You can also get the current iconification state with @ref glfwGetWindowAttrib.
 int iconified = glfwGetWindowAttrib(window, GLFW_ICONIFIED);
 ```
@note __Wayland:__ An application cannot know if any of its windows have been
 iconified or restore one from iconification.  The @ref glfwRestoreWindow
 function can only restore windows from maximization and the iconify callback
 will not be called.  The [GLFW_ICONIFIED](@ref GLFW_ICONIFIED_attrib) attribute
 will be false.  The @ref glfwIconifyWindow function works normally.
 ### Window maximization {#window_maximize}
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@ -1,5 +1,5 @@
 /*************************************************************************
- * GLFW 3.5 - www.glfw.org
+ * GLFW 3.4 - www.glfw.org
 * A library for OpenGL, window and input
 *------------------------------------------------------------------------
 * Copyright (c) 2002-2006 Marcus Geelnard
@ -291,7 +291,7 @@ extern "C" {
 *  features are added to the API but it remains backward-compatible.
 *  @ingroup init
 */
-#define GLFW_VERSION_MINOR          5
+#define GLFW_VERSION_MINOR          4
 /*! @brief The revision number of the GLFW header.
 *
 *  The revision number of the GLFW header.  This is incremented when a bug fix
@ -1149,12 +1149,11 @@ extern "C" {
 #define GLFW_OPENGL_CORE_PROFILE    0x00032001
 #define GLFW_OPENGL_COMPAT_PROFILE  0x00032002
-#define GLFW_CURSOR                  0x00033001
+#define GLFW_CURSOR                 0x00033001
-#define GLFW_STICKY_KEYS             0x00033002
+#define GLFW_STICKY_KEYS            0x00033002
-#define GLFW_STICKY_MOUSE_BUTTONS    0x00033003
+#define GLFW_STICKY_MOUSE_BUTTONS   0x00033003
-#define GLFW_LOCK_KEY_MODS           0x00033004
+#define GLFW_LOCK_KEY_MODS          0x00033004
-#define GLFW_RAW_MOUSE_MOTION        0x00033005
+#define GLFW_RAW_MOUSE_MOTION       0x00033005
 #define GLFW_UNLIMITED_MOUSE_BUTTONS 0x00033006
 #define GLFW_CURSOR_NORMAL          0x00034001
 #define GLFW_CURSOR_HIDDEN          0x00034002
@ -1228,13 +1227,13 @@ extern "C" {
 *  The top-left to bottom-right diagonal resize/move shape.  This is usually
 *  a diagonal double-headed arrow.
 *
- *  @note __macOS:__ This shape is provided by a private system API and may fail
+ *  @note @macos This shape is provided by a private system API and may fail
 *  with @ref GLFW_CURSOR_UNAVAILABLE in the future.
 *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
+ *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
+ *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 */
 #define GLFW_RESIZE_NWSE_CURSOR     0x00036007
@ -1243,13 +1242,13 @@ extern "C" {
 *  The top-right to bottom-left diagonal resize/move shape.  This is usually
 *  a diagonal double-headed arrow.
 *
- *  @note __macOS:__ This shape is provided by a private system API and may fail
+ *  @note @macos This shape is provided by a private system API and may fail
 *  with @ref GLFW_CURSOR_UNAVAILABLE in the future.
 *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
+ *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
+ *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 */
 #define GLFW_RESIZE_NESW_CURSOR     0x00036008
@ -1264,10 +1263,10 @@ extern "C" {
 *  The operation-not-allowed shape.  This is usually a circle with a diagonal
 *  line through it.
 *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
+ *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
+ *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 */
 #define GLFW_NOT_ALLOWED_CURSOR     0x0003600A
@ -1629,7 +1628,7 @@ typedef void (* GLFWwindowposfun)(GLFWwindow* window, int xpos, int ypos);
 *  @sa @ref glfwSetWindowSizeCallback
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -1649,7 +1648,7 @@ typedef void (* GLFWwindowsizefun)(GLFWwindow* window, int width, int height);
 *  @sa @ref glfwSetWindowCloseCallback
 *
 *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -1669,7 +1668,7 @@ typedef void (* GLFWwindowclosefun)(GLFWwindow* window);
 *  @sa @ref glfwSetWindowRefreshCallback
 *
 *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -1800,7 +1799,7 @@ typedef void (* GLFWwindowcontentscalefun)(GLFWwindow* window, float xscale, flo
 *  @sa @ref glfwSetMouseButtonCallback
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle and modifier mask parameters.
+ *  @glfw3 Added window handle and modifier mask parameters.
 *
 *  @ingroup input
 */
@ -1891,7 +1890,7 @@ typedef void (* GLFWscrollfun)(GLFWwindow* window, double xoffset, double yoffse
 *  @sa @ref glfwSetKeyCallback
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle, scancode and modifier mask parameters.
+ *  @glfw3 Added window handle, scancode and modifier mask parameters.
 *
 *  @ingroup input
 */
@ -1912,7 +1911,7 @@ typedef void (* GLFWkeyfun)(GLFWwindow* window, int key, int scancode, int actio
 *  @sa @ref glfwSetCharCallback
 *
 *  @since Added in version 2.4.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup input
 */
@ -2020,7 +2019,7 @@ typedef void (* GLFWjoystickfun)(int jid, int event);
 *  @sa @ref glfwGetVideoModes
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added refresh rate member.
+ *  @glfw3 Added refresh rate member.
 *
 *  @ingroup monitor
 */
@ -2083,7 +2082,7 @@ typedef struct GLFWgammaramp
 *  @sa @ref window_icon
 *
 *  @since Added in version 2.1.
- *  __GLFW 3:__ Removed format and bytes-per-pixel members.
+ *  @glfw3 Removed format and bytes-per-pixel members.
 *
 *  @ingroup window
 */
@ -2183,12 +2182,12 @@ typedef struct GLFWallocator
 *  @errors Possible errors include @ref GLFW_PLATFORM_UNAVAILABLE and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __macOS:__ This function will change the current directory of the
+ *  @remark @macos This function will change the current directory of the
 *  application to the `Contents/Resources` subdirectory of the application's
 *  bundle, if present.  This can be disabled with the @ref
 *  GLFW_COCOA_CHDIR_RESOURCES init hint.
 *
- *  @remark __macOS:__ This function will create the main menu and dock icon for the
+ *  @remark @macos This function will create the main menu and dock icon for the
 *  application.  If GLFW finds a `MainMenu.nib` it is loaded and assumed to
 *  contain a menu bar.  Otherwise a minimal menu bar is created manually with
 *  common commands like Hide, Quit and About.  The About entry opens a minimal
@ -2203,7 +2202,7 @@ typedef struct GLFWallocator
 *  to something other than `wayland` or `x11`, the regular detection mechanism
 *  will be used instead.
 *
- *  @remark __X11:__ This function will set the `LC_CTYPE` category of the
+ *  @remark @x11 This function will set the `LC_CTYPE` category of the
 *  application locale according to the current environment if that category is
 *  still "C".  This is because the "C" locale breaks Unicode text input.
 *
@ -2679,7 +2678,7 @@ GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* monitor, int* xpos, int* ypos,
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
- *  @remark __Win32:__ On Windows 8 and earlier the physical size is calculated from
+ *  @remark @win32 On Windows 8 and earlier the physical size is calculated from
 *  the current resolution and system DPI instead of querying the monitor EDID data.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -2713,7 +2712,7 @@ GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* monitor, int* widthMM, int*
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __Wayland:__ Fractional scaling information is not yet available for
+ *  @remark @wayland Fractional scaling information is not yet available for
 *  monitors, so this function only returns integer content scales.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -2861,7 +2860,7 @@ GLFWAPI GLFWmonitorfun glfwSetMonitorCallback(GLFWmonitorfun callback);
 *  @sa @ref glfwGetVideoMode
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Changed to return an array of modes for a specific monitor.
+ *  @glfw3 Changed to return an array of modes for a specific monitor.
 *
 *  @ingroup monitor
 */
@ -2915,8 +2914,8 @@ GLFWAPI const GLFWvidmode* glfwGetVideoMode(GLFWmonitor* monitor);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref GLFW_INVALID_VALUE,
 *  @ref GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
+ *  @remark @wayland Gamma handling is a privileged protocol, this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
+ *  will thus never be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
@ -2939,8 +2938,8 @@ GLFWAPI void glfwSetGamma(GLFWmonitor* monitor, float gamma);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref GLFW_PLATFORM_ERROR
 *  and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
+ *  @remark @wayland Gamma handling is a privileged protocol, this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE while
+ *  will thus never be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE while
 *  returning `NULL`.
 *
 *  @pointer_lifetime The returned structure and its arrays are allocated and
@ -2981,10 +2980,10 @@ GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* monitor);
 *  @remark The size of the specified gamma ramp should match the size of the
 *  current ramp for that monitor.
 *
- *  @remark __Win32:__ The gamma ramp size must be 256.
+ *  @remark @win32 The gamma ramp size must be 256.
 *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
+ *  @remark @wayland Gamma handling is a privileged protocol, this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
+ *  will thus never be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @pointer_lifetime The specified gamma ramp is copied before this function
 *  returns.
@ -3159,32 +3158,32 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
 *  GLFW_VERSION_UNAVAILABLE, @ref GLFW_FORMAT_UNAVAILABLE, @ref
 *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_ERROR.
 *
- *  @remark __Win32:__ Window creation will fail if the Microsoft GDI software
+ *  @remark @win32 Window creation will fail if the Microsoft GDI software
 *  OpenGL implementation is the only one available.
 *
- *  @remark __Win32:__ If the executable has an icon resource named `GLFW_ICON,` it
+ *  @remark @win32 If the executable has an icon resource named `GLFW_ICON,` it
 *  will be set as the initial icon for the window.  If no such icon is present,
 *  the `IDI_APPLICATION` icon will be used instead.  To set a different icon,
 *  see @ref glfwSetWindowIcon.
 *
- *  @remark __Win32:__ The context to share resources with must not be current on
+ *  @remark @win32 The context to share resources with must not be current on
 *  any other thread.
 *
- *  @remark __macOS:__ The OS only supports core profile contexts for OpenGL
+ *  @remark @macos The OS only supports core profile contexts for OpenGL
 *  versions 3.2 and later.  Before creating an OpenGL context of version 3.2 or
 *  later you must set the [GLFW_OPENGL_PROFILE](@ref GLFW_OPENGL_PROFILE_hint)
 *  hint accordingly.  OpenGL 3.0 and 3.1 contexts are not supported at all
 *  on macOS.
 *
- *  @remark __macOS:__ The GLFW window has no icon, as it is not a document
+ *  @remark @macos The GLFW window has no icon, as it is not a document
 *  window, but the dock icon will be the same as the application bundle's icon.
 *  For more information on bundles, see the
 *  [Bundle Programming Guide][bundle-guide] in the Mac Developer Library.
 *
 *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
 *
- *  @remark __macOS:__  The window frame will not be rendered at full resolution
+ *  @remark @macos On OS X 10.10 and later the window frame will not be rendered
- *  on Retina displays unless the
+ *  at full resolution on Retina displays unless the
 *  [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint)
 *  hint is `GLFW_TRUE` and the `NSHighResolutionCapable` key is enabled in the
 *  application bundle's `Info.plist`.  For more information, see
@ -3195,11 +3194,11 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
 *
 *  [hidpi-guide]: https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html
 *
- *  @remark __macOS:__ When activating frame autosaving with
+ *  @remark @macos When activating frame autosaving with
 *  [GLFW_COCOA_FRAME_NAME](@ref GLFW_COCOA_FRAME_NAME_hint), the specified
 *  window size and position may be overridden by previously saved values.
 *
- *  @remark __Wayland:__ GLFW uses [libdecor][] where available to create its window
+ *  @remark @wayland GLFW uses [libdecor][] where available to create its window
 *  decorations.  This in turn uses server-side XDG decorations where available
 *  and provides high quality client-side decorations on compositors like GNOME.
 *  If both XDG decorations and libdecor are unavailable, GLFW falls back to
@ -3208,15 +3207,15 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
 *
 *  [libdecor]: https://gitlab.freedesktop.org/libdecor/libdecor
 *
- *  @remark __X11:__ Some window managers will not respect the placement of
+ *  @remark @x11 Some window managers will not respect the placement of
 *  initially hidden windows.
 *
- *  @remark __X11:__ Due to the asynchronous nature of X11, it may take a moment for
+ *  @remark @x11 Due to the asynchronous nature of X11, it may take a moment for
 *  a window to reach its requested state.  This means you may not be able to
 *  query the final size, position or other attributes directly after window
 *  creation.
 *
- *  @remark __X11:__ The class part of the `WM_CLASS` window property will by
+ *  @remark @x11 The class part of the `WM_CLASS` window property will by
 *  default be set to the window title passed to this function.  The instance
 *  part will use the contents of the `RESOURCE_NAME` environment variable, if
 *  present and not empty, or fall back to the window title.  Set the
@ -3349,7 +3348,7 @@ GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __macOS:__ The window title will not be updated until the next time you
+ *  @remark @macos The window title will not be updated until the next time you
 *  process events.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3358,7 +3357,7 @@ GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* window);
 *  @sa @ref glfwGetWindowTitle
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3392,14 +3391,14 @@ GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title);
 *  @pointer_lifetime The specified image data is copied before this function
 *  returns.
 *
- *  @remark __macOS:__ Regular windows do not have icons on macOS.  This function
+ *  @remark @macos Regular windows do not have icons on macOS.  This function
 *  will emit @ref GLFW_FEATURE_UNAVAILABLE.  The dock icon will be the same as
 *  the application bundle's icon.  For more information on bundles, see the
 *  [Bundle Programming Guide][bundle-guide] in the Mac Developer Library.
 *
 *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
 *
- *  @remark __Wayland:__ There is no existing protocol to change an icon, the
+ *  @remark @wayland There is no existing protocol to change an icon, the
 *  window will thus inherit the one defined in the application's desktop file.
 *  This function will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
@ -3430,8 +3429,8 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* i
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ Window positions are not currently part of any common
+ *  @remark @wayland There is no way for an application to retrieve the global
- *  Wayland protocol, so this function cannot be implemented and will emit @ref
+ *  position of its windows.  This function will emit @ref
 *  GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3464,8 +3463,8 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow* window, int* xpos, int* ypos);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ Window positions are not currently part of any common
+ *  @remark @wayland There is no way for an application to set the global
- *  Wayland protocol, so this function cannot be implemented and will emit @ref
+ *  position of its windows.  This function will emit @ref
 *  GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3474,7 +3473,7 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow* window, int* xpos, int* ypos);
 *  @sa @ref glfwGetWindowPos
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3504,7 +3503,7 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow* window, int xpos, int ypos);
 *  @sa @ref glfwSetWindowSize
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3539,7 +3538,7 @@ GLFWAPI void glfwGetWindowSize(GLFWwindow* window, int* width, int* height);
 *  @remark If you set size limits and an aspect ratio that conflict, the
 *  results are undefined.
 *
- *  @remark __Wayland:__ The size limits will not be applied until the window is
+ *  @remark @wayland The size limits will not be applied until the window is
 *  actually resized, either by the user or by the compositor.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3582,7 +3581,7 @@ GLFWAPI void glfwSetWindowSizeLimits(GLFWwindow* window, int minwidth, int minhe
 *  @remark If you set size limits and an aspect ratio that conflict, the
 *  results are undefined.
 *
- *  @remark __Wayland:__ The aspect ratio will not be applied until the window is
+ *  @remark @wayland The aspect ratio will not be applied until the window is
 *  actually resized, either by the user or by the compositor.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3628,7 +3627,7 @@ GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* window, int numer, int denom);
 *  @sa @ref glfwSetWindowMonitor
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3778,7 +3777,7 @@ GLFWAPI float glfwGetWindowOpacity(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ There is no way to set an opacity factor for a window.
+ *  @remark @wayland There is no way to set an opacity factor for a window.
 *  This function will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3807,6 +3806,10 @@ GLFWAPI void glfwSetWindowOpacity(GLFWwindow* window, float opacity);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
 *  @remark @wayland Once a window is iconified, @ref glfwRestoreWindow won’t
 *  be able to restore it.  This is a design decision of the xdg-shell
 *  protocol.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_iconify
@ -3814,7 +3817,7 @@ GLFWAPI void glfwSetWindowOpacity(GLFWwindow* window, float opacity);
 *  @sa @ref glfwMaximizeWindow
 *
 *  @since Added in version 2.1.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3834,10 +3837,6 @@ GLFWAPI void glfwIconifyWindow(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
 *  @remark __Wayland:__ Restoring a window from maximization is not currently
 *  part of any common Wayland protocol, so this function can only restore
 *  windows from maximization.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_iconify
@ -3845,7 +3844,7 @@ GLFWAPI void glfwIconifyWindow(GLFWwindow* window);
 *  @sa @ref glfwMaximizeWindow
 *
 *  @since Added in version 2.1.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -3892,7 +3891,7 @@ GLFWAPI void glfwMaximizeWindow(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __Wayland:__ Because Wayland wants every frame of the desktop to be
+ *  @remark @wayland Because Wayland wants every frame of the desktop to be
 *  complete, this function does not immediately make the window visible.
 *  Instead it will become visible the next time the window framebuffer is
 *  updated after this call.
@ -3955,7 +3954,7 @@ GLFWAPI void glfwHideWindow(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __Wayland:__ The compositor will likely ignore focus requests unless
+ *  @remark @wayland The compositor will likely ignore focus requests unless
 *  another window created by the same application already has input focus.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -3983,7 +3982,7 @@ GLFWAPI void glfwFocusWindow(GLFWwindow* window);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __macOS:__ Attention is requested to the application as a whole, not the
+ *  @remark @macos Attention is requested to the application as a whole, not the
 *  specific window.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -4058,8 +4057,8 @@ GLFWAPI GLFWmonitor* glfwGetWindowMonitor(GLFWwindow* window);
 *  affected by any resizing or mode switching, although you may need to update
 *  your viewport if the framebuffer size has changed.
 *
- *  @remark __Wayland:__ Window positions are not currently part of any common
+ *  @remark @wayland The desired window position is ignored, as there is no way
- *  Wayland protocol.  The window position arguments are ignored.
+ *  for an application to set this property.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
@ -4096,9 +4095,8 @@ GLFWAPI void glfwSetWindowMonitor(GLFWwindow* window, GLFWmonitor* monitor, int
 *  errors.  However, this function should not fail as long as it is passed
 *  valid arguments and the library has been [initialized](@ref intro_init).
 *
- *  @remark __Wayland:__ Checking whether a window is iconified is not currently
+ *  @remark @wayland The Wayland protocol provides no way to check whether a
- *  part of any common Wayland protocol, so the @ref GLFW_ICONIFIED attribute
+ *  window is iconfied, so @ref GLFW_ICONIFIED always returns `GLFW_FALSE`.
 *  cannot be implemented and is always `GLFW_FALSE`.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
@ -4140,7 +4138,7 @@ GLFWAPI int glfwGetWindowAttrib(GLFWwindow* window, int attrib);
 *  @remark Calling @ref glfwGetWindowAttrib will always return the latest
 *  value, even if that value is ignored by the current mode of the window.
 *
- *  @remark __Wayland:__ The [GLFW_FLOATING](@ref GLFW_FLOATING_attrib) window attribute is
+ *  @remark @wayland The [GLFW_FLOATING](@ref GLFW_FLOATING_attrib) window attribute is
 *  not supported.  Setting this will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -4220,8 +4218,8 @@ GLFWAPI void* glfwGetWindowUserPointer(GLFWwindow* window);
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
- *  @remark __Wayland:__ This callback will not be called.  The Wayland protocol
+ *  @remark @wayland This callback will never be called, as there is no way for
- *  provides no way to be notified of when a window is moved.
+ *  an application to know its global position.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
@ -4259,7 +4257,7 @@ GLFWAPI GLFWwindowposfun glfwSetWindowPosCallback(GLFWwindow* window, GLFWwindow
 *  @sa @ref window_size
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup window
 */
@ -4291,7 +4289,7 @@ GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* window, GLFWwind
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
- *  @remark __macOS:__ Selecting Quit from the application menu will trigger the
+ *  @remark @macos Selecting Quit from the application menu will trigger the
 *  close callback for all windows.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -4299,7 +4297,7 @@ GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* window, GLFWwind
 *  @sa @ref window_close
 *
 *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup window
 */
@ -4335,7 +4333,7 @@ GLFWAPI GLFWwindowclosefun glfwSetWindowCloseCallback(GLFWwindow* window, GLFWwi
 *  @sa @ref window_refresh
 *
 *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup window
 */
@ -4396,10 +4394,6 @@ GLFWAPI GLFWwindowfocusfun glfwSetWindowFocusCallback(GLFWwindow* window, GLFWwi
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
 *  @remark __Wayland:__ This callback will not be called.  The Wayland protocol
 *  provides no way to be notified of when a window is iconified, and no way to
 *  check whether a window is currently iconified.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_iconify
@ -4682,8 +4676,8 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
 *
 *  This function sets an input mode option for the specified window.  The mode
 *  must be one of @ref GLFW_CURSOR, @ref GLFW_STICKY_KEYS,
- *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS
+ *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS or
- *  @ref GLFW_RAW_MOUSE_MOTION, or @ref GLFW_UNLIMITED_MOUSE_BUTTONS.
+ *  @ref GLFW_RAW_MOUSE_MOTION.
 *
 *  If the mode is `GLFW_CURSOR`, the value must be one of the following cursor
 *  modes:
@ -4723,11 +4717,6 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
 *  attempting to set this will emit @ref GLFW_FEATURE_UNAVAILABLE.  Call @ref
 *  glfwRawMouseMotionSupported to check for support.
 *
 *  If the mode is `GLFW_UNLIMITED_MOUSE_BUTTONS`, the value must be either
 *  `GLFW_TRUE` to disable the mouse button limit when calling the mouse button
 *  callback, or `GLFW_FALSE` to limit the mouse buttons sent to the callback
 *  to the mouse button token values up to `GLFW_MOUSE_BUTTON_LAST`.
 *
 *  @param[in] window The window whose input mode to set.
 *  @param[in] mode One of `GLFW_CURSOR`, `GLFW_STICKY_KEYS`,
 *  `GLFW_STICKY_MOUSE_BUTTONS`, `GLFW_LOCK_KEY_MODS` or
@ -4905,7 +4894,7 @@ GLFWAPI int glfwGetKeyScancode(int key);
 *  @sa @ref input_key
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup input
 */
@ -4922,11 +4911,8 @@ GLFWAPI int glfwGetKey(GLFWwindow* window, int key);
 *  returns `GLFW_PRESS` the first time you call it for a mouse button that was
 *  pressed, even if that mouse button has already been released.
 *
 *  The @ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode does not effect the
 *  limit on buttons which can be polled with this function.
 *
 *  @param[in] window The desired window.
- *  @param[in] button The desired [mouse button token](@ref buttons).
+ *  @param[in] button The desired [mouse button](@ref buttons).
 *  @return One of `GLFW_PRESS` or `GLFW_RELEASE`.
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
@ -4937,7 +4923,7 @@ GLFWAPI int glfwGetKey(GLFWwindow* window, int key);
 *  @sa @ref input_mouse_button
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup input
 */
@ -5007,7 +4993,7 @@ GLFWAPI void glfwGetCursorPos(GLFWwindow* window, double* xpos, double* ypos);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark __Wayland:__ This function will only work when the cursor mode is
+ *  @remark @wayland This function will only work when the cursor mode is
 *  `GLFW_CURSOR_DISABLED`, otherwise it will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
@ -5205,7 +5191,7 @@ GLFWAPI void glfwSetCursor(GLFWwindow* window, GLFWcursor* cursor);
 *  @sa @ref input_key
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup input
 */
@ -5248,7 +5234,7 @@ GLFWAPI GLFWkeyfun glfwSetKeyCallback(GLFWwindow* window, GLFWkeyfun callback);
 *  @sa @ref input_char
 *
 *  @since Added in version 2.4.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup input
 */
@ -5302,15 +5288,10 @@ 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 with associated button tokens.
+ *  release events for all pressed mouse buttons.  You can tell these events
- *  You can tell these events from user-generated events by the fact that the
+ *  from user-generated events by the fact that the synthetic ones are generated
- *  synthetic ones are generated after the focus loss event has been processed,
+ *  after the focus loss event has been processed, i.e. after the
- *  i.e. after the [window focus callback](@ref glfwSetWindowFocusCallback) has
+ *  [window focus callback](@ref glfwSetWindowFocusCallback) has been called.
 *  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_UNLIMITED_MOUSE_BUTTONS 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
@ -5332,7 +5313,7 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmods
 *  @sa @ref input_mouse_button
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
+ *  @glfw3 Added window handle parameter and return value.
 *
 *  @ingroup input
 */
@ -5562,7 +5543,7 @@ GLFWAPI const float* glfwGetJoystickAxes(int jid, int* count);
 *  @sa @ref joystick_button
 *
 *  @since Added in version 2.2.
- *  __GLFW 3:__ Changed to return a dynamic array.
+ *  @glfw3 Changed to return a dynamic array.
 *
 *  @ingroup input
 */
@ -5926,7 +5907,7 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
- *  @remark __Win32:__ The clipboard on Windows has a single global lock for reading and
+ *  @remark @win32 The clipboard on Windows has a single global lock for reading and
 *  writing.  GLFW tries to acquire it a few times, which is almost always enough.  If it
 *  cannot acquire the lock then this function emits @ref GLFW_PLATFORM_ERROR and returns.
 *  It is safe to try this multiple times.
@ -5959,7 +5940,7 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char* string);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_FORMAT_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
 *
- *  @remark __Win32:__ The clipboard on Windows has a single global lock for reading and
+ *  @remark @win32 The clipboard on Windows has a single global lock for reading and
 *  writing.  GLFW tries to acquire it a few times, which is almost always enough.  If it
 *  cannot acquire the lock then this function emits @ref GLFW_PLATFORM_ERROR and returns.
 *  It is safe to try this multiple times.
@ -6176,7 +6157,7 @@ GLFWAPI GLFWwindow* glfwGetCurrentContext(void);
 *  @sa @ref glfwSwapInterval
 *
 *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
+ *  @glfw3 Added window handle parameter.
 *
 *  @ingroup window
 */
@ -6443,7 +6424,7 @@ GLFWAPI GLFWvkproc glfwGetInstanceProcAddress(VkInstance instance, const char* p
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_API_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
 *
- *  @remark __macOS:__ This function currently always returns `GLFW_TRUE`, as the
+ *  @remark @macos This function currently always returns `GLFW_TRUE`, as the
 *  `VK_MVK_macos_surface` and `VK_EXT_metal_surface` extensions do not provide
 *  a `vkGetPhysicalDevice*PresentationSupport` type function.
 *
@ -6501,15 +6482,15 @@ GLFWAPI int glfwGetPhysicalDevicePresentationSupport(VkInstance instance, VkPhys
 *  @ref glfwVulkanSupported and @ref glfwGetRequiredInstanceExtensions should
 *  eliminate almost all occurrences of these errors.
 *
- *  @remark __macOS:__ GLFW prefers the `VK_EXT_metal_surface` extension, with the
+ *  @remark @macos GLFW prefers the `VK_EXT_metal_surface` extension, with the
 *  `VK_MVK_macos_surface` extension as a fallback.  The name of the selected
 *  extension, if any, is included in the array returned by @ref
 *  glfwGetRequiredInstanceExtensions.
 *
- *  @remark __macOS:__ This function creates and sets a `CAMetalLayer` instance for
+ *  @remark @macos This function creates and sets a `CAMetalLayer` instance for
 *  the window content view, which is required for MoltenVK to function.
 *
- *  @remark __X11:__ By default GLFW prefers the `VK_KHR_xcb_surface` extension,
+ *  @remark @x11 By default GLFW prefers the `VK_KHR_xcb_surface` extension,
 *  with the `VK_KHR_xlib_surface` extension as a fallback.  You can make
 *  `VK_KHR_xlib_surface` the preferred extension by setting the
 *  [GLFW_X11_XCB_VULKAN_SURFACE](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint) init
--- a/include/GLFW/glfw3native.h
+++ b/include/GLFW/glfw3native.h
@ -1,5 +1,5 @@
 /*************************************************************************
- * GLFW 3.5 - www.glfw.org
+ * GLFW 3.4 - www.glfw.org
 * A library for OpenGL, window and input
 *------------------------------------------------------------------------
 * Copyright (c) 2002-2006 Marcus Geelnard
@ -478,29 +478,6 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* window);
 *  @ingroup native
 */
 GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* window);
 /*! @brief Retrieves the `GLXFBConfig` of the specified window's `GLXWindow`.
 *
 *  @param[in] window The window whose `GLXWindow` to query.
 *  @param[out] config The `GLXFBConfig` of the window `GLXWindow`, if available.
 *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
 *  [error](@ref error_handling) occurred.
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
 *
 *  @remark `GLXFBConfig` is an opaque type.  Unlike other GLFW functions, the
 *  @p config out parameter is not cleared on error, as core GLX does not define
 *  any invalid value.
 *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
 *  @since Added in version 3.5
 *
 *  @ingroup native
 */
 GLFWAPI int glfwGetGLXFBConfig(GLFWwindow* window, GLXFBConfig* config);
 #endif
 #if defined(GLFW_EXPOSE_NATIVE_WAYLAND)
@ -609,29 +586,6 @@ GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window);
 *  @ingroup native
 */
 GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* window);
 /*! @brief Retrieves the `EGLConfig` of the specified window's `EGLSurface`.
 *
 *  @param[in] window The window whose `EGLSurface` to query.
 *  @param[out] config The `EGLConfig` of the window `EGLSurface`, if available.
 *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
 *  [error](@ref error_handling) occurred.
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_NO_WINDOW_CONTEXT.
 *
 *  @remark `EGLConfig` is an opaque type.  Unlike other GLFW functions, the @p
 *  config out parameter is not cleared on error, as core EGL does not define
 *  any invalid value.
 *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
 *  @since Added in version 3.5.
 *
 *  @ingroup native
 */
 GLFWAPI int glfwGetEGLConfig(GLFWwindow* window, EGLConfig* config);
 #endif
 #if defined(GLFW_EXPOSE_NATIVE_OSMESA)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -30,7 +30,6 @@ add_custom_target(update_mappings
 set_target_properties(update_mappings PROPERTIES FOLDER "GLFW3")
 if (GLFW_BUILD_COCOA)
    enable_language(OBJC)
    target_compile_definitions(glfw PRIVATE _GLFW_COCOA)
    target_sources(glfw PRIVATE cocoa_platform.h cocoa_joystick.h cocoa_init.m
                                cocoa_joystick.m cocoa_monitor.m cocoa_window.m
@ -53,8 +52,8 @@ endif()
 if (GLFW_BUILD_WAYLAND)
    target_compile_definitions(glfw PRIVATE _GLFW_WAYLAND)
-    target_sources(glfw PRIVATE wl_platform.h wl_init.c
+    target_sources(glfw PRIVATE wl_platform.h xkb_unicode.h wl_init.c
-                                wl_monitor.c wl_window.c)
+                                wl_monitor.c wl_window.c xkb_unicode.c)
 endif()
 if (GLFW_BUILD_X11 OR GLFW_BUILD_WAYLAND)
@ -138,6 +137,13 @@ target_include_directories(glfw PRIVATE
                           "${GLFW_BINARY_DIR}/src")
 target_link_libraries(glfw PRIVATE Threads::Threads)
 # Workaround for CMake not knowing about .m files before version 3.16
 if (CMAKE_VERSION VERSION_LESS "3.16" AND APPLE)
    set_source_files_properties(cocoa_init.m cocoa_joystick.m cocoa_monitor.m
                                cocoa_window.m nsgl_context.m PROPERTIES
                                LANGUAGE C)
 endif()
 if (GLFW_BUILD_WIN32)
    list(APPEND glfw_PKG_LIBS "-lgdi32")
 endif()
@ -145,11 +151,10 @@ endif()
 if (GLFW_BUILD_COCOA)
    target_link_libraries(glfw PRIVATE "-framework Cocoa"
                                       "-framework IOKit"
-                                       "-framework CoreFoundation"
+                                       "-framework CoreFoundation")
                                       "-framework QuartzCore")
    set(glfw_PKG_DEPS "")
-    set(glfw_PKG_LIBS "-framework Cocoa -framework IOKit -framework CoreFoundation -framework QuartzCore")
+    set(glfw_PKG_LIBS "-framework Cocoa -framework IOKit -framework CoreFoundation")
 endif()
 if (GLFW_BUILD_WAYLAND)
@ -255,6 +260,24 @@ if (GLFW_BUILD_WIN32)
    target_compile_definitions(glfw PRIVATE UNICODE _UNICODE)
 endif()
 # HACK: When building on MinGW, WINVER and UNICODE need to be defined before
 # the inclusion of stddef.h (by glfw3.h), which is itself included before
 # win32_platform.h.  We define them here until a saner solution can be found
 # NOTE: MinGW-w64 and Visual C++ do /not/ need this hack.
 if (MINGW)
    target_compile_definitions(glfw PRIVATE WINVER=0x0501)
 endif()
 # Workaround for legacy MinGW not providing XInput and DirectInput
 if (MINGW)
    include(CheckIncludeFile)
    check_include_file(dinput.h DINPUT_H_FOUND)
    check_include_file(xinput.h XINPUT_H_FOUND)
    if (NOT DINPUT_H_FOUND OR NOT XINPUT_H_FOUND)
        target_include_directories(glfw PRIVATE "${GLFW_SOURCE_DIR}/deps/mingw")
    endif()
 endif()
 # Workaround for the MS CRT deprecating parts of the standard library
 if (MSVC OR CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
    target_compile_definitions(glfw PRIVATE _CRT_SECURE_NO_WARNINGS)
@ -268,6 +291,10 @@ endif()
 if (GLFW_BUILD_SHARED_LIBRARY)
    if (WIN32)
        if (MINGW)
            # Remove the dependency on the shared version of libgcc
            # NOTE: MinGW-w64 has the correct default but MinGW needs this
            target_link_libraries(glfw PRIVATE "-static-libgcc")
            # Remove the lib prefix on the DLL (but not the import library)
            set_target_properties(glfw PROPERTIES PREFIX "")
@ -285,34 +312,30 @@ if (GLFW_BUILD_SHARED_LIBRARY)
    if (MINGW)
        # Enable link-time exploit mitigation features enabled by default on MSVC
        include(CheckCCompilerFlag)
        include(CMakePushCheckState)
        # Compatibility with data execution prevention (DEP)
        cmake_push_check_state()
        set(CMAKE_REQUIRED_FLAGS "-Wl,--nxcompat")
        check_c_compiler_flag("" _GLFW_HAS_DEP)
        if (_GLFW_HAS_DEP)
            target_link_libraries(glfw PRIVATE "-Wl,--nxcompat")
        endif()
        cmake_pop_check_state()
        # Compatibility with address space layout randomization (ASLR)
        cmake_push_check_state()
        set(CMAKE_REQUIRED_FLAGS "-Wl,--dynamicbase")
        check_c_compiler_flag("" _GLFW_HAS_ASLR)
        if (_GLFW_HAS_ASLR)
            target_link_libraries(glfw PRIVATE "-Wl,--dynamicbase")
        endif()
        cmake_pop_check_state()
        # Compatibility with 64-bit address space layout randomization (ASLR)
        cmake_push_check_state()
        set(CMAKE_REQUIRED_FLAGS "-Wl,--high-entropy-va")
        check_c_compiler_flag("" _GLFW_HAS_64ASLR)
        if (_GLFW_HAS_64ASLR)
            target_link_libraries(glfw PRIVATE "-Wl,--high-entropy-va")
        endif()
-        cmake_pop_check_state()
+
        # Clear flags again to avoid breaking later tests
        set(CMAKE_REQUIRED_FLAGS)
    endif()
    if (UNIX)
@ -321,8 +344,12 @@ if (GLFW_BUILD_SHARED_LIBRARY)
    endif()
 endif()
-list(JOIN glfw_PKG_DEPS " " deps)
+foreach(arg ${glfw_PKG_DEPS})
-list(JOIN glfw_PKG_LIBS " " libs)
+    string(APPEND deps " ${arg}")
 endforeach()
 foreach(arg ${glfw_PKG_LIBS})
    string(APPEND libs " ${arg}")
 endforeach()
 set(GLFW_PKG_CONFIG_REQUIRES_PRIVATE "${deps}" CACHE INTERNAL
    "GLFW pkg-config Requires.private")
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/cocoa_joystick.h
+++ b/src/cocoa_joystick.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Cocoa - www.glfw.org
+// GLFW 3.4 Cocoa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/cocoa_joystick.m
+++ b/src/cocoa_joystick.m
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Cocoa - www.glfw.org
+// GLFW 3.4 Cocoa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 // Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
--- a/src/cocoa_monitor.m
+++ b/src/cocoa_monitor.m
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
 #include <assert.h>
 #include <IOKit/graphics/IOGraphicsLib.h>
 #include <ApplicationServices/ApplicationServices.h>
@ -137,7 +136,7 @@ static GLFWbool modeIsGood(CGDisplayModeRef mode)
    if (flags & kDisplayModeStretchedFlag)
        return GLFW_FALSE;
-#if MAC_OS_X_VERSION_MAX_ALLOWED == 101100
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101100
    CFStringRef format = CGDisplayModeCopyPixelEncoding(mode);
    if (CFStringCompare(format, CFSTR(IO16BitDirectPixels), 0) &&
        CFStringCompare(format, CFSTR(IO32BitDirectPixels), 0))
@ -164,7 +163,7 @@ static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode,
    if (result.refreshRate == 0)
        result.refreshRate = (int) round(fallbackRefreshRate);
-#if MAC_OS_X_VERSION_MAX_ALLOWED == 101100
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101100
    CFStringRef format = CGDisplayModeCopyPixelEncoding(mode);
    if (CFStringCompare(format, CFSTR(IO16BitDirectPixels), 0) == 0)
    {
@ -180,7 +179,7 @@ static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode,
        result.blueBits = 8;
    }
-#if MAC_OS_X_VERSION_MAX_ALLOWED == 101100
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101100
    CFRelease(format);
 #endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
    return result;
@ -628,6 +627,7 @@ void _glfwSetGammaRampCocoa(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(kCGNullDirectDisplay);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
@ -636,9 +636,6 @@ GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* handle)
        return kCGNullDirectDisplay;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->ns.displayID;
 }
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/cocoa_time.c
+++ b/src/cocoa_time.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/cocoa_time.h
+++ b/src/cocoa_time.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2021 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@ -28,11 +28,8 @@
 #if defined(_GLFW_COCOA)
 #import <QuartzCore/CAMetalLayer.h>
 #include <float.h>
 #include <string.h>
 #include <assert.h>
 // HACK: This enum value is missing from framework headers on OS X 10.11 despite
 //       having been (according to documentation) added in Mac OS X 10.7
@ -312,6 +309,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 - (void)windowDidChangeOcclusionState:(NSNotification* )notification
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
    if ([window->ns.object respondsToSelector:@selector(occlusionState)])
    {
        if ([window->ns.object occlusionState] & NSWindowOcclusionStateVisible)
@ -319,6 +317,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
        else
            window->ns.occluded = GLFW_TRUE;
    }
 #endif
 }
@end
@ -884,7 +883,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
    [window->ns.object setContentView:window->ns.view];
    [window->ns.object makeFirstResponder:window->ns.view];
-    [window->ns.object setTitle:@(window->title)];
+    [window->ns.object setTitle:@(wndconfig->title)];
    [window->ns.object setDelegate:window->ns.delegate];
    [window->ns.object setAcceptsMouseMovedEvents:YES];
    [window->ns.object setRestorable:NO];
@ -1950,8 +1949,19 @@ VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance,
 {
    @autoreleasepool {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
    // HACK: Dynamically load Core Animation to avoid adding an extra
    //       dependency for the majority who don't use MoltenVK
    NSBundle* bundle = [NSBundle bundleWithPath:@"/System/Library/Frameworks/QuartzCore.framework"];
    if (!bundle)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
                        "Cocoa: Failed to find QuartzCore.framework");
        return VK_ERROR_EXTENSION_NOT_PRESENT;
    }
    // NOTE: Create the layer here as makeBackingLayer should not return nil
-    window->ns.layer = [CAMetalLayer layer];
+    window->ns.layer = [[bundle classNamed:@"CAMetalLayer"] layer];
    if (!window->ns.layer)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
@ -2016,6 +2026,9 @@ VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance,
    }
    return err;
 #else
    return VK_ERROR_EXTENSION_NOT_PRESENT;
 #endif
    } // autoreleasepool
 }
@ -2027,6 +2040,7 @@ VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance,
 GLFWAPI id glfwGetCocoaWindow(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(nil);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
@ -2036,14 +2050,12 @@ GLFWAPI id glfwGetCocoaWindow(GLFWwindow* handle)
        return nil;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->ns.object;
 }
 GLFWAPI id glfwGetCocoaView(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(nil);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
@ -2053,9 +2065,6 @@ GLFWAPI id glfwGetCocoaView(GLFWwindow* handle)
        return nil;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->ns.view;
 }
--- a/src/context.c
+++ b/src/context.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
@ -615,11 +615,11 @@ GLFWbool _glfwStringInExtensionString(const char* string, const char* extensions
 GLFWAPI void glfwMakeContextCurrent(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFWwindow* previous;
    _GLFW_REQUIRE_INIT();
    previous = _glfwPlatformGetTls(&_glfw.contextSlot);
    if (window && window->context.client == GLFW_NO_API)
@ -647,11 +647,11 @@ GLFWAPI GLFWwindow* glfwGetCurrentContext(void)
 GLFWAPI void glfwSwapBuffers(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (window->context.client == GLFW_NO_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT,
--- a/src/egl_context.c
+++ b/src/egl_context.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 EGL - www.glfw.org
+// GLFW 3.4 EGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -92,7 +92,7 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
    EGLConfig* nativeConfigs;
    _GLFWfbconfig* usableConfigs;
    const _GLFWfbconfig* closest;
-    int i, nativeCount, usableCount, apiBit, surfaceTypeBit;
+    int i, nativeCount, usableCount, apiBit;
    GLFWbool wrongApiAvailable = GLFW_FALSE;
    if (ctxconfig->client == GLFW_OPENGL_ES_API)
@ -105,11 +105,6 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
    else
        apiBit = EGL_OPENGL_BIT;
    if (_glfw.egl.platform == EGL_PLATFORM_SURFACELESS_MESA)
        surfaceTypeBit = EGL_PBUFFER_BIT;
    else
        surfaceTypeBit = EGL_WINDOW_BIT;
    if (fbconfig->stereo)
    {
        _glfwInputError(GLFW_FORMAT_UNAVAILABLE, "EGL: Stereo rendering not supported");
@ -138,7 +133,8 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
        if (getEGLConfigAttrib(n, EGL_COLOR_BUFFER_TYPE) != EGL_RGB_BUFFER)
            continue;
-        if (!(getEGLConfigAttrib(n, EGL_SURFACE_TYPE) & surfaceTypeBit))
+        // Only consider window EGLConfigs
        if (!(getEGLConfigAttrib(n, EGL_SURFACE_TYPE) & EGL_WINDOW_BIT))
            continue;
 #if defined(_GLFW_X11)
@ -424,8 +420,6 @@ GLFWbool _glfwInitEGL(void)
        _glfwPlatformGetModuleSymbol(_glfw.egl.handle, "eglDestroyContext");
    _glfw.egl.CreateWindowSurface = (PFN_eglCreateWindowSurface)
        _glfwPlatformGetModuleSymbol(_glfw.egl.handle, "eglCreateWindowSurface");
    _glfw.egl.CreatePbufferSurface = (PFN_eglCreatePbufferSurface)
        _glfwPlatformGetModuleSymbol(_glfw.egl.handle, "eglCreatePbufferSurface");
    _glfw.egl.MakeCurrent = (PFN_eglMakeCurrent)
        _glfwPlatformGetModuleSymbol(_glfw.egl.handle, "eglMakeCurrent");
    _glfw.egl.SwapBuffers = (PFN_eglSwapBuffers)
@ -448,7 +442,6 @@ GLFWbool _glfwInitEGL(void)
        !_glfw.egl.DestroySurface ||
        !_glfw.egl.DestroyContext ||
        !_glfw.egl.CreateWindowSurface ||
        !_glfw.egl.CreatePbufferSurface ||
        !_glfw.egl.MakeCurrent ||
        !_glfw.egl.SwapBuffers ||
        !_glfw.egl.SwapInterval ||
@ -484,8 +477,6 @@ GLFWbool _glfwInitEGL(void)
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_vulkan", extensions);
        _glfw.egl.ANGLE_platform_angle_metal =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_metal", extensions);
        _glfw.egl.MESA_platform_surfaceless =
            _glfwStringInExtensionString("EGL_MESA_platform_surfaceless", extensions);
    }
    if (_glfw.egl.EXT_platform_base)
@ -555,8 +546,7 @@ void _glfwTerminateEGL(void)
        _glfw.egl.display = EGL_NO_DISPLAY;
    }
-    // Free modules only after all wayland termination functions are called
+    if (_glfw.egl.handle)
    if (_glfw.egl.handle && _glfw.platform.platformID != GLFW_PLATFORM_WAYLAND)
    {
        _glfwPlatformFreeModule(_glfw.egl.handle);
        _glfw.egl.handle = NULL;
@ -718,36 +708,20 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
            SET_ATTRIB(EGL_PRESENT_OPAQUE_EXT, !fbconfig->transparent);
    }
    if (_glfw.egl.platform == EGL_PLATFORM_SURFACELESS_MESA)
    {
        int width, height;
        _glfw.platform.getFramebufferSize(window, &width, &height);
        SET_ATTRIB(EGL_WIDTH, width);
        SET_ATTRIB(EGL_HEIGHT, height);
    }
    SET_ATTRIB(EGL_NONE, EGL_NONE);
    native = _glfw.platform.getEGLNativeWindow(window);
-    if (!_glfw.egl.platform || _glfw.egl.platform == EGL_PLATFORM_ANGLE_ANGLE)
+    // HACK: ANGLE does not implement eglCreatePlatformWindowSurfaceEXT
    //       despite reporting EGL_EXT_platform_base
    if (_glfw.egl.platform && _glfw.egl.platform != EGL_PLATFORM_ANGLE_ANGLE)
    {
        // HACK: Also use non-platform function for ANGLE, as it does not
        //       implement eglCreatePlatformWindowSurfaceEXT despite reporting
        //       support for EGL_EXT_platform_base
        window->context.egl.surface =
-            eglCreateWindowSurface(_glfw.egl.display, config, native, attribs);
+            eglCreatePlatformWindowSurfaceEXT(_glfw.egl.display, config, native, attribs);
    }
    else if (_glfw.egl.platform == EGL_PLATFORM_SURFACELESS_MESA)
    {
        // HACK: Use a pbuffer surface as the default framebuffer
        window->context.egl.surface =
            eglCreatePbufferSurface(_glfw.egl.display, config, attribs);
    }
    else
    {
        window->context.egl.surface =
-            eglCreatePlatformWindowSurfaceEXT(_glfw.egl.display, config, native, attribs);
+            eglCreateWindowSurface(_glfw.egl.display, config, native, attribs);
    }
    if (window->context.egl.surface == EGL_NO_SURFACE)
@ -909,19 +883,13 @@ GLFWAPI EGLDisplay glfwGetEGLDisplay(void)
 GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(EGL_NO_CONTEXT);
    _GLFWwindow* window = (_GLFWwindow*) handle;
-    assert(window != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(EGL_NO_CONTEXT);
    if (window->context.source != GLFW_EGL_CONTEXT_API)
    {
-        if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND ||
+        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
-            window->context.source != GLFW_NATIVE_CONTEXT_API)
+        return EGL_NO_CONTEXT;
        {
            _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
            return EGL_NO_CONTEXT;
        }
    }
    return window->context.egl.handle;
@ -929,43 +897,15 @@ GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* handle)
 GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(EGL_NO_SURFACE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
-    assert(window != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(EGL_NO_SURFACE);
    if (window->context.source != GLFW_EGL_CONTEXT_API)
    {
-        if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND ||
+        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
-            window->context.source != GLFW_NATIVE_CONTEXT_API)
+        return EGL_NO_SURFACE;
        {
            _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
            return EGL_NO_SURFACE;
        }
    }
    return window->context.egl.surface;
 }
 GLFWAPI int glfwGetEGLConfig(GLFWwindow* handle, EGLConfig* config)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(config != NULL);
    if (window->context.source != GLFW_EGL_CONTEXT_API)
    {
        if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND ||
            window->context.source != GLFW_NATIVE_CONTEXT_API)
        {
            _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
            return GLFW_FALSE;
        }
    }
    *config = window->context.egl.config;
    return GLFW_TRUE;
 }
--- a/src/glx_context.c
+++ b/src/glx_context.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 GLX - www.glfw.org
+// GLFW 3.4 GLX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -626,8 +626,6 @@ GLFWbool _glfwCreateContextGLX(_GLFWwindow* window,
        return GLFW_FALSE;
    }
    window->context.glx.fbconfig = native;
    window->context.makeCurrent = makeContextCurrentGLX;
    window->context.swapBuffers = swapBuffersGLX;
    window->context.swapInterval = swapIntervalGLX;
@ -679,6 +677,7 @@ GLFWbool _glfwChooseVisualGLX(const _GLFWwndconfig* wndconfig,
 GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
@ -687,9 +686,6 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* handle)
        return NULL;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (window->context.source != GLFW_NATIVE_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
@ -701,6 +697,7 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* handle)
 GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
@ -709,9 +706,6 @@ GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* handle)
        return None;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (window->context.source != GLFW_NATIVE_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
@ -721,29 +715,5 @@ GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* handle)
    return window->context.glx.window;
 }
 GLFWAPI int glfwGetGLXFBConfig(GLFWwindow* handle, GLXFBConfig* config)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "GLX: Platform not initialized");
        return GLFW_FALSE;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(config != NULL);
    if (window->context.source != GLFW_NATIVE_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
        return GLFW_FALSE;
    }
    *config = window->context.glx.fbconfig;
    return GLFW_TRUE;
 }
 #endif // _GLFW_X11
--- a/src/init.c
+++ b/src/init.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
--- a/src/input.c
+++ b/src/input.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -348,22 +348,20 @@ 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 || (!window->disableMouseButtonLimit && button > GLFW_MOUSE_BUTTON_LAST))
+    if (button < 0 || button > GLFW_MOUSE_BUTTON_LAST)
        return;
    if (!window->lockKeyMods)
        mods &= ~(GLFW_MOD_CAPS_LOCK | GLFW_MOD_NUM_LOCK);
-    if (button <= GLFW_MOUSE_BUTTON_LAST)
+    if (action == GLFW_RELEASE && window->stickyMouseButtons)
-    {
+        window->mouseButtons[button] = _GLFW_STICK;
-        if (action == GLFW_RELEASE && window->stickyMouseButtons)
+    else
-            window->mouseButtons[button] = _GLFW_STICK;
+        window->mouseButtons[button] = (char) action;
        else
            window->mouseButtons[button] = (char) action;
    }
    if (window->callbacks.mouseButton)
        window->callbacks.mouseButton((GLFWwindow*) window, button, action, mods);
@ -561,11 +559,11 @@ void _glfwCenterCursorInContentArea(_GLFWwindow* window)
 GLFWAPI int glfwGetInputMode(GLFWwindow* handle, int mode)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    switch (mode)
    {
        case GLFW_CURSOR:
@ -578,8 +576,6 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* handle, int mode)
            return window->lockKeyMods;
        case GLFW_RAW_MOUSE_MOTION:
            return window->rawMouseMotion;
        case GLFW_UNLIMITED_MOUSE_BUTTONS:
            return window->disableMouseButtonLimit;
    }
    _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0x%08X", mode);
@ -588,11 +584,11 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* handle, int mode)
 GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    switch (mode)
    {
        case GLFW_CURSOR:
@ -687,12 +683,6 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
            _glfw.platform.setRawMouseMotion(window, value);
            return;
        }
        case GLFW_UNLIMITED_MOUSE_BUTTONS:
        {
            window->disableMouseButtonLimit = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        }
    }
    _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0x%08X", mode);
@ -744,11 +734,11 @@ GLFWAPI int glfwGetKeyScancode(int key)
 GLFWAPI int glfwGetKey(GLFWwindow* handle, int key)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_RELEASE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_RELEASE);
    if (key < GLFW_KEY_SPACE || key > GLFW_KEY_LAST)
    {
        _glfwInputError(GLFW_INVALID_ENUM, "Invalid key %i", key);
@ -767,11 +757,11 @@ GLFWAPI int glfwGetKey(GLFWwindow* handle, int key)
 GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_RELEASE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_RELEASE);
    if (button < GLFW_MOUSE_BUTTON_1 || button > GLFW_MOUSE_BUTTON_LAST)
    {
        _glfwInputError(GLFW_INVALID_ENUM, "Invalid mouse button %i", button);
@ -790,6 +780,9 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button)
 GLFWAPI void glfwGetCursorPos(GLFWwindow* handle, double* xpos, double* ypos)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (xpos)
        *xpos = 0;
    if (ypos)
@ -797,9 +790,6 @@ GLFWAPI void glfwGetCursorPos(GLFWwindow* handle, double* xpos, double* ypos)
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (window->cursorMode == GLFW_CURSOR_DISABLED)
    {
        if (xpos)
@ -813,11 +803,11 @@ GLFWAPI void glfwGetCursorPos(GLFWwindow* handle, double* xpos, double* ypos)
 GLFWAPI void glfwSetCursorPos(GLFWwindow* handle, double xpos, double ypos)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (xpos != xpos || xpos < -DBL_MAX || xpos > DBL_MAX ||
        ypos != ypos || ypos < -DBL_MAX || ypos > DBL_MAX)
    {
@ -907,10 +897,10 @@ GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape)
 GLFWAPI void glfwDestroyCursor(GLFWcursor* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWcursor* cursor = (_GLFWcursor*) handle;
    _GLFW_REQUIRE_INIT();
    if (cursor == NULL)
        return;
@ -942,12 +932,12 @@ GLFWAPI void glfwDestroyCursor(GLFWcursor* handle)
 GLFWAPI void glfwSetCursor(GLFWwindow* windowHandle, GLFWcursor* cursorHandle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) windowHandle;
    _GLFWcursor* cursor = (_GLFWcursor*) cursorHandle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    window->cursor = cursor;
    _glfw.platform.setCursor(window, cursor);
@ -955,33 +945,30 @@ GLFWAPI void glfwSetCursor(GLFWwindow* windowHandle, GLFWcursor* cursorHandle)
 GLFWAPI GLFWkeyfun glfwSetKeyCallback(GLFWwindow* handle, GLFWkeyfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWkeyfun, window->callbacks.key, cbfun);
    return cbfun;
 }
 GLFWAPI GLFWcharfun glfwSetCharCallback(GLFWwindow* handle, GLFWcharfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWcharfun, window->callbacks.character, cbfun);
    return cbfun;
 }
 GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* handle, GLFWcharmodsfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWcharmodsfun, window->callbacks.charmods, cbfun);
    return cbfun;
 }
@ -989,11 +976,10 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* handle, GLFWcharmods
 GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* handle,
                                                      GLFWmousebuttonfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWmousebuttonfun, window->callbacks.mouseButton, cbfun);
    return cbfun;
 }
@ -1001,11 +987,10 @@ GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* handle,
 GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* handle,
                                                  GLFWcursorposfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWcursorposfun, window->callbacks.cursorPos, cbfun);
    return cbfun;
 }
@ -1013,11 +998,10 @@ GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* handle,
 GLFWAPI GLFWcursorenterfun glfwSetCursorEnterCallback(GLFWwindow* handle,
                                                      GLFWcursorenterfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWcursorenterfun, window->callbacks.cursorEnter, cbfun);
    return cbfun;
 }
@ -1025,22 +1009,20 @@ GLFWAPI GLFWcursorenterfun glfwSetCursorEnterCallback(GLFWwindow* handle,
 GLFWAPI GLFWscrollfun glfwSetScrollCallback(GLFWwindow* handle,
                                            GLFWscrollfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWscrollfun, window->callbacks.scroll, cbfun);
    return cbfun;
 }
 GLFWAPI GLFWdropfun glfwSetDropCallback(GLFWwindow* handle, GLFWdropfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWdropfun, window->callbacks.drop, cbfun);
    return cbfun;
 }
--- a/src/internal.h
+++ b/src/internal.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -48,8 +48,6 @@
 #define GLFW_INCLUDE_NONE
 #include "../include/GLFW/glfw3.h"
 #include <stdbool.h>
 #define _GLFW_INSERT_FIRST      0
 #define _GLFW_INSERT_LAST       1
@ -152,9 +150,6 @@ typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint);
 #define EGL_NO_DISPLAY ((EGLDisplay) 0)
 #define EGL_NO_CONTEXT ((EGLContext) 0)
 #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType) 0)
 #define EGL_PBUFFER_BIT 0x0001
 #define EGL_WIDTH 0x3057
 #define EGL_HEIGHT 0x3056
 #define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR 0x00000002
 #define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001
@ -186,7 +181,6 @@ typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint);
 #define EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE 0x3450
 #define EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE 0x3489
 #define EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE 0x348f
 #define EGL_PLATFORM_SURFACELESS_MESA 0x31dd
 typedef int EGLint;
 typedef unsigned int EGLBoolean;
@ -211,7 +205,6 @@ typedef EGLContext (APIENTRY * PFN_eglCreateContext)(EGLDisplay,EGLConfig,EGLCon
 typedef EGLBoolean (APIENTRY * PFN_eglDestroySurface)(EGLDisplay,EGLSurface);
 typedef EGLBoolean (APIENTRY * PFN_eglDestroyContext)(EGLDisplay,EGLContext);
 typedef EGLSurface (APIENTRY * PFN_eglCreateWindowSurface)(EGLDisplay,EGLConfig,EGLNativeWindowType,const EGLint*);
 typedef EGLSurface (APIENTRY * PFN_eglCreatePbufferSurface)(EGLDisplay,EGLContext,const EGLint*);
 typedef EGLBoolean (APIENTRY * PFN_eglMakeCurrent)(EGLDisplay,EGLSurface,EGLSurface,EGLContext);
 typedef EGLBoolean (APIENTRY * PFN_eglSwapBuffers)(EGLDisplay,EGLSurface);
 typedef EGLBoolean (APIENTRY * PFN_eglSwapInterval)(EGLDisplay,EGLint);
@ -228,7 +221,6 @@ typedef GLFWglproc (APIENTRY * PFN_eglGetProcAddress)(const char*);
 #define eglDestroySurface _glfw.egl.DestroySurface
 #define eglDestroyContext _glfw.egl.DestroyContext
 #define eglCreateWindowSurface _glfw.egl.CreateWindowSurface
 #define eglCreatePbufferSurface _glfw.egl.CreatePbufferSurface
 #define eglMakeCurrent _glfw.egl.MakeCurrent
 #define eglSwapBuffers _glfw.egl.SwapBuffers
 #define eglSwapInterval _glfw.egl.SwapInterval
@ -285,7 +277,6 @@ typedef enum VkStructureType
    VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000,
    VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000,
    VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT = 1000217000,
    VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000,
    VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkStructureType;
@ -402,6 +393,7 @@ struct _GLFWwndconfig
    int           ypos;
    int           width;
    int           height;
    const char*   title;
    GLFWbool      resizable;
    GLFWbool      visible;
    GLFWbool      decorated;
@ -552,7 +544,6 @@ 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];
@ -820,7 +811,6 @@ struct _GLFWlibrary
        GLFWbool        ANGLE_platform_angle_d3d;
        GLFWbool        ANGLE_platform_angle_vulkan;
        GLFWbool        ANGLE_platform_angle_metal;
        GLFWbool        MESA_platform_surfaceless;
        void*           handle;
@ -835,7 +825,6 @@ struct _GLFWlibrary
        PFN_eglDestroySurface       DestroySurface;
        PFN_eglDestroyContext       DestroyContext;
        PFN_eglCreateWindowSurface  CreateWindowSurface;
        PFN_eglCreatePbufferSurface CreatePbufferSurface;
        PFN_eglMakeCurrent          MakeCurrent;
        PFN_eglSwapBuffers          SwapBuffers;
        PFN_eglSwapInterval         SwapInterval;
@ -871,7 +860,6 @@ struct _GLFWlibrary
        GLFWbool        KHR_xlib_surface;
        GLFWbool        KHR_xcb_surface;
        GLFWbool        KHR_wayland_surface;
        GLFWbool        EXT_headless_surface;
    } vk;
    struct {
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Linux - www.glfw.org
+// GLFW 3.4 Linux - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <dirent.h>
--- a/src/linux_joystick.h
+++ b/src/linux_joystick.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Linux - www.glfw.org
+// GLFW 3.4 Linux - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
--- a/src/mappings.h
+++ b/src/mappings.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/mappings.h.in
+++ b/src/mappings.h.in
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/monitor.c
+++ b/src/monitor.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -325,6 +325,9 @@ GLFWAPI GLFWmonitor* glfwGetPrimaryMonitor(void)
 GLFWAPI void glfwGetMonitorPos(GLFWmonitor* handle, int* xpos, int* ypos)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (xpos)
        *xpos = 0;
    if (ypos)
@ -332,9 +335,6 @@ GLFWAPI void glfwGetMonitorPos(GLFWmonitor* handle, int* xpos, int* ypos)
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _glfw.platform.getMonitorPos(monitor, xpos, ypos);
 }
@ -342,6 +342,9 @@ GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* handle,
                                    int* xpos, int* ypos,
                                    int* width, int* height)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (xpos)
        *xpos = 0;
    if (ypos)
@ -353,14 +356,14 @@ GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* handle,
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _glfw.platform.getMonitorWorkarea(monitor, xpos, ypos, width, height);
 }
 GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* handle, int* widthMM, int* heightMM)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (widthMM)
        *widthMM = 0;
    if (heightMM)
@ -368,9 +371,6 @@ GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* handle, int* widthMM, int*
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (widthMM)
        *widthMM = monitor->widthMM;
    if (heightMM)
@ -380,46 +380,42 @@ GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* handle, int* widthMM, int*
 GLFWAPI void glfwGetMonitorContentScale(GLFWmonitor* handle,
                                        float* xscale, float* yscale)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (xscale)
        *xscale = 0.f;
    if (yscale)
        *yscale = 0.f;
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _glfw.platform.getMonitorContentScale(monitor, xscale, yscale);
 }
 GLFWAPI const char* glfwGetMonitorName(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return monitor->name;
 }
 GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor* handle, void* pointer)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _GLFW_REQUIRE_INIT();
    monitor->userPointer = pointer;
 }
 GLFWAPI void* glfwGetMonitorUserPointer(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return monitor->userPointer;
 }
@ -432,15 +428,14 @@ GLFWAPI GLFWmonitorfun glfwSetMonitorCallback(GLFWmonitorfun cbfun)
 GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* handle, int* count)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    assert(count != NULL);
    *count = 0;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (!refreshVideoModes(monitor))
        return NULL;
@ -450,11 +445,11 @@ GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* handle, int* count)
 GLFWAPI const GLFWvidmode* glfwGetVideoMode(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (!_glfw.platform.getVideoMode(monitor, &monitor->currentMode))
        return NULL;
@ -467,13 +462,12 @@ GLFWAPI void glfwSetGamma(GLFWmonitor* handle, float gamma)
    unsigned short* values;
    GLFWgammaramp ramp;
    const GLFWgammaramp* original;
    assert(handle != NULL);
    assert(gamma > 0.f);
    assert(gamma <= FLT_MAX);
    _GLFW_REQUIRE_INIT();
    assert(handle != NULL);
    if (gamma != gamma || gamma <= 0.f || gamma > FLT_MAX)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid gamma value %f", gamma);
@ -511,11 +505,11 @@ GLFWAPI void glfwSetGamma(GLFWmonitor* handle, float gamma)
 GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _glfwFreeGammaArrays(&monitor->currentRamp);
    if (!_glfw.platform.getGammaRamp(monitor, &monitor->currentRamp))
        return NULL;
@ -525,6 +519,8 @@ GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* handle)
 GLFWAPI void glfwSetGammaRamp(GLFWmonitor* handle, const GLFWgammaramp* ramp)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    assert(ramp != NULL);
    assert(ramp->size > 0);
    assert(ramp->red != NULL);
@ -533,9 +529,6 @@ GLFWAPI void glfwSetGammaRamp(GLFWmonitor* handle, const GLFWgammaramp* ramp)
    _GLFW_REQUIRE_INIT();
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    if (ramp->size <= 0)
    {
        _glfwInputError(GLFW_INVALID_VALUE,
--- a/src/nsgl_context.m
+++ b/src/nsgl_context.m
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <math.h>
 #include <assert.h>
 static void makeContextCurrentNSGL(_GLFWwindow* window)
 {
@ -183,16 +182,16 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
        return GLFW_FALSE;
    }
-    // Context robustness modes (GL_KHR_robustness) are not supported by
+    // Context robustness modes (GL_KHR_robustness) are not yet supported by
    // macOS but are not a hard constraint, so ignore and continue
-    // Context release behaviors (GL_KHR_context_flush_control) are not 
+    // Context release behaviors (GL_KHR_context_flush_control) are not yet
    // supported by macOS but are not a hard constraint, so ignore and continue
-    // Debug contexts (GL_KHR_debug) are not supported by macOS but are not
+    // Debug contexts (GL_KHR_debug) are not yet supported by macOS but are not
    // a hard constraint, so ignore and continue
-    // No-error contexts (GL_KHR_no_error) are not supported by macOS but
+    // No-error contexts (GL_KHR_no_error) are not yet supported by macOS but
    // are not a hard constraint, so ignore and continue
 #define ADD_ATTRIB(a) \
@ -218,11 +217,14 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
        ADD_ATTRIB(kCGLPFASupportsAutomaticGraphicsSwitching);
    }
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
    if (ctxconfig->major >= 4)
    {
        SET_ATTRIB(NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core);
    }
-    else if (ctxconfig->major >= 3)
+    else
 #endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
    if (ctxconfig->major >= 3)
    {
        SET_ATTRIB(NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core);
    }
@ -359,6 +361,7 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
 GLFWAPI id glfwGetNSGLContext(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(nil);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
@ -368,9 +371,6 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* handle)
        return nil;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (window->context.source != GLFW_NATIVE_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
--- a/src/null_init.c
+++ b/src/null_init.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/null_joystick.c
+++ b/src/null_joystick.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/null_joystick.h
+++ b/src/null_joystick.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/null_monitor.c
+++ b/src/null_monitor.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
--- a/src/null_platform.h
+++ b/src/null_platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@ -156,17 +156,6 @@
 #define GLFW_NULL_SC_MENU           120
 #define GLFW_NULL_SC_LAST           GLFW_NULL_SC_MENU
 typedef VkFlags VkHeadlessSurfaceCreateFlagsEXT;
 typedef struct VkHeadlessSurfaceCreateInfoEXT
 {
    VkStructureType                 sType;
    const void*                     pNext;
    VkHeadlessSurfaceCreateFlagsEXT flags;
 } VkHeadlessSurfaceCreateInfoEXT;
 typedef VkResult (APIENTRY *PFN_vkCreateHeadlessSurfaceEXT)(VkInstance,const VkHeadlessSurfaceCreateInfoEXT*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 // Null-specific per-window data
 //
 typedef struct _GLFWwindowNull
--- a/src/null_window.c
+++ b/src/null_window.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
@ -28,7 +28,6 @@
 #include "internal.h"
 #include <stdlib.h>
 #include <string.h>
 static void applySizeLimits(_GLFWwindow* window, int* width, int* height)
 {
@ -553,15 +552,12 @@ const char* _glfwGetClipboardStringNull(void)
 EGLenum _glfwGetEGLPlatformNull(EGLint** attribs)
 {
-    if (_glfw.egl.EXT_platform_base && _glfw.egl.MESA_platform_surfaceless)
+    return 0;
        return EGL_PLATFORM_SURFACELESS_MESA;
    else
        return 0;
 }
 EGLNativeDisplayType _glfwGetEGLNativeDisplayNull(void)
 {
-    return EGL_DEFAULT_DISPLAY;
+    return 0;
 }
 EGLNativeWindowType _glfwGetEGLNativeWindowNull(_GLFWwindow* window)
@ -703,18 +699,13 @@ int _glfwGetKeyScancodeNull(int key)
 void _glfwGetRequiredInstanceExtensionsNull(char** extensions)
 {
    if (!_glfw.vk.KHR_surface || !_glfw.vk.EXT_headless_surface)
        return;
    extensions[0] = "VK_KHR_surface";
    extensions[1] = "VK_EXT_headless_surface";
 }
 GLFWbool _glfwGetPhysicalDevicePresentationSupportNull(VkInstance instance,
                                                       VkPhysicalDevice device,
                                                       uint32_t queuefamily)
 {
-    return GLFW_TRUE;
+    return GLFW_FALSE;
 }
 VkResult _glfwCreateWindowSurfaceNull(VkInstance instance,
@ -722,28 +713,7 @@ VkResult _glfwCreateWindowSurfaceNull(VkInstance instance,
                                      const VkAllocationCallbacks* allocator,
                                      VkSurfaceKHR* surface)
 {
-    PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT =
+    // This seems like the most appropriate error to return here
-        (PFN_vkCreateHeadlessSurfaceEXT)
+    return VK_ERROR_EXTENSION_NOT_PRESENT;
        vkGetInstanceProcAddr(instance, "vkCreateHeadlessSurfaceEXT");
    if (!vkCreateHeadlessSurfaceEXT)
    {
        _glfwInputError(GLFW_API_UNAVAILABLE,
                        "Null: Vulkan instance missing VK_EXT_headless_surface extension");
        return VK_ERROR_EXTENSION_NOT_PRESENT;
    }
    VkHeadlessSurfaceCreateInfoEXT sci;
    memset(&sci, 0, sizeof(sci));
    sci.sType = VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT;
    const VkResult err = vkCreateHeadlessSurfaceEXT(instance, &sci, allocator, surface);
    if (err)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
                        "Null: Failed to create Vulkan surface: %s",
                        _glfwGetVulkanResultString(err));
    }
    return err;
 }
--- a/src/osmesa_context.c
+++ b/src/osmesa_context.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 OSMesa - www.glfw.org
+// GLFW 3.4 OSMesa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@ -296,12 +296,11 @@ GLFWAPI int glfwGetOSMesaColorBuffer(GLFWwindow* handle, int* width,
 {
    void* mesaBuffer;
    GLint mesaWidth, mesaHeight, mesaFormat;
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    if (window->context.source != GLFW_OSMESA_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
@ -336,12 +335,11 @@ GLFWAPI int glfwGetOSMesaDepthBuffer(GLFWwindow* handle,
 {
    void* mesaBuffer;
    GLint mesaWidth, mesaHeight, mesaBytes;
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    if (window->context.source != GLFW_OSMESA_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
@ -371,10 +369,8 @@ GLFWAPI int glfwGetOSMesaDepthBuffer(GLFWwindow* handle,
 GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
-    assert(window != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (window->context.source != GLFW_OSMESA_CONTEXT_API)
    {
--- a/src/platform.c
+++ b/src/platform.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
@ -187,6 +187,8 @@ GLFWAPI const char* glfwGetVersionString(void)
        " OSMesa"
 #if defined(__MINGW64_VERSION_MAJOR)
        " MinGW-w64"
 #elif defined(__MINGW32__)
        " MinGW"
 #elif defined(_MSC_VER)
        " VisualC"
 #endif
--- a/src/platform.h
+++ b/src/platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
--- a/src/posix_module.c
+++ b/src/posix_module.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2021 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/posix_poll.c
+++ b/src/posix_poll.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2022 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/posix_poll.h
+++ b/src/posix_poll.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2022 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/posix_thread.c
+++ b/src/posix_thread.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/posix_thread.h
+++ b/src/posix_thread.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/posix_time.c
+++ b/src/posix_time.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/posix_time.h
+++ b/src/posix_time.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/vulkan.c
+++ b/src/vulkan.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
@ -142,8 +142,6 @@ GLFWbool _glfwInitVulkan(int mode)
            _glfw.vk.KHR_xcb_surface = GLFW_TRUE;
        else if (strcmp(ep[i].extensionName, "VK_KHR_wayland_surface") == 0)
            _glfw.vk.KHR_wayland_surface = GLFW_TRUE;
        else if (strcmp(ep[i].extensionName, "VK_EXT_headless_surface") == 0)
            _glfw.vk.EXT_headless_surface = GLFW_TRUE;
    }
    _glfw_free(ep);
@ -274,11 +272,11 @@ GLFWAPI int glfwGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                     VkPhysicalDevice device,
                                                     uint32_t queuefamily)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    assert(instance != VK_NULL_HANDLE);
    assert(device != VK_NULL_HANDLE);
    _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_FALSE);
    if (!_glfwInitVulkan(_GLFW_REQUIRE_LOADER))
        return GLFW_FALSE;
@ -299,16 +297,15 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance,
                                         const VkAllocationCallbacks* allocator,
                                         VkSurfaceKHR* surface)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(instance != VK_NULL_HANDLE);
    assert(window != NULL);
    assert(surface != NULL);
    *surface = VK_NULL_HANDLE;
    _GLFW_REQUIRE_INIT_OR_RETURN(VK_ERROR_INITIALIZATION_FAILED);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(instance != VK_NULL_HANDLE);
    if (!_glfwInitVulkan(_GLFW_REQUIRE_LOADER))
        return VK_ERROR_INITIALIZATION_FAILED;
--- a/src/wgl_context.c
+++ b/src/wgl_context.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 WGL - www.glfw.org
+// GLFW 3.4 WGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -327,8 +327,8 @@ static void swapBuffersWGL(_GLFWwindow* window)
 {
    if (!window->monitor)
    {
-        // HACK: Use DwmFlush when desktop composition is enabled on Windows 7
+        // HACK: Use DwmFlush when desktop composition is enabled on Windows Vista and 7
-        if (!IsWindows8OrGreater())
+        if (!IsWindows8OrGreater() && IsWindowsVistaOrGreater())
        {
            BOOL enabled = FALSE;
@ -353,9 +353,9 @@ static void swapIntervalWGL(int interval)
    if (!window->monitor)
    {
-        // HACK: Disable WGL swap interval when desktop composition is enabled on
+        // HACK: Disable WGL swap interval when desktop composition is enabled on Windows
-        //       Windows 7 to avoid interfering with DWM vsync
+        //       Vista and 7 to avoid interfering with DWM vsync
-        if (!IsWindows8OrGreater())
+        if (!IsWindows8OrGreater() && IsWindowsVistaOrGreater())
        {
            BOOL enabled = FALSE;
@ -775,6 +775,7 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
 GLFWAPI HGLRC glfwGetWGLContext(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
@ -784,9 +785,6 @@ GLFWAPI HGLRC glfwGetWGLContext(GLFWwindow* handle)
        return NULL;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (window->context.source != GLFW_NATIVE_CONTEXT_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
--- a/src/win32_init.c
+++ b/src/win32_init.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -89,6 +89,10 @@ static GLFWbool loadLibraries(void)
        return GLFW_FALSE;
    }
    _glfw.win32.user32.SetProcessDPIAware_ = (PFN_SetProcessDPIAware)
        _glfwPlatformGetModuleSymbol(_glfw.win32.user32.instance, "SetProcessDPIAware");
    _glfw.win32.user32.ChangeWindowMessageFilterEx_ = (PFN_ChangeWindowMessageFilterEx)
        _glfwPlatformGetModuleSymbol(_glfw.win32.user32.instance, "ChangeWindowMessageFilterEx");
    _glfw.win32.user32.EnableNonClientDpiScaling_ = (PFN_EnableNonClientDpiScaling)
        _glfwPlatformGetModuleSymbol(_glfw.win32.user32.instance, "EnableNonClientDpiScaling");
    _glfw.win32.user32.SetProcessDpiAwarenessContext_ = (PFN_SetProcessDpiAwarenessContext)
@ -528,8 +532,7 @@ void _glfwUpdateKeyNamesWin32(void)
        if (key >= GLFW_KEY_KP_0 && key <= GLFW_KEY_KP_ADD)
        {
-            const UINT vks[] =
+            const UINT vks[] = {
            {
                VK_NUMPAD0,  VK_NUMPAD1,  VK_NUMPAD2, VK_NUMPAD3,
                VK_NUMPAD4,  VK_NUMPAD5,  VK_NUMPAD6, VK_NUMPAD7,
                VK_NUMPAD8,  VK_NUMPAD9,  VK_DECIMAL, VK_DIVIDE,
@ -689,7 +692,7 @@ int _glfwInitWin32(void)
        SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
    else if (IsWindows8Point1OrGreater())
        SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
-    else
+    else if (IsWindowsVistaOrGreater())
        SetProcessDPIAware();
    if (!createHelperWindow())
--- a/src/win32_joystick.c
+++ b/src/win32_joystick.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
--- a/src/win32_joystick.h
+++ b/src/win32_joystick.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/win32_module.c
+++ b/src/win32_module.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2021 Camilla Löwy <elmindreda@glfw.org>
 //
--- a/src/win32_monitor.c
+++ b/src/win32_monitor.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -33,7 +33,6 @@
 #include <string.h>
 #include <limits.h>
 #include <wchar.h>
 #include <assert.h>
 // Callback for EnumDisplayMonitors in createMonitor
@ -540,6 +539,7 @@ void _glfwSetGammaRampWin32(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI const char* glfwGetWin32Adapter(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
@ -548,14 +548,12 @@ GLFWAPI const char* glfwGetWin32Adapter(GLFWmonitor* handle)
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->win32.publicAdapterName;
 }
 GLFWAPI const char* glfwGetWin32Monitor(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
@ -564,9 +562,6 @@ GLFWAPI const char* glfwGetWin32Monitor(GLFWmonitor* handle)
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->win32.publicDisplayName;
 }
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -48,14 +48,14 @@
 #define UNICODE
 #endif
-// GLFW requires Windows 7 or later
+// GLFW requires Windows XP or later
-#if WINVER < 0x0601
+#if WINVER < 0x0501
 #undef WINVER
- #define WINVER 0x0601
+ #define WINVER 0x0501
 #endif
-#if _WIN32_WINNT < 0x0601
+#if _WIN32_WINNT < 0x0501
 #undef _WIN32_WINNT
- #define _WIN32_WINNT 0x0601
+ #define _WIN32_WINNT 0x0501
 #endif
 // GLFW uses DirectInput8 interfaces
@ -66,21 +66,41 @@
 #include <wctype.h>
 #include <windows.h>
 #include <dwmapi.h>
 #include <dinput.h>
 #include <xinput.h>
 #include <dbt.h>
 // HACK: Define macros that some windows.h variants don't
 #ifndef WM_MOUSEHWHEEL
 #define WM_MOUSEHWHEEL 0x020E
 #endif
 #ifndef WM_DWMCOMPOSITIONCHANGED
 #define WM_DWMCOMPOSITIONCHANGED 0x031E
 #endif
 #ifndef WM_DWMCOLORIZATIONCOLORCHANGED
 #define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
 #endif
 #ifndef WM_COPYGLOBALDATA
 #define WM_COPYGLOBALDATA 0x0049
 #endif
 #ifndef WM_UNICHAR
 #define WM_UNICHAR 0x0109
 #endif
 #ifndef UNICODE_NOCHAR
 #define UNICODE_NOCHAR 0xFFFF
 #endif
 #ifndef WM_DPICHANGED
 #define WM_DPICHANGED 0x02E0
 #endif
 #ifndef GET_XBUTTON_WPARAM
 #define GET_XBUTTON_WPARAM(w) (HIWORD(w))
 #endif
 #ifndef EDS_ROTATEDMODE
 #define EDS_ROTATEDMODE 0x00000004
 #endif
 #ifndef DISPLAY_DEVICE_ACTIVE
 #define DISPLAY_DEVICE_ACTIVE 0x00000001
 #endif
 #ifndef _WIN32_WINNT_WINBLUE
 #define _WIN32_WINNT_WINBLUE 0x0603
 #endif
@ -93,6 +113,34 @@
 #ifndef USER_DEFAULT_SCREEN_DPI
 #define USER_DEFAULT_SCREEN_DPI 96
 #endif
 #ifndef OCR_HAND
 #define OCR_HAND 32649
 #endif
 #if WINVER < 0x0601
 typedef struct
 {
    DWORD cbSize;
    DWORD ExtStatus;
 } CHANGEFILTERSTRUCT;
 #ifndef MSGFLT_ALLOW
 #define MSGFLT_ALLOW 1
 #endif
 #endif /*Windows 7*/
 #if WINVER < 0x0600
 #define DWM_BB_ENABLE 0x00000001
 #define DWM_BB_BLURREGION 0x00000002
 typedef struct
 {
    DWORD dwFlags;
    BOOL fEnable;
    HRGN hRgnBlur;
    BOOL fTransitionOnMaximized;
 } DWM_BLURBEHIND;
 #else
 #include <dwmapi.h>
 #endif /*Windows Vista*/
 #ifndef DPI_ENUMS_DECLARED
 typedef enum
@ -117,6 +165,12 @@ typedef enum
 // Replacement for versionhelpers.h macros, as we cannot rely on the
 // application having a correct embedded manifest
 //
 #define IsWindowsVistaOrGreater()                                     \
    _glfwIsWindowsVersionOrGreaterWin32(HIBYTE(_WIN32_WINNT_VISTA),   \
                                        LOBYTE(_WIN32_WINNT_VISTA), 0)
 #define IsWindows7OrGreater()                                         \
    _glfwIsWindowsVersionOrGreaterWin32(HIBYTE(_WIN32_WINNT_WIN7),    \
                                        LOBYTE(_WIN32_WINNT_WIN7), 0)
 #define IsWindows8OrGreater()                                         \
    _glfwIsWindowsVersionOrGreaterWin32(HIBYTE(_WIN32_WINNT_WIN8),    \
                                        LOBYTE(_WIN32_WINNT_WIN8), 0)
@ -227,11 +281,15 @@ typedef HRESULT (WINAPI * PFN_DirectInput8Create)(HINSTANCE,DWORD,REFIID,LPVOID*
 #define DirectInput8Create _glfw.win32.dinput8.Create
 // user32.dll function pointer typedefs
 typedef BOOL (WINAPI * PFN_SetProcessDPIAware)(void);
 typedef BOOL (WINAPI * PFN_ChangeWindowMessageFilterEx)(HWND,UINT,DWORD,CHANGEFILTERSTRUCT*);
 typedef BOOL (WINAPI * PFN_EnableNonClientDpiScaling)(HWND);
 typedef BOOL (WINAPI * PFN_SetProcessDpiAwarenessContext)(HANDLE);
 typedef UINT (WINAPI * PFN_GetDpiForWindow)(HWND);
 typedef BOOL (WINAPI * PFN_AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT);
 typedef int (WINAPI * PFN_GetSystemMetricsForDpi)(int,UINT);
 #define SetProcessDPIAware _glfw.win32.user32.SetProcessDPIAware_
 #define ChangeWindowMessageFilterEx _glfw.win32.user32.ChangeWindowMessageFilterEx_
 #define EnableNonClientDpiScaling _glfw.win32.user32.EnableNonClientDpiScaling_
 #define SetProcessDpiAwarenessContext _glfw.win32.user32.SetProcessDpiAwarenessContext_
 #define GetDpiForWindow _glfw.win32.user32.GetDpiForWindow_
@ -417,6 +475,8 @@ typedef struct _GLFWlibraryWin32
    struct {
        HINSTANCE                       instance;
        PFN_SetProcessDPIAware          SetProcessDPIAware_;
        PFN_ChangeWindowMessageFilterEx ChangeWindowMessageFilterEx_;
        PFN_EnableNonClientDpiScaling   EnableNonClientDpiScaling_;
        PFN_SetProcessDpiAwarenessContext SetProcessDpiAwarenessContext_;
        PFN_GetDpiForWindow             GetDpiForWindow_;
--- a/src/win32_thread.c
+++ b/src/win32_thread.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/win32_thread.h
+++ b/src/win32_thread.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/win32_time.c
+++ b/src/win32_time.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/win32_time.h
+++ b/src/win32_time.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/win32_window.c
+++ b/src/win32_window.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -32,7 +32,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <windowsx.h>
 #include <shellapi.h>
@ -374,6 +373,9 @@ static void updateFramebufferTransparency(const _GLFWwindow* window)
    BOOL composition, opaque;
    DWORD color;
    if (!IsWindowsVistaOrGreater())
        return;
    if (FAILED(DwmIsCompositionEnabled(&composition)) || !composition)
       return;
@ -980,6 +982,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
        case WM_MOUSEHWHEEL:
        {
            // This message is only sent on Windows Vista and later
            // NOTE: The X-axis is inverted for consistency with macOS and X11
            _glfwInputScroll(window, -((SHORT) HIWORD(wParam) / (double) WHEEL_DELTA), 0.0);
            return 0;
@ -1377,7 +1380,7 @@ static int createNativeWindow(_GLFWwindow* window,
        frameHeight = rect.bottom - rect.top;
    }
-    wideTitle = _glfwCreateWideStringFromUTF8Win32(window->title);
+    wideTitle = _glfwCreateWideStringFromUTF8Win32(wndconfig->title);
    if (!wideTitle)
        return GLFW_FALSE;
@ -1403,9 +1406,15 @@ static int createNativeWindow(_GLFWwindow* window,
    SetPropW(window->win32.handle, L"GLFW", window);
-    ChangeWindowMessageFilterEx(window->win32.handle, WM_DROPFILES, MSGFLT_ALLOW, NULL);
+    if (IsWindows7OrGreater())
-    ChangeWindowMessageFilterEx(window->win32.handle, WM_COPYDATA, MSGFLT_ALLOW, NULL);
+    {
-    ChangeWindowMessageFilterEx(window->win32.handle, WM_COPYGLOBALDATA, MSGFLT_ALLOW, NULL);
+        ChangeWindowMessageFilterEx(window->win32.handle,
                                    WM_DROPFILES, MSGFLT_ALLOW, NULL);
        ChangeWindowMessageFilterEx(window->win32.handle,
                                    WM_COPYDATA, MSGFLT_ALLOW, NULL);
        ChangeWindowMessageFilterEx(window->win32.handle,
                                    WM_COPYGLOBALDATA, MSGFLT_ALLOW, NULL);
    }
    window->win32.scaleToMonitor = wndconfig->scaleToMonitor;
    window->win32.keymenu = wndconfig->win32.keymenu;
@ -1971,6 +1980,9 @@ GLFWbool _glfwFramebufferTransparentWin32(_GLFWwindow* window)
    if (!window->win32.transparent)
        return GLFW_FALSE;
    if (!IsWindowsVistaOrGreater())
        return GLFW_FALSE;
    if (FAILED(DwmIsCompositionEnabled(&composition)) || !composition)
        return GLFW_FALSE;
@ -2564,6 +2576,7 @@ VkResult _glfwCreateWindowSurfaceWin32(VkInstance instance,
 GLFWAPI HWND glfwGetWin32Window(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
@ -2573,9 +2586,6 @@ GLFWAPI HWND glfwGetWin32Window(GLFWwindow* handle)
        return NULL;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->win32.handle;
 }
--- a/src/window.c
+++ b/src/window.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -208,6 +208,7 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
    wndconfig.width   = width;
    wndconfig.height  = height;
    wndconfig.title   = title;
    ctxconfig.share   = (_GLFWwindow*) share;
    if (!_glfwIsValidContextConfig(&ctxconfig))
@ -466,10 +467,10 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value)
 GLFWAPI void glfwDestroyWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT();
    // Allow closing of NULL (to match the behavior of free)
    if (window == NULL)
        return;
@ -500,43 +501,40 @@ GLFWAPI void glfwDestroyWindow(GLFWwindow* handle)
 GLFWAPI int glfwWindowShouldClose(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    return window->shouldClose;
 }
 GLFWAPI void glfwSetWindowShouldClose(GLFWwindow* handle, int value)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    window->shouldClose = value;
 }
 GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return window->title;
 }
 GLFWAPI void glfwSetWindowTitle(GLFWwindow* handle, const char* title)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(title != NULL);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    char* prev = window->title;
    window->title = _glfw_strdup(title);
@ -548,15 +546,14 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle,
                               int count, const GLFWimage* images)
 {
    int i;
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(count >= 0);
    assert(count == 0 || images != NULL);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (count < 0)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid image count for window icon");
@ -580,26 +577,25 @@ GLFWAPI void glfwSetWindowIcon(GLFWwindow* handle,
 GLFWAPI void glfwGetWindowPos(GLFWwindow* handle, int* xpos, int* ypos)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (xpos)
        *xpos = 0;
    if (ypos)
        *ypos = 0;
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _glfw.platform.getWindowPos(window, xpos, ypos);
 }
 GLFWAPI void glfwSetWindowPos(GLFWwindow* handle, int xpos, int ypos)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (window->monitor)
        return;
@ -608,29 +604,27 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow* handle, int xpos, int ypos)
 GLFWAPI void glfwGetWindowSize(GLFWwindow* handle, int* width, int* height)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (width)
        *width = 0;
    if (height)
        *height = 0;
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _glfw.platform.getWindowSize(window, width, height);
 }
 GLFWAPI void glfwSetWindowSize(GLFWwindow* handle, int width, int height)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(width >= 0);
    assert(height >= 0);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    window->videoMode.width  = width;
    window->videoMode.height = height;
@ -641,11 +635,11 @@ GLFWAPI void glfwSetWindowSizeLimits(GLFWwindow* handle,
                                     int minwidth, int minheight,
                                     int maxwidth, int maxheight)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (minwidth != GLFW_DONT_CARE && minheight != GLFW_DONT_CARE)
    {
        if (minwidth < 0 || minheight < 0)
@ -684,14 +678,13 @@ GLFWAPI void glfwSetWindowSizeLimits(GLFWwindow* handle,
 GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* handle, int numer, int denom)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(numer != 0);
    assert(denom != 0);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (numer != GLFW_DONT_CARE && denom != GLFW_DONT_CARE)
    {
        if (numer <= 0 || denom <= 0)
@ -714,16 +707,15 @@ GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* handle, int numer, int denom)
 GLFWAPI void glfwGetFramebufferSize(GLFWwindow* handle, int* width, int* height)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (width)
        *width = 0;
    if (height)
        *height = 0;
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _glfw.platform.getFramebufferSize(window, width, height);
 }
@ -731,6 +723,9 @@ GLFWAPI void glfwGetWindowFrameSize(GLFWwindow* handle,
                                    int* left, int* top,
                                    int* right, int* bottom)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (left)
        *left = 0;
    if (top)
@ -741,50 +736,43 @@ GLFWAPI void glfwGetWindowFrameSize(GLFWwindow* handle,
        *bottom = 0;
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _glfw.platform.getWindowFrameSize(window, left, top, right, bottom);
 }
 GLFWAPI void glfwGetWindowContentScale(GLFWwindow* handle,
                                       float* xscale, float* yscale)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (xscale)
        *xscale = 0.f;
    if (yscale)
        *yscale = 0.f;
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _glfw.platform.getWindowContentScale(window, xscale, yscale);
 }
 GLFWAPI float glfwGetWindowOpacity(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(0.f);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(0.f);
    return _glfw.platform.getWindowOpacity(window);
 }
 GLFWAPI void glfwSetWindowOpacity(GLFWwindow* handle, float opacity)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    assert(opacity == opacity);
    assert(opacity >= 0.f);
    assert(opacity <= 1.f);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    if (opacity != opacity || opacity < 0.f || opacity > 1.f)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid window opacity %f", opacity);
@ -796,31 +784,29 @@ GLFWAPI void glfwSetWindowOpacity(GLFWwindow* handle, float opacity)
 GLFWAPI void glfwIconifyWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    _glfw.platform.iconifyWindow(window);
 }
 GLFWAPI void glfwRestoreWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    _glfw.platform.restoreWindow(window);
 }
 GLFWAPI void glfwMaximizeWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (window->monitor)
        return;
@ -829,11 +815,11 @@ GLFWAPI void glfwMaximizeWindow(GLFWwindow* handle)
 GLFWAPI void glfwShowWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (window->monitor)
        return;
@ -845,21 +831,21 @@ GLFWAPI void glfwShowWindow(GLFWwindow* handle)
 GLFWAPI void glfwRequestWindowAttention(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    _glfw.platform.requestWindowAttention(window);
 }
 GLFWAPI void glfwHideWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    if (window->monitor)
        return;
@ -868,21 +854,21 @@ GLFWAPI void glfwHideWindow(GLFWwindow* handle)
 GLFWAPI void glfwFocusWindow(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    _glfw.platform.focusWindow(window);
 }
 GLFWAPI int glfwGetWindowAttrib(GLFWwindow* handle, int attrib)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(0);
    switch (attrib)
    {
        case GLFW_FOCUSED:
@ -941,11 +927,11 @@ GLFWAPI int glfwGetWindowAttrib(GLFWwindow* handle, int attrib)
 GLFWAPI void glfwSetWindowAttrib(GLFWwindow* handle, int attrib, int value)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    value = value ? GLFW_TRUE : GLFW_FALSE;
    switch (attrib)
@ -987,11 +973,10 @@ GLFWAPI void glfwSetWindowAttrib(GLFWwindow* handle, int attrib, int value)
 GLFWAPI GLFWmonitor* glfwGetWindowMonitor(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return (GLFWmonitor*) window->monitor;
 }
@ -1001,15 +986,14 @@ GLFWAPI void glfwSetWindowMonitor(GLFWwindow* wh,
                                  int width, int height,
                                  int refreshRate)
 {
    _GLFWwindow* window = (_GLFWwindow*) wh;
    _GLFWmonitor* monitor = (_GLFWmonitor*) mh;
    assert(window != NULL);
    assert(width >= 0);
    assert(height >= 0);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) wh;
    _GLFWmonitor* monitor = (_GLFWmonitor*) mh;
    assert(window != NULL);
    if (width <= 0 || height <= 0)
    {
        _glfwInputError(GLFW_INVALID_VALUE,
@ -1037,32 +1021,29 @@ GLFWAPI void glfwSetWindowMonitor(GLFWwindow* wh,
 GLFWAPI void glfwSetWindowUserPointer(GLFWwindow* handle, void* pointer)
 {
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    window->userPointer = pointer;
 }
 GLFWAPI void* glfwGetWindowUserPointer(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return window->userPointer;
 }
 GLFWAPI GLFWwindowposfun glfwSetWindowPosCallback(GLFWwindow* handle,
                                                  GLFWwindowposfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowposfun, window->callbacks.pos, cbfun);
    return cbfun;
 }
@ -1070,11 +1051,10 @@ GLFWAPI GLFWwindowposfun glfwSetWindowPosCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* handle,
                                                    GLFWwindowsizefun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowsizefun, window->callbacks.size, cbfun);
    return cbfun;
 }
@ -1082,11 +1062,10 @@ GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowclosefun glfwSetWindowCloseCallback(GLFWwindow* handle,
                                                      GLFWwindowclosefun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowclosefun, window->callbacks.close, cbfun);
    return cbfun;
 }
@ -1094,11 +1073,10 @@ GLFWAPI GLFWwindowclosefun glfwSetWindowCloseCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowrefreshfun glfwSetWindowRefreshCallback(GLFWwindow* handle,
                                                          GLFWwindowrefreshfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowrefreshfun, window->callbacks.refresh, cbfun);
    return cbfun;
 }
@ -1106,11 +1084,10 @@ GLFWAPI GLFWwindowrefreshfun glfwSetWindowRefreshCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowfocusfun glfwSetWindowFocusCallback(GLFWwindow* handle,
                                                      GLFWwindowfocusfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowfocusfun, window->callbacks.focus, cbfun);
    return cbfun;
 }
@ -1118,11 +1095,10 @@ GLFWAPI GLFWwindowfocusfun glfwSetWindowFocusCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowiconifyfun glfwSetWindowIconifyCallback(GLFWwindow* handle,
                                                          GLFWwindowiconifyfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowiconifyfun, window->callbacks.iconify, cbfun);
    return cbfun;
 }
@ -1130,11 +1106,10 @@ GLFWAPI GLFWwindowiconifyfun glfwSetWindowIconifyCallback(GLFWwindow* handle,
 GLFWAPI GLFWwindowmaximizefun glfwSetWindowMaximizeCallback(GLFWwindow* handle,
                                                            GLFWwindowmaximizefun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowmaximizefun, window->callbacks.maximize, cbfun);
    return cbfun;
 }
@ -1142,11 +1117,10 @@ GLFWAPI GLFWwindowmaximizefun glfwSetWindowMaximizeCallback(GLFWwindow* handle,
 GLFWAPI GLFWframebuffersizefun glfwSetFramebufferSizeCallback(GLFWwindow* handle,
                                                              GLFWframebuffersizefun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWframebuffersizefun, window->callbacks.fbsize, cbfun);
    return cbfun;
 }
@ -1154,11 +1128,10 @@ GLFWAPI GLFWframebuffersizefun glfwSetFramebufferSizeCallback(GLFWwindow* handle
 GLFWAPI GLFWwindowcontentscalefun glfwSetWindowContentScaleCallback(GLFWwindow* handle,
                                                                    GLFWwindowcontentscalefun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFW_SWAP(GLFWwindowcontentscalefun, window->callbacks.scale, cbfun);
    return cbfun;
 }
--- a/src/wl_init.c
+++ b/src/wl_init.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Wayland - www.glfw.org
+// GLFW 3.4 Wayland - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
@ -137,13 +137,6 @@ static void registryHandleGlobal(void* userData,
                wl_registry_bind(registry, name, &wl_seat_interface,
                                 _glfw_min(4, version));
            _glfwAddSeatListenerWayland(_glfw.wl.seat);
            if (wl_seat_get_version(_glfw.wl.seat) >=
                WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
            {
                _glfw.wl.keyRepeatTimerfd =
                    timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
            }
        }
    }
    else if (strcmp(interface, "wl_data_device_manager") == 0)
@ -711,10 +704,6 @@ int _glfwInitWayland(void)
        _glfwPlatformGetModuleSymbol(_glfw.wl.xkb.handle, "xkb_compose_state_get_status");
    _glfw.wl.xkb.compose_state_get_one_sym = (PFN_xkb_compose_state_get_one_sym)
        _glfwPlatformGetModuleSymbol(_glfw.wl.xkb.handle, "xkb_compose_state_get_one_sym");
    _glfw.wl.xkb.keysym_to_utf32 = (PFN_xkb_keysym_to_utf32)
        _glfwPlatformGetModuleSymbol(_glfw.wl.xkb.handle, "xkb_keysym_to_utf32");
    _glfw.wl.xkb.keysym_to_utf8 = (PFN_xkb_keysym_to_utf8)
        _glfwPlatformGetModuleSymbol(_glfw.wl.xkb.handle, "xkb_keysym_to_utf8");
    if (!_glfw.wl.xkb.context_new ||
        !_glfw.wl.xkb.context_unref ||
@ -864,6 +853,12 @@ int _glfwInitWayland(void)
        }
    }
    if (wl_seat_get_version(_glfw.wl.seat) >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
    {
        _glfw.wl.keyRepeatTimerfd =
            timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
    }
    if (!_glfw.wl.wmBase)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
@ -907,6 +902,18 @@ void _glfwTerminateWayland(void)
        libdecor_unref(_glfw.wl.libdecor.context);
    }
    if (_glfw.wl.libdecor.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.libdecor.handle);
        _glfw.wl.libdecor.handle = NULL;
    }
    if (_glfw.wl.egl.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.egl.handle);
        _glfw.wl.egl.handle = NULL;
    }
    if (_glfw.wl.xkb.composeState)
        xkb_compose_state_unref(_glfw.wl.xkb.composeState);
    if (_glfw.wl.xkb.keymap)
@ -915,11 +922,21 @@ void _glfwTerminateWayland(void)
        xkb_state_unref(_glfw.wl.xkb.state);
    if (_glfw.wl.xkb.context)
        xkb_context_unref(_glfw.wl.xkb.context);
    if (_glfw.wl.xkb.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.xkb.handle);
        _glfw.wl.xkb.handle = NULL;
    }
    if (_glfw.wl.cursorTheme)
        wl_cursor_theme_destroy(_glfw.wl.cursorTheme);
    if (_glfw.wl.cursorThemeHiDPI)
        wl_cursor_theme_destroy(_glfw.wl.cursorThemeHiDPI);
    if (_glfw.wl.cursor.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.cursor.handle);
        _glfw.wl.cursor.handle = NULL;
    }
    for (unsigned int i = 0; i < _glfw.wl.offerCount; i++)
        wl_data_offer_destroy(_glfw.wl.offers[i].offer);
@ -979,38 +996,6 @@ void _glfwTerminateWayland(void)
    if (_glfw.wl.cursorTimerfd >= 0)
        close(_glfw.wl.cursorTimerfd);
    // Free modules only after all Wayland termination functions are called
    if (_glfw.egl.handle)
    {
        _glfwPlatformFreeModule(_glfw.egl.handle);
        _glfw.egl.handle = NULL;
    }
    if (_glfw.wl.libdecor.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.libdecor.handle);
        _glfw.wl.libdecor.handle = NULL;
    }
    if (_glfw.wl.egl.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.egl.handle);
        _glfw.wl.egl.handle = NULL;
    }
    if (_glfw.wl.xkb.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.xkb.handle);
        _glfw.wl.xkb.handle = NULL;
    }
    if (_glfw.wl.cursor.handle)
    {
        _glfwPlatformFreeModule(_glfw.wl.cursor.handle);
        _glfw.wl.cursor.handle = NULL;
    }
    _glfw_free(_glfw.wl.clipboardString);
 }
--- a/src/wl_monitor.c
+++ b/src/wl_monitor.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Wayland - www.glfw.org
+// GLFW 3.4 Wayland - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
@ -33,7 +33,6 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
 #include <assert.h>
 #include "wayland-client-protocol.h"
@ -259,6 +258,7 @@ void _glfwSetGammaRampWayland(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND)
@ -267,9 +267,6 @@ GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* handle)
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->wl.output;
 }
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Wayland - www.glfw.org
+// GLFW 3.4 Wayland - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
@ -28,6 +28,8 @@
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-compose.h>
 #include <stdbool.h>
 typedef VkFlags VkWaylandSurfaceCreateFlagsKHR;
 typedef struct VkWaylandSurfaceCreateInfoKHR
@ -42,6 +44,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR
 typedef VkResult (APIENTRY *PFN_vkCreateWaylandSurfaceKHR)(VkInstance,const VkWaylandSurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice,uint32_t,struct wl_display*);
 #include "xkb_unicode.h"
 #include "posix_poll.h"
 typedef int (* PFN_wl_display_flush)(struct wl_display* display);
@ -136,22 +139,18 @@ struct wl_output;
 #define GLFW_WAYLAND_MONITOR_STATE        _GLFWmonitorWayland wl;
 #define GLFW_WAYLAND_CURSOR_STATE         _GLFWcursorWayland  wl;
-struct wl_cursor_image
+struct wl_cursor_image {
 {
    uint32_t width;
    uint32_t height;
    uint32_t hotspot_x;
    uint32_t hotspot_y;
    uint32_t delay;
 };
-
+struct wl_cursor {
 struct wl_cursor
 {
    unsigned int image_count;
    struct wl_cursor_image** images;
    char* name;
 };
 typedef struct wl_cursor_theme* (* PFN_wl_cursor_theme_load)(const char*, int, struct wl_shm*);
 typedef void (* PFN_wl_cursor_theme_destroy)(struct wl_cursor_theme*);
 typedef struct wl_cursor* (* PFN_wl_cursor_theme_get_cursor)(struct wl_cursor_theme*, const char*);
@ -181,8 +180,6 @@ typedef int (* PFN_xkb_state_key_get_syms)(struct xkb_state*, xkb_keycode_t, con
 typedef enum xkb_state_component (* PFN_xkb_state_update_mask)(struct xkb_state*, xkb_mod_mask_t, xkb_mod_mask_t, xkb_mod_mask_t, xkb_layout_index_t, xkb_layout_index_t, xkb_layout_index_t);
 typedef xkb_layout_index_t (* PFN_xkb_state_key_get_layout)(struct xkb_state*,xkb_keycode_t);
 typedef int (* PFN_xkb_state_mod_index_is_active)(struct xkb_state*,xkb_mod_index_t,enum xkb_state_component);
 typedef uint32_t (* PFN_xkb_keysym_to_utf32)(xkb_keysym_t);
 typedef int (* PFN_xkb_keysym_to_utf8)(xkb_keysym_t, char*, size_t);
 #define xkb_context_new _glfw.wl.xkb.context_new
 #define xkb_context_unref _glfw.wl.xkb.context_unref
 #define xkb_keymap_new_from_string _glfw.wl.xkb.keymap_new_from_string
@ -196,8 +193,6 @@ typedef int (* PFN_xkb_keysym_to_utf8)(xkb_keysym_t, char*, size_t);
 #define xkb_state_update_mask _glfw.wl.xkb.state_update_mask
 #define xkb_state_key_get_layout _glfw.wl.xkb.state_key_get_layout
 #define xkb_state_mod_index_is_active _glfw.wl.xkb.state_mod_index_is_active
 #define xkb_keysym_to_utf32 _glfw.wl.xkb.keysym_to_utf32
 #define xkb_keysym_to_utf8 _glfw.wl.xkb.keysym_to_utf8
 typedef struct xkb_compose_table* (* PFN_xkb_compose_table_new_from_locale)(struct xkb_context*, const char*, enum xkb_compose_compile_flags);
 typedef void (* PFN_xkb_compose_table_unref)(struct xkb_compose_table*);
@ -221,62 +216,62 @@ struct libdecor_configuration;
 enum libdecor_error
 {
-    LIBDECOR_ERROR_COMPOSITOR_INCOMPATIBLE,
+	LIBDECOR_ERROR_COMPOSITOR_INCOMPATIBLE,
-    LIBDECOR_ERROR_INVALID_FRAME_CONFIGURATION,
+	LIBDECOR_ERROR_INVALID_FRAME_CONFIGURATION,
 };
 enum libdecor_window_state
 {
-    LIBDECOR_WINDOW_STATE_NONE = 0,
+	LIBDECOR_WINDOW_STATE_NONE = 0,
-    LIBDECOR_WINDOW_STATE_ACTIVE = 1,
+	LIBDECOR_WINDOW_STATE_ACTIVE = 1,
-    LIBDECOR_WINDOW_STATE_MAXIMIZED = 2,
+	LIBDECOR_WINDOW_STATE_MAXIMIZED = 2,
-    LIBDECOR_WINDOW_STATE_FULLSCREEN = 4,
+	LIBDECOR_WINDOW_STATE_FULLSCREEN = 4,
-    LIBDECOR_WINDOW_STATE_TILED_LEFT = 8,
+	LIBDECOR_WINDOW_STATE_TILED_LEFT = 8,
-    LIBDECOR_WINDOW_STATE_TILED_RIGHT = 16,
+	LIBDECOR_WINDOW_STATE_TILED_RIGHT = 16,
-    LIBDECOR_WINDOW_STATE_TILED_TOP = 32,
+	LIBDECOR_WINDOW_STATE_TILED_TOP = 32,
-    LIBDECOR_WINDOW_STATE_TILED_BOTTOM = 64
+	LIBDECOR_WINDOW_STATE_TILED_BOTTOM = 64
 };
 enum libdecor_capabilities
 {
-    LIBDECOR_ACTION_MOVE = 1,
+	LIBDECOR_ACTION_MOVE = 1,
-    LIBDECOR_ACTION_RESIZE = 2,
+	LIBDECOR_ACTION_RESIZE = 2,
-    LIBDECOR_ACTION_MINIMIZE = 4,
+	LIBDECOR_ACTION_MINIMIZE = 4,
-    LIBDECOR_ACTION_FULLSCREEN = 8,
+	LIBDECOR_ACTION_FULLSCREEN = 8,
-    LIBDECOR_ACTION_CLOSE = 16
+	LIBDECOR_ACTION_CLOSE = 16
 };
 struct libdecor_interface
 {
-    void (* error)(struct libdecor*,enum libdecor_error,const char*);
+	void (* error)(struct libdecor*,enum libdecor_error,const char*);
-    void (* reserved0)(void);
+	void (* reserved0)(void);
-    void (* reserved1)(void);
+	void (* reserved1)(void);
-    void (* reserved2)(void);
+	void (* reserved2)(void);
-    void (* reserved3)(void);
+	void (* reserved3)(void);
-    void (* reserved4)(void);
+	void (* reserved4)(void);
-    void (* reserved5)(void);
+	void (* reserved5)(void);
-    void (* reserved6)(void);
+	void (* reserved6)(void);
-    void (* reserved7)(void);
+	void (* reserved7)(void);
-    void (* reserved8)(void);
+	void (* reserved8)(void);
-    void (* reserved9)(void);
+	void (* reserved9)(void);
 };
 struct libdecor_frame_interface
 {
-    void (* configure)(struct libdecor_frame*,struct libdecor_configuration*,void*);
+	void (* configure)(struct libdecor_frame*,struct libdecor_configuration*,void*);
-    void (* close)(struct libdecor_frame*,void*);
+	void (* close)(struct libdecor_frame*,void*);
-    void (* commit)(struct libdecor_frame*,void*);
+	void (* commit)(struct libdecor_frame*,void*);
-    void (* dismiss_popup)(struct libdecor_frame*,const char*,void*);
+	void (* dismiss_popup)(struct libdecor_frame*,const char*,void*);
-    void (* reserved0)(void);
+	void (* reserved0)(void);
-    void (* reserved1)(void);
+	void (* reserved1)(void);
-    void (* reserved2)(void);
+	void (* reserved2)(void);
-    void (* reserved3)(void);
+	void (* reserved3)(void);
-    void (* reserved4)(void);
+	void (* reserved4)(void);
-    void (* reserved5)(void);
+	void (* reserved5)(void);
-    void (* reserved6)(void);
+	void (* reserved6)(void);
-    void (* reserved7)(void);
+	void (* reserved7)(void);
-    void (* reserved8)(void);
+	void (* reserved8)(void);
-    void (* reserved9)(void);
+	void (* reserved9)(void);
 };
 typedef struct libdecor* (* PFN_libdecor_new)(struct wl_display*,const struct libdecor_interface*);
@ -417,8 +412,6 @@ typedef struct _GLFWwindowWayland
        struct wl_buffer*           buffer;
        _GLFWfallbackEdgeWayland    top, left, right, bottom;
        struct wl_surface*          focus;
        wl_fixed_t                  pointerX, pointerY;
        const char*                 cursorName;
    } fallback;
 } _GLFWwindowWayland;
@ -460,6 +453,7 @@ typedef struct _GLFWlibraryWayland
    struct wl_cursor_theme*     cursorTheme;
    struct wl_cursor_theme*     cursorThemeHiDPI;
    struct wl_surface*          cursorSurface;
    const char*                 cursorPreviousName;
    int                         cursorTimerfd;
    uint32_t                    serial;
    uint32_t                    pointerEnterSerial;
@ -503,8 +497,6 @@ typedef struct _GLFWlibraryWayland
        PFN_xkb_state_update_mask state_update_mask;
        PFN_xkb_state_key_get_layout state_key_get_layout;
        PFN_xkb_state_mod_index_is_active state_mod_index_is_active;
        PFN_xkb_keysym_to_utf32 keysym_to_utf32;
        PFN_xkb_keysym_to_utf8 keysym_to_utf8;
        PFN_xkb_compose_table_new_from_locale compose_table_new_from_locale;
        PFN_xkb_compose_table_unref compose_table_unref;
--- a/src/wl_window.c
+++ b/src/wl_window.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Wayland - www.glfw.org
+// GLFW 3.4 Wayland - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
@ -275,152 +275,6 @@ static void destroyFallbackDecorations(_GLFWwindow* window)
    destroyFallbackEdge(&window->wl.fallback.bottom);
 }
 static void updateFallbackDecorationCursor(_GLFWwindow* window,
                                           wl_fixed_t sx,
                                           wl_fixed_t sy)
 {
    window->wl.fallback.pointerX = sx;
    window->wl.fallback.pointerY = sy;
    const double xpos = wl_fixed_to_double(sx);
    const double ypos = wl_fixed_to_double(sy);
    const char* cursorName = "left_ptr";
    if (window->resizable)
    {
        if (window->wl.fallback.focus == window->wl.fallback.top.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                cursorName = "n-resize";
        }
        else if (window->wl.fallback.focus == window->wl.fallback.left.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                cursorName = "nw-resize";
            else
                cursorName = "w-resize";
        }
        else if (window->wl.fallback.focus == window->wl.fallback.right.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                cursorName = "ne-resize";
            else
                cursorName = "e-resize";
        }
        else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface)
        {
            if (xpos < GLFW_BORDER_SIZE)
                cursorName = "sw-resize";
            else if (xpos > window->wl.width + GLFW_BORDER_SIZE)
                cursorName = "se-resize";
            else
                cursorName = "s-resize";
        }
    }
    if (window->wl.fallback.cursorName != cursorName)
    {
        struct wl_surface* surface = _glfw.wl.cursorSurface;
        struct wl_cursor_theme* theme = _glfw.wl.cursorTheme;
        int scale = 1;
        if (window->wl.bufferScale > 1 && _glfw.wl.cursorThemeHiDPI)
        {
            // We only support up to scale=2 for now, since libwayland-cursor
            // requires us to load a different theme for each size.
            scale = 2;
            theme = _glfw.wl.cursorThemeHiDPI;
        }
        struct wl_cursor* cursor = wl_cursor_theme_get_cursor(theme, cursorName);
        if (!cursor)
            return;
        // TODO: handle animated cursors too.
        struct wl_cursor_image* image = cursor->images[0];
        if (!image)
            return;
        struct wl_buffer* buffer = wl_cursor_image_get_buffer(image);
        if (!buffer)
            return;
        wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerEnterSerial,
                              surface,
                              image->hotspot_x / scale,
                              image->hotspot_y / scale);
        wl_surface_set_buffer_scale(surface, scale);
        wl_surface_attach(surface, buffer, 0, 0);
        wl_surface_damage(surface, 0, 0, image->width, image->height);
        wl_surface_commit(surface);
        window->wl.fallback.cursorName = cursorName;
    }
 }
 static void handleFallbackDecorationButton(_GLFWwindow* window,
                                           uint32_t serial,
                                           uint32_t button)
 {
    const double xpos = wl_fixed_to_double(window->wl.fallback.pointerX);
    const double ypos = wl_fixed_to_double(window->wl.fallback.pointerY);
    if (button == BTN_LEFT)
    {
        uint32_t edges = XDG_TOPLEVEL_RESIZE_EDGE_NONE;
        if (window->wl.fallback.focus == window->wl.fallback.top.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP;
            else
                xdg_toplevel_move(window->wl.xdg.toplevel, _glfw.wl.seat, serial);
        }
        else if (window->wl.fallback.focus == window->wl.fallback.left.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT;
            else
                edges = XDG_TOPLEVEL_RESIZE_EDGE_LEFT;
        }
        else if (window->wl.fallback.focus == window->wl.fallback.right.surface)
        {
            if (ypos < GLFW_BORDER_SIZE)
                edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT;
            else
                edges = XDG_TOPLEVEL_RESIZE_EDGE_RIGHT;
        }
        else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface)
        {
            if (xpos < GLFW_BORDER_SIZE)
                edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT;
            else if (xpos > window->wl.width + GLFW_BORDER_SIZE)
                edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT;
            else
                edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM;
        }
        if (edges != XDG_TOPLEVEL_RESIZE_EDGE_NONE)
            xdg_toplevel_resize(window->wl.xdg.toplevel, _glfw.wl.seat, serial, edges);
    }
    else if (button == BTN_RIGHT)
    {
        if (!window->wl.xdg.toplevel)
            return;
        if (window->wl.fallback.focus != window->wl.fallback.top.surface)
            return;
        if (ypos < GLFW_BORDER_SIZE)
            return;
        xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
                                      _glfw.wl.seat, serial,
                                      xpos,
                                      ypos - GLFW_CAPTION_HEIGHT - GLFW_BORDER_SIZE);
    }
 }
 static void xdgDecorationHandleConfigure(void* userData,
                                         struct zxdg_toplevel_decoration_v1* decoration,
                                         uint32_t mode)
@ -1338,8 +1192,8 @@ static void inputText(_GLFWwindow* window, uint32_t scancode)
    if (xkb_state_key_get_syms(_glfw.wl.xkb.state, keycode, &keysyms) == 1)
    {
        const xkb_keysym_t keysym = composeSymbol(keysyms[0]);
-        const uint32_t codepoint = xkb_keysym_to_utf32(keysym);
+        const uint32_t codepoint = _glfwKeySym2Unicode(keysym);
-        if (codepoint != 0)
+        if (codepoint != GLFW_INVALID_CODEPOINT)
        {
            const int mods = _glfw.wl.xkb.modifiers;
            const int plain = !(mods & (GLFW_MOD_CONTROL | GLFW_MOD_ALT));
@ -1413,21 +1267,17 @@ static void handleEvents(double* timeout)
            if (read(_glfw.wl.keyRepeatTimerfd, &repeats, sizeof(repeats)) == 8)
            {
-                if (_glfw.wl.keyboardFocus)
+                for (uint64_t i = 0; i < repeats; i++)
                {
-                    for (uint64_t i = 0; i < repeats; i++)
+                    _glfwInputKey(_glfw.wl.keyboardFocus,
-                    {
+                                  translateKey(_glfw.wl.keyRepeatScancode),
-                        _glfwInputKey(_glfw.wl.keyboardFocus,
+                                  _glfw.wl.keyRepeatScancode,
-                                      translateKey(_glfw.wl.keyRepeatScancode),
+                                  GLFW_PRESS,
-                                      _glfw.wl.keyRepeatScancode,
+                                  _glfw.wl.xkb.modifiers);
-                                      GLFW_PRESS,
+                    inputText(_glfw.wl.keyboardFocus, _glfw.wl.keyRepeatScancode);
                                      _glfw.wl.xkb.modifiers);
                        inputText(_glfw.wl.keyboardFocus, _glfw.wl.keyRepeatScancode);
                    }
                    event = GLFW_TRUE;
                }
                event = GLFW_TRUE;
            }
        }
@ -1479,7 +1329,6 @@ static char* readDataOfferAsString(struct wl_data_offer* offer, const char* mime
            if (!longer)
            {
                _glfwInputError(GLFW_OUT_OF_MEMORY, NULL);
                _glfw_free(string);
                close(fds[0]);
                return NULL;
            }
@ -1499,7 +1348,6 @@ static char* readDataOfferAsString(struct wl_data_offer* offer, const char* mime
            _glfwInputError(GLFW_PLATFORM_ERROR,
                            "Wayland: Failed to read from data offer pipe: %s",
                            strerror(errno));
            _glfw_free(string);
            close(fds[0]);
            return NULL;
        }
@ -1538,21 +1386,11 @@ static void pointerHandleEnter(void* userData,
        window->wl.hovered = GLFW_TRUE;
        _glfwSetCursorWayland(window, window->wl.currentCursor);
        _glfwInputCursorEnter(window, GLFW_TRUE);
        if (window->cursorMode != GLFW_CURSOR_DISABLED)
        {
            window->wl.cursorPosX = wl_fixed_to_double(sx);
            window->wl.cursorPosY = wl_fixed_to_double(sy);
            _glfwInputCursorPos(window, window->wl.cursorPosX, window->wl.cursorPosY);
        }
    }
    else
    {
        if (window->wl.fallback.decorations)
        {
            window->wl.fallback.focus = surface;
            updateFallbackDecorationCursor(window, sx, sy);
        }
    }
 }
@ -1573,6 +1411,7 @@ static void pointerHandleLeave(void* userData,
    _glfw.wl.serial = serial;
    _glfw.wl.pointerFocus = NULL;
    _glfw.wl.cursorPreviousName = NULL;
    if (window->wl.hovered)
    {
@ -1582,10 +1421,7 @@ static void pointerHandleLeave(void* userData,
    else
    {
        if (window->wl.fallback.decorations)
        {
            window->wl.fallback.focus = NULL;
            window->wl.fallback.cursorName = NULL;
        }
    }
 }
@ -1602,16 +1438,92 @@ static void pointerHandleMotion(void* userData,
    if (window->cursorMode == GLFW_CURSOR_DISABLED)
        return;
    const double xpos = wl_fixed_to_double(sx);
    const double ypos = wl_fixed_to_double(sy);
    window->wl.cursorPosX = xpos;
    window->wl.cursorPosY = ypos;
    if (window->wl.hovered)
    {
-        window->wl.cursorPosX = wl_fixed_to_double(sx);
+        _glfw.wl.cursorPreviousName = NULL;
-        window->wl.cursorPosY = wl_fixed_to_double(sy);
+        _glfwInputCursorPos(window, xpos, ypos);
-        _glfwInputCursorPos(window, window->wl.cursorPosX, window->wl.cursorPosY);
+        return;
    }
-    else
+
    if (window->wl.fallback.decorations)
    {
-        if (window->wl.fallback.decorations)
+        const char* cursorName = "left_ptr";
-            updateFallbackDecorationCursor(window, sx, sy);
+
        if (window->resizable)
        {
            if (window->wl.fallback.focus == window->wl.fallback.top.surface)
            {
                if (ypos < GLFW_BORDER_SIZE)
                    cursorName = "n-resize";
            }
            else if (window->wl.fallback.focus == window->wl.fallback.left.surface)
            {
                if (ypos < GLFW_BORDER_SIZE)
                    cursorName = "nw-resize";
                else
                    cursorName = "w-resize";
            }
            else if (window->wl.fallback.focus == window->wl.fallback.right.surface)
            {
                if (ypos < GLFW_BORDER_SIZE)
                    cursorName = "ne-resize";
                else
                    cursorName = "e-resize";
            }
            else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface)
            {
                if (xpos < GLFW_BORDER_SIZE)
                    cursorName = "sw-resize";
                else if (xpos > window->wl.width + GLFW_BORDER_SIZE)
                    cursorName = "se-resize";
                else
                    cursorName = "s-resize";
            }
        }
        if (_glfw.wl.cursorPreviousName != cursorName)
        {
            struct wl_surface* surface = _glfw.wl.cursorSurface;
            struct wl_cursor_theme* theme = _glfw.wl.cursorTheme;
            int scale = 1;
            if (window->wl.bufferScale > 1 && _glfw.wl.cursorThemeHiDPI)
            {
                // We only support up to scale=2 for now, since libwayland-cursor
                // requires us to load a different theme for each size.
                scale = 2;
                theme = _glfw.wl.cursorThemeHiDPI;
            }
            struct wl_cursor* cursor = wl_cursor_theme_get_cursor(theme, cursorName);
            if (!cursor)
                return;
            // TODO: handle animated cursors too.
            struct wl_cursor_image* image = cursor->images[0];
            if (!image)
                return;
            struct wl_buffer* buffer = wl_cursor_image_get_buffer(image);
            if (!buffer)
                return;
            wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerEnterSerial,
                                  surface,
                                  image->hotspot_x / scale,
                                  image->hotspot_y / scale);
            wl_surface_set_buffer_scale(surface, scale);
            wl_surface_attach(surface, buffer, 0, 0);
            wl_surface_damage(surface, 0, 0, image->width, image->height);
            wl_surface_commit(surface);
            _glfw.wl.cursorPreviousName = cursorName;
        }
    }
 }
@ -1634,11 +1546,62 @@ static void pointerHandleButton(void* userData,
                             button - BTN_LEFT,
                             state == WL_POINTER_BUTTON_STATE_PRESSED,
                             _glfw.wl.xkb.modifiers);
        return;
    }
-    else
+
    if (window->wl.fallback.decorations)
    {
-        if (window->wl.fallback.decorations)
+        if (button == BTN_LEFT)
-            handleFallbackDecorationButton(window, serial, button);
+        {
            uint32_t edges = XDG_TOPLEVEL_RESIZE_EDGE_NONE;
            if (window->wl.fallback.focus == window->wl.fallback.top.surface)
            {
                if (window->wl.cursorPosY < GLFW_BORDER_SIZE)
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP;
                else
                    xdg_toplevel_move(window->wl.xdg.toplevel, _glfw.wl.seat, serial);
            }
            else if (window->wl.fallback.focus == window->wl.fallback.left.surface)
            {
                if (window->wl.cursorPosY < GLFW_BORDER_SIZE)
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT;
                else
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_LEFT;
            }
            else if (window->wl.fallback.focus == window->wl.fallback.right.surface)
            {
                if (window->wl.cursorPosY < GLFW_BORDER_SIZE)
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT;
                else
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_RIGHT;
            }
            else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface)
            {
                if (window->wl.cursorPosX < GLFW_BORDER_SIZE)
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT;
                else if (window->wl.cursorPosX > window->wl.width + GLFW_BORDER_SIZE)
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT;
                else
                    edges = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM;
            }
            if (edges != XDG_TOPLEVEL_RESIZE_EDGE_NONE)
            {
                xdg_toplevel_resize(window->wl.xdg.toplevel, _glfw.wl.seat,
                                    serial, edges);
            }
        }
        else if (button == BTN_RIGHT)
        {
            if (window->wl.xdg.toplevel)
            {
                xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
                                              _glfw.wl.seat, serial,
                                              window->wl.cursorPosX,
                                              window->wl.cursorPosY);
            }
        }
    }
 }
@ -1652,14 +1615,11 @@ static void pointerHandleAxis(void* userData,
    if (!window)
        return;
-    if (window->wl.hovered)
+    // NOTE: 10 units of motion per mouse wheel step seems to be a common ratio
-    {
+    if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
-        // NOTE: 10 units of motion per mouse wheel step seems to be a common ratio
+        _glfwInputScroll(window, -wl_fixed_to_double(value) / 10.0, 0.0);
-        if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
+    else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
-            _glfwInputScroll(window, -wl_fixed_to_double(value) / 10.0, 0.0);
+        _glfwInputScroll(window, 0.0, -wl_fixed_to_double(value) / 10.0);
        else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
            _glfwInputScroll(window, 0.0, -wl_fixed_to_double(value) / 10.0);
    }
 }
 static const struct wl_pointer_listener pointerListener =
@ -1692,8 +1652,7 @@ static void keyboardHandleKeymap(void* userData,
    }
    mapStr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-    if (mapStr == MAP_FAILED)
+    if (mapStr == MAP_FAILED) {
    {
        close(fd);
        return;
    }
@ -1837,13 +1796,10 @@ static void keyboardHandleKey(void* userData,
            timer.it_value.tv_sec = _glfw.wl.keyRepeatDelay / 1000;
            timer.it_value.tv_nsec = (_glfw.wl.keyRepeatDelay % 1000) * 1000000;
            timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
        }
    }
-    else if (scancode == _glfw.wl.keyRepeatScancode)
+
-    {
+    timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
        timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
    }
    _glfwInputKey(window, key, scancode, action, _glfw.wl.xkb.modifiers);
@ -2018,41 +1974,41 @@ static void dataDeviceHandleEnter(void* userData,
        _glfw.wl.dragFocus = NULL;
    }
-    unsigned int i;
+    for (unsigned int i = 0; i < _glfw.wl.offerCount; i++)
    for (i = 0; i < _glfw.wl.offerCount; i++)
    {
        if (_glfw.wl.offers[i].offer == offer)
            break;
    }
    if (i == _glfw.wl.offerCount)
        return;
    if (surface && wl_proxy_get_tag((struct wl_proxy*) surface) == &_glfw.wl.tag)
    {
        _GLFWwindow* window = wl_surface_get_user_data(surface);
        if (window->wl.surface == surface)
        {
-            if (_glfw.wl.offers[i].text_uri_list)
+            _GLFWwindow* window = NULL;
            if (surface)
            {
                if (wl_proxy_get_tag((struct wl_proxy*) surface) == &_glfw.wl.tag)
                    window = wl_surface_get_user_data(surface);
            }
            if (surface == window->wl.surface && _glfw.wl.offers[i].text_uri_list)
            {
                _glfw.wl.dragOffer = offer;
                _glfw.wl.dragFocus = window;
                _glfw.wl.dragSerial = serial;
                wl_data_offer_accept(offer, serial, "text/uri-list");
            }
            _glfw.wl.offers[i] = _glfw.wl.offers[_glfw.wl.offerCount - 1];
            _glfw.wl.offerCount--;
            break;
        }
    }
-    if (!_glfw.wl.dragOffer)
+    if (wl_proxy_get_tag((struct wl_proxy*) surface) != &_glfw.wl.tag)
        return;
    if (_glfw.wl.dragOffer)
        wl_data_offer_accept(offer, serial, "text/uri-list");
    else
    {
        wl_data_offer_accept(offer, serial, NULL);
        wl_data_offer_destroy(offer);
    }
    _glfw.wl.offers[i] = _glfw.wl.offers[_glfw.wl.offerCount - 1];
    _glfw.wl.offerCount--;
 }
 static void dataDeviceHandleLeave(void* userData,
@ -2086,17 +2042,15 @@ static void dataDeviceHandleDrop(void* userData,
        int count;
        char** paths = _glfwParseUriList(string, &count);
        if (paths)
        {
            _glfwInputDrop(_glfw.wl.dragFocus, count, (const char**) paths);
-            for (int i = 0; i < count; i++)
+        for (int i = 0; i < count; i++)
-                _glfw_free(paths[i]);
+            _glfw_free(paths[i]);
-            _glfw_free(paths);
+        _glfw_free(paths);
        }
        _glfw_free(string);
    }
    _glfw_free(string);
 }
 static void dataDeviceHandleSelection(void* userData,
@ -2227,18 +2181,7 @@ void _glfwDestroyWindowWayland(_GLFWwindow* window)
        _glfw.wl.pointerFocus = NULL;
    if (window == _glfw.wl.keyboardFocus)
    {
        struct itimerspec timer = {0};
        timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
        _glfw.wl.keyboardFocus = NULL;
    }
    if (window->wl.fractionalScale)
        wp_fractional_scale_v1_destroy(window->wl.fractionalScale);
    if (window->wl.scalingViewport)
        wp_viewport_destroy(window->wl.scalingViewport);
    if (window->wl.activationToken)
        xdg_activation_token_v1_destroy(window->wl.activationToken);
@ -2770,23 +2713,23 @@ const char* _glfwGetScancodeNameWayland(int scancode)
        return NULL;
    }
-    // WORKAROUND: xkb_keysym_to_utf8() requires the third parameter (size of the output buffer)
+    const uint32_t codepoint = _glfwKeySym2Unicode(keysyms[0]);
-    // to be at least 7 (6 bytes + a null terminator), because it was written when UTF-8
+    if (codepoint == GLFW_INVALID_CODEPOINT)
    // sequences could be up to 6 bytes long. The _glfw.wl.keynames buffers are only 5 bytes
    // long, because UTF-8 sequences are now limited to 4 bytes and no codepoints were ever assigned
    // that needed more than that. To work around this, we first copy to a temporary buffer.
    //
    // See: https://github.com/xkbcommon/libxkbcommon/issues/418
    char temp_buffer[7];
    const int bytes_written = xkb_keysym_to_utf8(keysyms[0], temp_buffer, sizeof(temp_buffer));
    if (bytes_written <= 0 || bytes_written > 5)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
-                        "Wayland: Failed to encode keysym as UTF-8");
+                        "Wayland: Failed to retrieve codepoint for key name");
        return NULL;
    }
    memcpy(_glfw.wl.keynames[key], temp_buffer, bytes_written);
    const size_t count = _glfwEncodeUTF8(_glfw.wl.keynames[key],  codepoint);
    if (count == 0)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
                        "Wayland: Failed to encode codepoint for key name");
        return NULL;
    }
    _glfw.wl.keynames[key][count] = '\0';
    return _glfw.wl.keynames[key];
 }
@ -2977,16 +2920,10 @@ static void lockPointer(_GLFWwindow* window)
    if (!_glfw.wl.relativePointerManager)
    {
        _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
-                        "Wayland: The compositor does not support relative pointer motion");
+                        "Wayland: The compositor does not support pointer locking");
        return;
    }
    if (!_glfw.wl.pointerConstraints)
    {
        _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
                        "Wayland: The compositor does not support locking the pointer");
    }
    window->wl.relativePointer =
        zwp_relative_pointer_manager_v1_get_relative_pointer(
            _glfw.wl.relativePointerManager,
@ -3034,12 +2971,6 @@ static const struct zwp_confined_pointer_v1_listener confinedPointerListener =
 static void confinePointer(_GLFWwindow* window)
 {
    if (!_glfw.wl.pointerConstraints)
    {
        _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
                        "Wayland: The compositor does not support confining the pointer");
    }
    window->wl.confinedPointer =
        zwp_pointer_constraints_v1_confine_pointer(
            _glfw.wl.pointerConstraints,
@ -3360,6 +3291,7 @@ GLFWAPI struct wl_display* glfwGetWaylandDisplay(void)
 GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND)
@ -3369,9 +3301,6 @@ GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* handle)
        return NULL;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->wl.surface;
 }
--- a/src/x11_init.c
+++ b/src/x11_init.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 X11 - www.glfw.org
+// GLFW 3.4 X11 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -535,7 +535,6 @@ static void detectEWMH(void)
                                   XA_WINDOW,
                                   (unsigned char**) &windowFromChild))
    {
        _glfwReleaseErrorHandlerX11();
        XFree(windowFromRoot);
        return;
    }
--- a/src/x11_monitor.c
+++ b/src/x11_monitor.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 X11 - www.glfw.org
+// GLFW 3.4 X11 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
 // Check whether the display mode should be included in enumeration
@ -151,12 +150,6 @@ void _glfwPollMonitorsX11(void)
            }
            XRRCrtcInfo* ci = XRRGetCrtcInfo(_glfw.x11.display, sr, oi->crtc);
            if (!ci)
            {
                XRRFreeOutputInfo(oi);
                continue;
            }
            if (ci->rotation == RR_Rotate_90 || ci->rotation == RR_Rotate_270)
            {
                widthMM  = oi->mm_height;
@ -618,6 +611,7 @@ void _glfwSetGammaRampX11(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI RRCrtc glfwGetX11Adapter(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
@ -626,14 +620,12 @@ GLFWAPI RRCrtc glfwGetX11Adapter(GLFWmonitor* handle)
        return None;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->x11.crtc;
 }
 GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)
 {
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
@ -642,9 +634,6 @@ GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)
        return None;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
    assert(monitor != NULL);
    return monitor->x11.output;
 }
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 X11 - www.glfw.org
+// GLFW 3.4 X11 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -470,7 +470,6 @@ typedef struct _GLFWcontextGLX
 {
    GLXContext      handle;
    GLXWindow       window;
    GLXFBConfig     fbconfig;
 } _GLFWcontextGLX;
 // GLX-specific global data
--- a/src/x11_window.c
+++ b/src/x11_window.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 X11 - www.glfw.org
+// GLFW 3.4 X11 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@ -576,10 +576,6 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
        height *= _glfw.x11.contentScaleY;
    }
    // The dimensions must be nonzero, or a BadValue error results.
    width = _glfw_max(1, width);
    height = _glfw_max(1, height);
    int xpos = 0, ypos = 0;
    if (wndconfig->xpos != GLFW_ANY_POSITION && wndconfig->ypos != GLFW_ANY_POSITION)
@ -758,13 +754,13 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
            const char* resourceName = getenv("RESOURCE_NAME");
            if (resourceName && strlen(resourceName))
                hint->res_name = (char*) resourceName;
-            else if (strlen(window->title))
+            else if (strlen(wndconfig->title))
-                hint->res_name = (char*) window->title;
+                hint->res_name = (char*) wndconfig->title;
            else
                hint->res_name = (char*) "glfw-application";
-            if (strlen(window->title))
+            if (strlen(wndconfig->title))
-                hint->res_class = (char*) window->title;
+                hint->res_class = (char*) wndconfig->title;
            else
                hint->res_class = (char*) "GLFW-Application";
        }
@ -784,7 +780,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
    if (_glfw.x11.im)
        _glfwCreateInputContextX11(window);
-    _glfwSetWindowTitleX11(window, window->title);
+    _glfwSetWindowTitleX11(window, wndconfig->title);
    _glfwGetWindowPosX11(window, &window->x11.xpos, &window->x11.ypos);
    _glfwGetWindowSizeX11(window, &window->x11.width, &window->x11.height);
@ -2207,10 +2203,6 @@ void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height)
 void _glfwSetWindowSizeX11(_GLFWwindow* window, int width, int height)
 {
    // The dimensions must be nonzero, or a BadValue error results
    width = _glfw_max(1, width);
    height = _glfw_max(1, height);
    if (window->monitor)
    {
        if (window->monitor->window == window)
@ -3310,6 +3302,7 @@ GLFWAPI Display* glfwGetX11Display(void)
 GLFWAPI Window glfwGetX11Window(GLFWwindow* handle)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
@ -3318,16 +3311,11 @@ GLFWAPI Window glfwGetX11Window(GLFWwindow* handle)
        return None;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->x11.handle;
 }
 GLFWAPI void glfwSetX11SelectionString(const char* string)
 {
    assert(string != NULL);
    _GLFW_REQUIRE_INIT();
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
--- a/src/xkb_unicode.c
+++ b/src/xkb_unicode.c
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 X11 - www.glfw.org
+// GLFW 3.4 X11 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
--- a/src/xkb_unicode.h
+++ b/src/xkb_unicode.h
@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.5 Linux - www.glfw.org
+// GLFW 3.4 Linux - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
--- a/tests/events.c
+++ b/tests/events.c
@ -630,7 +630,6 @@ int main(int argc, char** argv)
            glfwTerminate();
            exit(EXIT_FAILURE);
        }
        glfwSetInputMode(slots[i].window, GLFW_UNLIMITED_MOUSE_BUTTONS, GLFW_TRUE);
        glfwSetWindowUserPointer(slots[i].window, slots + i);
--- a/tests/window.c
+++ b/tests/window.c
@ -78,7 +78,6 @@ int main(int argc, char** argv)
        glfwTerminate();
        exit(EXIT_FAILURE);
    }
    glfwSetInputMode(window, GLFW_UNLIMITED_MOUSE_BUTTONS, GLFW_TRUE);
    glfwMakeContextCurrent(window);
    gladLoadGL(glfwGetProcAddress);