Merge 1226d4a839 into d79afa8055

2024-11-14 10:34:34 +00:00 · 2024-01-28 11:30:10 -08:00
95 changed files with 3155 additions and 3718 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -28,7 +28,7 @@ indent_size = 4
 indent_style = space
 indent_size = 4
-[*.{md}]
+[*.{dox,md}]
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = false
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -17,7 +17,7 @@ jobs:
            CC: clang
            CFLAGS: -Werror
        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - name: Install dependencies
              run: |
                  sudo apt update
@ -54,10 +54,10 @@ 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
+            - uses: actions/checkout@v3
            - name: Configure Null shared library
              run: cmake -B build-null-shared -D GLFW_BUILD_COCOA=OFF -D BUILD_SHARED_LIBS=ON
@ -81,7 +81,7 @@ jobs:
        env:
            CFLAGS: /WX
        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
            - name: Configure Win32 shared x86 library
              run: cmake -B build-win32-shared-x86 -G "Visual Studio 17 2022" -A Win32 -D BUILD_SHARED_LIBS=ON
--- 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/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.4...3.28 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.4...3.20 FATAL_ERROR)
-project(GLFW VERSION 3.5.0 LANGUAGES C)
+project(GLFW VERSION 3.4.0 LANGUAGES C)
 if (POLICY CMP0069)
    cmake_policy(SET CMP0069 NEW)
@ -27,15 +27,11 @@ if (GLFW_USE_OSMESA)
    message(FATAL_ERROR "GLFW_USE_OSMESA has been removed; set the GLFW_PLATFORM init hint")
 endif()
 if (DEFINED GLFW_USE_WAYLAND AND UNIX AND NOT APPLE)
    message(FATAL_ERROR
        "GLFW_USE_WAYLAND has been removed; delete the CMake cache and set GLFW_BUILD_WAYLAND and GLFW_BUILD_X11 instead")
 endif()
 cmake_dependent_option(GLFW_BUILD_WIN32 "Build support for Win32" ON "WIN32" OFF)
 cmake_dependent_option(GLFW_BUILD_COCOA "Build support for Cocoa" ON "APPLE" OFF)
 cmake_dependent_option(GLFW_BUILD_X11 "Build support for X11" ON "UNIX;NOT APPLE" OFF)
-cmake_dependent_option(GLFW_BUILD_WAYLAND "Build support for Wayland" ON "UNIX;NOT APPLE" OFF)
+cmake_dependent_option(GLFW_BUILD_WAYLAND "Build support for Wayland"
    "${GLFW_USE_WAYLAND}" "UNIX;NOT APPLE" OFF)
 cmake_dependent_option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF
                       "WIN32" OFF)
@ -59,6 +55,11 @@ list(APPEND CMAKE_MODULE_PATH "${GLFW_SOURCE_DIR}/CMake/modules")
 find_package(Threads REQUIRED)
 if (GLFW_BUILD_DOCS)
    set(DOXYGEN_SKIP_DOT TRUE)
    find_package(Doxygen)
 endif()
 #--------------------------------------------------------------------
 # Report backend selection
 #--------------------------------------------------------------------
@ -129,7 +130,7 @@ if (GLFW_BUILD_TESTS)
    add_subdirectory(tests)
 endif()
-if (GLFW_BUILD_DOCS)
+if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
    add_subdirectory(docs)
 endif()
@ -151,6 +152,11 @@ if (GLFW_INSTALL)
    install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
    if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
        install(DIRECTORY "${GLFW_BINARY_DIR}/docs/html"
                DESTINATION "${CMAKE_INSTALL_DOCDIR}")
    endif()
    # Only generate this target if no higher-level project already has
    if (NOT TARGET uninstall)
        configure_file(CMake/cmake_uninstall.cmake.in
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -15,7 +15,6 @@ video tutorials.
 - Keith Bauer
 - John Bartholomew
 - Coşku Baş
 - Bayemite
 - Niklas Behrens
 - Andrew Belt
 - Nevyn Bengtsson
@ -33,9 +32,7 @@ video tutorials.
 - Nicolas Caramelli
 - David Carlier
 - Arturo Castro
 - Jose Luis Cercós Pita
 - Chi-kwan Chan
 - Victor Chernyakin
 - TheChocolateOre
 - Ali Chraghi
 - Joseph Chua
@ -49,9 +46,7 @@ video tutorials.
 - Andrew Corrigan
 - Bailey Cosier
 - Noel Cower
 - James Cowgill
 - CuriouserThing
 - Bill Currie
 - Jason Daly
 - danhambleton
 - Jarrod Davis
@ -103,7 +98,6 @@ video tutorials.
 - Warren Hu
 - Charles Huber
 - Brent Huisman
 - Florian Hülsmann
 - illustris
 - InKryption
 - IntellectualKitty
@ -157,7 +151,6 @@ video tutorials.
 - Jonathan Mercier
 - Marcel Metz
 - Liam Middlebrook
 - mightgoyardstill
 - Ave Milia
 - Icyllis Milica
 - Jonathan Miller
@ -174,15 +167,11 @@ video tutorials.
 - Pascal Muetschard
 - James Murphy
 - Julian Møller
 - Julius Häger
 - Nat!
 - NateIsStalling
 - ndogxj
 - F. Nedelec
 - n3rdopolis
 - Kristian Nielsen
 - Joel Niemelä
 - Victor Nova
 - Kamil Nowakowski
 - onox
 - Denis Ovod
@ -229,8 +218,8 @@ video tutorials.
 - Yoshinori Sano
 - Brandon Schaefer
 - Sebastian Schuberth
 - Scr3amer
 - Jan Schuerkamp
 - Scr3amer
 - Christian Sdunek
 - Matt Sealey
 - Steve Sexton
@ -260,7 +249,6 @@ video tutorials.
 - Paul Sultana
 - Nathan Sweet
 - TTK-Bandit
 - Nuno Teixeira
 - Jared Tiala
 - Sergey Tikhomirov
 - Arthur Tombs
--- a/README.md
+++ b/README.md
@ -2,6 +2,7 @@
 [![Build status](https://github.com/glfw/glfw/actions/workflows/build.yml/badge.svg)](https://github.com/glfw/glfw/actions)
 [![Build status](https://ci.appveyor.com/api/projects/status/0kf0ct9831i5l6sp/branch/master?svg=true)](https://ci.appveyor.com/project/elmindreda/glfw)
 [![Coverity Scan](https://scan.coverity.com/projects/4884/badge.svg)](https://scan.coverity.com/projects/glfw-glfw)
 ## Introduction
@ -10,15 +11,15 @@ application development.  It provides a simple, platform-independent API for
 creating windows, contexts and surfaces, reading input, handling events, etc.
 GLFW natively supports Windows, macOS and Linux and other Unix-like systems.  On
-Linux both Wayland and X11 are supported.
+Linux both X11 and Wayland 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 binaries.  Each release starting with 3.0 also has
+as source or Windows binaries, or fetch the `latest` branch from GitHub.  Each
-a corresponding [annotated tag](https://github.com/glfw/glfw/releases) with
+release starting with 3.0 also has a corresponding [annotated
-source and binary archives.
+tag](https://github.com/glfw/glfw/releases) with source and binary archives.
 The [documentation](https://www.glfw.org/docs/latest/) is available online and is
 included in all source and binary archives.  See the [release
@ -46,19 +47,18 @@ features or fixing bugs.
 ## Compiling GLFW
-GLFW is written primarily in C99, with parts of macOS support being written in
+GLFW itself requires only the headers and libraries for your OS and window
-Objective-C.  GLFW itself requires only the headers and libraries for your OS
+system.  It does not need the headers for any context creation API (WGL, GLX,
-and window system.  It does not need any additional headers for context creation
+EGL, NSGL, OSMesa) or rendering API (OpenGL, OpenGL ES, Vulkan) to enable
-APIs (WGL, GLX, EGL, NSGL, OSMesa) or rendering APIs (OpenGL, OpenGL ES, Vulkan)
+support for them.
 to enable support for them.
-GLFW supports compilation on Windows with Visual C++ 2013 and later, MinGW and
+GLFW supports compilation on Windows with Visual C++ 2010 and later, MinGW and
 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.
-There are [pre-compiled binaries](https://www.glfw.org/download.html) available
+There are [pre-compiled Windows binaries](https://www.glfw.org/download.html)
-for all supported compilers on Windows and macOS.
+available for all supported compilers.
 See the [compilation guide](https://www.glfw.org/docs/latest/compile.html) for
 more information about how to compile GLFW yourself.
@ -79,7 +79,9 @@ more information.
 ## System requirements
-GLFW supports Windows XP and later and macOS 10.11 and later.  Linux and other
+GLFW is written in C99 and does not support Visual Studio 2012 or earlier.
 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.
@ -90,7 +92,7 @@ in the documentation for more information.
 ## Dependencies
-GLFW itself needs only CMake 3.4 or later and the headers and libraries for your
+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
@ -119,21 +121,305 @@ 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
 - Added `glfwSetWindowBadge` and `glfwSetWindowBadgeString` for displaying window application badge (#2248)
 - Added `glfwSetWindowProgressIndicator` for displaying progress on the dock or taskbar (#2286,#1183)
- - 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`,
- - [Cocoa] Added `QuartzCore` framework as link-time dependency
+   `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` and `GLFW_PLATFORM_NULL` symbols to
- - [Cocoa] Removed support for OS X 10.10 Yosemite and earlier (#2506)
+   specify the desired platform (#1958)
- - [Wayland] Bugfix: The fractional scaling related objects were not destroyed
+ - Added `glfwGetPlatform` function to query what platform was selected (#1655,#1958)
- - [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
+ - Added `glfwPlatformSupported` function to query if a platform is supported
- - [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
+   (#1655,#1958)
- - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
+ - Added `glfwInitAllocator` for setting a custom memory allocator (#544,#1628,#1947)
- - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
+ - Added `GLFWallocator` struct and `GLFWallocatefun`, `GLFWreallocatefun` and
- - [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
+   `GLFWdeallocatefun` types (#544,#1628,#1947)
-   `GLFW_NATIVE_CONTEXT_API` (#2518)
+ - Added `glfwInitVulkanLoader` for using a non-default Vulkan loader (#1374,#1890)
 - Added `GLFW_RESIZE_NWSE_CURSOR`, `GLFW_RESIZE_NESW_CURSOR`,
   `GLFW_RESIZE_ALL_CURSOR` and `GLFW_NOT_ALLOWED_CURSOR` cursor shapes (#427)
 - Added `GLFW_RESIZE_EW_CURSOR` alias for `GLFW_HRESIZE_CURSOR` (#427)
 - Added `GLFW_RESIZE_NS_CURSOR` alias for `GLFW_VRESIZE_CURSOR` (#427)
 - Added `GLFW_POINTING_HAND_CURSOR` alias for `GLFW_HAND_CURSOR` (#427)
 - Added `GLFW_MOUSE_PASSTHROUGH` window hint for letting mouse input pass
   through the window (#1236,#1568)
 - Added `GLFW_CURSOR_CAPTURED` cursor mode to confine the cursor to the window
   content area (#58)
 - Added `GLFW_POSITION_X` and `GLFW_POSITION_Y` window hints for initial position
   (#1603,#1747)
 - Added `GLFW_ANY_POSITION` hint value for letting the window manager choose (#1603,#1747)
 - Added `GLFW_PLATFORM_UNAVAILABLE` error for platform detection failures (#1958)
 - Added `GLFW_FEATURE_UNAVAILABLE` error for platform limitations (#1692)
 - Added `GLFW_FEATURE_UNIMPLEMENTED` error for incomplete backends (#1692)
 - Added `GLFW_WAYLAND_APP_ID` window hint string for Wayland app\_id selection
   (#2121,#2122)
 - Added `GLFW_ANGLE_PLATFORM_TYPE` init hint and `GLFW_ANGLE_PLATFORM_TYPE_*`
   values to select ANGLE backend (#1380)
 - Added `GLFW_X11_XCB_VULKAN_SURFACE` init hint for selecting X11 Vulkan
   surface extension (#1793)
 - 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 `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
 - Updated the minimum required CMake version to 3.1
 - Updated gamepad mappings from upstream
 - Disabled tests and examples by default when built as a CMake subdirectory
 - Renamed `GLFW_USE_WAYLAND` CMake option to `GLFW_BUILD_WAYLAND` (#1958)
 - Removed `GLFW_USE_OSMESA` CMake option enabling the Null platform (#1958)
 - Removed CMake generated configuration header
 - 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] Added the `GLFW_WIN32_KEYBOARD_MENU` window hint for enabling access
           to the window menu
 - [Win32] Added a version info resource to the GLFW DLL
 - [Win32] Made hidden helper window use its own window class
 - [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: The foreground lock timeout was overridden, ignoring the user
 - [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] Moved main menu creation to GLFW initialization time (#1649)
 - [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: Touching event queue from secondary thread before main thread
   would abort (#1649)
 - [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: Termination would segfault if the IM had been destroyed
 - [X11] Bugfix: Any IM started after initialization would not be detected
 - [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 dynamic loading of all Wayland libraries
 - [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: `CLOCK_MONOTONIC` was not correctly enabled
 - [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
 - [POSIX] Removed use of deprecated function `gettimeofday`
 - [POSIX] Bugfix: `CLOCK_MONOTONIC` was not correctly tested for or enabled
 - [Linux] Bugfix: Joysticks without buttons were ignored (#2042,#2043)
 - [Linux] Bugfix: A small amount of memory could leak if initialization failed (#2229)
 - [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: `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 platform selection via the `EGL_EXT_platform_base` extension
   (#442)
 - [EGL] Added ANGLE backend selection via `EGL_ANGLE_platform_angle` extension
   (#1380)
 - [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
@ -142,12 +428,13 @@ On [glfw.org](https://www.glfw.org/) you can find the latest version of GLFW, as
 well as news, documentation and other information about the project.
 If you have questions related to the use of GLFW, we have a
-[forum](https://discourse.glfw.org/).
+[forum](https://discourse.glfw.org/), and the `#glfw` IRC channel on
 [Libera.Chat](https://libera.chat/).
 If you have a bug to report, a patch to submit or a feature you'd like to
 request, please file it in the
 [issue tracker](https://github.com/glfw/glfw/issues) on GitHub.
 Finally, if you're interested in helping out with the development of GLFW or
-porting it to your favorite platform, join us on the forum or GitHub.
+porting it to your favorite platform, join us on the forum, GitHub or IRC.
--- a/deps/wayland/fractional-scale-v1.xml
+++ b/deps/wayland/fractional-scale-v1.xml
@ -1,102 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <protocol name="fractional_scale_v1">
  <copyright>
    Copyright © 2022 Kenny Levinsen
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
    the rights to use, copy, modify, merge, publish, distribute, sublicense,
    and/or sell copies of the Software, and to permit persons to whom the
    Software is furnished to do so, subject to the following conditions:
    The above copyright notice and this permission notice (including the next
    paragraph) shall be included in all copies or substantial portions of the
    Software.
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
  </copyright>
  <description summary="Protocol for requesting fractional surface scales">
    This protocol allows a compositor to suggest for surfaces to render at
    fractional scales.
    A client can submit scaled content by utilizing wp_viewport. This is done by
    creating a wp_viewport object for the surface and setting the destination
    rectangle to the surface size before the scale factor is applied.
    The buffer size is calculated by multiplying the surface size by the
    intended scale.
    The wl_surface buffer scale should remain set to 1.
    If a surface has a surface-local size of 100 px by 50 px and wishes to
    submit buffers with a scale of 1.5, then a buffer of 150px by 75 px should
    be used and the wp_viewport destination rectangle should be 100 px by 50 px.
    For toplevel surfaces, the size is rounded halfway away from zero. The
    rounding algorithm for subsurface position and size is not defined.
  </description>
  <interface name="wp_fractional_scale_manager_v1" version="1">
    <description summary="fractional surface scale information">
      A global interface for requesting surfaces to use fractional scales.
    </description>
    <request name="destroy" type="destructor">
      <description summary="unbind the fractional surface scale interface">
        Informs the server that the client will not be using this protocol
        object anymore. This does not affect any other objects,
        wp_fractional_scale_v1 objects included.
      </description>
    </request>
    <enum name="error">
      <entry name="fractional_scale_exists" value="0"
        summary="the surface already has a fractional_scale object associated"/>
    </enum>
    <request name="get_fractional_scale">
      <description summary="extend surface interface for scale information">
        Create an add-on object for the the wl_surface to let the compositor
        request fractional scales. If the given wl_surface already has a
        wp_fractional_scale_v1 object associated, the fractional_scale_exists
        protocol error is raised.
      </description>
      <arg name="id" type="new_id" interface="wp_fractional_scale_v1"
           summary="the new surface scale info interface id"/>
      <arg name="surface" type="object" interface="wl_surface"
           summary="the surface"/>
    </request>
  </interface>
  <interface name="wp_fractional_scale_v1" version="1">
    <description summary="fractional scale interface to a wl_surface">
      An additional interface to a wl_surface object which allows the compositor
      to inform the client of the preferred scale.
    </description>
    <request name="destroy" type="destructor">
      <description summary="remove surface scale information for surface">
        Destroy the fractional scale object. When this object is destroyed,
        preferred_scale events will no longer be sent.
      </description>
    </request>
    <event name="preferred_scale">
      <description summary="notify of new preferred scale">
        Notification of a new preferred scale for this surface that the
        compositor suggests that the client should use.
        The sent scale is the numerator of a fraction with a denominator of 120.
      </description>
      <arg name="scale" type="uint" summary="the new preferred scale"/>
    </event>
  </interface>
 </protocol>
--- a/deps/wayland/xdg-activation-v1.xml
+++ b/deps/wayland/xdg-activation-v1.xml
@ -1,200 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <protocol name="xdg_activation_v1">
  <copyright>
    Copyright © 2020 Aleix Pol Gonzalez &lt;aleixpol@kde.org&gt;
    Copyright © 2020 Carlos Garnacho &lt;carlosg@gnome.org&gt;
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
    the rights to use, copy, modify, merge, publish, distribute, sublicense,
    and/or sell copies of the Software, and to permit persons to whom the
    Software is furnished to do so, subject to the following conditions:
    The above copyright notice and this permission notice (including the next
    paragraph) shall be included in all copies or substantial portions of the
    Software.
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
  </copyright>
  <description summary="Protocol for requesting activation of surfaces">
    The way for a client to pass focus to another toplevel is as follows.
    The client that intends to activate another toplevel uses the
    xdg_activation_v1.get_activation_token request to get an activation token.
    This token is then forwarded to the client, which is supposed to activate
    one of its surfaces, through a separate band of communication.
    One established way of doing this is through the XDG_ACTIVATION_TOKEN
    environment variable of a newly launched child process. The child process
    should unset the environment variable again right after reading it out in
    order to avoid propagating it to other child processes.
    Another established way exists for Applications implementing the D-Bus
    interface org.freedesktop.Application, which should get their token under
    activation-token on their platform_data.
    In general activation tokens may be transferred across clients through
    means not described in this protocol.
    The client to be activated will then pass the token
    it received to the xdg_activation_v1.activate request. The compositor can
    then use this token to decide how to react to the activation request.
    The token the activating client gets may be ineffective either already at
    the time it receives it, for example if it was not focused, for focus
    stealing prevention. The activating client will have no way to discover
    the validity of the token, and may still forward it to the to be activated
    client.
    The created activation token may optionally get information attached to it
    that can be used by the compositor to identify the application that we
    intend to activate. This can for example be used to display a visual hint
    about what application is being started.
    Warning! The protocol described in this file is currently in the testing
    phase. Backward compatible changes may be added together with the
    corresponding interface version bump. Backward incompatible changes can
    only be done by creating a new major version of the extension.
  </description>
  <interface name="xdg_activation_v1" version="1">
    <description summary="interface for activating surfaces">
      A global interface used for informing the compositor about applications
      being activated or started, or for applications to request to be
      activated.
    </description>
    <request name="destroy" type="destructor">
      <description summary="destroy the xdg_activation object">
        Notify the compositor that the xdg_activation object will no longer be
        used.
        The child objects created via this interface are unaffected and should
        be destroyed separately.
      </description>
    </request>
    <request name="get_activation_token">
      <description summary="requests a token">
        Creates an xdg_activation_token_v1 object that will provide
        the initiating client with a unique token for this activation. This
        token should be offered to the clients to be activated.
      </description>
      <arg name="id" type="new_id" interface="xdg_activation_token_v1"/>
    </request>
    <request name="activate">
      <description summary="notify new interaction being available">
        Requests surface activation. It's up to the compositor to display
        this information as desired, for example by placing the surface above
        the rest.
        The compositor may know who requested this by checking the activation
        token and might decide not to follow through with the activation if it's
        considered unwanted.
        Compositors can ignore unknown activation tokens when an invalid
        token is passed.
      </description>
      <arg name="token" type="string" summary="the activation token of the initiating client"/>
      <arg name="surface" type="object" interface="wl_surface"
 	   summary="the wl_surface to activate"/>
    </request>
  </interface>
  <interface name="xdg_activation_token_v1" version="1">
    <description summary="an exported activation handle">
      An object for setting up a token and receiving a token handle that can
      be passed as an activation token to another client.
      The object is created using the xdg_activation_v1.get_activation_token
      request. This object should then be populated with the app_id, surface
      and serial information and committed. The compositor shall then issue a
      done event with the token. In case the request's parameters are invalid,
      the compositor will provide an invalid token.
    </description>
    <enum name="error">
      <entry name="already_used" value="0"
             summary="The token has already been used previously"/>
    </enum>
    <request name="set_serial">
      <description summary="specifies the seat and serial of the activating event">
        Provides information about the seat and serial event that requested the
        token.
        The serial can come from an input or focus event. For instance, if a
        click triggers the launch of a third-party client, the launcher client
        should send a set_serial request with the serial and seat from the
        wl_pointer.button event.
        Some compositors might refuse to activate toplevels when the token
        doesn't have a valid and recent enough event serial.
        Must be sent before commit. This information is optional.
      </description>
      <arg name="serial" type="uint"
           summary="the serial of the event that triggered the activation"/>
      <arg name="seat" type="object" interface="wl_seat"
           summary="the wl_seat of the event"/>
    </request>
    <request name="set_app_id">
      <description summary="specifies the application being activated">
        The requesting client can specify an app_id to associate the token
        being created with it.
        Must be sent before commit. This information is optional.
      </description>
      <arg name="app_id" type="string"
           summary="the application id of the client being activated."/>
    </request>
    <request name="set_surface">
      <description summary="specifies the surface requesting activation">
        This request sets the surface requesting the activation. Note, this is
        different from the surface that will be activated.
        Some compositors might refuse to activate toplevels when the token
        doesn't have a requesting surface.
        Must be sent before commit. This information is optional.
      </description>
      <arg name="surface" type="object" interface="wl_surface"
 	   summary="the requesting surface"/>
    </request>
    <request name="commit">
      <description summary="issues the token request">
        Requests an activation token based on the different parameters that
        have been offered through set_serial, set_surface and set_app_id.
      </description>
    </request>
    <event name="done">
      <description summary="the exported activation token">
        The 'done' event contains the unique token of this activation request
        and notifies that the provider is done.
      </description>
      <arg name="token" type="string" summary="the exported activation token"/>
    </event>
    <request name="destroy" type="destructor">
      <description summary="destroy the xdg_activation_token_v1 object">
        Notify the compositor that the xdg_activation_token_v1 object will no
        longer be used. The received token stays valid.
      </description>
    </request>
  </interface>
 </protocol>
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@ -2,20 +2,20 @@
 # 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
-    main.md
+    main.dox
-    news.md
+    news.dox
-    quick.md
+    quick.dox
-    moving.md
+    moving.dox
-    compile.md
+    compile.dox
-    build.md
+    build.dox
-    intro.md
+    intro.dox
-    context.md
+    context.dox
-    monitor.md
+    monitor.dox
-    window.md
+    window.dox
-    input.md
+    input.dox
-    vulkan.md
+    vulkan.dox
-    compat.md
+    compat.dox
-    internal.md)
+    internal.dox)
 set(extra_files DoxygenLayout.xml header.html footer.html extra.css spaces.svg)
@ -31,27 +31,16 @@ foreach(file IN LISTS source_files)
    string(APPEND GLFW_DOXYGEN_INPUT " \\\n\"${CMAKE_CURRENT_SOURCE_DIR}/${file}\"")
 endforeach()
-set(DOXYGEN_SKIP_DOT TRUE)
+configure_file(Doxyfile.in Doxyfile @ONLY)
 find_package(Doxygen)
-if (NOT DOXYGEN_FOUND OR DOXYGEN_VERSION VERSION_LESS "1.9.8")
+add_custom_command(OUTPUT "html/index.html"
-    message(STATUS "Documentation generation requires Doxygen 1.9.8 or later")
+                   COMMAND "${DOXYGEN_EXECUTABLE}"
-else()
+                   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    configure_file(Doxyfile.in Doxyfile @ONLY)
+                   MAIN_DEPENDENCY Doxyfile
-    add_custom_command(OUTPUT "html/index.html"
+                   DEPENDS ${header_paths} ${source_files} ${extra_files}
-                       COMMAND "${DOXYGEN_EXECUTABLE}"
+                   COMMENT "Generating HTML documentation"
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                   VERBATIM)
                       MAIN_DEPENDENCY Doxyfile
                       DEPENDS ${header_paths} ${source_files} ${extra_files}
                       COMMENT "Generating HTML documentation"
                       VERBATIM)
-    add_custom_target(docs ALL SOURCES "html/index.html")
+add_custom_target(docs ALL SOURCES "html/index.html")
-    set_target_properties(docs PROPERTIES FOLDER "GLFW3")
+set_target_properties(docs PROPERTIES FOLDER "GLFW3")
    if (GLFW_INSTALL)
        install(DIRECTORY "${GLFW_BINARY_DIR}/docs/html"
                DESTINATION "${CMAKE_INSTALL_DOCDIR}")
    endif()
 endif()
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@ -23,12 +23,13 @@ Questions about how to use GLFW should be asked either in the [support
 section](https://discourse.glfw.org/c/support) of the forum, under the [Stack
 Overflow tag](https://stackoverflow.com/questions/tagged/glfw) or [Game
 Development tag](https://gamedev.stackexchange.com/questions/tagged/glfw) on
-Stack Exchange.
+Stack Exchange or in the IRC channel `#glfw` on
 [Libera.Chat](https://libera.chat/).
 Questions about the design or implementation of GLFW or about future plans
 should be asked in the [dev section](https://discourse.glfw.org/c/dev) of the
-forum.  Please don't open a GitHub issue to discuss design questions without
+forum or in the IRC channel.  Please don't open a GitHub issue to discuss design
-first checking with a maintainer.
+questions without first checking with a maintainer.
 ## Reporting a bug
@ -357,7 +358,7 @@ feature.
 In addition to the code, a complete feature includes:
 - Change log entry in `README.md`, listing all new symbols
- News page entry in `docs/news.md`, briefly describing the feature
+- News page entry in `docs/news.dox`, briefly describing the feature
 - Guide documentation, with minimal examples, in the relevant guide in the `docs` folder
 - Reference documentation, with all applicable tags
 - Cross-references and mentions in appropriate places
@ -373,7 +374,7 @@ If it adds a new monitor property, support for it must be added to
 If it adds a new OpenGL, OpenGL ES or Vulkan option or extension, support
 for it must be added to `tests/glfwinfo.c` and the behavior of the library when
-the extension is missing documented in `docs/compat.md`.
+the extension is missing documented in `docs/compat.dox`.
 If you haven't already, read the excellent article [How to Write a Git Commit
 Message](https://chris.beams.io/posts/git-commit/).
--- a/docs/DoxygenLayout.xml
+++ b/docs/DoxygenLayout.xml
@ -5,7 +5,7 @@
    <tab type="mainpage" visible="yes" title="Introduction"/>
    <tab type="user" url="quick_guide.html" title="Tutorial"/>
    <tab type="pages" visible="yes" title="Guides" intro=""/>
-    <tab type="topics" visible="yes" title="Reference" intro=""/>
+    <tab type="modules" visible="yes" title="Reference" intro=""/>
    <tab type="filelist" visible="yes" title="Files"/>
  </navindex>
--- a/docs/SUPPORT.md
+++ b/docs/SUPPORT.md
@ -4,7 +4,8 @@ See the [latest documentation](https://www.glfw.org/docs/latest/) for tutorials,
 guides and the API reference.
 If you have questions about using GLFW, we have a
-[forum](https://discourse.glfw.org/).
+[forum](https://discourse.glfw.org/), and the `#glfw` IRC channel on
 [Libera.Chat](https://libera.chat/).
 Bugs are reported to our [issue tracker](https://github.com/glfw/glfw/issues).
 Please check the [contribution
--- a/docs/build.dox
+++ b/docs/build.dox
@ -1,6 +1,8 @@
-# Building applications {#build_guide}
+/*!
-[TOC]
+@page build_guide Building applications
@tableofcontents
 This is about compiling and linking applications that use GLFW.  For information on
 how to write such applications, start with the
@ -14,14 +16,14 @@ and linking process should be explained in your C programming material and in
 the documentation for your development environment.
-## Including the GLFW header file {#build_include}
+@section build_include Including the GLFW header file
 You should include the GLFW header in the source files where you use OpenGL or
 GLFW.
-```c
+@code
 #include <GLFW/glfw3.h>
-```
+@endcode
 This header defines all the constants and declares all the types and function
 prototypes of the GLFW API.  By default, it also includes the OpenGL header from
@ -41,18 +43,17 @@ In other words:
 - Do not include window system headers unless you will use those APIs directly
 - If you do need such headers, include them before the GLFW header
-If you are using an OpenGL extension loading library such as [glad][], the
+If you are using an OpenGL extension loading library such as
-extension loader header should be included before the GLFW one.  GLFW attempts
+[glad](https://github.com/Dav1dde/glad), the extension loader header should
-to detect any OpenGL or OpenGL ES header or extension loader header included
+be included before the GLFW one.  GLFW attempts to detect any OpenGL or OpenGL
-before it and will then disable the inclusion of the default OpenGL header.
+ES header or extension loader header included before it and will then disable
-Most extension loaders also define macros that disable similar headers below it.
+the inclusion of the default OpenGL header.  Most extension loaders also define
 macros that disable similar headers below it.
-[glad]: https://github.com/Dav1dde/glad
+@code
 ```c
 #include <glad/gl.h>
 #include <GLFW/glfw3.h>
-```
+@endcode
 Both of these mechanisms depend on the extension loader header defining a known
 macro.  If yours doesn't or you don't know which one your users will pick, the
@ -60,14 +61,14 @@ macro.  If yours doesn't or you don't know which one your users will pick, the
 including the OpenGL header.  This will also allow you to include the two
 headers in any order.
-```c
+@code
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <glad/gl.h>
-```
+@endcode
-### GLFW header option macros {#build_macros}
+@subsection build_macros GLFW header option macros
 These macros may be defined before the inclusion of the GLFW header and affect
 its behavior.
@ -81,9 +82,8 @@ Only one of these may be defined at a time.
@note GLFW does not provide any of the API headers mentioned below.  They are
 provided by your development environment or your OpenGL, OpenGL ES or Vulkan
-SDK, and most of them can be downloaded from the [Khronos Registry][registry].
+SDK, and most of them can be downloaded from the
-
+[Khronos Registry](https://www.khronos.org/registry/).
 [registry]: https://www.khronos.org/registry/
@anchor GLFW_INCLUDE_GLCOREARB
 __GLFW_INCLUDE_GLCOREARB__ makes the GLFW header include the modern
@ -142,7 +142,7 @@ If your build includes GLFW and you define any these in your build files, make
 sure they are not applied to the GLFW sources.
-## Link with the right libraries {#build_link}
+@section build_link Link with the right libraries
 GLFW is essentially a wrapper of various platform-specific APIs and therefore
 needs to link against many different system libraries.  If you are using GLFW as
@ -155,104 +155,28 @@ hard-coded into your build environment.  See the section for your development
 environment below.  On Linux and other Unix-like operating systems, the list
 varies but can be retrieved in various ways as described below.
-A good general introduction to linking is [Beginner's Guide to
+A good general introduction to linking is
-Linkers][linker_guide] by David Drysdale.
+[Beginner's Guide to Linkers](https://www.lurklurk.org/linkers/linkers.html) by
-
+David Drysdale.
 [linker_guide]: https://www.lurklurk.org/linkers/linkers.html
-### With Visual C++ and GLFW binaries {#build_link_win32}
+@subsection build_link_win32 With MinGW or Visual C++ on Windows
-If you are using a downloaded [binary
+The static version of the GLFW library is named `glfw3`.  When using this
-archive](https://www.glfw.org/download.html), first make sure you have the
+version, it is also necessary to link with some libraries that GLFW uses.
 archive matching the architecture you are building for (32-bit or 64-bit), or
 you will get link errors.  Also make sure you are using the binaries for your
 version of Visual C++ or you may get other link errors.
-There are two version of the static GLFW library in the binary archive, because
+When using MinGW to link an application with the static version of GLFW, you
-it needs to use the same base run-time library variant as the rest of your
+must also explicitly link with `gdi32`. Other toolchains including MinGW-w64
-executable.
+include it in the set of default libraries along with other dependencies like
 `user32` and `kernel32`.
-One is named `glfw3.lib` and is for projects with the _Runtime Library_ project
+The link library for the GLFW DLL is named `glfw3dll`.  When compiling an
-option set to _Multi-threaded DLL_ or _Multi-threaded Debug DLL_.  The other is
+application that uses the DLL version of GLFW, you need to define the @ref
-named `glfw3_mt.lib` and is for projects with _Runtime Library_ set to
+GLFW_DLL macro _before_ any inclusion of the GLFW header.  This can be done
-_Multi-threaded_ or _Multi-threaded Debug_.  To use the static GLFW library you
+either with a compiler switch or by defining it in your source code.
 will need to add `path/to/glfw3.lib` or `path/to/glfw3_mt.lib` to the
 _Additional Dependencies_ project option.
 If you compiled a GLFW static library yourself then there will only be one,
 named `glfw3.lib`, and you have to make sure the run-time library variant
 matches.
 The DLL version of the GLFW library is named `glfw3.dll`, but you will be
 linking against the `glfw3dll.lib` link library.  To use the DLL you will need
 to add `path/to/glfw3dll.lib` to the _Additional Dependencies_ project option.
 All of its dependencies are already listed there by default, but when building
 with the DLL version of GLFW, you also need to define the @ref GLFW_DLL.  This
 can be done either in the _Preprocessor Definitions_ project option or by
 defining it in your source code before including the GLFW header.
 ```c
 #define GLFW_DLL
 #include <GLFW/glfw3.h>
 ```
 All link-time dependencies for GLFW are already listed in the _Additional
 Dependencies_ option by default.
-### With MinGW-w64 and GLFW binaries {#build_link_mingw}
+@subsection build_link_cmake_source With CMake and GLFW source
 This is intended for building a program from the command-line or by writing
 a makefile, on Windows with [MinGW-w64][] and GLFW binaries.  These can be from
 a downloaded and extracted [binary archive](https://www.glfw.org/download.html)
 or by compiling GLFW yourself.  The paths below assume a binary archive is used.
 If you are using a downloaded binary archive, first make sure you have the
 archive matching the architecture you are building for (32-bit or 64-bit) or you
 will get link errors.
 Note that the order of source files and libraries matter for GCC.  Dependencies
 must be listed after the files that depend on them.  Any source files that
 depend on GLFW must be listed before the GLFW library.  GLFW in turn depends on
 `gdi32` and must be listed before it.
 [MinGW-w64]: https://www.mingw-w64.org/
 If you are using the static version of the GLFW library, which is named
 `libglfw3.a`, do:
 ```sh
 gcc -o myprog myprog.c -I path/to/glfw/include path/to/glfw/lib-mingw-w64/libglfw3.a -lgdi32
 ```
 If you are using the DLL version of the GLFW library, which is named
 `glfw3.dll`, you will need to use the `libglfw3dll.a` link library.
 ```sh
 gcc -o myprog myprog.c -I path/to/glfw/include path/to/glfw/lib-mingw-w64/libglfw3dll.a -lgdi32
 ```
 The resulting executable will need to find `glfw3.dll` to run, typically by
 keeping both files in the same directory.
 When you are building with the DLL version of GLFW, you will also need to define
 the @ref GLFW_DLL macro.  This can be done in your source files, as long as it
 done before including the GLFW header:
 ```c
 #define GLFW_DLL
 #include <GLFW/glfw3.h>
 ```
 It can also be done on the command-line:
 ```sh
 gcc -o myprog myprog.c -D GLFW_DLL -I path/to/glfw/include path/to/glfw/lib-mingw-w64/libglfw3dll.a -lgdi32
 ```
 ### With CMake and GLFW source {#build_link_cmake_source}
 This section is about using CMake to compile and link GLFW along with your
 application.  If you want to use an installed binary instead, see @ref
@ -264,18 +188,18 @@ built along with your application.
 Add the root directory of the GLFW source tree to your project.  This will add
 the `glfw` target to your project.
-```cmake
+@code{.cmake}
 add_subdirectory(path/to/glfw)
-```
+@endcode
 Once GLFW has been added, link your application against the `glfw` target.
 This adds the GLFW library and its link-time dependencies as it is currently
 configured, the include directory for the GLFW header and, when applicable, the
@ref GLFW_DLL macro.
-```cmake
+@code{.cmake}
 target_link_libraries(myapp glfw)
-```
+@endcode
 Note that the `glfw` target does not depend on OpenGL, as GLFW loads any OpenGL,
 OpenGL ES or Vulkan libraries it needs at runtime.  If your application calls
@ -283,24 +207,22 @@ OpenGL directly, instead of using a modern
 [extension loader library](@ref context_glext_auto), use the OpenGL CMake
 package.
-```cmake
+@code{.cmake}
 find_package(OpenGL REQUIRED)
-```
+@endcode
 If OpenGL is found, the `OpenGL::GL` target is added to your project, containing
 library and include directory paths.  Link against this like any other library.
-```cmake
+@code{.cmake}
 target_link_libraries(myapp OpenGL::GL)
-```
+@endcode
 For a minimal example of a program and GLFW sources built with CMake, see the
-[GLFW CMake Starter][cmake_starter] on GitHub.
+[GLFW CMake Starter](https://github.com/juliettef/GLFW-CMake-starter) on GitHub.
 [cmake_starter]: https://github.com/juliettef/GLFW-CMake-starter
-### With CMake and installed GLFW binaries {#build_link_cmake_package}
+@subsection build_link_cmake_package With CMake and installed GLFW binaries
 This section is about using CMake to link GLFW after it has been built and
 installed.  If you want to build it along with your application instead, see
@ -309,17 +231,17 @@ installed.  If you want to build it along with your application instead, see
 With a few changes to your `CMakeLists.txt` you can locate the package and
 target files generated when GLFW is installed.
-```cmake
+@code{.cmake}
-find_package(glfw3 3.5 REQUIRED)
+find_package(glfw3 3.4 REQUIRED)
-```
+@endcode
 Once GLFW has been added to the project, link against it with the `glfw` target.
 This adds the GLFW library and its link-time dependencies, the include directory
 for the GLFW header and, when applicable, the @ref GLFW_DLL macro.
-```cmake
+@code{.cmake}
 target_link_libraries(myapp glfw)
-```
+@endcode
 Note that the `glfw` target does not depend on OpenGL, as GLFW loads any OpenGL,
 OpenGL ES or Vulkan libraries it needs at runtime.  If your application calls
@ -327,51 +249,47 @@ OpenGL directly, instead of using a modern
 [extension loader library](@ref context_glext_auto), use the OpenGL CMake
 package.
-```cmake
+@code{.cmake}
 find_package(OpenGL REQUIRED)
-```
+@endcode
 If OpenGL is found, the `OpenGL::GL` target is added to your project, containing
 library and include directory paths.  Link against this like any other library.
-```cmake
+@code{.cmake}
 target_link_libraries(myapp OpenGL::GL)
-```
+@endcode
-### With pkg-config and GLFW binaries on Unix {#build_link_pkgconfig}
+@subsection build_link_pkgconfig With makefiles and pkg-config on Unix
-This is intended for building a program from the command-line or by writing
+GLFW supports [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/),
-a makefile, on macOS or any Unix-like system like Linux, FreeBSD and Cygwin.
+and the `glfw3.pc` pkg-config file is generated when the GLFW library is built
-
+and is installed along with it.  A pkg-config file describes all necessary
-GLFW supports [pkg-config][], and the `glfw3.pc` pkg-config file is generated
+compile-time and link-time flags and dependencies needed to use a library.  When
-when the GLFW library is built and is installed along with it.  A pkg-config
+they are updated or if they differ between systems, you will get the correct
-file describes all necessary compile-time and link-time flags and dependencies
+ones automatically.
 needed to use a library.  When they are updated or if they differ between
 systems, you will get the correct ones automatically.
 [pkg-config]: https://www.freedesktop.org/wiki/Software/pkg-config/
 A typical compile and link command-line when using the static version of the
 GLFW library may look like this:
-```sh
+@code{.sh}
 cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --static --libs glfw3)
-```
+@endcode
 If you are using the shared version of the GLFW library, omit the `--static`
 flag.
-```sh
+@code{.sh}
 cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --libs glfw3)
-```
+@endcode
 You can also use the `glfw3.pc` file without installing it first, by using the
 `PKG_CONFIG_PATH` environment variable.
-```sh
+@code{.sh}
 env PKG_CONFIG_PATH=path/to/glfw/src cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --libs glfw3)
-```
+@endcode
 The dependencies do not include OpenGL, as GLFW loads any OpenGL, OpenGL ES or
 Vulkan libraries it needs at runtime.  If your application calls OpenGL
@ -379,34 +297,34 @@ directly, instead of using a modern
 [extension loader library](@ref context_glext_auto), you should add the `gl`
 pkg-config package.
-```sh
+@code{.sh}
 cc $(pkg-config --cflags glfw3 gl) -o myprog myprog.c $(pkg-config --libs glfw3 gl)
-```
+@endcode
-### With Xcode on macOS {#build_link_xcode}
+@subsection build_link_xcode With Xcode on macOS
 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}
+@subsection build_link_osx With command-line on macOS
 It is recommended that you use [pkg-config](@ref build_link_pkgconfig) when
-using installed GLFW binaries from the command line on macOS.  That way you will
+building from the command line on macOS.  That way you will get any new
-get any new dependencies added automatically.  If you still wish to build
+dependencies added automatically.  If you still wish to build manually, you need
-manually, you need to add the required frameworks and libraries to your
+to add the required frameworks and libraries to your command-line yourself using
-command-line yourself using the `-l` and `-framework` switches.
+the `-l` and `-framework` switches.
 If you are using the dynamic GLFW library, which is named `libglfw.3.dylib`, do:
-```sh
+@code{.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
-```
+@endcode
 If you are using the static library, named `libglfw3.a`, substitute `-lglfw3`
 for `-lglfw`.
@ -417,3 +335,4 @@ against it from the command-line.
@note Your machine may have `libGL.*.dylib` style OpenGL library, but that is
 for the X Window System and will not work with the macOS native version of GLFW.
 */
--- a/docs/compat.dox
+++ b/docs/compat.dox
@ -1,6 +1,8 @@
-# Standards conformance {#compat_guide}
+/*!
-[TOC]
+@page compat_guide Standards conformance
@tableofcontents
 This guide describes the various API extensions used by this version of GLFW.
 It lists what are essentially implementation details, but which are nonetheless
@ -13,18 +15,18 @@ part of this information may change in future versions of GLFW and that will not
 be considered a breaking API change.
-## X11 extensions, protocols and IPC standards {#compat_x11}
+@section compat_x11 X11 extensions, protocols and IPC standards
-As GLFW uses Xlib directly, without any intervening toolkit library, it has sole
+As GLFW uses Xlib directly, without any intervening toolkit
-responsibility for interacting well with the many and varied window managers in
+library, it has sole responsibility for interacting well with the many and
-use on Unix-like systems.  In order for applications and window managers to work
+varied window managers in use on Unix-like systems.  In order for applications
-well together, a number of standards and conventions have been developed that
+and window managers to work well together, a number of standards and
-regulate behavior outside the scope of the X11 API; most importantly the
+conventions have been developed that regulate behavior outside the scope of the
-[Inter-Client Communication Conventions Manual][ICCCM] (ICCCM) and [Extended
+X11 API; most importantly the
-Window Manager Hints][EWMH] (EWMH) standards.
+[Inter-Client Communication Conventions Manual](https://www.tronche.com/gui/x/icccm/)
-
+(ICCCM) and
-[ICCCM]: https://www.tronche.com/gui/x/icccm/
+[Extended Window Manager Hints](https://standards.freedesktop.org/wm-spec/wm-spec-latest.html)
-[EWMH]: https://standards.freedesktop.org/wm-spec/wm-spec-latest.html
+(EWMH) standards.
 GLFW uses the `_MOTIF_WM_HINTS` window property to support borderless windows.
 If the running window manager does not support this property, the
@ -50,18 +52,16 @@ 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 push a clipboard
+GLFW uses the
-string (i.e. selection) owned by a GLFW window about to be destroyed to the
+[clipboard manager protocol](https://www.freedesktop.org/wiki/ClipboardManager/)
-clipboard manager.  If there is no running clipboard manager, the clipboard
+to push a clipboard string (i.e. selection) owned by a GLFW window about to be
-string will be unavailable once the window has been destroyed.
+destroyed to the clipboard manager.  If there is no running clipboard manager,
 the clipboard string will be unavailable once the window has been destroyed.
-[clipboardManager]: https://www.freedesktop.org/wiki/ClipboardManager/
+GLFW uses the
-
+[X drag-and-drop protocol](https://www.freedesktop.org/wiki/Specifications/XDND/)
-GLFW uses the [X drag-and-drop protocol][XDND] to provide file drop events.  If
+to provide file drop events.  If the application originating the drag does not
-the application originating the drag does not support this protocol, drag and
+support this protocol, drag and drop will not work.
 drop will not work.
 [XDND]: https://www.freedesktop.org/wiki/Specifications/XDND/
 GLFW uses the XRandR 1.3 extension to provide multi-monitor support.  If the
 running X server does not support this version of this extension, multi-monitor
@ -93,7 +93,7 @@ conventions, the `GLFW_RESIZE_NWSE_CURSOR`, `GLFW_RESIZE_NESW_CURSOR` and
 legacy images.
-## Wayland protocols and IPC standards {#compat_wayland}
+@section compat_wayland Wayland protocols and IPC standards
 As GLFW uses libwayland directly, without any intervening toolkit library, it
 has sole responsibility for interacting well with every compositor in use on
@ -106,60 +106,42 @@ Wayland protocols to implement certain features if the compositor supports them.
 GLFW uses xkbcommon 0.5.0 to provide key and text input support.  Earlier
 versions are not supported.
-GLFW uses the [xdg-shell][] protocol to provide better window management.  This
+GLFW uses the [xdg-shell protocol](https://wayland.app/protocols/xdg-shell)
-protocol is mandatory for GLFW to display a window.
+to provide better window management.  This protocol is mandatory for GLFW to
 display a window.
-[xdg-shell]: https://wayland.app/protocols/xdg-shell
+GLFW uses the
 [relative pointer protocol](https://wayland.app/protocols/relative-pointer-unstable-v1)
 alongside the
 [pointer constraints protocol](https://wayland.app/protocols/pointer-constraints-unstable-v1)
 to implement disabled cursor.  If the running compositor does not support both
 of these protocols, disabling the cursor will have no effect.
-GLFW uses the [relative-pointer-unstable-v1][] protocol alongside the
+GLFW uses the
-[pointer-constraints-unstable-v1][] protocol to implement disabled cursor.  If
+[idle inhibit protocol](https://wayland.app/protocols/idle-inhibit-unstable-v1)
-the running compositor does not support both of these protocols, disabling the
+to prohibit the screensaver from starting.  If the running compositor does not
-cursor will have no effect.
+support this protocol, the screensaver may start even for full screen windows.
-[relative-pointer-unstable-v1]: https://wayland.app/protocols/relative-pointer-unstable-v1
+GLFW uses the
-[pointer-constraints-unstable-v1]: https://wayland.app/protocols/pointer-constraints-unstable-v1
+[libdecor library](https://gitlab.freedesktop.org/libdecor/libdecor) for window
 decorations, where available.  This in turn provides good quality client-side
 decorations (drawn by the application) on desktop systems that do not support
 server-side decorations (drawn by the window manager).  On systems that do not
 provide either libdecor or xdg-decoration, very basic window decorations are
 provided.  These do not include the window title or any caption buttons.
-GLFW uses the [idle-inhibit-unstable-v1][] protocol to prohibit the screensaver
+GLFW uses the
-from starting.  If the running compositor does not support this protocol, the
+[xdg-decoration protocol](https://wayland.app/protocols/xdg-decoration-unstable-v1)
-screensaver may start even for full screen windows.
+to request decorations to be drawn around its windows.  This protocol is part
-
+of wayland-protocols 1.15, and mandatory at build time.  If the running
-[idle-inhibit-unstable-v1]: https://wayland.app/protocols/idle-inhibit-unstable-v1
+compositor does not support this protocol, a very simple frame will be drawn by
-
+GLFW itself, using the
-GLFW uses the [libdecor][] library for window decorations, where available.
+[viewporter protocol](https://wayland.app/protocols/viewporter)
-This in turn provides good quality client-side decorations (drawn by the
+alongside subsurfaces.  If the running compositor does not support these
-application) on desktop systems that do not support server-side decorations
+protocols either, no decorations will be drawn around windows.
 (drawn by the window manager).  On systems that do not provide either libdecor
 or xdg-decoration, very basic window decorations are provided.  These do not
 include the window title or any caption buttons.
 [libdecor]: https://gitlab.freedesktop.org/libdecor/libdecor
 GLFW uses the [xdg-decoration-unstable-v1][] protocol to request decorations to
 be drawn around its windows.  This protocol is part of wayland-protocols 1.15,
 and mandatory at build time.  If the running compositor does not support this
 protocol, a very simple frame will be drawn by GLFW itself, using the
 [viewporter][] protocol alongside subsurfaces.  If the running compositor does
 not support these protocols either, no decorations will be drawn around windows.
 [xdg-decoration-unstable-v1]: https://wayland.app/protocols/xdg-decoration-unstable-v1
 [viewporter]: https://wayland.app/protocols/viewporter
 GLFW uses the [xdg-activation-v1][] protocol to implement window focus and
 attention requests.  If the running compositor does not support this protocol,
 window focus and attention requests do nothing.
 [xdg-activation-v1]: https://wayland.app/protocols/xdg-activation-v1
 GLFW uses the [fractional-scale-v1][] protocol to implement fine-grained
 framebuffer scaling.  If the running compositor does not support this protocol,
 the @ref GLFW_SCALE_FRAMEBUFFER window hint will only be able to scale the
 framebuffer by integer scales.  This will typically be the smallest integer not
 less than the actual scale.
 [fractional-scale-v1]: https://wayland.app/protocols/fractional-scale-v1
-## GLX extensions {#compat_glx}
+@section compat_glx GLX extensions
 The GLX API is the default API used to create OpenGL contexts on Unix-like
 systems using the X Window System.
@ -199,7 +181,7 @@ extensions to provide support for sRGB framebuffers.  Where both of these
 extensions are unavailable, the `GLFW_SRGB_CAPABLE` hint will have no effect.
-## WGL extensions {#compat_wgl}
+@section compat_wgl WGL extensions
 The WGL API is used to create OpenGL contexts on Microsoft Windows and other
 implementations of the Win32 API, such as Wine.
@ -240,32 +222,29 @@ extensions to provide support for sRGB framebuffers.  When both of these
 extensions are unavailable, the `GLFW_SRGB_CAPABLE` hint will have no effect.
-## OpenGL on macOS {#compat_osx}
+@section compat_osx OpenGL on macOS
-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}
+@section compat_vulkan Vulkan loader and API
 By default, GLFW uses the standard system-wide Vulkan loader to access the
 Vulkan API on all platforms except macOS.  This is installed by both graphics
@ -275,7 +254,7 @@ all other Vulkan-related functions will fail with an @ref GLFW_API_UNAVAILABLE
 error.
-## Vulkan WSI extensions {#compat_wsi}
+@section compat_wsi Vulkan WSI extensions
 The Vulkan WSI extensions are used to create Vulkan surfaces for GLFW windows on
 all supported platforms.
@ -301,3 +280,4 @@ surfaces on Wayland.  If any of these extensions are not available, @ref
 glfwGetRequiredInstanceExtensions will return an empty list and window surface
 creation will fail.
 */
--- a/docs/compile.dox
+++ b/docs/compile.dox
@ -1,6 +1,8 @@
-# Compiling GLFW {#compile_guide}
+/*!
-[TOC]
+@page compile_guide Compiling GLFW
@tableofcontents
 This is about compiling the GLFW library itself.  For information on how to
 build applications that use GLFW, see @ref build_guide.
@ -8,7 +10,7 @@ build applications that use GLFW, see @ref build_guide.
 GLFW uses some C99 features and does not support Visual Studio 2012 and earlier.
-## Using CMake {#compile_cmake}
+@section compile_cmake Using CMake
 GLFW behaves like most other libraries that use CMake so this guide mostly
 describes the standard configure, generate and compile sequence.  If you are already
@ -19,8 +21,8 @@ GLFW uses [CMake](https://cmake.org/) to generate project files or makefiles
 for your chosen development environment.  To compile GLFW, first generate these
 files with CMake and then use them to compile the GLFW library. 
-If you are on Windows and macOS you can [download
+If you are on Windows and macOS you can
-CMake](https://cmake.org/download/) from their site.
+[download CMake](https://cmake.org/download/) from their site.
 If you are on a Unix-like system such as Linux, FreeBSD or Cygwin or have
 a package system like Fink, MacPorts or Homebrew, you can install its CMake
@ -28,65 +30,89 @@ package.
 CMake is a complex tool and this guide will only show a few of the possible ways
 to set up and compile GLFW.  The CMake project has their own much more detailed
-[CMake user guide][cmake-guide] that includes everything in this guide not
+[CMake user guide](https://cmake.org/cmake/help/latest/guide/user-interaction/)
-specific to GLFW.  It may be a useful companion to this one.
+that includes everything in this guide not specific to GLFW.  It may be a useful
-
+companion to this one.
 [cmake-guide]: https://cmake.org/cmake/help/latest/guide/user-interaction/
-### Installing dependencies {#compile_deps}
+@subsection compile_deps Installing dependencies
 The C/C++ development environments in Visual Studio, Xcode and MinGW come with
 all necessary dependencies for compiling GLFW, but on Unix-like systems like
 Linux and FreeBSD you will need a few extra packages.
-#### Dependencies for Wayland and X11 {#compile_deps_wayland}
+@subsubsection compile_deps_x11 Dependencies for X11
-By default, both the Wayland and X11 backends are enabled on Linux and other Unix-like
+To compile GLFW for X11, you need to have the X11 development packages
-systems (except macOS).  To disable one or both of these, set the @ref GLFW_BUILD_WAYLAND
+installed.  They are not needed to build or run programs that use GLFW.
 or @ref GLFW_BUILD_X11 CMake options in the next step when generating build files.
-To compile GLFW for both Wayland and X11, you need to have the X11, Wayland and xkbcommon
+On Debian and derivatives like Ubuntu and Linux Mint the `xorg-dev` meta-package
-development packages installed.  On some systems a few other packages are also required.
+pulls in the development packages for all of X11.
 None of the development packages above are needed to build or run programs that use an
 already compiled GLFW library.
-On Debian and derivatives like Ubuntu and Linux Mint you will need the `libwayland-dev`
+@code{.sh}
-and `libxkbcommon-dev` packages to compile for Wayland and the `xorg-dev` meta-package to
+sudo apt install xorg-dev
-compile for X11.  These will pull in all other dependencies.
+@endcode
-```sh
+On Fedora and derivatives like Red Hat the X11 extension packages
-sudo apt install libwayland-dev libxkbcommon-dev xorg-dev
+`libXcursor-devel`, `libXi-devel`, `libXinerama-devel` and `libXrandr-devel`
-```
+required by GLFW pull in all its other dependencies.
-On Fedora and derivatives like Red Hat you will need the `wayland-devel` and
+@code{.sh}
-`libxkbcommon-devel` packages to compile for Wayland and the `libXcursor-devel`,
+sudo dnf install libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel
-`libXi-devel`, `libXinerama-devel` and `libXrandr-devel` packages to compile for X11.
+@endcode
 These will pull in all other dependencies.
-```sh
+On FreeBSD the X11 headers are installed along the end-user X11 packages, so if
-sudo dnf install wayland-devel libxkbcommon-devel libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel
+you have an X server running you should have the headers as well.  If not,
-```
+install the `xorgproto` package.
-On FreeBSD you will need the `wayland`, `libxkbcommon` and `evdev-proto` packages to
+@code{.sh}
-compile for Wayland.  The X11 headers are installed along the end-user X11 packages, so if
+pkg install xorgproto
-you have an X server running you should have the headers as well.  If not, install the
+@endcode
 `xorgproto` package to compile for X11.
-```sh
+On Cygwin the `libXcursor-devel`, `libXi-devel`, `libXinerama-devel`,
-pkg install wayland libxkbcommon evdev-proto xorgproto
+`libXrandr-devel` and `libXrender-devel` packages in the Libs section of the GUI
-```
+installer will install all the headers and other development related files GLFW
-
+requires for X11.
 On Cygwin Wayland is not supported but you will need the `libXcursor-devel`,
 `libXi-devel`, `libXinerama-devel`, `libXrandr-devel` and `libXrender-devel` packages to
 compile for X11.  These can be found in the Libs section of the GUI installer and will
 pull in all other dependencies.
 Once you have the required dependencies, move on to @ref compile_generate.
-### Generating build files with CMake {#compile_generate}
+@subsubsection compile_deps_wayland Dependencies for Wayland and X11
 To compile GLFW for both Wayland and X11, you need to have the X11, Wayland and xkbcommon
 development packages installed.  They are not needed to build or run programs that use
 GLFW.  You will also need to set the @ref GLFW_BUILD_WAYLAND CMake option in the next
 step when generating build files.
 On Debian and derivatives like Ubuntu and Linux Mint you will need the `libwayland-dev`
 and `libxkbcommon-dev` packages and the `xorg-dev` meta-package.  These will pull in all
 other dependencies.
@code{.sh}
 sudo apt install libwayland-dev libxkbcommon-dev xorg-dev
@endcode
 On Fedora and derivatives like Red Hat you will need the `wayland-devel`,
 `libxkbcommon-devel`, `libXcursor-devel`, `libXi-devel`, `libXinerama-devel` and
 `libXrandr-devel` packages.  These will pull in all other dependencies.
@code{.sh}
 sudo dnf install wayland-devel libxkbcommon-devel libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel
@endcode
 On FreeBSD you will need the `wayland` and `libxkbcommon` packages.  The X11 headers are
 installed along the end-user X11 packages, so if you have an X server running you should
 have the headers as well.  If not, install the `xorgproto` package.
@code{.sh}
 pkg install wayland libxkbcommon xorgproto
@endcode
 Once you have the required dependencies, move on to @ref compile_generate.
@subsection compile_generate Generating build files with CMake
 Once you have all necessary dependencies it is time to generate the project
 files or makefiles for your development environment.  CMake needs two paths for
@ -108,7 +134,7 @@ A common pattern when building a single configuration is to have a build
 directory named `build` in the root of the source tree.
-#### Generating with the CMake GUI {#compile_generate_gui}
+@subsubsection compile_generate_gui Generating with the CMake GUI
 Start the CMake GUI and set the paths to the source and build directories
 described above.  Then press _Configure_ and _Generate_.
@ -117,54 +143,53 @@ If you wish change any CMake variables in the list, press _Configure_ and then
 _Generate_ to have the new values take effect.  The variable list will be
 populated after the first configure step.
-By default, GLFW will use Wayland and X11 on Linux and other Unix-like systems other than
+By default, GLFW will use X11 on Linux and other Unix-like systems other than macOS.  To
-macOS.  To disable support for one or both of these, set the @ref GLFW_BUILD_WAYLAND
+include support for Wayland as well, set the @ref GLFW_BUILD_WAYLAND option in the GLFW
-and/or @ref GLFW_BUILD_X11 option in the GLFW section of the variable list, then apply the
+section of the variable list, then apply the new value as described above.
 new value as described above.
 Once you have generated the project files or makefiles for your chosen
 development environment, move on to @ref compile_compile.
-#### Generating with command-line CMake {#compile_generate_cli}
+@subsubsection compile_generate_cli Generating with command-line CMake
 To make a build directory, pass the source and build directories to the `cmake`
 command.  These can be relative or absolute paths.  The build directory is
 created if it doesn't already exist.
-```sh
+@code{.sh}
 cmake -S path/to/glfw -B path/to/build
-```
+@endcode
 It is common to name the build directory `build` and place it in the root of the
 source tree when only planning to build a single configuration.
-```sh
+@code{.sh}
 cd path/to/glfw
 cmake -S . -B build
-```
+@endcode
 Without other flags these will generate Visual Studio project files on Windows
 and makefiles on other platforms.  You can choose other targets using the `-G`
 flag.
-```sh
+@code{.sh}
 cmake -S path/to/glfw -B path/to/build -G Xcode
-```
+@endcode
-By default, GLFW will use Wayland and X11 on Linux and other Unix-like systems other than
+By default, GLFW will use X11 on Linux and other Unix-like systems other
-macOS.  To disable support for one or both of these, set the @ref GLFW_BUILD_WAYLAND
+than macOS.  To also include support for Wayland, set the @ref GLFW_BUILD_WAYLAND CMake
-and/or @ref GLFW_BUILD_X11 CMake option.
+option.
-```sh
+@code{.sh}
-cmake -S path/to/glfw -B path/to/build -D GLFW_BUILD_X11=0
+cmake -S path/to/glfw -B path/to/build -D GLFW_BUILD_WAYLAND=1
-```
+@endcode
 Once you have generated the project files or makefiles for your chosen
 development environment, move on to @ref compile_compile.
-### Compiling the library {#compile_compile}
+@subsection compile_compile Compiling the library
 You should now have all required dependencies and the project files or makefiles
 necessary to compile GLFW.  Go ahead and compile the actual GLFW library with
@ -175,24 +200,24 @@ With Visual Studio open `GLFW.sln` and use the Build menu.  With Xcode open
 With Linux, macOS and other forms of Unix, run `make`.
-```sh
+@code{.sh}
 cd path/to/build
 make
-```
+@endcode
 With MinGW, it is `mingw32-make`.
-```sh
+@code{.sh}
 cd path/to/build
 mingw32-make
-```
+@endcode
 Any CMake build directory can also be built with the `cmake` command and the
 `--build` flag.
-```sh
+@code{.sh}
 cmake --build path/to/build
-```
+@endcode
 This will run the platform specific build tool the directory was generated for.
@ -200,7 +225,7 @@ Once the GLFW library is compiled you are ready to build your application,
 linking it to the GLFW library.  See @ref build_guide for more information.
-## CMake options {#compile_options}
+@section compile_options CMake options
 The CMake files for GLFW provide a number of options, although not all are
 available on all supported platforms.  Some of these are de facto standards
@ -215,12 +240,12 @@ distributions based on Debian GNU/Linux have this tool in a separate
 Finally, if you don't want to use any GUI, you can set options from the `cmake`
 command-line with the `-D` flag.
-```sh
+@code{.sh}
 cmake -S path/to/glfw -B path/to/build -D BUILD_SHARED_LIBS=ON
-```
+@endcode
-### Shared CMake options {#compile_options_shared}
+@subsection compile_options_shared Shared CMake options
@anchor BUILD_SHARED_LIBS
 __BUILD_SHARED_LIBS__ determines whether GLFW is built as a static library or as
@ -252,7 +277,7 @@ with the library.  This is enabled by default if
 [Doxygen](https://www.doxygen.nl/) is found by CMake during configuration.
-### Win32 specific CMake options {#compile_options_win32}
+@subsection compile_options_win32 Win32 specific CMake options
@anchor GLFW_BUILD_WIN32
 __GLFW_BUILD_WIN32__ determines whether to include support for Win32 when compiling the
@ -264,11 +289,10 @@ __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.
-On CMake 3.15 and later you can set the standard CMake [CMAKE_MSVC_RUNTIME_LIBRARY][]
+On CMake 3.15 and later you can set the standard CMake
 [CMAKE_MSVC_RUNTIME_LIBRARY](https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html)
 variable instead of this GLFW-specific option.
 [CMAKE_MSVC_RUNTIME_LIBRARY]: https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
@anchor GLFW_USE_HYBRID_HPG
 __GLFW_USE_HYBRID_HPG__ determines whether to export the `NvOptimusEnablement` and
 `AmdPowerXpressRequestHighPerformance` symbols, which force the use of the
@ -278,7 +302,7 @@ will not work if GLFW is built as a DLL.  This is disabled by default, letting
 the operating system and driver decide.
-### macOS specific CMake options {#compile_options_macos}
+@subsection compile_options_macos macOS specific CMake options
@anchor GLFW_BUILD_COCOA
 __GLFW_BUILD_COCOA__ determines whether to include support for Cocoa when compiling the
@ -286,12 +310,12 @@ library.  This option is only available when compiling for macOS.  This is enabl
 default.
-### Unix-like system specific CMake options {#compile_options_unix}
+@subsection compile_options_unix Unix-like system specific CMake options
@anchor GLFW_BUILD_WAYLAND
 __GLFW_BUILD_WAYLAND__ determines whether to include support for Wayland when compiling
 the library.  This option is only available when compiling for Linux and other Unix-like
-systems other than macOS.  This is enabled by default.
+systems other than macOS.  This is disabled by default.
@anchor GLFW_BUILD_X11
 __GLFW_BUILD_X11__ determines whether to include support for X11 when compiling the
@ -299,7 +323,7 @@ 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 {#compile_mingw_cross}
+@section compile_mingw_cross Cross-compilation with CMake and MinGW
 Both Cygwin and many Linux distributions have MinGW or MinGW-w64 packages.  For
 example, Cygwin has the `mingw64-i686-gcc` and `mingw64-x86_64-gcc` packages
@ -311,9 +335,9 @@ cross-compilation of Windows binaries.  To use these files you set the
 `CMAKE_TOOLCHAIN_FILE` CMake variable with the `-D` flag add an option when
 configuring and generating the build files.
-```sh
+@code{.sh}
 cmake -S path/to/glfw -B path/to/build -D CMAKE_TOOLCHAIN_FILE=path/to/file
-```
+@endcode
 The exact toolchain file to use depends on the prefix used by the MinGW or
 MinGW-w64 binaries on your system.  You can usually see this in the /usr
@ -321,19 +345,18 @@ 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:
-```sh
+@code{.sh}
 cmake -S path/to/glfw -B path/to/build -D CMAKE_TOOLCHAIN_FILE=CMake/x86_64-w64-mingw32.cmake
-```
+@endcode
 The path to the toolchain file is relative to the path to the GLFW source tree
 passed to the `-S` flag, not to the current directory.
-For more details see the [CMake toolchain guide][cmake-toolchains].
+For more details see the
-
+[CMake toolchain guide](https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html).
 [cmake-toolchains]: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html
-## Compiling GLFW manually {#compile_manual}
+@section compile_manual Compiling GLFW manually
 If you wish to compile GLFW without its CMake build environment then you will have to do
 at least some platform-detection yourself.  There are preprocessor macros for
@ -350,8 +373,8 @@ clipboard.  The options are:
 - @b _GLFW_COCOA to use the Cocoa frameworks
 - @b _GLFW_WIN32 to use the Win32 API
 - @b _GLFW_WAYLAND to use the Wayland protocol
 - @b _GLFW_X11 to use the X Window System
 - @b _GLFW_WAYLAND to use the Wayland API (incomplete)
 The @b _GLFW_WAYLAND and @b _GLFW_X11 macros may be combined and produces a library that
 attempts to detect the appropriate platform at initialization.
@ -369,3 +392,4 @@ _GLFW_GLESV2_LIBRARY.  Otherwise, GLFW will use the built-in default names.
 GLFW.  If you define any of these in your build files, make sure they are not
 applied to the GLFW sources.
 */
--- a/docs/context.dox
+++ b/docs/context.dox
@ -1,6 +1,8 @@
-# Context guide {#context_guide}
+/*!
-[TOC]
+@page context_guide Context guide
@tableofcontents
 This guide introduces the OpenGL and OpenGL ES context related functions of
 GLFW.  For details on a specific function in this category, see the @ref
@ -13,7 +15,7 @@ context.  There are also guides for the other areas of the GLFW API.
 - @ref input_guide
-## Context objects {#context_object}
+@section context_object Context objects
 A window object encapsulates both a top-level window and an OpenGL or OpenGL ES
 context.  It is created with @ref glfwCreateWindow and destroyed with @ref
@ -32,22 +34,22 @@ context creation by setting the [GLFW_CLIENT_API](@ref GLFW_CLIENT_API_hint)
 hint to `GLFW_NO_API`.  For more information, see the @ref vulkan_guide.
-### Context creation hints {#context_hints}
+@subsection context_hints Context creation hints
 There are a number of hints, specified using @ref glfwWindowHint, related to
 what kind of context is created.  See
 [context related hints](@ref window_hints_ctx) in the window guide.
-### Context object sharing {#context_sharing}
+@subsection context_sharing Context object sharing
 When creating a window and its OpenGL or OpenGL ES context with @ref
 glfwCreateWindow, you can specify another window whose context the new one
 should share its objects (textures, vertex and element buffers, etc.) with.
-```c
+@code
 GLFWwindow* second_window = glfwCreateWindow(640, 480, "Second Window", NULL, first_window);
-```
+@endcode
 Object sharing is implemented by the operating system and graphics driver.  On
 platforms where it is possible to choose which types of objects are shared, GLFW
@ -62,17 +64,17 @@ Contexts_.
 GLFW comes with a bare-bones object sharing example program called `sharing`.
-### Offscreen contexts {#context_offscreen}
+@subsection context_offscreen Offscreen contexts
 GLFW doesn't support creating contexts without an associated window.  However,
 contexts with hidden windows can be created with the
 [GLFW_VISIBLE](@ref GLFW_VISIBLE_hint) window hint.
-```c
+@code
 glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
 GLFWwindow* offscreen_context = glfwCreateWindow(640, 480, "", NULL, NULL);
-```
+@endcode
 The window never needs to be shown and its context can be used as a plain
 offscreen context.  Depending on the window manager, the size of a hidden
@ -83,7 +85,7 @@ You should still [process events](@ref events) as long as you have at least one
 window, even if none of them are visible.
-### Windows without contexts {#context_less}
+@subsection context_less Windows without contexts
 You can disable context creation by setting the
 [GLFW_CLIENT_API](@ref GLFW_CLIENT_API_hint) hint to `GLFW_NO_API`.
@ -92,7 +94,7 @@ Windows without contexts should not be passed to @ref glfwMakeContextCurrent or
@ref glfwSwapBuffers.  Doing this generates a @ref GLFW_NO_WINDOW_CONTEXT error.
-## Current context {#context_current}
+@section context_current Current context
 Before you can make OpenGL or OpenGL ES calls, you need to have a current
 context of the correct type.  A context can only be current for a single thread
@ -103,15 +105,15 @@ thread before making it current on the new one.
 The context of a window is made current with @ref glfwMakeContextCurrent.
-```c
+@code
 glfwMakeContextCurrent(window);
-```
+@endcode
 The window of the current context is returned by @ref glfwGetCurrentContext.
-```c
+@code
 GLFWwindow* window = glfwGetCurrentContext();
-```
+@endcode
 The following GLFW functions require a context to be current.  Calling any these
 functions without a current context will generate a @ref GLFW_NO_CURRENT_CONTEXT
@ -122,12 +124,12 @@ error.
 - @ref glfwGetProcAddress
-## Buffer swapping {#context_swap}
+@section context_swap Buffer swapping
 See @ref buffer_swap in the window guide.
-## OpenGL and OpenGL ES extensions {#context_glext}
+@section context_glext OpenGL and OpenGL ES extensions
 One of the benefits of OpenGL and OpenGL ES is their extensibility.
 Hardware vendors may include extensions in their implementations that extend the
@ -150,7 +152,7 @@ their specifications, can be found at the
 [OpenGL ES Registry](https://www.khronos.org/registry/gles/).
-### Loading extension with a loader library {#context_glext_auto}
+@subsection context_glext_auto Loading extension with a loader library
 An extension loader library is the easiest and best way to access both OpenGL and
 OpenGL ES extensions and modern versions of the core OpenGL or OpenGL ES APIs.
@ -167,9 +169,9 @@ both GLFW and glad, but loaders for OpenGL ES, as well as loaders for specific
 API versions and extension sets can be generated.  The generated files are
 written to the `output` directory.
-```sh
+@code{.sh}
 python main.py --generator c --no-loader --out-path output
-```
+@endcode
 The `--no-loader` option is added because GLFW already provides a function for
 loading OpenGL and OpenGL ES function pointers, one that automatically uses the
@ -183,14 +185,14 @@ include the glad header file, which will replace the OpenGL header of your
 development environment.  By including the glad header before the GLFW header,
 it suppresses the development environment's OpenGL or OpenGL ES header.
-```c
+@code
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
-```
+@endcode
 Finally, you need to initialize glad once you have a suitable current context.
-```c
+@code
 window = glfwCreateWindow(640, 480, "My Window", NULL, NULL);
 if (!window)
 {
@ -200,7 +202,7 @@ if (!window)
 glfwMakeContextCurrent(window);
 gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
-```
+@endcode
 Once glad has been loaded, you have access to all OpenGL core and extension
 functions supported by both the context you created and the glad loader you
@ -213,25 +215,25 @@ check the actual OpenGL or OpenGL ES version with
 a specific version is supported by the current context with the
 `GLAD_GL_VERSION_x_x` booleans.
-```c
+@code
 if (GLAD_GL_VERSION_3_2)
 {
    // Call OpenGL 3.2+ specific code
 }
-```
+@endcode
 To check whether a specific extension is supported, use the `GLAD_GL_xxx`
 booleans.
-```c
+@code
 if (GLAD_GL_ARB_gl_spirv)
 {
    // Use GL_ARB_gl_spirv
 }
-```
+@endcode
-### Loading extensions manually {#context_glext_manual}
+@subsection context_glext_manual Loading extensions manually
 __Do not use this technique__ unless it is absolutely necessary.  An
 [extension loader library](@ref context_glext_auto) will save you a ton of
@ -246,7 +248,7 @@ This section will demonstrate manual loading of OpenGL extensions.  The loading
 of OpenGL ES extensions is identical except for the name of the extension header.
-#### The glext.h header {#context_glext_header}
+@subsubsection context_glext_header The glext.h header
 The `glext.h` extension header is a continually updated file that defines the
 interfaces for all OpenGL extensions.  The latest version of this can always be
@ -265,41 +267,41 @@ to function) and `PROC` (procedure) are added to the ends.
 To include the extension header, define @ref GLFW_INCLUDE_GLEXT before including
 the GLFW header.
-```c
+@code
 #define GLFW_INCLUDE_GLEXT
 #include <GLFW/glfw3.h>
-```
+@endcode
-#### Checking for extensions {#context_glext_string}
+@subsubsection context_glext_string Checking for extensions
 A given machine may not actually support the extension (it may have older
 drivers or a graphics card that lacks the necessary hardware features), so it
 is necessary to check at run-time whether the context supports the extension.
 This is done with @ref glfwExtensionSupported.
-```c
+@code
 if (glfwExtensionSupported("GL_ARB_gl_spirv"))
 {
    // The extension is supported by the current context
 }
-```
+@endcode
 The argument is a null terminated ASCII string with the extension name.  If the
 extension is supported, @ref glfwExtensionSupported returns `GLFW_TRUE`,
 otherwise it returns `GLFW_FALSE`.
-#### Fetching function pointers {#context_glext_proc}
+@subsubsection context_glext_proc Fetching function pointers
 Many extensions, though not all, require the use of new OpenGL functions.
 These functions often do not have entry points in the client API libraries of
 your operating system, making it necessary to fetch them at run time.  You can
 retrieve pointers to these functions with @ref glfwGetProcAddress.
-```c
+@code
 PFNGLSPECIALIZESHADERARBPROC pfnSpecializeShaderARB = glfwGetProcAddress("glSpecializeShaderARB");
-```
+@endcode
 In general, you should avoid giving the function pointer variables the (exact)
 same name as the function, as this may confuse your linker.  Instead, you can
@ -308,7 +310,7 @@ use a different prefix, like above, or some other naming scheme.
 Now that all the pieces have been introduced, here is what they might look like
 when used together.
-```c
+@code
 #define GLFW_INCLUDE_GLEXT
 #include <GLFW/glfw3.h>
@ -336,5 +338,6 @@ void some_function(void)
        glSpecializeShaderARB(...);
    }
 }
-```
+@endcode
 */
--- a/docs/extra.css
+++ b/docs/extra.css
--- a/docs/extra.css.map
+++ b/docs/extra.css.map
@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AA8EA,2GAA4G,CAC3G,UAAU,CAAC,IAAI,CACf,WAAW,CAAC,IAAI,CAGjB,wBAAyB,CACxB,YAAY,CAAC,2CAAsD,CAGpE,4HAA6H,CAC5H,YAAY,CAAC,wCAAuD,CAGrE,wIAAyI,CACxI,YAAY,CAAC,wCAAuD,CAGrE,kBAAmB,CAClB,UAAU,CA9EgB,IAAa,CA+EvC,WAAW,CAAC,IAAI,CAGjB,sBAAuB,CACtB,KAAK,CAzFe,OAAa,CA0FjC,WAAW,CAAC,IAAI,CAGjB,4UAA6U,CAC5U,UAAU,CAAC,IAAI,CAGhB,kJAAmJ,CAClJ,MAAM,CAAC,IAAI,CAGZ,wHAAyH,CACxH,WAAW,CAAC,IAAI,CAGjB,qBAAsB,CACrB,UAAU,CAAC,IAAI,CAGhB,2LAA4L,CAC3L,OAAO,CAAC,CAAC,CAGV,wCAAyC,CACxC,OAAO,CAAC,IAAI,CAGb,iMAAkM,CACjM,UAAU,CApGW,OAA+B,CAuGrD,IAAK,CACJ,KAAK,CA1He,OAAa,CA6HlC,SAAU,CACN,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,aAAa,CAGzB,qDAAsD,CACrD,KAAK,CApHU,OAAa,CAqH5B,aAAa,CAAC,IAAI,CAGnB,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,SAAS,CAAC,IAAI,CAGf,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,aAAa,CAAC,CAAC,CACf,SAAS,CAAC,IAAI,CAGf,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,aAAa,CAAC,CAAC,CACf,SAAS,CAAC,IAAI,CAGf,WAAY,CACX,SAAS,CAAC,IAAI,CACd,UAAU,CAAC,IAAI,CACf,SAAS,CAAC,KAAK,CACf,OAAO,CAAC,MAAM,CACd,MAAM,CAAC,MAAM,CAEb,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,SAAS,CAAE,IAAI,CACf,eAAe,CAAE,UAAU,CAC3B,WAAW,CAAE,MAAM,CACnB,aAAa,CAAE,OAAO,CAGvB,SAAU,CACT,WAAW,CAAC,IAAI,CAChB,aAAa,CAAC,IAAI,CAClB,KAAK,CApKqB,IAAa,CAqKvC,SAAS,CAAC,KAAK,CACf,UAAU,CAAC,yDAAyD,CAGrE,WAAY,CACX,eAAe,CAAC,IAAI,CACpB,MAAM,CAAC,UAAU,CACjB,KAAK,CAAC,KAAK,CAGZ,wBAAyB,CACxB,KAAK,CAAC,IAAI,CAGX,mCAAoC,CACnC,WAAW,CAAC,IAAI,CAChB,WAAW,CAAC,GAAG,CACf,OAAO,CAAC,KAAK,CACb,KAAK,CAvLqB,IAAa,CA0LxC,WAAY,CACX,YAAY,CAAE,CAAC,CAGhB,6CAA8C,CAC7C,UAAU,CAAC,SAAS,CAGrB,kBAAmB,CAClB,KAAK,CAnMqB,IAAa,CAsMxC,cAAe,CACd,UAAU,CAAC,MAAM,CACjB,OAAO,CAAC,GAAG,CACX,UAAU,CAAC,GAAG,CAGf,IAAK,CACJ,UAAU,CA7MgB,IAAa,CAgNxC,SAAU,CACT,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,SAAS,CAAC,IAAI,CAGf,UAAW,CACV,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,SAAS,CAAC,IAAI,CAGf,SAAU,CACT,OAAO,CAAC,IAAI,CAGb,kBAAmB,CAClB,WAAW,CAAC,IAAI,CAChB,WAAW,CAAC,IAAI,CAGjB,UAAW,CACV,UAAU,CAAC,IAAI,CACf,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,SAAS,CAAE,IAAI,CACf,eAAe,CAAE,UAAU,CAC3B,WAAW,CAAE,MAAM,CACnB,aAAa,CAAE,OAAO,CAGvB,kBAAmB,CACf,aAAa,CAAE,IAAI,CAGvB,kEAAmE,CAClE,KAAK,CAxOgB,OAA+B,CA2OrD,+BAAgC,CAC/B,KAAK,CA9Pe,OAAa,CAiQlC,qCAAsC,CACrC,KAAK,CA9NoB,IAAsB,CAiOhD,wBAA2B,CAC1B,MAAM,CAAE,UAAU,CAGnB,SAAU,CACT,UAAU,CAAC,KAAK,CAGjB,uBAAwB,CACvB,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,OAAO,CAAC,MAAM,CACd,UAAU,CAAC,SAA8B,CAG1C,sDAAuD,CACtD,UAAU,CAAC,iDAAoF,CAC/F,UAAU,CAAC,mBAAuC,CAClD,WAAW,CAAC,kBAAgD,CAC5D,UAAU,CAAC,IAAI,CACf,KAAK,CAtPa,IAAe,CAyPlC,kBAAmB,CAClB,KAAK,CAzPoB,IAAsB,CA0P/C,OAAO,CAAC,IAAI,CACZ,aAAa,CAAC,GAAG,CACjB,gBAAgB,CAAC,OAAiC,CAGnD,OAAQ,CACP,KAAK,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAGV,oCAAoC,CACnC,OAAQ,CACP,KAAK,CAAC,IAAI,CACV,KAAK,CAAC,OAAO,CACb,MAAM,CAAC,CAAC,EAIV,UAAW,CACV,SAAS,CAAC,MAAM,CAGjB,UAAW,CACV,YAAY,CAAC,KAAK,CAGnB,UAAW,CACV,SAAS,CAAC,GAAG,CACb,YAAY,CAAC,CAAC,CACd,eAAe,CAAC,IAAI,CAIjB,mCAAqB,CACjB,WAAW,CAAC,KAAK,CAIzB,mCAAoC,CACnC,UAAU,CAAC,oDAAgF,CAC3F,UAAU,CAAC,sBAAqC,CAChD,WAAW,CAAC,cAA8C,CAC1D,KAAK,CAzTU,OAAa,CA0T5B,MAAM,CAAC,iBAAgC,CACvC,aAAa,CAAC,GAAG,CAGlB,UAAW,CACV,KAAK,CAlSkB,OAAgC,CAqSxD,aAAc,CACb,MAAM,CAAC,cAA+B,CACtC,sBAAsB,CAAC,GAAG,CAC1B,uBAAuB,CAAC,GAAG,CAC3B,aAAa,CAAC,IAAI,CAGnB,aAAc,CACb,MAAM,CAAC,cAA+B,CACtC,0BAA0B,CAAC,GAAG,CAC9B,yBAAyB,CAAC,GAAG,CAC7B,UAAU,CAAC,IAAI,CAGhB,kCAAmC,CAClC,eAAe,CAAC,OAAO,CACvB,cAAc,CAAC,CAAC,CAChB,MAAM,CAAC,cAA+B,CACtC,aAAa,CAAC,GAAG,CAGlB,+HAAgI,CAC/H,KAAK,CAnUoB,IAAsB,CAoU/C,eAAe,CAAC,IAAI,CAGrB,aAAc,CACb,eAAe,CAAC,OAAO,CACvB,cAAc,CAAC,CAAC,CAChB,MAAM,CAAC,cAA+B,CACtC,aAAa,CAAC,GAAG,CAGlB,gBAAiB,CAChB,MAAM,CAAC,GAAG,CACV,UAAU,CAAC,gEAAiH,CAG7H,mCAAoC,CA3TnC,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CA4T3D,uBAAwB,CA/TvB,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAgU3D,oBAAqB,CAnUpB,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAoU3D,eAAgB,CAvUf,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAwU3D,gGAAiG,CAChG,aAAa,CAAC,GAAG,CACjB,OAAO,CAAC,GAAG,CACX,WAAW,CAAC,cAAwB,CACpC,MAAM,CAAC,KAAK,CAGb,iRAAkR,CACjR,KAAK,CAAC,OAAO,CAGd,QAAS,CACR,WAAW,CAAC,OAAO,CAGpB,yBAA0B,CACzB,UAAU,CAAC,OAAa,CACxB,aAAa,CAAC,GAAG,CACjB,MAAM,CAAC,IAAI,CACX,OAAO,CAAC,GAAG,CACX,QAAQ,CAAC,IAAI,CACb,WAAW,CAAC,cAAuB,CACnC,MAAM,CAAC,KAAK,CAGb,8CAA+C,CAC9C,KAAK,CAjae,OAAa,CAoalC,8BAA+B,CAC9B,KAAK,CAAC,OAAiB,CAGxB,qBAAsB,CACrB,KAAK,CAAC,OAAgB,CAGvB,8CAA+C,CAC9C,KAAK,CAAC,OAA+B,CACrC,WAAW,CAAC,IAAI,CAGjB,kBAAmB,CAClB,KAAK,CAAC,OAAiB,CAGxB,IAAK,CACJ,OAAO,CAAC,IAAI,CACZ,aAAa,CAAC,GAAG",
+"mappings": "AA8EA,2GAA4G,CAC3G,UAAU,CAAC,IAAI,CACf,WAAW,CAAC,IAAI,CAGjB,wBAAyB,CACxB,YAAY,CAAC,2CAAsD,CAGpE,4HAA6H,CAC5H,YAAY,CAAC,wCAAuD,CAGrE,wIAAyI,CACxI,YAAY,CAAC,wCAAuD,CAGrE,kBAAmB,CAClB,UAAU,CA9EgB,IAAa,CA+EvC,WAAW,CAAC,IAAI,CAGjB,sBAAuB,CACtB,KAAK,CAzFe,OAAa,CA0FjC,WAAW,CAAC,IAAI,CAGjB,4UAA6U,CAC5U,UAAU,CAAC,IAAI,CAGhB,kJAAmJ,CAClJ,MAAM,CAAC,IAAI,CAGZ,wHAAyH,CACxH,WAAW,CAAC,IAAI,CAGjB,qBAAsB,CACrB,UAAU,CAAC,IAAI,CAGhB,2LAA4L,CAC3L,OAAO,CAAC,CAAC,CAGV,wCAAyC,CACxC,OAAO,CAAC,IAAI,CAGb,iMAAkM,CACjM,UAAU,CApGW,OAA+B,CAuGrD,IAAK,CACJ,KAAK,CA1He,OAAa,CA6HlC,SAAU,CACN,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,aAAa,CAGzB,qDAAsD,CACrD,KAAK,CApHU,OAAa,CAqH5B,aAAa,CAAC,IAAI,CAGnB,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,SAAS,CAAC,IAAI,CAGf,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,aAAa,CAAC,CAAC,CACf,SAAS,CAAC,IAAI,CAGf,EAAG,CACF,WAAW,CAAC,KAAK,CACjB,aAAa,CAAC,CAAC,CACf,SAAS,CAAC,IAAI,CAGf,WAAY,CACX,SAAS,CAAC,IAAI,CACd,UAAU,CAAC,IAAI,CACf,SAAS,CAAC,KAAK,CACf,OAAO,CAAC,MAAM,CACd,MAAM,CAAC,MAAM,CAEb,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,SAAS,CAAE,IAAI,CACf,eAAe,CAAE,UAAU,CAC3B,WAAW,CAAE,MAAM,CACnB,aAAa,CAAE,OAAO,CAGvB,SAAU,CACT,WAAW,CAAC,IAAI,CAChB,aAAa,CAAC,IAAI,CAClB,KAAK,CApKqB,IAAa,CAqKvC,SAAS,CAAC,KAAK,CACf,UAAU,CAAC,yDAAyD,CAGrE,WAAY,CACX,eAAe,CAAC,IAAI,CACpB,MAAM,CAAC,UAAU,CACjB,KAAK,CAAC,KAAK,CAGZ,wBAAyB,CACxB,KAAK,CAAC,IAAI,CAGX,mCAAoC,CACnC,WAAW,CAAC,IAAI,CAChB,WAAW,CAAC,GAAG,CACf,OAAO,CAAC,KAAK,CACb,KAAK,CAvLqB,IAAa,CA0LxC,WAAY,CACX,YAAY,CAAE,CAAC,CAGhB,6CAA8C,CAC7C,UAAU,CAAC,SAAS,CAGrB,kBAAmB,CAClB,KAAK,CAnMqB,IAAa,CAsMxC,cAAe,CACd,UAAU,CAAC,MAAM,CACjB,OAAO,CAAC,GAAG,CACX,UAAU,CAAC,GAAG,CAGf,IAAK,CACJ,UAAU,CA7MgB,IAAa,CAgNxC,SAAU,CACT,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,SAAS,CAAC,IAAI,CAGf,UAAW,CACV,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,SAAS,CAAC,IAAI,CAGf,SAAU,CACT,OAAO,CAAC,IAAI,CAGb,kBAAmB,CAClB,WAAW,CAAC,IAAI,CAChB,WAAW,CAAC,IAAI,CAGjB,UAAW,CACV,UAAU,CAAC,IAAI,CACf,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,SAAS,CAAE,IAAI,CACf,eAAe,CAAE,UAAU,CAC3B,WAAW,CAAE,MAAM,CACnB,aAAa,CAAE,OAAO,CAGvB,kEAAmE,CAClE,KAAK,CApOgB,OAA+B,CAuOrD,+BAAgC,CAC/B,KAAK,CA1Pe,OAAa,CA6PlC,qCAAsC,CACrC,KAAK,CA1NoB,IAAsB,CA6NhD,wBAA2B,CAC1B,MAAM,CAAE,UAAU,CAGnB,SAAU,CACT,UAAU,CAAC,KAAK,CAGjB,uBAAwB,CACvB,SAAS,CAAC,KAAK,CACf,MAAM,CAAC,MAAM,CACb,OAAO,CAAC,MAAM,CACd,UAAU,CAAC,SAA8B,CAG1C,sDAAuD,CACtD,UAAU,CAAC,iDAAoF,CAC/F,UAAU,CAAC,mBAAuC,CAClD,WAAW,CAAC,kBAAgD,CAC5D,UAAU,CAAC,IAAI,CACf,KAAK,CAlPa,IAAe,CAqPlC,kBAAmB,CAClB,KAAK,CArPoB,IAAsB,CAsP/C,OAAO,CAAC,IAAI,CACZ,aAAa,CAAC,GAAG,CACjB,gBAAgB,CAAC,OAAiC,CAGnD,OAAQ,CACP,KAAK,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAGV,oCAAoC,CACnC,OAAQ,CACP,KAAK,CAAC,IAAI,CACV,KAAK,CAAC,OAAO,CACb,MAAM,CAAC,CAAC,EAIV,UAAW,CACV,SAAS,CAAC,MAAM,CAGjB,UAAW,CACV,YAAY,CAAC,KAAK,CAGnB,UAAW,CACV,SAAS,CAAC,GAAG,CACb,YAAY,CAAC,CAAC,CACd,eAAe,CAAC,IAAI,CAIjB,mCAAqB,CACjB,WAAW,CAAC,KAAK,CAIzB,mCAAoC,CACnC,UAAU,CAAC,oDAAgF,CAC3F,UAAU,CAAC,sBAAqC,CAChD,WAAW,CAAC,cAA8C,CAC1D,KAAK,CArTU,OAAa,CAsT5B,MAAM,CAAC,iBAAgC,CACvC,aAAa,CAAC,GAAG,CAGlB,UAAW,CACV,KAAK,CA9RkB,OAAgC,CAiSxD,aAAc,CACb,MAAM,CAAC,cAA+B,CACtC,sBAAsB,CAAC,GAAG,CAC1B,uBAAuB,CAAC,GAAG,CAC3B,aAAa,CAAC,IAAI,CAGnB,aAAc,CACb,MAAM,CAAC,cAA+B,CACtC,0BAA0B,CAAC,GAAG,CAC9B,yBAAyB,CAAC,GAAG,CAC7B,UAAU,CAAC,IAAI,CAGhB,kCAAmC,CAClC,eAAe,CAAC,OAAO,CACvB,cAAc,CAAC,CAAC,CAChB,MAAM,CAAC,cAA+B,CACtC,aAAa,CAAC,GAAG,CAGlB,+HAAgI,CAC/H,KAAK,CA/ToB,IAAsB,CAgU/C,eAAe,CAAC,IAAI,CAGrB,aAAc,CACb,eAAe,CAAC,OAAO,CACvB,cAAc,CAAC,CAAC,CAChB,MAAM,CAAC,cAA+B,CACtC,aAAa,CAAC,GAAG,CAGlB,gBAAiB,CAChB,MAAM,CAAC,GAAG,CACV,UAAU,CAAC,gEAAiH,CAG7H,mCAAoC,CAvTnC,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAwT3D,uBAAwB,CA3TvB,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CA4T3D,oBAAqB,CA/TpB,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAgU3D,eAAgB,CAnUf,UAAU,CAAC,oDAAuE,CAClF,UAAU,CAAC,sBAAsC,CACjD,KAAK,CAAC,OAAwB,CAC9B,MAAM,CAAC,iBAAmD,CAoU3D,gGAAiG,CAChG,aAAa,CAAC,GAAG,CACjB,OAAO,CAAC,GAAG,CACX,WAAW,CAAC,cAAwB,CACpC,MAAM,CAAC,KAAK,CAGb,iRAAkR,CACjR,KAAK,CAAC,OAAO,CAGd,QAAS,CACR,WAAW,CAAC,OAAO,CAGpB,yBAA0B,CACzB,UAAU,CAAC,OAAa,CACxB,aAAa,CAAC,GAAG,CACjB,MAAM,CAAC,IAAI,CACX,OAAO,CAAC,GAAG,CACX,QAAQ,CAAC,IAAI,CACb,WAAW,CAAC,cAAuB,CACnC,MAAM,CAAC,KAAK,CAGb,8CAA+C,CAC9C,KAAK,CA7Ze,OAAa,CAgalC,8BAA+B,CAC9B,KAAK,CAAC,OAAiB,CAGxB,qBAAsB,CACrB,KAAK,CAAC,OAAgB,CAGvB,8CAA+C,CAC9C,KAAK,CAAC,OAA+B,CACrC,WAAW,CAAC,IAAI,CAGjB,kBAAmB,CAClB,KAAK,CAAC,OAAiB,CAGxB,IAAK,CACJ,OAAO,CAAC,IAAI,CACZ,aAAa,CAAC,GAAG",
 "sources": ["extra.scss"],
 "names": [],
 "file": "extra.css"
--- a/docs/extra.scss
+++ b/docs/extra.scss
@ -255,10 +255,6 @@ address.footer {
 	align-content: stretch;
 }
 #main-menu a:focus {
    outline-style: none;
 }
 #main-menu a,#main-menu a:visited,#main-menu a:hover,#main-menu li {
 	color:$navbar-link-color;
 }
--- a/docs/input.dox
+++ b/docs/input.dox
@ -1,6 +1,8 @@
-# Input guide {#input_guide}
+/*!
-[TOC]
+@page input_guide Input guide
@tableofcontents
 This guide introduces the input related functions of GLFW.  For details on
 a specific function in this category, see the @ref input.  There are also guides
@ -27,7 +29,7 @@ out all arguments provided for every event, along with time and sequence
 information.
-## Event processing {#events}
+@section events Event processing
 GLFW needs to poll the window system for events both to provide input to the
 application and to prove to the window system that the application hasn't locked
@ -40,18 +42,18 @@ There are three functions for processing pending events.  @ref glfwPollEvents,
 processes only those events that have already been received and then returns
 immediately.
-```c
+@code
 glfwPollEvents();
-```
+@endcode
 This is the best choice when rendering continuously, like most games do.
 If you only need to update the contents of the window when you receive new
 input, @ref glfwWaitEvents is a better choice.
-```c
+@code
 glfwWaitEvents();
-```
+@endcode
 It puts the thread to sleep until at least one event has been received and then
 processes all received events.  This saves a great deal of CPU cycles and is
@ -60,9 +62,9 @@ useful for, for example, editing tools.
 If you want to wait for events but have UI elements or other tasks that need
 periodic updates, @ref glfwWaitEventsTimeout lets you specify a timeout.
-```c
+@code
 glfwWaitEventsTimeout(0.7);
-```
+@endcode
 It puts the thread to sleep until at least one event has been received, or until
 the specified number of seconds have elapsed.  It then processes any received
@ -72,9 +74,9 @@ If the main thread is sleeping in @ref glfwWaitEvents, you can wake it from
 another thread by posting an empty event to the event queue with @ref
 glfwPostEmptyEvent.
-```c
+@code
 glfwPostEmptyEvent();
-```
+@endcode
 Do not assume that callbacks will _only_ be called in response to the above
 functions.  While it is necessary to process events in one or more of the ways
@ -89,7 +91,7 @@ a [window size callback](@ref window_size) GLFW will call it in turn with the
 new size before everything returns back out of the @ref glfwSetWindowSize call.
-## Keyboard input {#input_keyboard}
+@section input_keyboard Keyboard input
 GLFW divides keyboard input into two categories; key events and character
 events.  Key events relate to actual physical keyboard keys, whereas character
@ -101,25 +103,25 @@ may not be the case on your machine, but your users are likely not all using the
 same keyboard layout, input method or even operating system as you.
-### Key input {#input_key}
+@subsection input_key Key input
 If you wish to be notified when a physical key is pressed or released or when it
 repeats, set a key callback.
-```c
+@code
 glfwSetKeyCallback(window, key_callback);
-```
+@endcode
 The callback function receives the [keyboard key](@ref keys), platform-specific
 scancode, key action and [modifier bits](@ref mods).
-```c
+@code
 void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
 {
    if (key == GLFW_KEY_E && action == GLFW_PRESS)
        activate_airship();
 }
-```
+@endcode
 The action is one of `GLFW_PRESS`, `GLFW_REPEAT` or `GLFW_RELEASE`.  Events with
 `GLFW_PRESS` and `GLFW_RELEASE` actions are emitted for every key press.  Most
@ -147,21 +149,21 @@ different scancodes depending on the platform but they are safe to save to disk.
 You can query the scancode for any [key token](@ref keys) supported on the
 current platform with @ref glfwGetKeyScancode.
-```c
+@code
 const int scancode = glfwGetKeyScancode(GLFW_KEY_X);
 set_key_mapping(scancode, swap_weapons);
-```
+@endcode
 The last reported state for every physical key with a [key token](@ref keys) is
 also saved in per-window state arrays that can be polled with @ref glfwGetKey.
-```c
+@code
 int state = glfwGetKey(window, GLFW_KEY_E);
 if (state == GLFW_PRESS)
 {
    activate_airship();
 }
-```
+@endcode
 The returned state is one of `GLFW_PRESS` or `GLFW_RELEASE`.
@ -175,9 +177,9 @@ If a pressed key is released again before you poll its state, you will have
 missed the key press.  The recommended solution for this is to use a
 key callback, but there is also the `GLFW_STICKY_KEYS` input mode.
-```c
+@code
 glfwSetInputMode(window, GLFW_STICKY_KEYS, GLFW_TRUE);
-```
+@endcode
 When sticky keys mode is enabled, the pollable state of a key will remain
 `GLFW_PRESS` until the state of that key is polled with @ref glfwGetKey.  Once
@ -188,9 +190,9 @@ the state will reset to `GLFW_RELEASE`, otherwise it will remain `GLFW_PRESS`.
 If you wish to know what the state of the Caps Lock and Num Lock keys was when
 input events were generated, set the `GLFW_LOCK_KEY_MODS` input mode.
-```c
+@code
 glfwSetInputMode(window, GLFW_LOCK_KEY_MODS, GLFW_TRUE);
-```
+@endcode
 When this input mode is enabled, any callback that receives
 [modifier bits](@ref mods) will have the @ref GLFW_MOD_CAPS_LOCK bit set if Caps
@ -201,7 +203,7 @@ The `GLFW_KEY_LAST` constant holds the highest value of any
 [key token](@ref keys).
-### Text input {#input_char}
+@subsection input_char Text input
 GLFW supports text input in the form of a stream of
 [Unicode code points](https://en.wikipedia.org/wiki/Unicode), as produced by the
@ -215,30 +217,30 @@ you can treat the code point argument as native endian UTF-32.
 If you wish to offer regular text input, set a character callback.
-```c
+@code
 glfwSetCharCallback(window, character_callback);
-```
+@endcode
 The callback function receives Unicode code points for key events that would
 have led to regular text input and generally behaves as a standard text field on
 that platform.
-```c
+@code
 void character_callback(GLFWwindow* window, unsigned int codepoint)
 {
 }
-```
+@endcode
-### Key names {#input_key_name}
+@subsection input_key_name Key names
 If you wish to refer to keys by name, you can query the keyboard layout
 dependent name of printable keys with @ref glfwGetKeyName.
-```c
+@code
 const char* key_name = glfwGetKeyName(GLFW_KEY_W, 0);
 show_tutorial_hint("Press %s to move forward", key_name);
-```
+@endcode
 This function can handle both [keys and scancodes](@ref input_key).  If the
 specified key is `GLFW_KEY_UNKNOWN` then the scancode is used, otherwise it is
@ -246,42 +248,42 @@ ignored.  This matches the behavior of the key callback, meaning the callback
 arguments can always be passed unmodified to this function.
-## Mouse input {#input_mouse}
+@section input_mouse Mouse input
 Mouse input comes in many forms, including mouse motion, button presses and
 scrolling offsets.  The cursor appearance can also be changed, either to
 a custom image or a standard cursor shape from the system theme.
-### Cursor position {#cursor_pos}
+@subsection cursor_pos Cursor position
 If you wish to be notified when the cursor moves over the window, set a cursor
 position callback.
-```c
+@code
 glfwSetCursorPosCallback(window, cursor_position_callback);
-```
+@endcode
 The callback functions receives the cursor position, measured in screen
 coordinates but relative to the top-left corner of the window content area.  On
 platforms that provide it, the full sub-pixel cursor position is passed on.
-```c
+@code
 static void cursor_position_callback(GLFWwindow* window, double xpos, double ypos)
 {
 }
-```
+@endcode
 The cursor position is also saved per-window and can be polled with @ref
 glfwGetCursorPos.
-```c
+@code
 double xpos, ypos;
 glfwGetCursorPos(window, &xpos, &ypos);
-```
+@endcode
-### Cursor mode {#cursor_mode}
+@subsection cursor_mode Cursor mode
@anchor GLFW_CURSOR
 The `GLFW_CURSOR` input mode provides several cursor modes for special forms of
@ -293,9 +295,9 @@ If you wish to implement mouse motion based camera controls or other input
 schemes that require unlimited mouse movement, set the cursor mode to
 `GLFW_CURSOR_DISABLED`.
-```c
+@code
 glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
-```
+@endcode
 This will hide the cursor and lock it to the specified window.  GLFW will then
 take care of all the details of cursor re-centering and offset calculation and
@ -309,18 +311,18 @@ other features of GLFW.  It is not supported and will not work as robustly as
 If you only wish the cursor to become hidden when it is over a window but still
 want it to behave normally, set the cursor mode to `GLFW_CURSOR_HIDDEN`.
-```c
+@code
 glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
-```
+@endcode
 This mode puts no limit on the motion of the cursor.
 If you wish the cursor to be visible but confined to the content area of the
 window, set the cursor mode to `GLFW_CURSOR_CAPTURED`.
-```c
+@code
 glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_CAPTURED);
-```
+@endcode
 The cursor will behave normally inside the content area but will not be able to
 leave unless the window loses focus.
@ -328,15 +330,15 @@ leave unless the window loses focus.
 To exit out of either of these special modes, restore the `GLFW_CURSOR_NORMAL`
 cursor mode.
-```c
+@code
 glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
-```
+@endcode
 If the cursor was disabled, this will move it back to its last visible position.
@anchor GLFW_RAW_MOUSE_MOTION
-### Raw mouse motion {#raw_mouse_motion}
+@subsection raw_mouse_motion Raw mouse motion
 When the cursor is disabled, raw (unscaled and unaccelerated) mouse motion can
 be enabled if available.
@ -351,16 +353,16 @@ Call @ref glfwRawMouseMotionSupported to check if the current machine provides
 raw motion and set the `GLFW_RAW_MOUSE_MOTION` input mode to enable it.  It is
 disabled by default.
-```c
+@code
 if (glfwRawMouseMotionSupported())
    glfwSetInputMode(window, GLFW_RAW_MOUSE_MOTION, GLFW_TRUE);
-```
+@endcode
 If supported, raw mouse motion can be enabled or disabled per-window and at any
 time but it will only be provided when the cursor is disabled.
-### Cursor objects {#cursor_object}
+@subsection cursor_object Cursor objects
 GLFW supports creating both custom and system theme cursor images, encapsulated
 as @ref GLFWcursor objects.  They are created with @ref glfwCreateCursor or @ref
@ -368,13 +370,13 @@ glfwCreateStandardCursor and destroyed with @ref glfwDestroyCursor, or @ref
 glfwTerminate, if any remain.
-#### Custom cursor creation {#cursor_custom}
+@subsubsection cursor_custom Custom cursor creation
 A custom cursor is created with @ref glfwCreateCursor, which returns a handle to
 the created cursor object.  For example, this creates a 16x16 white square
 cursor with the hot-spot in the upper-left corner:
-```c
+@code
 unsigned char pixels[16 * 16 * 4];
 memset(pixels, 0xff, sizeof(pixels));
@ -384,7 +386,7 @@ image.height = 16;
 image.pixels = pixels;
 GLFWcursor* cursor = glfwCreateCursor(&image, 0, 0);
-```
+@endcode
 If cursor creation fails, `NULL` will be returned, so it is necessary to check
 the return value.
@ -394,14 +396,14 @@ per channel with the red channel first.  The pixels are arranged canonically as
 sequential rows, starting from the top-left corner.
-#### Standard cursor creation {#cursor_standard}
+@subsubsection cursor_standard Standard cursor creation
 A cursor with a [standard shape](@ref shapes) from the current system cursor
 theme can be created with @ref glfwCreateStandardCursor.
-```c
+@code
 GLFWcursor* url_cursor = glfwCreateStandardCursor(GLFW_POINTING_HAND_CURSOR);
-```
+@endcode
 These cursor objects behave in the exact same way as those created with @ref
 glfwCreateCursor except that the system cursor theme provides the actual image.
@ -410,26 +412,26 @@ A few of these shapes are not available everywhere.  If a shape is unavailable,
 `NULL` is returned.  See @ref glfwCreateStandardCursor for details.
-#### Cursor destruction {#cursor_destruction}
+@subsubsection cursor_destruction Cursor destruction
 When a cursor is no longer needed, destroy it with @ref glfwDestroyCursor.
-```c
+@code
 glfwDestroyCursor(cursor);
-```
+@endcode
 Cursor destruction always succeeds.  If the cursor is current for any window,
 that window will revert to the default cursor.  This does not affect the cursor
 mode.  All remaining cursors are destroyed when @ref glfwTerminate is called.
-#### Cursor setting {#cursor_set}
+@subsubsection cursor_set Cursor setting
 A cursor can be set as current for a window with @ref glfwSetCursor.
-```c
+@code
 glfwSetCursor(window, cursor);
-```
+@endcode
 Once set, the cursor image will be used as long as the system cursor is over the
 content area of the window and the [cursor mode](@ref cursor_mode) is set
@ -439,26 +441,26 @@ A single cursor may be set for any number of windows.
 To revert to the default cursor, set the cursor of that window to `NULL`.
-```c
+@code
 glfwSetCursor(window, NULL);
-```
+@endcode
 When a cursor is destroyed, any window that has it set will revert to the
 default cursor.  This does not affect the cursor mode.
-### Cursor enter/leave events {#cursor_enter}
+@subsection cursor_enter Cursor enter/leave events
 If you wish to be notified when the cursor enters or leaves the content area of
 a window, set a cursor enter/leave callback.
-```c
+@code
 glfwSetCursorEnterCallback(window, cursor_enter_callback);
-```
+@endcode
 The callback function receives the new classification of the cursor.
-```c
+@code
 void cursor_enter_callback(GLFWwindow* window, int entered)
 {
    if (entered)
@ -470,71 +472,52 @@ void cursor_enter_callback(GLFWwindow* window, int entered)
        // The cursor left the content area of the window
    }
 }
-```
+@endcode
 You can query whether the cursor is currently inside the content area of the
 window with the [GLFW_HOVERED](@ref GLFW_HOVERED_attrib) window attribute.
-```c
+@code
 if (glfwGetWindowAttrib(window, GLFW_HOVERED))
 {
    highlight_interface();
 }
-```
+@endcode
-### Mouse button input {#input_mouse_button}
+@subsection input_mouse_button Mouse button input
 If you wish to be notified when a mouse button is pressed or released, set
 a mouse button callback.
-```c
+@code
 glfwSetMouseButtonCallback(window, mouse_button_callback);
-```
+@endcode
@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).
-```c
+@code
 void mouse_button_callback(GLFWwindow* window, int button, int action, int mods)
 {
    if (button == GLFW_MOUSE_BUTTON_RIGHT && action == GLFW_PRESS)
        popup_menu();
 }
-```
+@endcode
 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
+@code
 int state = glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_LEFT);
 if (state == GLFW_PRESS)
 {
    upgrade_cow();
 }
-```
+@endcode
 The returned state is one of `GLFW_PRESS` or `GLFW_RELEASE`.
@ -548,9 +531,9 @@ missed the button press.  The recommended solution for this is to use a
 mouse button callback, but there is also the `GLFW_STICKY_MOUSE_BUTTONS`
 input mode.
-```c
+@code
 glfwSetInputMode(window, GLFW_STICKY_MOUSE_BUTTONS, GLFW_TRUE);
-```
+@endcode
 When sticky mouse buttons mode is enabled, the pollable state of a mouse button
 will remain `GLFW_PRESS` until the state of that button is polled with @ref
@ -559,30 +542,30 @@ 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}
+@subsection scrolling Scroll input
 If you wish to be notified when the user scrolls, whether with a mouse wheel or
 touchpad gesture, set a scroll callback.
-```c
+@code
 glfwSetScrollCallback(window, scroll_callback);
-```
+@endcode
 The callback function receives two-dimensional scroll offsets.
-```c
+@code
 void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
 {
 }
-```
+@endcode
 A normal mouse wheel, being vertical, provides offsets along the Y-axis.
-## Joystick input {#joystick}
+@section joystick Joystick input
 The joystick functions expose connected joysticks and controllers, with both
 referred to as joysticks.  It supports up to sixteen joysticks, ranging from
@ -590,9 +573,9 @@ referred to as joysticks.  It supports up to sixteen joysticks, ranging from
 `GLFW_JOYSTICK_LAST`.  You can test whether a [joystick](@ref joysticks) is
 present with @ref glfwJoystickPresent.
-```c
+@code
 int present = glfwJoystickPresent(GLFW_JOYSTICK_1);
-```
+@endcode
 Each joystick has zero or more axes, zero or more buttons, zero or more hats,
 a human-readable name, a user pointer and an SDL compatible GUID.
@ -612,30 +595,30 @@ To see all the properties of all connected joysticks in real-time, run the
 `joysticks` test program.
-### Joystick axis states {#joystick_axis}
+@subsection joystick_axis Joystick axis states
 The positions of all axes of a joystick are returned by @ref
 glfwGetJoystickAxes.  See the reference documentation for the lifetime of the
 returned array.
-```c
+@code
 int count;
 const float* axes = glfwGetJoystickAxes(GLFW_JOYSTICK_5, &count);
-```
+@endcode
 Each element in the returned array is a value between -1.0 and 1.0.
-### Joystick button states {#joystick_button}
+@subsection joystick_button Joystick button states
 The states of all buttons of a joystick are returned by @ref
 glfwGetJoystickButtons.  See the reference documentation for the lifetime of the
 returned array.
-```c
+@code
 int count;
 const unsigned char* buttons = glfwGetJoystickButtons(GLFW_JOYSTICK_3, &count);
-```
+@endcode
 Each element in the returned array is either `GLFW_PRESS` or `GLFW_RELEASE`.
@ -644,15 +627,15 @@ glfwGetJoystickHats, the button array by default also includes all hats.  See
 the reference documentation for @ref glfwGetJoystickButtons for details.
-### Joystick hat states {#joystick_hat}
+@subsection joystick_hat Joystick hat states
 The states of all hats are returned by @ref glfwGetJoystickHats.  See the
 reference documentation for the lifetime of the returned array.
-```c
+@code
 int count;
 const unsigned char* hats = glfwGetJoystickHats(GLFW_JOYSTICK_7, &count);
-```
+@endcode
 Each element in the returned array is one of the following:
@ -672,34 +655,34 @@ The diagonal directions are bitwise combinations of the primary (up, right, down
 and left) directions and you can test for these individually by ANDing it with
 the corresponding direction.
-```c
+@code
 if (hats[2] & GLFW_HAT_RIGHT)
 {
    // State of hat 2 could be right-up, right or right-down
 }
-```
+@endcode
 For backward compatibility with earlier versions that did not have @ref
 glfwGetJoystickHats, all hats are by default also included in the button array.
 See the reference documentation for @ref glfwGetJoystickButtons for details.
-### Joystick name {#joystick_name}
+@subsection joystick_name Joystick name
 The human-readable, UTF-8 encoded name of a joystick is returned by @ref
 glfwGetJoystickName.  See the reference documentation for the lifetime of the
 returned string.
-```c
+@code
 const char* name = glfwGetJoystickName(GLFW_JOYSTICK_4);
-```
+@endcode
 Joystick names are not guaranteed to be unique.  Two joysticks of the same model
 and make may have the same name.  Only the [joystick ID](@ref joysticks) is
 guaranteed to be unique, and only until that joystick is disconnected.
-### Joystick user pointer {#joystick_userptr}
+@subsection joystick_userptr Joystick user pointer
 Each joystick has a user pointer that can be set with @ref
 glfwSetJoystickUserPointer and queried with @ref glfwGetJoystickUserPointer.
@ -710,19 +693,19 @@ terminated.
 The initial value of the pointer is `NULL`.
-### Joystick configuration changes {#joystick_event}
+@subsection joystick_event Joystick configuration changes
 If you wish to be notified when a joystick is connected or disconnected, set
 a joystick callback.
-```c
+@code
 glfwSetJoystickCallback(joystick_callback);
-```
+@endcode
 The callback function receives the ID of the joystick that has been connected
 and disconnected and the event that occurred.
-```c
+@code
 void joystick_callback(int jid, int event)
 {
    if (event == GLFW_CONNECTED)
@ -734,7 +717,7 @@ void joystick_callback(int jid, int event)
        // The joystick was disconnected
    }
 }
-```
+@endcode
 For joystick connection and disconnection events to be delivered on all
 platforms, you need to call one of the [event processing](@ref events)
@ -747,17 +730,15 @@ useful values for a disconnected joystick and only before the monitor callback
 returns.
-### Gamepad input {#gamepad}
+@subsection gamepad Gamepad input
 The joystick functions provide unlabeled axes, buttons and hats, with no
 indication of where they are located on the device.  Their order may also vary
 between platforms even with the same device.
 To solve this problem the SDL community crowdsourced the
-[SDL_GameControllerDB][] project, a database of mappings from many different
+[SDL_GameControllerDB](https://github.com/gabomdq/SDL_GameControllerDB) project,
-devices to an Xbox-like gamepad.
+a database of mappings from many different devices to an Xbox-like gamepad.
 [SDL_GameControllerDB]: https://github.com/gabomdq/SDL_GameControllerDB
 GLFW supports this mapping format and contains a copy of the mappings
 available at the time of release.  See @ref gamepad_mapping for how to update
@ -767,12 +748,12 @@ a joystick is connected or the mappings are updated.
 You can check whether a joystick is both present and has a gamepad mapping with
@ref glfwJoystickIsGamepad.
-```c
+@code
 if (glfwJoystickIsGamepad(GLFW_JOYSTICK_2))
 {
    // Use as gamepad
 }
-```
+@endcode
 If you are only interested in gamepad input you can use this function instead of
@ref glfwJoystickPresent.
@ -781,13 +762,13 @@ You can query the human-readable name provided by the gamepad mapping with @ref
 glfwGetGamepadName.  This may or may not be the same as the
 [joystick name](@ref joystick_name).
-```c
+@code
 const char* name = glfwGetGamepadName(GLFW_JOYSTICK_7);
-```
+@endcode
 To retrieve the gamepad state of a joystick, call @ref glfwGetGamepadState.
-```c
+@code
 GLFWgamepadstate state;
 if (glfwGetGamepadState(GLFW_JOYSTICK_3, &state))
@ -799,7 +780,7 @@ if (glfwGetGamepadState(GLFW_JOYSTICK_3, &state))
    input_speed(state.axes[GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER]);
 }
-```
+@endcode
 The @ref GLFWgamepadstate struct has two arrays; one for button states and one
 for axis states.  The values for each button and axis are the same as for the
@ -830,17 +811,18 @@ The `GLFW_GAMEPAD_BUTTON_LAST` and `GLFW_GAMEPAD_AXIS_LAST` constants equal
 the largest available index for each array.
-### Gamepad mappings {#gamepad_mapping}
+@subsection gamepad_mapping Gamepad mappings
-GLFW contains a copy of the mappings available in [SDL_GameControllerDB][] at
+GLFW contains a copy of the mappings available in
-the time of release.  Newer ones can be added at runtime with @ref
+[SDL_GameControllerDB](https://github.com/gabomdq/SDL_GameControllerDB) at the
 time of release.  Newer ones can be added at runtime with @ref
 glfwUpdateGamepadMappings.
-```c
+@code
 const char* mappings = load_file_contents("game/data/gamecontrollerdb.txt");
 glfwUpdateGamepadMappings(mappings);
-```
+@endcode
 This function supports everything from single lines up to and including the
 unmodified contents of the whole `gamecontrollerdb.txt` file.
@ -900,25 +882,25 @@ one built into GLFW for Xbox controllers accessed via the XInput API on Windows.
 This example has been broken into several lines to fit on the page, but real
 gamepad mappings must be a single line.
-```
+@code{.unparsed}
 78696e70757401000000000000000000,XInput Gamepad (GLFW),platform:Windows,a:b0,
 b:b1,x:b2,y:b3,leftshoulder:b4,rightshoulder:b5,back:b6,start:b7,leftstick:b8,
 rightstick:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,
 righttrigger:a5,dpup:h0.1,dpright:h0.2,dpdown:h0.4,dpleft:h0.8,
-```
+@endcode
@note GLFW does not yet support the output range and modifiers `+` and `-` that
 were recently added to SDL.  The input modifiers `+`, `-` and `~` are supported
 and described above.
-## Time input {#time}
+@section time Time input
 GLFW provides high-resolution time input, in seconds, with @ref glfwGetTime.
-```c
+@code
 double seconds = glfwGetTime();
-```
+@endcode
 It returns the number of seconds since the library was initialized with @ref
 glfwInit.  The platform-specific time sources used typically have micro- or
@ -926,9 +908,9 @@ nanosecond resolution.
 You can modify the base time with @ref glfwSetTime.
-```c
+@code
 glfwSetTime(4.0);
-```
+@endcode
 This sets the time to the specified time, in seconds, and it continues to count
 from there.
@ -936,32 +918,32 @@ from there.
 You can also access the raw timer used to implement the functions above,
 with @ref glfwGetTimerValue.
-```c
+@code
 uint64_t value = glfwGetTimerValue();
-```
+@endcode
 This value is in 1&nbsp;/&nbsp;frequency seconds.  The frequency of the raw
 timer varies depending on the operating system and hardware.  You can query the
 frequency, in Hz, with @ref glfwGetTimerFrequency.
-```c
+@code
 uint64_t frequency = glfwGetTimerFrequency();
-```
+@endcode
-## Clipboard input and output {#clipboard}
+@section clipboard Clipboard input and output
 If the system clipboard contains a UTF-8 encoded string or if it can be
 converted to one, you can retrieve it with @ref glfwGetClipboardString.  See the
 reference documentation for the lifetime of the returned string.
-```c
+@code
 const char* text = glfwGetClipboardString(NULL);
 if (text)
 {
    insert_text(text);
 }
-```
+@endcode
 If the clipboard is empty or if its contents could not be converted, `NULL` is
 returned.
@ -969,32 +951,33 @@ returned.
 The contents of the system clipboard can be set to a UTF-8 encoded string with
@ref glfwSetClipboardString.
-```c
+@code
 glfwSetClipboardString(NULL, "A string with words in it");
-```
+@endcode
-## Path drop input {#path_drop}
+@section path_drop Path drop input
 If you wish to receive the paths of files and/or directories dropped on
 a window, set a file drop callback.
-```c
+@code
 glfwSetDropCallback(window, drop_callback);
-```
+@endcode
 The callback function receives an array of paths encoded as UTF-8.
-```c
+@code
 void drop_callback(GLFWwindow* window, int count, const char** paths)
 {
    int i;
    for (i = 0;  i < count;  i++)
        handle_dropped_file(paths[i]);
 }
-```
+@endcode
 The path array and its strings are only valid until the file drop callback
 returns, as they may have been generated specifically for that event.  You need
 to make a deep copy of the array if you want to keep the paths.
 */
--- a/docs/internal.dox
+++ b/docs/internal.dox
@ -1,12 +1,14 @@
-# Internal structure {#internals_guide}
+/*!
-[TOC]
+@page internals_guide Internal structure
@tableofcontents
 There are several interfaces inside GLFW.  Each interface has its own area of
 responsibility and its own naming conventions.
-## Public interface {#internals_public}
+@section internals_public Public interface
 The most well-known is the public interface, described in the glfw3.h header
 file.  This is implemented in source files shared by all platforms and these
@ -20,7 +22,7 @@ it use headless camel case.
 Examples: `glfwCreateWindow`, `GLFWwindow`, `GLFW_RED_BITS`
-## Native interface {#internals_native}
+@section internals_native Native interface
 The [native interface](@ref native) is a small set of publicly available
 but platform-specific functions, described in the glfw3native.h header file and
@ -34,7 +36,7 @@ from.
 Examples: `glfwGetX11Window`, `glfwGetWGLContext`
-## Internal interface {#internals_internal}
+@section internals_internal Internal interface
 The internal interface consists of utility functions used by all other
 interfaces.  It is shared code implemented in the same shared source files as
@ -50,7 +52,7 @@ global names have a leading underscore.
 Examples: `_glfwIsValidContextConfig`, `_GLFWwindow`, `_glfw.monitorCount`
-## Platform interface {#internals_platform}
+@section internals_platform Platform interface
 The platform interface implements all platform-specific operations as a service
 to the public interface.  This includes event processing.  The platform
@ -88,7 +90,7 @@ prevents shared code from accidentally using these members.
 Examples: `window->win32.handle`, `_glfw.x11.display`
-## Event interface {#internals_event}
+@section internals_event Event interface
 The event interface is implemented in the same shared source files as the public
 interface and is responsible for delivering the events it receives to the
@ -100,7 +102,7 @@ ObjectEvent pattern.
 Examples: `_glfwInputWindowFocus`, `_glfwInputCursorPos`
-## Static functions {#internals_static}
+@section internals_static Static functions
 Static functions may be used by any interface and have no prefixes or suffixes.
 These use headless camel case.
@ -108,7 +110,7 @@ These use headless camel case.
 Examples: `isValidElementForJoystick`
-## Configuration macros {#internals_config}
+@section internals_config Configuration macros
 GLFW uses a number of configuration macros to select at compile time which
 interfaces and code paths to use.  They are defined in the GLFW CMake target.
@ -118,3 +120,4 @@ with a leading underscore.
 Examples: `_GLFW_WIN32`, `_GLFW_BUILD_DLL`
 */
--- a/docs/intro.dox
+++ b/docs/intro.dox
@ -1,6 +1,8 @@
-# Introduction to the API {#intro_guide}
+/*!
-[TOC]
+@page intro_guide Introduction to the API
@tableofcontents
 This guide introduces the basic concepts of GLFW and describes initialization,
 error handling and API guarantees and limitations.  For a broad but shallow
@ -16,7 +18,7 @@ There are also guides for the other areas of GLFW.
 - @ref input_guide
-## Initialization and termination {#intro_init}
+@section intro_init Initialization and termination
 Before most GLFW functions may be called, the library must be initialized.
 This initialization checks what features are available on the machine,
@ -41,17 +43,17 @@ Calling any other function before successful initialization will cause a @ref
 GLFW_NOT_INITIALIZED error.
-### Initializing GLFW {#intro_init_init}
+@subsection intro_init_init Initializing GLFW
 The library is initialized with @ref glfwInit, which returns `GLFW_FALSE` if an
 error occurred.
-```c
+@code
 if (!glfwInit())
 {
    // Handle initialization failure
 }
-```
+@endcode
 If any part of initialization fails, any parts that succeeded are terminated as
 if @ref glfwTerminate had been called.  The library only needs to be initialized
@ -69,14 +71,14 @@ main menu and dock icon can be disabled with the @ref GLFW_COCOA_MENUBAR init
 hint.
-### Initialization hints {#init_hints}
+@subsection init_hints Initialization hints
 Initialization hints are set before @ref glfwInit and affect how the library
 behaves until termination.  Hints are set with @ref glfwInitHint.
-```c
+@code
 glfwInitHint(GLFW_JOYSTICK_HAT_BUTTONS, GLFW_FALSE);
-```
+@endcode
 The values you set hints to are never reset by GLFW, but they only take effect
 during initialization.  Once GLFW has been initialized, any values you set will
@ -87,12 +89,12 @@ will only affect their specific platform.  Other platforms will ignore them.
 Setting these hints requires no platform specific headers or functions.
-#### Shared init hints {#init_hints_shared}
+@subsubsection init_hints_shared Shared init hints
@anchor GLFW_PLATFORM
 __GLFW_PLATFORM__ specifies the platform to use for windowing and input.
 Possible values are `GLFW_ANY_PLATFORM`, `GLFW_PLATFORM_WIN32`,
-`GLFW_PLATFORM_COCOA`, `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` and
+`GLFW_PLATFORM_COCOA`, `GLFW_PLATFORM_X11`, `GLFW_PLATFORM_WAYLAND` and
 `GLFW_PLATFORM_NULL`.  The default value is `GLFW_ANY_PLATFORM`, which will
 choose any platform the library includes support for except for the Null
 backend.
@ -105,21 +107,20 @@ glfwGetJoystickHats.  Possible values are `GLFW_TRUE` and `GLFW_FALSE`.
@anchor GLFW_ANGLE_PLATFORM_TYPE_hint
 __GLFW_ANGLE_PLATFORM_TYPE__ specifies the platform type (rendering backend) to
-request when using OpenGL ES and EGL via [ANGLE][].  If the requested platform
+request when using OpenGL ES and EGL via
-type is unavailable, ANGLE will use its default. Possible values are one of
+[ANGLE](https://chromium.googlesource.com/angle/angle/).  If the requested
-`GLFW_ANGLE_PLATFORM_TYPE_NONE`, `GLFW_ANGLE_PLATFORM_TYPE_OPENGL`,
+platform type is unavailable, ANGLE will use its default. Possible values are
 one of `GLFW_ANGLE_PLATFORM_TYPE_NONE`, `GLFW_ANGLE_PLATFORM_TYPE_OPENGL`,
 `GLFW_ANGLE_PLATFORM_TYPE_OPENGLES`, `GLFW_ANGLE_PLATFORM_TYPE_D3D9`,
 `GLFW_ANGLE_PLATFORM_TYPE_D3D11`, `GLFW_ANGLE_PLATFORM_TYPE_VULKAN` and
 `GLFW_ANGLE_PLATFORM_TYPE_METAL`.
 [ANGLE]: https://chromium.googlesource.com/angle/angle/
 The ANGLE platform type is specified via the `EGL_ANGLE_platform_angle`
 extension.  This extension is not used if this hint is
 `GLFW_ANGLE_PLATFORM_TYPE_NONE`, which is the default value.
-#### macOS specific init hints {#init_hints_osx}
+@subsubsection init_hints_osx macOS specific init hints
@anchor GLFW_COCOA_CHDIR_RESOURCES_hint
 __GLFW_COCOA_CHDIR_RESOURCES__ specifies whether to set the current directory to
@ -134,17 +135,7 @@ a nib or manually by GLFW.  Possible values are `GLFW_TRUE` and `GLFW_FALSE`.
 This is ignored on other platforms.
-#### Wayland specific init hints {#init_hints_wayland}
+@subsubsection init_hints_x11 X11 specific init hints
@anchor GLFW_WAYLAND_LIBDECOR_hint
 __GLFW_WAYLAND_LIBDECOR__ specifies whether to use [libdecor][] for window
 decorations where available.  Possible values are `GLFW_WAYLAND_PREFER_LIBDECOR`
 and `GLFW_WAYLAND_DISABLE_LIBDECOR`.  This is ignored on other platforms.
 [libdecor]: https://gitlab.freedesktop.org/libdecor/libdecor
 #### X11 specific init hints {#init_hints_x11}
@anchor GLFW_X11_XCB_VULKAN_SURFACE_hint
 __GLFW_X11_XCB_VULKAN_SURFACE__ specifies whether to prefer the
@ -153,67 +144,76 @@ the `VK_KHR_xlib_surface` extension.  Possible values are `GLFW_TRUE` and
 `GLFW_FALSE`.  This is ignored on other platforms.
-#### Supported and default values {#init_hints_values}
+@subsubsection init_hints_wayland Wayland specific init hints
@anchor GLFW_WAYLAND_LIBDECOR_hint
 __GLFW_WAYLAND_LIBDECOR__ specifies whether to use
 [libdecor](https://gitlab.freedesktop.org/libdecor/libdecor) for window
 decorations where available.  Possible values are `GLFW_WAYLAND_PREFER_LIBDECOR`
 and `GLFW_WAYLAND_DISABLE_LIBDECOR`.  This is ignored on other platforms.
@subsubsection init_hints_values Supported and default values
 Initialization hint              | Default value                   | Supported values
 -------------------------------- | ------------------------------- | ----------------
-@ref GLFW_PLATFORM               | `GLFW_ANY_PLATFORM`             | `GLFW_ANY_PLATFORM`, `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`, `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` or `GLFW_PLATFORM_NULL`
+@ref GLFW_PLATFORM               | `GLFW_ANY_PLATFORM`             | `GLFW_ANY_PLATFORM`, `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`, `GLFW_PLATFORM_X11`, `GLFW_PLATFORM_WAYLAND` or `GLFW_PLATFORM_NULL`
@ref GLFW_JOYSTICK_HAT_BUTTONS   | `GLFW_TRUE`                     | `GLFW_TRUE` or `GLFW_FALSE`
@ref GLFW_ANGLE_PLATFORM_TYPE    | `GLFW_ANGLE_PLATFORM_TYPE_NONE` | `GLFW_ANGLE_PLATFORM_TYPE_NONE`, `GLFW_ANGLE_PLATFORM_TYPE_OPENGL`, `GLFW_ANGLE_PLATFORM_TYPE_OPENGLES`, `GLFW_ANGLE_PLATFORM_TYPE_D3D9`, `GLFW_ANGLE_PLATFORM_TYPE_D3D11`, `GLFW_ANGLE_PLATFORM_TYPE_VULKAN` or `GLFW_ANGLE_PLATFORM_TYPE_METAL`
@ref GLFW_COCOA_CHDIR_RESOURCES  | `GLFW_TRUE`                     | `GLFW_TRUE` or `GLFW_FALSE`
@ref GLFW_COCOA_MENUBAR          | `GLFW_TRUE`                     | `GLFW_TRUE` or `GLFW_FALSE`
@ref GLFW_WAYLAND_LIBDECOR       | `GLFW_WAYLAND_PREFER_LIBDECOR`  | `GLFW_WAYLAND_PREFER_LIBDECOR` or `GLFW_WAYLAND_DISABLE_LIBDECOR`
@ref GLFW_X11_XCB_VULKAN_SURFACE | `GLFW_TRUE`                     | `GLFW_TRUE` or `GLFW_FALSE`
@ref GLFW_WAYLAND_LIBDECOR       | `GLFW_WAYLAND_PREFER_LIBDECOR`  | `GLFW_WAYLAND_PREFER_LIBDECOR` or `GLFW_WAYLAND_DISABLE_LIBDECOR`
-### Runtime platform selection {#platform}
+@subsection platform Runtime platform selection
 GLFW can be compiled for more than one platform (window system) at once.  This lets
-a single library binary support both Wayland and X11 on Linux and other Unix-like systems.
+a single library binary support both X11 and Wayland on Linux and other Unix-like systems.
 You can control platform selection via the @ref GLFW_PLATFORM initialization hint.  By
 default, this is set to @ref GLFW_ANY_PLATFORM, which will look for supported window
 systems in order of priority and select the first one it finds.  It can also be set to any
 specific platform to have GLFW only look for that one.
-```c
+@code
 glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
-```
+@endcode
 This mechanism also provides the Null platform, which is always supported but needs to be
 explicitly requested.  This platform is effectively a stub, emulating a window system on
 a single 1080p monitor, but will not interact with any actual window system.
-```c
+@code
 glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_NULL);
-```
+@endcode
 You can test whether a library binary was compiled with support for a specific platform
 with @ref glfwPlatformSupported.
-```c
+@code
 if (glfwPlatformSupported(GLFW_PLATFORM_WAYLAND))
    glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_WAYLAND);
-```
+@endcode
 Once GLFW has been initialized, you can query which platform was selected with @ref
 glfwGetPlatform.
-```c
+@code
 int platform = glfwGetPlatform();
-```
+@endcode
 If you are using any [native access functions](@ref native), especially on Linux and other
 Unix-like systems, then you may need to check that you are calling the ones matching the
 selected platform.
-### Custom heap memory allocator {#init_allocator}
+@subsection init_allocator Custom heap memory allocator
 The heap memory allocator can be customized before initialization with @ref
 glfwInitAllocator.
-```c
+@code
 GLFWallocator allocator;
 allocator.allocate = my_malloc;
 allocator.reallocate = my_realloc;
@ -221,11 +221,11 @@ allocator.deallocate = my_free;
 allocator.user = NULL;
 glfwInitAllocator(&allocator);
-```
+@endcode
-The allocator will be made active at the beginning of initialization and will be used by
+The allocator will be picked up at the beginning of initialization and will be
-GLFW until the library has been fully terminated.  Any allocator set after initialization
+used until GLFW has been fully terminated.  Any allocator set after
-will be picked up only at the next initialization.
+initialization will be picked up only at the next initialization.
 The allocator will only be used for allocations that would have been made with
 the C standard library.  Memory allocations that must be made with platform
@ -235,54 +235,45 @@ The allocation function must have a signature matching @ref GLFWallocatefun.  It
 the desired size, in bytes, and the user pointer passed to @ref glfwInitAllocator and
 returns the address to the allocated memory block.
-```c
+@code
 void* my_malloc(size_t size, void* user)
 {
    ...
 }
-```
+@endcode
 The documentation for @ref GLFWallocatefun also lists the requirements and limitations for
 an allocation function.  If the active one does not meet all of these, GLFW may fail.
 The reallocation function must have a function signature matching @ref GLFWreallocatefun.
 It receives the memory block to be reallocated, the new desired size, in bytes, and the user
 pointer passed to @ref glfwInitAllocator and returns the address to the resized memory
 block.
-```c
+@code
 void* my_realloc(void* block, size_t size, void* user)
 {
    ...
 }
-```
+@endcode
 The documentation for @ref GLFWreallocatefun also lists the requirements and limitations
 for a reallocation function.  If the active one does not meet all of these, GLFW may fail.
 The deallocation function must have a function signature matching @ref GLFWdeallocatefun.
 It receives the memory block to be deallocated and the user pointer passed to @ref
 glfwInitAllocator.
-```c
+@code
 void my_free(void* block, void* user)
 {
    ...
 }
-```
+@endcode
 The documentation for @ref GLFWdeallocatefun also lists the requirements and limitations
 for a deallocation function.  If the active one does not meet all of these, GLFW may fail.
-### Terminating GLFW {#intro_init_terminate}
+@subsection intro_init_terminate Terminating GLFW
 Before your application exits, you should terminate the GLFW library if it has
 been initialized.  This is done with @ref glfwTerminate.
-```c
+@code
 glfwTerminate();
-```
+@endcode
 This will destroy any remaining window, monitor and cursor objects, restore any
 modified gamma ramps, re-enable the screensaver if it had been disabled and free
@ -294,7 +285,7 @@ library was not initialized or had already been terminated, it returns
 immediately.
-## Error handling {#error_handling}
+@section error_handling Error handling
 Some GLFW functions have return values that indicate an error, but this is often
 not very helpful when trying to figure out what happened or why it occurred.
@ -305,12 +296,12 @@ values.
 The last [error code](@ref errors) for the calling thread can be queried at any
 time with @ref glfwGetError.
-```c
+@code
 int code = glfwGetError(NULL);
 if (code != GLFW_NO_ERROR)
    handle_error(code);
-```
+@endcode
 If no error has occurred since the last call, @ref GLFW_NO_ERROR (zero) is
 returned.  The error is cleared before the function returns.
@ -324,13 +315,13 @@ can retrieve a UTF-8 encoded human-readable description along with the error
 code.  If no error has occurred since the last call, the description is set to
 `NULL`.
-```c
+@code
 const char* description;
 int code = glfwGetError(&description);
 if (description)
    display_error_message(code, description);
-```
+@endcode
 The retrieved description string is only valid until the next error occurs.
 This means you must make a copy of it if you want to keep it.
@ -338,19 +329,19 @@ This means you must make a copy of it if you want to keep it.
 You can also set an error callback, which will be called each time an error
 occurs.  It is set with @ref glfwSetErrorCallback.
-```c
+@code
 glfwSetErrorCallback(error_callback);
-```
+@endcode
 The error callback receives the same error code and human-readable description
 returned by @ref glfwGetError.
-```c
+@code
 void error_callback(int code, const char* description)
 {
    display_error_message(code, description);
 }
-```
+@endcode
 The error callback is called after the error is stored, so calling @ref
 glfwGetError from within the error callback returns the same values as the
@ -369,7 +360,7 @@ Do not rely on a currently invalid call to generate a specific error, as in the
 future that same call may generate a different error or become valid.
-## Coordinate systems {#coordinate_systems}
+@section coordinate_systems Coordinate systems
 GLFW has two primary coordinate systems: the _virtual screen_ and the window
 _content area_ or _content area_.  Both use the same unit: _virtual screen
@ -406,7 +397,7 @@ between screen coordinates and pixels may also change at run-time depending on
 which monitor the window is currently considered to be on.
-## Guarantees and limitations {#guarantees_limitations}
+@section guarantees_limitations Guarantees and limitations
 This section describes the conditions under which GLFW can be expected to
 function, barring bugs in the operating system or drivers.  Use of GLFW outside
@ -415,7 +406,7 @@ time, or on some versions of GLFW, but it may break at any time and this will
 not be considered a bug.
-### Pointer lifetimes {#lifetime}
+@subsection lifetime Pointer lifetimes
 GLFW will never free any pointer you provide to it, and you must never free any
 pointer it provides to you.
@ -435,7 +426,7 @@ Pointer lifetimes are guaranteed not to be shortened in future minor or patch
 releases.
-### Reentrancy {#reentrancy}
+@subsection reentrancy Reentrancy
 GLFW event processing and object destruction are not reentrant.  This means that
 the following functions must not be called from any callback function:
@ -451,7 +442,7 @@ These functions may be made reentrant in future minor or patch releases, but
 functions not on this list will not be made non-reentrant.
-### Thread safety {#thread_safety}
+@subsection thread_safety Thread safety
 Most GLFW functions must only be called from the main thread (the thread that
 calls main), but some may be called from any thread once the library has been
@ -532,7 +523,7 @@ but functions that are currently limited to the main thread may be updated to
 allow calls from any thread in future releases.
-### Version compatibility {#compatibility}
+@subsection compatibility Version compatibility
 GLFW uses [Semantic Versioning](https://semver.org/).  This guarantees source
 and binary backward compatibility with earlier minor versions of the API.  This
@ -552,14 +543,14 @@ fixed in the next release.  The reference documentation will also take
 precedence over anything stated in a guide.
-### Event order {#event_order}
+@subsection event_order Event order
 The order of arrival of related events is not guaranteed to be consistent
 across platforms.  The exception is synthetic key and mouse button release
 events, which are always delivered after the window defocus event.
-## Version management {#intro_version}
+@section intro_version Version management
 GLFW provides mechanisms for identifying what version of GLFW your application
 was compiled against as well as what version it is currently running against.
@ -567,33 +558,33 @@ If you are loading GLFW dynamically (not just linking dynamically), you can use
 this to verify that the library binary is compatible with your application.
-### Compile-time version {#intro_version_compile}
+@subsection intro_version_compile Compile-time version
 The compile-time version of GLFW is provided by the GLFW header with the
 `GLFW_VERSION_MAJOR`, `GLFW_VERSION_MINOR` and `GLFW_VERSION_REVISION` macros.
-```c
+@code
 printf("Compiled against GLFW %i.%i.%i\n",
       GLFW_VERSION_MAJOR,
       GLFW_VERSION_MINOR,
       GLFW_VERSION_REVISION);
-```
+@endcode
-### Run-time version {#intro_version_runtime}
+@subsection intro_version_runtime Run-time version
 The run-time version can be retrieved with @ref glfwGetVersion, a function that
 may be called regardless of whether GLFW is initialized.
-```c
+@code
 int major, minor, revision;
 glfwGetVersion(&major, &minor, &revision);
 printf("Running against GLFW %i.%i.%i\n", major, minor, revision);
-```
+@endcode
-### Version string {#intro_version_string}
+@subsection intro_version_string Version string
 GLFW 3 also provides a compile-time generated version string that describes the
 version, platform, compiler and any platform-specific compile-time options.
@ -621,17 +612,18 @@ 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 as a DLL for Windows, may result in a version string
+For example, compiling GLFW 3.4 with MinGW as a DLL for Windows, may result in a version string
 like this:
-```c
+@code
-3.5.0 Win32 WGL Null EGL OSMesa MinGW DLL
+3.4.0 Win32 WGL Null EGL OSMesa MinGW DLL
-```
+@endcode
 Compiling GLFW as a static library for Linux, with both Wayland and X11 enabled, may
 result in a version string like this:
-```c
+@code
-3.5.0 Wayland X11 GLX Null EGL OSMesa monotonic
+3.4.0 Wayland X11 GLX Null EGL OSMesa monotonic
-```
+@endcode
 */
--- a/docs/main.dox
+++ b/docs/main.dox
@ -1,10 +1,14 @@
-# Introduction {#mainpage}
+/*!
@mainpage notitle
@section main_intro Introduction
 GLFW is a free, 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.
-@ref news list new features, caveats and deprecations.
+@ref news_34 list new features, caveats and deprecations.
@ref quick_guide is a guide for users new to GLFW.  It takes you through how to
 write a small but complete program.
@ -29,6 +33,9 @@ use the new API.
 There is a section on @ref guarantees_limitations for pointer lifetimes,
 reentrancy, thread safety, event order and backward and forward compatibility.
 The [FAQ](https://www.glfw.org/faq.html) answers many common questions about the
 design, implementation and use of GLFW.
 Finally, @ref compat_guide explains what APIs, standards and protocols GLFW uses
 and what happens when they are not present on a given machine.
@ -36,3 +43,4 @@ This documentation was generated with Doxygen.  The sources for it are available
 in both the [source distribution](https://www.glfw.org/download.html) and
 [GitHub repository](https://github.com/glfw/glfw).
 */
--- a/docs/monitor.dox
+++ b/docs/monitor.dox
@ -1,6 +1,8 @@
-# Monitor guide {#monitor_guide}
+/*!
-[TOC]
+@page monitor_guide Monitor guide
@tableofcontents
 This guide introduces the monitor related functions of GLFW.  For details on
 a specific function in this category, see the @ref monitor.  There are also
@ -13,7 +15,7 @@ guides for the other areas of GLFW.
 - @ref input_guide
-## Monitor objects {#monitor_object}
+@section monitor_object Monitor objects
 A monitor object represents a currently connected monitor and is represented as
 a pointer to the [opaque](https://en.wikipedia.org/wiki/Opaque_data_type) type
@ -34,42 +36,42 @@ To see how GLFW views your monitor setup and its available video modes, run the
 `monitors` test program.
-### Retrieving monitors {#monitor_monitors}
+@subsection monitor_monitors Retrieving monitors
 The primary monitor is returned by @ref glfwGetPrimaryMonitor.  It is the user's
 preferred monitor and is usually the one with global UI elements like task bar
 or menu bar.
-```c
+@code
 GLFWmonitor* primary = glfwGetPrimaryMonitor();
-```
+@endcode
 You can retrieve all currently connected monitors with @ref glfwGetMonitors.
 See the reference documentation for the lifetime of the returned array.
-```c
+@code
 int count;
 GLFWmonitor** monitors = glfwGetMonitors(&count);
-```
+@endcode
 The primary monitor is always the first monitor in the returned array, but other
 monitors may be moved to a different index when a monitor is connected or
 disconnected.
-### Monitor configuration changes {#monitor_event}
+@subsection monitor_event Monitor configuration changes
 If you wish to be notified when a monitor is connected or disconnected, set
 a monitor callback.
-```c
+@code
 glfwSetMonitorCallback(monitor_callback);
-```
+@endcode
 The callback function receives the handle for the monitor that has been
 connected or disconnected and the event that occurred.
-```c
+@code
 void monitor_callback(GLFWmonitor* monitor, int event)
 {
    if (event == GLFW_CONNECTED)
@ -81,7 +83,7 @@ void monitor_callback(GLFWmonitor* monitor, int event)
        // The monitor was disconnected
    }
 }
-```
+@endcode
 If a monitor is disconnected, all windows that are full screen on it will be
 switched to windowed mode before the callback is called.  Only @ref
@ -89,14 +91,14 @@ glfwGetMonitorName and @ref glfwGetMonitorUserPointer will return useful values
 for a disconnected monitor and only before the monitor callback returns.
-## Monitor properties {#monitor_properties}
+@section monitor_properties Monitor properties
 Each monitor has a current video mode, a list of supported video modes,
 a virtual position, a content scale, a human-readable name, a user pointer, an
 estimated physical size and a gamma ramp.
-### Video modes {#monitor_modes}
+@subsection monitor_modes Video modes
 GLFW generally does a good job selecting a suitable video mode when you create
 a full screen window, change its video mode or make a windowed one full
@ -107,93 +109,101 @@ Video modes are represented as @ref GLFWvidmode structures.  You can get an
 array of the video modes supported by a monitor with @ref glfwGetVideoModes.
 See the reference documentation for the lifetime of the returned array.
-```c
+@code
 int count;
 GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
-```
+@endcode
 To get the current video mode of a monitor call @ref glfwGetVideoMode.  See the
 reference documentation for the lifetime of the returned pointer.
-```c
+@code
 const GLFWvidmode* mode = glfwGetVideoMode(monitor);
-```
+@endcode
 The resolution of a video mode is specified in
 [screen coordinates](@ref coordinate_systems), not pixels.
-### Physical size {#monitor_size}
+@subsection monitor_size Physical size
 The physical size of a monitor in millimetres, or an estimation of it, can be
 retrieved with @ref glfwGetMonitorPhysicalSize.  This has no relation to its
 current _resolution_, i.e. the width and height of its current
 [video mode](@ref monitor_modes).
-```c
+@code
 int width_mm, height_mm;
 glfwGetMonitorPhysicalSize(monitor, &width_mm, &height_mm);
-```
+@endcode
 While this can be used to calculate the raw DPI of a monitor, this is often not
 useful.  Instead, use the [monitor content scale](@ref monitor_scale) and
 [window content scale](@ref window_scale) to scale your content.
-### Content scale {#monitor_scale}
+@subsection monitor_scale Content scale
 The content scale for a monitor can be retrieved with @ref
 glfwGetMonitorContentScale.
-```c
+@code
 float xscale, yscale;
 glfwGetMonitorContentScale(monitor, &xscale, &yscale);
-```
+@endcode
-For more information on what the content scale is and how to use it, see
+The content scale is the ratio between the current DPI and the platform's
-[window content scale](@ref window_scale).
+default DPI.  This is especially important for text and any UI elements.  If the
 pixel dimensions of your UI scaled by this look appropriate on your machine then
 it should appear at a reasonable size on other machines regardless of their DPI
 and scaling settings.  This relies on the system DPI and scaling settings being
 somewhat correct.
 The content scale may depend on both the monitor resolution and pixel density
 and on user settings.  It may be very different from the raw DPI calculated from
 the physical size and current resolution.
-### Virtual position {#monitor_pos}
+@subsection monitor_pos Virtual position
 The position of the monitor on the virtual desktop, in
 [screen coordinates](@ref coordinate_systems), can be retrieved with @ref
 glfwGetMonitorPos.
-```c
+@code
 int xpos, ypos;
 glfwGetMonitorPos(monitor, &xpos, &ypos);
-```
+@endcode
-### Work area {#monitor_workarea}
+@subsection monitor_workarea Work area
 The area of a monitor not occupied by global task bars or menu bars is the work
 area.  This is specified in [screen coordinates](@ref coordinate_systems) and
 can be retrieved with @ref glfwGetMonitorWorkarea.
-```c
+@code
 int xpos, ypos, width, height;
 glfwGetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height);
-```
+@endcode
-### Human-readable name {#monitor_name}
+@subsection monitor_name Human-readable name
 The human-readable, UTF-8 encoded name of a monitor is returned by @ref
 glfwGetMonitorName.  See the reference documentation for the lifetime of the
 returned string.
-```c
+@code
 const char* name = glfwGetMonitorName(monitor);
-```
+@endcode
 Monitor names are not guaranteed to be unique.  Two monitors of the same model
 and make may have the same name.  Only the monitor handle is guaranteed to be
 unique, and only until that monitor is disconnected.
-### User pointer {#monitor_userptr}
+@subsection monitor_userptr User pointer
 Each monitor has a user pointer that can be set with @ref
 glfwSetMonitorUserPointer and queried with @ref glfwGetMonitorUserPointer.  This
@ -204,12 +214,12 @@ terminated.
 The initial value of the pointer is `NULL`.
-### Gamma ramp {#monitor_gamma}
+@subsection monitor_gamma Gamma ramp
 The gamma ramp of a monitor can be set with @ref glfwSetGammaRamp, which accepts
 a monitor handle and a pointer to a @ref GLFWgammaramp structure.
-```c
+@code
 GLFWgammaramp ramp;
 unsigned short red[256], green[256], blue[256];
@ -224,7 +234,7 @@ for (i = 0;  i < ramp.size;  i++)
 }
 glfwSetGammaRamp(monitor, &ramp);
-```
+@endcode
 The gamma ramp data is copied before the function returns, so there is no need
 to keep it around once the ramp has been set.
@ -235,17 +245,17 @@ ramp for that monitor.
 The current gamma ramp for a monitor is returned by @ref glfwGetGammaRamp.  See
 the reference documentation for the lifetime of the returned structure.
-```c
+@code
 const GLFWgammaramp* ramp = glfwGetGammaRamp(monitor);
-```
+@endcode
 If you wish to set a regular gamma ramp, you can have GLFW calculate it for you
 from the desired exponent with @ref glfwSetGamma, which in turn calls @ref
 glfwSetGammaRamp with the resulting ramp.
-```c
+@code
 glfwSetGamma(monitor, 1.0);
-```
+@endcode
 To experiment with gamma correction via the @ref glfwSetGamma function, run the
 `gamma` test program.
@ -255,3 +265,4 @@ 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.
 */
--- a/docs/moving.dox
+++ b/docs/moving.dox
@ -1,6 +1,8 @@
-# Moving from GLFW 2 to 3 {#moving_guide}
+/*!
-[TOC]
+@page moving_guide Moving from GLFW 2 to 3
@tableofcontents
 This is a transition guide for moving from GLFW 2 to 3.  It describes what has
 changed or been removed, but does _not_ include
@ -9,64 +11,61 @@ base onto the new API.  For example, the new multi-monitor functions are
 required to create full screen windows with GLFW 3.
-## Changed and removed features {#moving_removed}
+@section moving_removed Changed and removed features
-### Renamed library and header file {#moving_renamed_files}
+@subsection moving_renamed_files Renamed library and header file
 The GLFW 3 header is named @ref glfw3.h and moved to the `GLFW` directory, to
 avoid collisions with the headers of other major versions.  Similarly, the GLFW
 3 library is named `glfw3,` except when it's installed as a shared library on
-Unix-like systems, where it uses the [soname][] `libglfw.so.3`.
+Unix-like systems, where it uses the
 [soname](https://en.wikipedia.org/wiki/soname) `libglfw.so.3`.
-[soname]: https://en.wikipedia.org/wiki/soname
+@par Old syntax
-
+@code
 __Old syntax__
 ```c
 #include <GL/glfw.h>
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 #include <GLFW/glfw3.h>
-```
+@endcode
-### Removal of threading functions {#moving_threads}
+@subsection moving_threads Removal of threading functions
 The threading functions have been removed, including the per-thread sleep
 function.  They were fairly primitive, under-used, poorly integrated and took
 time away from the focus of GLFW (i.e.  context, input and window).  There are
 better threading libraries available and native threading support is available
-in both [C++11][] and [C11][], both of which are gaining traction.
+in both [C++11](https://en.cppreference.com/w/cpp/thread) and
-
+[C11](https://en.cppreference.com/w/c/thread), both of which are gaining
-[C++11]: https://en.cppreference.com/w/cpp/thread
+traction.
 [C11]: https://en.cppreference.com/w/c/thread
 If you wish to use the C++11 or C11 facilities but your compiler doesn't yet
-support them, see the [TinyThread++][] and [TinyCThread][] projects created by
+support them, see the
 [TinyThread++](https://gitorious.org/tinythread/tinythreadpp) and
 [TinyCThread](https://github.com/tinycthread/tinycthread) projects created by
 the original author of GLFW.  These libraries implement a usable subset of the
 threading APIs in C++11 and C11, and in fact some GLFW 3 test programs use
 TinyCThread.
 [TinyThread++]: https://gitorious.org/tinythread/tinythreadpp
 [TinyCThread]: https://github.com/tinycthread/tinycthread
 However, GLFW 3 has better support for _use from multiple threads_ than GLFW
 2 had.  Contexts can be made current on any thread, although only a single
 thread at a time, and the documentation explicitly states which functions may be
 used from any thread and which must only be used from the main thread.
-__Removed functions__
+@par Removed functions
-> `glfwSleep`, `glfwCreateThread`, `glfwDestroyThread`, `glfwWaitThread`,
+`glfwSleep`, `glfwCreateThread`, `glfwDestroyThread`, `glfwWaitThread`,
-> `glfwGetThreadID`, `glfwCreateMutex`, `glfwDestroyMutex`, `glfwLockMutex`,
+`glfwGetThreadID`, `glfwCreateMutex`, `glfwDestroyMutex`, `glfwLockMutex`,
-> `glfwUnlockMutex`, `glfwCreateCond`, `glfwDestroyCond`, `glfwWaitCond`,
+`glfwUnlockMutex`, `glfwCreateCond`, `glfwDestroyCond`, `glfwWaitCond`,
-> `glfwSignalCond`, `glfwBroadcastCond` and `glfwGetNumberOfProcessors`.
+`glfwSignalCond`, `glfwBroadcastCond` and `glfwGetNumberOfProcessors`.
-__Removed types__
+@par Removed types
-> `GLFWthreadfun`
+`GLFWthreadfun`
-### Removal of image and texture loading {#moving_image}
+@subsection moving_image Removal of image and texture loading
 The image and texture loading functions have been removed.  They only supported
 the Targa image format, making them mostly useful for beginner level examples.
@ -80,97 +79,94 @@ As there already are libraries doing this, it is unnecessary both to duplicate
 the work and to tie the duplicate to GLFW.  The resulting library would also be
 platform-independent, as both OpenGL and stdio are available wherever GLFW is.
-__Removed functions__
+@par Removed functions
-> `glfwReadImage`, `glfwReadMemoryImage`, `glfwFreeImage`, `glfwLoadTexture2D`,
+`glfwReadImage`, `glfwReadMemoryImage`, `glfwFreeImage`, `glfwLoadTexture2D`,
-> `glfwLoadMemoryTexture2D` and `glfwLoadTextureImage2D`.
+`glfwLoadMemoryTexture2D` and `glfwLoadTextureImage2D`.
-### Removal of GLFWCALL macro {#moving_stdcall}
+@subsection moving_stdcall Removal of GLFWCALL macro
-The `GLFWCALL` macro, which made callback functions use [\_\_stdcall][stdcall]
+The `GLFWCALL` macro, which made callback functions use
-on Windows, has been removed.  GLFW is written in C, not Pascal.  Removing this
+[__stdcall](https://msdn.microsoft.com/en-us/library/zxk0tw93.aspx) on Windows,
-macro means there's one less thing for application programmers to remember, i.e.
+has been removed.  GLFW is written in C, not Pascal.  Removing this macro means
-the requirement to mark all callback functions with `GLFWCALL`.  It also
+there's one less thing for application programmers to remember, i.e. the
-simplifies the creation of DLLs and DLL link libraries, as there's no need to
+requirement to mark all callback functions with `GLFWCALL`.  It also simplifies
-explicitly disable `@n` entry point suffixes.
+the creation of DLLs and DLL link libraries, as there's no need to explicitly
 disable `@n` entry point suffixes.
-[stdcall]: https://msdn.microsoft.com/en-us/library/zxk0tw93.aspx
+@par Old syntax
-
+@code
 __Old syntax__
 ```c
 void GLFWCALL callback_function(...);
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 void callback_function(...);
-```
+@endcode
-### Window handle parameters {#moving_window_handles}
+@subsection moving_window_handles Window handle parameters
 Because GLFW 3 supports multiple windows, window handle parameters have been
 added to all window-related GLFW functions and callbacks.  The handle of
 a newly created window is returned by @ref glfwCreateWindow (formerly
 `glfwOpenWindow`).  Window handles are pointers to the
-[opaque][opaque-type] type @ref GLFWwindow.
+[opaque](https://en.wikipedia.org/wiki/Opaque_data_type) type @ref GLFWwindow.
-[opaque-type]: https://en.wikipedia.org/wiki/Opaque_data_type
+@par Old syntax
-
+@code
 __Old syntax__
 ```c
 glfwSetWindowTitle("New Window Title");
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 glfwSetWindowTitle(window, "New Window Title");
-```
+@endcode
-### Explicit monitor selection {#moving_monitor}
+@subsection moving_monitor Explicit monitor selection
 GLFW 3 provides support for multiple monitors.  To request a full screen mode window,
 instead of passing `GLFW_FULLSCREEN` you specify which monitor you wish the
 window to use.  The @ref glfwGetPrimaryMonitor function returns the monitor that
 GLFW 2 would have selected, but there are many other
 [monitor functions](@ref monitor_guide).  Monitor handles are pointers to the
-[opaque][opaque-type] type @ref GLFWmonitor.
+[opaque](https://en.wikipedia.org/wiki/Opaque_data_type) type @ref GLFWmonitor.
-__Old basic full screen__
+@par Old basic full screen
-```c
+@code
 glfwOpenWindow(640, 480, 8, 8, 8, 0, 24, 0, GLFW_FULLSCREEN);
-```
+@endcode
-__New basic full screen__
+@par New basic full screen
-```c
+@code
 window = glfwCreateWindow(640, 480, "My Window", glfwGetPrimaryMonitor(), NULL);
-```
+@endcode
@note The framebuffer bit depth parameters of `glfwOpenWindow` have been turned
 into [window hints](@ref window_hints), but as they have been given
 [sane defaults](@ref window_hints_values) you rarely need to set these hints.
-### Removal of automatic event polling {#moving_autopoll}
+@subsection moving_autopoll Removal of automatic event polling
 GLFW 3 does not automatically poll for events in @ref glfwSwapBuffers, meaning
 you need to call @ref glfwPollEvents or @ref glfwWaitEvents yourself.  Unlike
 buffer swap, which acts on a single window, the event processing functions act
 on all windows at once.
-__Old basic main loop__
+@par Old basic main loop
-```c
+@code
 while (...)
 {
    // Process input
    // Render output
    glfwSwapBuffers();
 }
-```
+@endcode
-__New basic main loop__
+@par New basic main loop
-```c
+@code
 while (...)
 {
    // Process input
@ -178,10 +174,10 @@ while (...)
    glfwSwapBuffers(window);
    glfwPollEvents();
 }
-```
+@endcode
-### Explicit context management {#moving_context}
+@subsection moving_context Explicit context management
 Each GLFW 3 window has its own OpenGL context and only you, the application
 programmer, can know which context should be current on which thread at any
@ -191,7 +187,7 @@ This means that you need to call @ref glfwMakeContextCurrent after creating
 a window before you can call any OpenGL functions.
-### Separation of window and framebuffer sizes {#moving_hidpi}
+@subsection moving_hidpi Separation of window and framebuffer sizes
 Window positions and sizes now use screen coordinates, which may not be the same
 as pixels on machines with high-DPI monitors.  This is important as OpenGL uses
@ -201,20 +197,20 @@ been added.  You can retrieve the size of the framebuffer of a window with @ref
 glfwGetFramebufferSize function.  A framebuffer size callback has also been
 added, which can be set with @ref glfwSetFramebufferSizeCallback.
-__Old basic viewport setup__
+@par Old basic viewport setup
-```c
+@code
 glfwGetWindowSize(&width, &height);
 glViewport(0, 0, width, height);
-```
+@endcode
-__New basic viewport setup__
+@par New basic viewport setup
-```c
+@code
 glfwGetFramebufferSize(window, &width, &height);
 glViewport(0, 0, width, height);
-```
+@endcode
-### Window closing changes {#moving_window_close}
+@subsection moving_window_close Window closing changes
 The `GLFW_OPENED` window parameter has been removed.  As long as the window has
 not been destroyed, whether through @ref glfwDestroyWindow or @ref
@ -230,43 +226,43 @@ the window, take some other action or ignore the request.
 You can query the close flag at any time with @ref glfwWindowShouldClose and set
 it at any time with @ref glfwSetWindowShouldClose.
-__Old basic main loop__
+@par Old basic main loop
-```c
+@code
 while (glfwGetWindowParam(GLFW_OPENED))
 {
    ...
 }
-```
+@endcode
-__New basic main loop__
+@par New basic main loop
-```c
+@code
 while (!glfwWindowShouldClose(window))
 {
    ...
 }
-```
+@endcode
 The close callback no longer returns a value.  Instead, it is called after the
 close flag has been set, so it can optionally override its value, before
 event processing completes.  You may however not call @ref glfwDestroyWindow
 from the close callback (or any other window related callback).
-__Old syntax__
+@par Old syntax
-```c
+@code
 int GLFWCALL window_close_callback(void);
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 void window_close_callback(GLFWwindow* window);
-```
+@endcode
@note GLFW never clears the close flag to `GLFW_FALSE`, meaning you can use it
 for other reasons to close the window as well, for example the user choosing
 Quit from an in-game menu.
-### Persistent window hints {#moving_hints}
+@subsection moving_hints Persistent window hints
 The `glfwOpenWindowHint` function has been renamed to @ref glfwWindowHint.
@ -275,7 +271,7 @@ instead retain their values until modified by @ref glfwWindowHint or @ref
 glfwDefaultWindowHints, or until the library is terminated and re-initialized.
-### Video mode enumeration {#moving_video_modes}
+@subsection moving_video_modes Video mode enumeration
 Video mode enumeration is now per-monitor.  The @ref glfwGetVideoModes function
 now returns all available modes for a specific monitor instead of requiring you
@ -284,7 +280,7 @@ had poorly defined behavior, has been replaced by @ref glfwGetVideoMode, which
 returns the current mode of a monitor.
-### Removal of character actions {#moving_char_up}
+@subsection moving_char_up Removal of character actions
 The action parameter of the [character callback](@ref GLFWcharfun) has been
 removed.  This was an artefact of the origin of GLFW, i.e. being developed in
@ -292,18 +288,18 @@ English by a Swede.  However, many keyboard layouts require more than one key to
 produce characters with diacritical marks. Even the Swedish keyboard layout
 requires this for uncommon cases like ü.
-__Old syntax__
+@par Old syntax
-```c
+@code
 void GLFWCALL character_callback(int character, int action);
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 void character_callback(GLFWwindow* window, int character);
-```
+@endcode
-### Cursor position changes {#moving_cursorpos}
+@subsection moving_cursorpos Cursor position changes
 The `glfwGetMousePos` function has been renamed to @ref glfwGetCursorPos,
 `glfwSetMousePos` to @ref glfwSetCursorPos and `glfwSetMousePosCallback` to @ref
@ -319,7 +315,7 @@ glfwSetCursorPos (formerly `glfwSetMousePos`) when that window is active.
 Unless the window is active, the function fails silently.
-### Wheel position replaced by scroll offsets {#moving_wheel}
+@subsection moving_wheel Wheel position replaced by scroll offsets
 The `glfwGetMouseWheel` function has been removed.  Scrolling is the input of
 offsets and has no absolute position.  The mouse wheel callback has been
@ -327,21 +323,21 @@ replaced by a [scroll callback](@ref GLFWscrollfun) that receives
 two-dimensional floating point scroll offsets.  This allows you to receive
 precise scroll data from for example modern touchpads.
-__Old syntax__
+@par Old syntax
-```c
+@code
 void GLFWCALL mouse_wheel_callback(int position);
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
-```
+@endcode
-__Removed functions__
+@par Removed functions
-> `glfwGetMouseWheel`
+`glfwGetMouseWheel`
-### Key repeat action {#moving_repeat}
+@subsection moving_repeat Key repeat action
 The `GLFW_KEY_REPEAT` enable has been removed and key repeat is always enabled
 for both keys and characters.  A new key action, `GLFW_REPEAT`, has been added
@ -350,7 +346,7 @@ from a repeat.  Note that @ref glfwGetKey still returns only `GLFW_PRESS` or
 `GLFW_RELEASE`.
-### Physical key input {#moving_keys}
+@subsection moving_keys Physical key input
 GLFW 3 key tokens map to physical keys, unlike in GLFW 2 where they mapped to
 the values generated by the current keyboard layout.  The tokens are named
@ -370,7 +366,7 @@ having to remember whether to check for `a` or `A`, you now check for
@ref GLFW_KEY_A.
-### Joystick function changes {#moving_joystick}
+@subsection moving_joystick Joystick function changes
 The `glfwGetJoystickPos` function has been renamed to @ref glfwGetJoystickAxes.
@ -380,19 +376,18 @@ function as well as axis and button counts returned by the @ref
 glfwGetJoystickAxes and @ref glfwGetJoystickButtons functions.
-### Win32 MBCS support {#moving_mbcs}
+@subsection moving_mbcs Win32 MBCS support
-The Win32 port of GLFW 3 will not compile in [MBCS mode][MBCS].  However,
+The Win32 port of GLFW 3 will not compile in
-because the use of the Unicode version of the Win32 API doesn't affect the
+[MBCS mode](https://msdn.microsoft.com/en-us/library/5z097dxa.aspx).
-process as a whole, but only those windows created using it, it's perfectly
+However, because the use of the Unicode version of the Win32 API doesn't affect
 the process as a whole, but only those windows created using it, it's perfectly
 possible to call MBCS functions from other parts of the same application.
 Therefore, even if an application using GLFW has MBCS mode code, there's no need
 for GLFW itself to support it.
 [MBCS]: https://msdn.microsoft.com/en-us/library/5z097dxa.aspx
-
+@subsection moving_windows Support for versions of Windows older than XP
 ### Support for versions of Windows older than XP {#moving_windows}
 All explicit support for version of Windows older than XP has been removed.
 There is no code that actively prevents GLFW 3 from running on these earlier
@ -412,7 +407,7 @@ runtime checking for a number of functions that are present only on modern
 version of Windows.
-### Capture of system-wide hotkeys {#moving_syskeys}
+@subsection moving_syskeys Capture of system-wide hotkeys
 The ability to disable and capture system-wide hotkeys like Alt+Tab has been
 removed.  Modern applications, whether they're games, scientific visualisations
@ -420,7 +415,7 @@ or something else, are nowadays expected to be good desktop citizens and allow
 these hotkeys to function even when running in full screen mode.
-### Automatic termination {#moving_terminate}
+@subsection moving_terminate Automatic termination
 GLFW 3 does not register @ref glfwTerminate with `atexit` at initialization,
 because `exit` calls registered functions from the calling thread and while it
@ -433,41 +428,37 @@ destroys all windows not already destroyed with @ref glfwDestroyWindow,
 invalidating any window handles you may still have.
-### GLU header inclusion {#moving_glu}
+@subsection moving_glu GLU header inclusion
 GLFW 3 does not by default include the GLU header and GLU itself has been
-deprecated by [Khronos][].  __New projects should not use GLU__, but if you need
+deprecated by [Khronos](https://en.wikipedia.org/wiki/Khronos_Group).  __New
-it for legacy code that has been moved to GLFW 3, you can request that the GLFW
+projects should not use GLU__, but if you need it for legacy code that
-header includes it by defining @ref GLFW_INCLUDE_GLU before the inclusion of the
+has been moved to GLFW 3, you can request that the GLFW header includes it by
-GLFW header.
+defining @ref GLFW_INCLUDE_GLU before the inclusion of the GLFW header.
-[Khronos]: https://en.wikipedia.org/wiki/Khronos_Group
+@par Old syntax
-
+@code
 __Old syntax__
 ```c
 #include <GL/glfw.h>
-```
+@endcode
-__New syntax__
+@par New syntax
-```c
+@code
 #define GLFW_INCLUDE_GLU
 #include <GLFW/glfw3.h>
-```
+@endcode
 There are many libraries that offer replacements for the functionality offered
-by GLU.  For the matrix helper functions, see math libraries like [GLM][] (for
+by GLU.  For the matrix helper functions, see math libraries like
-C++), [linmath.h][] (for C) and others.  For the tessellation functions, see for
+[GLM](https://github.com/g-truc/glm) (for C++),
-example [libtess2][].
+[linmath.h](https://github.com/datenwolf/linmath.h) (for C) and others.  For the
-
+tessellation functions, see for example
-[GLM]: https://github.com/g-truc/glm
+[libtess2](https://github.com/memononen/libtess2).
 [linmath.h]: https://github.com/datenwolf/linmath.h
 [libtess2]: https://github.com/memononen/libtess2
-## Name change tables {#moving_tables}
+@section moving_tables Name change tables
-### Renamed functions {#moving_renamed_functions}
+@subsection moving_renamed_functions Renamed functions
 | GLFW 2                      | GLFW 3                        | Notes |
 | --------------------------- | ----------------------------- | ----- |
@ -487,7 +478,7 @@ example [libtess2][].
 | `glfwGetJoystickParam`      | @ref glfwJoystickPresent      | The axis and button counts are provided by @ref glfwGetJoystickAxes and @ref glfwGetJoystickButtons |
-### Renamed types {#moving_renamed_types}
+@subsection moving_renamed_types Renamed types
 | GLFW 2              | GLFW 3                | Notes |
 | ------------------- | --------------------- |       |
@ -495,7 +486,7 @@ example [libtess2][].
 | `GLFWmouseposfun`   | @ref GLFWcursorposfun |       |
-### Renamed tokens {#moving_renamed_tokens}
+@subsection moving_renamed_tokens Renamed tokens
 | GLFW 2                      | GLFW 3                       | Notes |
 | --------------------------- | ---------------------------- | ----- |
@ -519,3 +510,4 @@ example [libtess2][].
 | `GLFW_KEY_RALT`             | `GLFW_KEY_RIGHT_ALT`         |       |
 | `GLFW_KEY_RSUPER`           | `GLFW_KEY_RIGHT_SUPER`       |       |
 */
--- a/docs/news.dox
+++ b/docs/news.dox
@ -0,0 +1,293 @@
 /*!
@page news Release notes
@tableofcontents
@section news_34 Release notes for version 3.4
@subsection features_34 New features in version 3.4
@subsubsection runtime_platform_34 Runtime platform selection
 GLFW now supports being compiled for multiple backends and selecting between
 them at runtime with the @ref GLFW_PLATFORM init hint.  After initialization the
 selected platform can be queried with @ref glfwGetPlatform.  You can check if
 support for a given platform is compiled in with @ref glfwPlatformSupported.
@subsubsection standard_cursors_34 More standard cursors
 GLFW now provides the standard cursor shapes @ref GLFW_RESIZE_NWSE_CURSOR and
@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.
@subsubsection mouse_passthrough_34 Mouse event passthrough
 GLFW now provides the [GLFW_MOUSE_PASSTHROUGH](@ref GLFW_MOUSE_PASSTHROUGH_hint)
 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).
@subsubsection wayland_libdecor_34 Wayland libdecor decorations
 GLFW now supports improved fallback window decorations via
 [libdecor](https://gitlab.freedesktop.org/libdecor/libdecor).
 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.
@subsubsection wayland_app_id_34 Wayland app_id specification
 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.
@subsubsection features_34_angle_backend Support for ANGLE rendering backend selection
 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](https://chromium.googlesource.com/angle/angle/) to create OpenGL ES
 contexts.
@subsubsection captured_cursor_34 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.
@subsubsection features_34_init_allocator Support for custom memory allocator
 GLFW now supports plugging a custom 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.
@subsubsection features_34_position_hint Window hints for initial position
 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.
@subsubsection features_34_win32_keymenu Support for keyboard access to Windows window menu
 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.
@subsection caveats Caveats for version 3.4
@subsubsection native_34 Multiple sets of native access functions
 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.
@subsubsection version_string_34 Version string format has been changed
 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.
@subsubsection joysticks_34 Joystick support is initialized on demand
 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 will usually not be 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).
@subsubsection wayland_alpha_34 Frambuffer may lack alpha channel on older Wayland systems
 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 have no 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.
@subsubsection standalone_34 Tests and examples are disabled when built as a subproject
 GLFW now does not build the tests and examples when it is added as
 a subdirectory of another CMake project.  To enable these, set the @ref
 GLFW_BUILD_TESTS and @ref GLFW_BUILD_EXAMPLES cache variables before adding the
 GLFW subdirectory.
@code{.cmake}
 set(GLFW_BUILD_EXAMPLES ON CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
 add_subdirectory(path/to/glfw)
@endcode
@subsubsection initmenu_34 macOS main menu now created at initialization
 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.
@subsubsection corevideo_34 CoreVideo dependency has been removed
 GLFW no longer depends on the CoreVideo framework on macOS and it no longer
 needs to be specified during compilation or linking.
@subsubsection caveat_fbtransparency_34 Framebuffer transparency requires DWM transparency
 GLFW no longer supports framebuffer transparency enabled via @ref
 GLFW_TRANSPARENT_FRAMEBUFFER on Windows 7 if DWM transparency is off
 (the Transparency setting under Personalization > Window Color).
@subsubsection emptyevents_34 Empty events on X11 no longer round-trip to server
 Events posted with @ref glfwPostEmptyEvent now use a separate unnamed pipe
 instead of sending an X11 client event to the helper window.
@subsection deprecations_34 Deprecations in version 3.4
@subsection removals_34 Removals in 3.4
@subsubsection vulkan_static_34 GLFW_VULKAN_STATIC CMake option has been removed
 This option was used to compile GLFW directly linked with the Vulkan loader, instead of
 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.
@subsubsection osmesa_option_34 GLFW_USE_OSMESA CMake option has been removed
 This option was used to compile GLFW for the Null platform.  The Null platform is now
 always supported.  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 platform for
 the target OS.  This means setting the @ref GLFW_BUILD_WIN32, @ref GLFW_BUILD_COCOA or
@ref GLFW_BUILD_X11 CMake option to false.
 You can set all of them to false and the ones that don't apply for the target OS will be
 ignored.
@subsubsection wl_shell_34 Support for the wl_shell protocol has been removed
 Support for the 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.
@subsection symbols_34 New symbols in version 3.4
@subsubsection functions_34 New functions in version 3.4
 - @ref glfwInitAllocator
 - @ref glfwGetPlatform
 - @ref glfwPlatformSupported
 - @ref glfwInitVulkanLoader
@subsubsection types_34 New types in version 3.4
 - @ref GLFWallocator
 - @ref GLFWallocatefun
 - @ref GLFWreallocatefun
 - @ref GLFWdeallocatefun
@subsubsection constants_34 New constants in version 3.4
 - @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_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
@section news_archive Release notes for earlier versions
 - [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)
 - [Release notes for 3.0](https://www.glfw.org/docs/3.0/news.html)
 */
--- a/docs/news.md
+++ b/docs/news.md
@ -1,40 +0,0 @@
 # Release notes for version 3.5 {#news}
 [TOC]
 ## New features {#features}
 ### Unlimited mouse buttons {#unlimited_mouse_buttons}
 GLFW now has an input mode which allows an unlimited number of mouse buttons to
 be reported by the mouse buttton callback, rather than just the associated
 [mouse button tokens](@ref buttons). This allows using mouse buttons with
 values over 8. For compatibility with older versions, the
@ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode needs to be set to make use of
 this.
 ## Caveats {#caveats}
 ## Deprecations {#deprecations}
 ## Removals {#removals}
 ## New symbols {#new_symbols}
 ### New functions {#new_functions}
 ### New types {#new_types}
 ### New constants {#new_constants}
 - @ref GLFW_UNLIMITED_MOUSE_BUTTONS
 ## 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)
 - [Release notes for 3.0](https://www.glfw.org/docs/3.0/news.html)
--- a/docs/quick.dox
+++ b/docs/quick.dox
@ -1,6 +1,8 @@
-# Getting started {#quick_guide}
+/*!
-[TOC]
+@page quick_guide Getting started
@tableofcontents
 This guide takes you through writing a small application using GLFW 3.  The
 application will create a window and OpenGL context, render a rotating triangle
@ -12,16 +14,16 @@ have used GLFW 2 in the past, read @ref moving_guide, as some functions
 behave differently in GLFW 3.
-## Step by step {#quick_steps}
+@section quick_steps Step by step
-### Including the GLFW header {#quick_include}
+@subsection quick_include Including the GLFW header
 In the source files of your application where you use GLFW, you need to include
 its header file.
-```c
+@code
 #include <GLFW/glfw3.h>
-```
+@endcode
 This header provides all the constants, types and function prototypes of the
 GLFW API.
@ -36,51 +38,51 @@ This example uses files generated by [glad](https://gen.glad.sh/).  The GLFW
 header can detect most such headers if they are included first and will then not
 include the one from your development environment.
-```c
+@code
 #include <glad/gl.h>
 #include <GLFW/glfw3.h>
-```
+@endcode
 To make sure there will be no header conflicts, you can define @ref
 GLFW_INCLUDE_NONE before the GLFW header to explicitly disable inclusion of the
 development environment header.  This also allows the two headers to be included
 in any order.
-```c
+@code
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <glad/gl.h>
-```
+@endcode
-### Initializing and terminating GLFW {#quick_init_term}
+@subsection quick_init_term Initializing and terminating GLFW
 Before you can use most GLFW functions, the library must be initialized.  On
 successful initialization, `GLFW_TRUE` is returned.  If an error occurred,
 `GLFW_FALSE` is returned.
-```c
+@code
 if (!glfwInit())
 {
    // Initialization failed
 }
-```
+@endcode
 Note that `GLFW_TRUE` and `GLFW_FALSE` are and will always be one and zero.
 When you are done using GLFW, typically just before the application exits, you
 need to terminate GLFW.
-```c
+@code
 glfwTerminate();
-```
+@endcode
 This destroys any remaining windows and releases any other resources allocated by
 GLFW.  After this call, you must initialize GLFW again before using any GLFW
 functions that require it.
-### Setting an error callback {#quick_capture_error}
+@subsection quick_capture_error Setting an error callback
 Most events are reported through callbacks, whether it's a key being pressed,
 a GLFW window being moved, or an error occurring.  Callbacks are C functions (or
@ -90,36 +92,36 @@ In case a GLFW function fails, an error is reported to the GLFW error callback.
 You can receive these reports with an error callback.  This function must have
 the signature below but may do anything permitted in other callbacks.
-```c
+@code
 void error_callback(int error, const char* description)
 {
    fprintf(stderr, "Error: %s\n", description);
 }
-```
+@endcode
 Callback functions must be set, so GLFW knows to call them.  The function to set
 the error callback is one of the few GLFW functions that may be called before
 initialization, which lets you be notified of errors both during and after
 initialization.
-```c
+@code
 glfwSetErrorCallback(error_callback);
-```
+@endcode
-### Creating a window and context {#quick_create_window}
+@subsection quick_create_window Creating a window and context
 The window and its OpenGL context are created with a single call to @ref
 glfwCreateWindow, which returns a handle to the created combined window and
 context object
-```c
+@code
 GLFWwindow* window = glfwCreateWindow(640, 480, "My Title", NULL, NULL);
 if (!window)
 {
    // Window or OpenGL context creation failed
 }
-```
+@endcode
 This creates a 640 by 480 windowed mode window with an OpenGL context.  If
 window or OpenGL context creation fails, `NULL` will be returned.  You should
@ -136,7 +138,7 @@ You can select the OpenGL profile by setting the `GLFW_OPENGL_PROFILE` hint.
 This program uses the core profile as that is the only profile macOS supports
 for OpenGL 3.x and 4.x.
-```c
+@code
 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
 glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
@ -145,25 +147,25 @@ if (!window)
 {
    // Window or context creation failed
 }
-```
+@endcode
 When a window and context is no longer needed, destroy it.
-```c
+@code
 glfwDestroyWindow(window);
-```
+@endcode
 Once this function is called, no more events will be delivered for that window
 and its handle becomes invalid.
-### Making the OpenGL context current {#quick_context_current}
+@subsection quick_context_current Making the OpenGL context current
 Before you can use the OpenGL API, you must have a current OpenGL context.
-```c
+@code
 glfwMakeContextCurrent(window);
-```
+@endcode
 The context will remain current until you make another context current or until
 the window owning the current context is destroyed.
@ -174,12 +176,12 @@ a current context to load from.  This example uses
 [glad](https://github.com/Dav1dde/glad), but the same rule applies to all such
 libraries.
-```c
+@code
 gladLoadGL(glfwGetProcAddress);
-```
+@endcode
-### Checking the window close flag {#quick_window_close}
+@subsection quick_window_close Checking the window close flag
 Each window has a flag indicating whether the window should be closed.
@ -189,12 +191,12 @@ Note that __the window isn't actually closed__, so you are expected to monitor
 this flag and either destroy the window or give some kind of feedback to the
 user.
-```c
+@code
 while (!glfwWindowShouldClose(window))
 {
    // Keep running
 }
-```
+@endcode
 You can be notified when the user is attempting to close the window by setting
 a close callback with @ref glfwSetWindowCloseCallback.  The callback will be
@ -205,41 +207,41 @@ useful if you want to interpret other kinds of input as closing the window, like
 for example pressing the _Escape_ key.
-### Receiving input events {#quick_key_input}
+@subsection quick_key_input Receiving input events
 Each window has a large number of callbacks that can be set to receive all the
 various kinds of events.  To receive key press and release events, create a key
 callback function.
-```c
+@code
 static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
 {
    if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
        glfwSetWindowShouldClose(window, GLFW_TRUE);
 }
-```
+@endcode
 The key callback, like other window related callbacks, are set per-window.
-```c
+@code
 glfwSetKeyCallback(window, key_callback);
-```
+@endcode
 In order for event callbacks to be called when events occur, you need to process
 events as described below.
-### Rendering with OpenGL {#quick_render}
+@subsection quick_render Rendering with OpenGL
 Once you have a current OpenGL context, you can use OpenGL normally.  In this
 tutorial, a multicolored rotating triangle will be rendered.  The framebuffer
 size needs to be retrieved for `glViewport`.
-```c
+@code
 int width, height;
 glfwGetFramebufferSize(window, &width, &height);
 glViewport(0, 0, width, height);
-```
+@endcode
 You can also set a framebuffer size callback using @ref
 glfwSetFramebufferSizeCallback and be notified when the size changes.
@ -256,19 +258,19 @@ These all happen to use GLFW, but OpenGL itself works the same whatever API you
 use to create the window and context.
-### Reading the timer {#quick_timer}
+@subsection quick_timer Reading the timer
 To create smooth animation, a time source is needed.  GLFW provides a timer that
 returns the number of seconds since initialization.  The time source used is the
 most accurate on each platform and generally has micro- or nanosecond
 resolution.
-```c
+@code
 double time = glfwGetTime();
-```
+@endcode
-### Swapping buffers {#quick_swap_buffers}
+@subsection quick_swap_buffers Swapping buffers
 GLFW windows by default use double buffering.  That means that each window has
 two rendering buffers; a front buffer and a back buffer.  The front buffer is
@ -277,9 +279,9 @@ the one being displayed and the back buffer the one you render to.
 When the entire frame has been rendered, the buffers need to be swapped with one
 another, so the back buffer becomes the front buffer and vice versa.
-```c
+@code
 glfwSwapBuffers(window);
-```
+@endcode
 The swap interval indicates how many frames to wait until swapping the buffers,
 commonly known as _vsync_.  By default, the swap interval is zero, meaning
@ -294,15 +296,15 @@ For these reasons, applications will typically want to set the swap interval to
 one.  It can be set to higher values, but this is usually not recommended,
 because of the input latency it leads to.
-```c
+@code
 glfwSwapInterval(1);
-```
+@endcode
 This function acts on the current context and will fail unless a context is
 current.
-### Processing events {#quick_process_events}
+@subsection quick_process_events Processing events
 GLFW needs to communicate regularly with the window system both in order to
 receive events and to show that the application hasn't locked up.  Event
@ -313,9 +315,9 @@ There are two methods for processing pending events; polling and waiting.  This
 example will use event polling, which processes only those events that have
 already been received and then returns immediately.
-```c
+@code
 glfwPollEvents();
-```
+@endcode
 This is the best choice when rendering continually, like most games do.  If
 instead you only need to update your rendering once you have received new input,
@ -325,7 +327,7 @@ all received events.  This saves a great deal of CPU cycles and is useful for,
 for example, many kinds of editing tools.
-## Putting it together {#quick_example}
+@section quick_example Putting it together
 Now that you know how to initialize GLFW, create a window and poll for
 keyboard input, it's possible to create a small program.
@ -336,14 +338,13 @@ presses _Escape_ or closes the window.
@snippet triangle-opengl.c code
-The program above can be found in the [source package][download] as
+The program above can be found in the
 [source package](https://www.glfw.org/download.html) as
 `examples/triangle-opengl.c` and is compiled along with all other examples when
 you build GLFW.  If you built GLFW from the source package then you already have
 this as `triangle-opengl.exe` on Windows, `triangle-opengl` on Linux or
 `triangle-opengl.app` on macOS.
 [download]: https://www.glfw.org/download.html
 This tutorial used only a few of the many functions GLFW provides.  There are
 guides for each of the areas covered by GLFW.  Each guide will introduce all the
 functions for that category.
@ -363,3 +364,4 @@ environment you are using and is best explained by the documentation for that
 environment.  To learn about the details that are specific to GLFW, see
@ref build_guide.
 */
--- a/docs/vulkan.dox
+++ b/docs/vulkan.dox
@ -1,6 +1,8 @@
-# Vulkan guide {#vulkan_guide}
+/*!
-[TOC]
+@page vulkan_guide Vulkan guide
@tableofcontents
 This guide is intended to fill the gaps between the official [Vulkan
 resources](https://www.khronos.org/vulkan/) and the rest of the GLFW
@ -27,7 +29,7 @@ are also guides for the other areas of the GLFW API.
 - @ref input_guide
-## Finding the Vulkan loader {#vulkan_loader}
+@section vulkan_loader Finding the Vulkan loader
 GLFW itself does not ever need to be linked against the Vulkan loader.
@ -43,32 +45,32 @@ you will need to direct GLFW to it.  Pass your version of `vkGetInstanceProcAddr
 glfwInitVulkanLoader before initializing GLFW and it will use that function for all Vulkan
 entry point retrieval.  This prevents GLFW from dynamically loading the Vulkan loader.
-```c
+@code
 glfwInitVulkanLoader(vkGetInstanceProcAddr);
-```
+@endcode
@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).
-## Including the Vulkan header file {#vulkan_include}
+@section vulkan_include Including the Vulkan header file
 To have GLFW include the Vulkan header, define @ref GLFW_INCLUDE_VULKAN before including
 the GLFW header.
-```c
+@code
 #define GLFW_INCLUDE_VULKAN
 #include <GLFW/glfw3.h>
-```
+@endcode
 If you instead want to include the Vulkan header from a custom location or use
 your own custom Vulkan header then do this before the GLFW header.
-```c
+@code
 #include <path/to/vulkan.h>
 #include <GLFW/glfw3.h>
-```
+@endcode
 Unless a Vulkan header is included, either by the GLFW header or above it, the following
 GLFW functions will not be declared, as depend on Vulkan types.
@ -82,7 +84,7 @@ The `VK_USE_PLATFORM_*_KHR` macros do not need to be defined for the Vulkan part
 of GLFW to work.  Define them only if you are using these extensions directly.
-## Querying for Vulkan support {#vulkan_support}
+@section vulkan_support Querying for Vulkan support
 If you are linking directly against the Vulkan loader then you can skip this
 section.  The canonical desktop loader library exports all Vulkan core and
@ -92,12 +94,12 @@ If you are loading the Vulkan loader dynamically instead of linking directly
 against it, you can check for the availability of a loader and ICD with @ref
 glfwVulkanSupported.
-```c
+@code
 if (glfwVulkanSupported())
 {
    // Vulkan is available, at least for compute
 }
-```
+@endcode
 This function returns `GLFW_TRUE` if the Vulkan loader and any minimally
 functional ICD was found.
@ -106,24 +108,24 @@ If one or both were not found, calling any other Vulkan related GLFW function
 will generate a @ref GLFW_API_UNAVAILABLE error.
-### Querying Vulkan function pointers {#vulkan_proc}
+@subsection vulkan_proc Querying Vulkan function pointers
 To load any Vulkan core or extension function from the found loader, call @ref
 glfwGetInstanceProcAddress.  To load functions needed for instance creation,
 pass `NULL` as the instance.
-```c
+@code
 PFN_vkCreateInstance pfnCreateInstance = (PFN_vkCreateInstance)
    glfwGetInstanceProcAddress(NULL, "vkCreateInstance");
-```
+@endcode
 Once you have created an instance, you can load from it all other Vulkan core
 functions and functions from any instance extensions you enabled.
-```c
+@code
 PFN_vkCreateDevice pfnCreateDevice = (PFN_vkCreateDevice)
    glfwGetInstanceProcAddress(instance, "vkCreateDevice");
-```
+@endcode
 This function in turn calls `vkGetInstanceProcAddr`.  If that fails, the
 function falls back to a platform-specific query of the Vulkan loader (i.e.
@ -135,17 +137,17 @@ Vulkan also provides `vkGetDeviceProcAddr` for loading device-specific versions
 of Vulkan function.  This function can be retrieved from an instance with @ref
 glfwGetInstanceProcAddress.
-```c
+@code
 PFN_vkGetDeviceProcAddr pfnGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)
    glfwGetInstanceProcAddress(instance, "vkGetDeviceProcAddr");
-```
+@endcode
 Device-specific functions may execute a little faster, due to not having to
 dispatch internally based on the device passed to them.  For more information
 about `vkGetDeviceProcAddr`, see the Vulkan documentation.
-## Querying required Vulkan extensions {#vulkan_ext}
+@section vulkan_ext Querying required Vulkan extensions
 To do anything useful with Vulkan you need to create an instance.  If you want
 to use Vulkan to render to a window, you must enable the instance extensions
@ -154,10 +156,10 @@ GLFW requires to create Vulkan surfaces.
 To query the instance extensions required, call @ref
 glfwGetRequiredInstanceExtensions.
-```c
+@code
 uint32_t count;
 const char** extensions = glfwGetRequiredInstanceExtensions(&count);
-```
+@endcode
 These extensions must all be enabled when creating instances that are going to
 be passed to @ref glfwGetPhysicalDevicePresentationSupport and @ref
@ -172,14 +174,14 @@ If successful the returned array will always include `VK_KHR_surface`, so if
 you don't require any additional extensions you can pass this list directly to
 the `VkInstanceCreateInfo` struct.
-```c
+@code
 VkInstanceCreateInfo ici;
 memset(&ici, 0, sizeof(ici));
 ici.enabledExtensionCount = count;
 ici.ppEnabledExtensionNames = extensions;
 ...
-```
+@endcode
 Additional extensions may be required by future versions of GLFW.  You should
 check whether any extensions you wish to enable are already in the returned
@ -194,52 +196,52 @@ info flags for MoltenVK to show up in the list of physical devices.  For more
 information, see the Vulkan and MoltenVK documentation.
-## Querying for Vulkan presentation support {#vulkan_present}
+@section vulkan_present Querying for Vulkan presentation support
 Not every queue family of every Vulkan device can present images to surfaces.
 To check whether a specific queue family of a physical device supports image
 presentation without first having to create a window and surface, call @ref
 glfwGetPhysicalDevicePresentationSupport.
-```c
+@code
 if (glfwGetPhysicalDevicePresentationSupport(instance, physical_device, queue_family_index))
 {
    // Queue family supports image presentation
 }
-```
+@endcode
 The `VK_KHR_surface` extension additionally provides the
 `vkGetPhysicalDeviceSurfaceSupportKHR` function, which performs the same test on
 an existing Vulkan surface.
-## Creating the window {#vulkan_window}
+@section vulkan_window Creating the window
 Unless you will be using OpenGL or OpenGL ES with the same window as Vulkan,
 there is no need to create a context.  You can disable context creation with the
 [GLFW_CLIENT_API](@ref GLFW_CLIENT_API_hint) hint.
-```c
+@code
 glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
 GLFWwindow* window = glfwCreateWindow(640, 480, "Window Title", NULL, NULL);
-```
+@endcode
 See @ref context_less for more information.
-## Creating a Vulkan window surface {#vulkan_surface}
+@section vulkan_surface Creating a Vulkan window surface
 You can create a Vulkan surface (as defined by the `VK_KHR_surface` extension)
 for a GLFW window with @ref glfwCreateWindowSurface.
-```c
+@code
 VkSurfaceKHR surface;
 VkResult err = glfwCreateWindowSurface(instance, window, NULL, &surface);
 if (err)
 {
    // Window surface creation failed
 }
-```
+@endcode
 If an OpenGL or OpenGL ES context was created on the window, the context has
 ownership of the presentation on the window and a Vulkan surface cannot be
@ -248,3 +250,4 @@ created.
 It is your responsibility to destroy the surface.  GLFW does not destroy it for
 you.  Call `vkDestroySurfaceKHR` function from the same extension to destroy it.
 */
--- a/docs/window.dox
+++ b/docs/window.dox
--- 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
@ -1098,15 +1098,8 @@ extern "C" {
 *  [window hint](@ref GLFW_SCALE_TO_MONITOR).
 */
 #define GLFW_SCALE_TO_MONITOR       0x0002200C
-/*! @brief Window framebuffer scaling
+/*! @brief macOS specific
- *  [window hint](@ref GLFW_SCALE_FRAMEBUFFER_hint).
+ *  [window hint](@ref GLFW_COCOA_RETINA_FRAMEBUFFER_hint).
 */
 #define GLFW_SCALE_FRAMEBUFFER      0x0002200D
 /*! @brief Legacy name for compatibility.
 *
 *  This is an alias for the
 *  [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint) window hint for
 *  compatibility with earlier versions.
 */
 #define GLFW_COCOA_RETINA_FRAMEBUFFER 0x00023001
 /*! @brief macOS specific
@ -1126,12 +1119,7 @@ extern "C" {
 */
 #define GLFW_X11_INSTANCE_NAME      0x00024002
 #define GLFW_WIN32_KEYBOARD_MENU    0x00025001
-/*! @brief Win32 specific [window hint](@ref GLFW_WIN32_SHOWDEFAULT_hint).
+#define GLFW_WIN32_GENERIC_BADGE    0x00025002
 */
 #define GLFW_WIN32_SHOWDEFAULT      0x00025002
 #define GLFW_WIN32_GENERIC_BADGE    0x00025003
 /*! @brief Wayland specific
 *  [window hint](@ref GLFW_WAYLAND_APP_ID_hint).
 *  
@ -1152,12 +1140,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
@ -1234,11 +1221,11 @@ extern "C" {
 *  @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
 *  all cursor themes.
 *
 *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 *
 *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 */
 #define GLFW_RESIZE_NWSE_CURSOR     0x00036007
 /*! @brief The top-right to bottom-left diagonal resize/move arrow shape.
@ -1249,11 +1236,11 @@ extern "C" {
 *  @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
 *  all cursor themes.
 *
 *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 *
 *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 */
 #define GLFW_RESIZE_NESW_CURSOR     0x00036008
 /*! @brief The omni-directional resize/move cursor shape.
@ -1267,11 +1254,11 @@ 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
 *  all cursor themes.
 *
 *  @note @x11 This shape is provided by a newer standard not supported by all
 *  cursor themes.
 *
 *  @note @wayland This shape is provided by a newer standard not supported by
 *  all cursor themes.
 */
 #define GLFW_NOT_ALLOWED_CURSOR     0x0003600A
 /*! @brief Legacy name for compatibility.
@ -1483,25 +1470,16 @@ typedef struct GLFWcursor GLFWcursor;
 *  or `NULL` if allocation failed.  Note that not all parts of GLFW handle allocation
 *  failures gracefully yet.
 *
- *  This function must support being called during @ref glfwInit but before the library is
+ *  This function may be called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
+ *  flagged as initialized, as well as during @ref glfwTerminate after the
- *  longer flagged as initialized.
+ *  library is no longer flagged as initialized.
 *
- *  Any memory allocated via this function will be deallocated via the same allocator
+ *  Any memory allocated by this function will be deallocated during library
- *  during library termination or earlier.
+ *  termination or earlier.
 *
 *  Any memory allocated via this function must be suitably aligned for any object type.
 *  If you are using C99 or earlier, this alignment is platform-dependent but will be the
 *  same as what `malloc` provides.  If you are using C11 or later, this is the value of
 *  `alignof(max_align_t)`.
 *
 *  The size will always be greater than zero.  Allocations of size zero are filtered out
 *  before reaching the custom allocator.
 *
 *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
 *
 *  This function must not call any GLFW function.
 *
 *  @param[in] size The minimum size, in bytes, of the memory block.
 *  @param[in] user The user-defined pointer from the allocator.
 *  @return The address of the newly allocated memory block, or `NULL` if an
@ -1512,8 +1490,7 @@ typedef struct GLFWcursor GLFWcursor;
 *
 *  @reentrancy This function should not call any GLFW function.
 *
- *  @thread_safety This function must support being called from any thread that calls GLFW
+ *  @thread_safety This function may be called from any thread that calls GLFW functions.
 *  functions.
 *
 *  @sa @ref init_allocator
 *  @sa @ref GLFWallocator
@ -1536,26 +1513,16 @@ typedef void* (* GLFWallocatefun)(size_t size, void* user);
 *  `NULL` if allocation failed.  Note that not all parts of GLFW handle allocation
 *  failures gracefully yet.
 *
- *  This function must support being called during @ref glfwInit but before the library is
+ *  This function may be called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
+ *  flagged as initialized, as well as during @ref glfwTerminate after the
- *  longer flagged as initialized.
+ *  library is no longer flagged as initialized.
 *
- *  Any memory allocated via this function will be deallocated via the same allocator
+ *  Any memory allocated by this function will be deallocated during library
- *  during library termination or earlier.
+ *  termination or earlier.
 *
 *  Any memory allocated via this function must be suitably aligned for any object type.
 *  If you are using C99 or earlier, this alignment is platform-dependent but will be the
 *  same as what `realloc` provides.  If you are using C11 or later, this is the value of
 *  `alignof(max_align_t)`.
 *
 *  The block address will never be `NULL` and the size will always be greater than zero.
- *  Reallocations of a block to size zero are converted into deallocations before reaching
+ *  Reallocations of a block to size zero are converted into deallocations.  Reallocations
- *  the custom allocator.  Reallocations of `NULL` to a non-zero size are converted into
+ *  of `NULL` to a non-zero size are converted into regular allocations.
 *  regular allocations before reaching the custom allocator.
 *
 *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
 *
 *  This function must not call any GLFW function.
 *
 *  @param[in] block The address of the memory block to reallocate.
 *  @param[in] size The new minimum size, in bytes, of the memory block.
@ -1568,8 +1535,7 @@ typedef void* (* GLFWallocatefun)(size_t size, void* user);
 *
 *  @reentrancy This function should not call any GLFW function.
 *
- *  @thread_safety This function must support being called from any thread that calls GLFW
+ *  @thread_safety This function may be called from any thread that calls GLFW functions.
 *  functions.
 *
 *  @sa @ref init_allocator
 *  @sa @ref GLFWallocator
@ -1591,17 +1557,13 @@ typedef void* (* GLFWreallocatefun)(void* block, size_t size, void* user);
 *  This function may deallocate the specified memory block.  This memory block
 *  will have been allocated with the same allocator.
 *
- *  This function must support being called during @ref glfwInit but before the library is
+ *  This function may be called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
+ *  flagged as initialized, as well as during @ref glfwTerminate after the
- *  longer flagged as initialized.
+ *  library is no longer flagged as initialized.
 *
 *  The block address will never be `NULL`.  Deallocations of `NULL` are filtered out
 *  before reaching the custom allocator.
 *
 *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
 *
 *  This function must not call any GLFW function.
 *
 *  @param[in] block The address of the memory block to deallocate.
 *  @param[in] user The user-defined pointer from the allocator.
 *
@ -1610,8 +1572,7 @@ typedef void* (* GLFWreallocatefun)(void* block, size_t size, void* user);
 *
 *  @reentrancy This function should not call any GLFW function.
 *
- *  @thread_safety This function must support being called from any thread that calls GLFW
+ *  @thread_safety This function may be called from any thread that calls GLFW functions.
 *  functions.
 *
 *  @sa @ref init_allocator
 *  @sa @ref GLFWallocator
@ -2179,10 +2140,7 @@ typedef struct GLFWgamepadstate
    float axes[6];
 } GLFWgamepadstate;
-/*! @brief Custom heap memory allocator.
+/*! @brief
 *
 *  This describes a custom heap memory allocator for GLFW.  To set an allocator, pass it
 *  to @ref glfwInitAllocator before initializing the library.
 *
 *  @sa @ref init_allocator
 *  @sa @ref glfwInitAllocator
@ -2193,21 +2151,9 @@ typedef struct GLFWgamepadstate
 */
 typedef struct GLFWallocator
 {
    /*! The memory allocation function.  See @ref GLFWallocatefun for details about
     *  allocation function.
     */
    GLFWallocatefun allocate;
    /*! The memory reallocation function.  See @ref GLFWreallocatefun for details about
     *  reallocation function.
     */
    GLFWreallocatefun reallocate;
    /*! The memory deallocation function.  See @ref GLFWdeallocatefun for details about
     *  deallocation function.
     */
    GLFWdeallocatefun deallocate;
    /*! The user pointer for this custom allocator.  This value will be passed to the
     *  allocator functions.
     */
    void* user;
 } GLFWallocator;
@ -2252,13 +2198,6 @@ typedef struct GLFWallocator
 *  and dock icon can be disabled entirely with the @ref GLFW_COCOA_MENUBAR init
 *  hint.
 *
 *  @remark __Wayland, X11:__ If the library was compiled with support for both
 *  Wayland and X11, and the @ref GLFW_PLATFORM init hint is set to
 *  `GLFW_ANY_PLATFORM`, the `XDG_SESSION_TYPE` environment variable affects
 *  which platform is picked.  If the environment variable is not set, or is set
 *  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
 *  application locale according to the current environment if that category is
 *  still "C".  This is because the "C" locale breaks Unicode text input.
@ -2347,12 +2286,8 @@ GLFWAPI void glfwInitHint(int hint, int value);
 *  To use the default allocator, call this function with a `NULL` argument.
 *
 *  If you specify an allocator struct, every member must be a valid function
- *  pointer.  If any member is `NULL`, this function will emit @ref
+ *  pointer.  If any member is `NULL`, this function emits @ref
- *  GLFW_INVALID_VALUE and the init allocator will be unchanged.
+ *  GLFW_INVALID_VALUE and the init allocator is unchanged.
 *
 *  The functions in the allocator must fulfil a number of requirements.  See the
 *  documentation for @ref GLFWallocatefun, @ref GLFWreallocatefun and @ref
 *  GLFWdeallocatefun for details.
 *
 *  @param[in] allocator The allocator to use at the next initialization, or
 *  `NULL` to use the default one.
@ -2719,10 +2654,9 @@ GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* monitor, int* xpos, int* ypos,
 *  specified monitor.
 *
 *  Some platforms do not provide accurate monitor size information, either
- *  because the monitor [EDID][] data is incorrect or because the driver does
+ *  because the monitor
- *  not report it accurately.
+ *  [EDID](https://en.wikipedia.org/wiki/Extended_display_identification_data)
- *
+ *  data is incorrect or because the driver does not report it accurately.
 *  [EDID]: https://en.wikipedia.org/wiki/Extended_display_identification_data
 *
 *  Any or all of the size arguments may be `NULL`.  If an error occurs, all
 *  non-`NULL` size arguments will be set to zero.
@ -2769,9 +2703,6 @@ 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
 *  monitors, so this function only returns integer content scales.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref monitor_scale
@ -3235,35 +3166,23 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
 *  @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 Programming Guide](https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/)
 *  in the Mac Developer Library.
 *
- *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
+ *  @remark @macos On OS X 10.10 and later the window frame will not be rendered
- *
+ *  at full resolution on Retina displays unless the
- *  @remark @macos The window frame will not be rendered at full resolution on
+ *  [GLFW_COCOA_RETINA_FRAMEBUFFER](@ref GLFW_COCOA_RETINA_FRAMEBUFFER_hint)
 *  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
- *  [High Resolution Guidelines for OS X][hidpi-guide] in the Mac Developer
+ *  [High Resolution Guidelines for OS X](https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html)
- *  Library.  The GLFW test and example programs use a custom `Info.plist`
+ *  in the Mac Developer Library.  The GLFW test and example programs use
- *  template for this, which can be found as `CMake/Info.plist.in` in the source
+ *  a custom `Info.plist` template for this, which can be found as
- *  tree.
+ *  `CMake/Info.plist.in` in the source tree.
 *
 *  [hidpi-guide]: https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html
 *
 *  @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
 *  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
 *  a very simple set of window decorations that only support moving, resizing
 *  and the window manager's right-click menu.
 *
 *  [libdecor]: https://gitlab.freedesktop.org/libdecor/libdecor
 *
 *  @remark @x11 Some window managers will not respect the placement of
 *  initially hidden windows.
 *
@ -3280,6 +3199,20 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
 *  [GLFW_X11_INSTANCE_NAME](@ref GLFW_X11_INSTANCE_NAME_hint) window hints to
 *  override this.
 *
 *  @remark @wayland Compositors should implement the xdg-decoration protocol
 *  for GLFW to decorate the window properly.  If this protocol isn't
 *  supported, or if the compositor prefers client-side decorations, a very
 *  simple fallback frame will be drawn using the wp_viewporter protocol.  A
 *  compositor can still emit close, maximize or fullscreen events, using for
 *  instance a keybind mechanism.  If neither of these protocols is supported,
 *  the window won't be decorated.
 *
 *  @remark @wayland A full screen window will not attempt to change the mode,
 *  no matter what the requested size or refresh rate.
 *
 *  @remark @wayland Screensaver inhibition requires the idle-inhibit protocol
 *  to be implemented in the user's compositor.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_creation
@ -3362,38 +3295,6 @@ GLFWAPI int glfwWindowShouldClose(GLFWwindow* window);
 */
 GLFWAPI void glfwSetWindowShouldClose(GLFWwindow* window, int value);
 /*! @brief Returns the title of the specified window.
 *
 *  This function returns the window title, encoded as UTF-8, of the specified
 *  window.  This is the title set previously by @ref glfwCreateWindow
 *  or @ref glfwSetWindowTitle.
 *
 *  @param[in] window The window to query.
 *  @return The UTF-8 encoded window title, or `NULL` if an
 *  [error](@ref error_handling) occurred.
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
 *  @remark The returned title is currently a copy of the title last set by @ref
 *  glfwCreateWindow or @ref glfwSetWindowTitle.  It does not include any
 *  additional text which may be appended by the platform or another program.
 *
 *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
 *  should not free it yourself.  It is valid until the next call to @ref
 *  glfwGetWindowTitle or @ref glfwSetWindowTitle, or until the library is
 *  terminated.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_title
 *  @sa @ref glfwSetWindowTitle
 *
 *  @since Added in version 3.4.
 *
 *  @ingroup window
 */
 GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* window);
 /*! @brief Sets the title of the specified window.
 *
 *  This function sets the window title, encoded as UTF-8, of the specified
@ -3411,7 +3312,6 @@ GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* window);
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_title
 *  @sa @ref glfwGetWindowTitle
 *
 *  @since Added in version 1.0.
 *  @glfw3 Added window handle parameter.
@ -3451,9 +3351,8 @@ GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title);
 *  @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 Programming Guide](https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/)
- *
+ *  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
 *  window will thus inherit the one defined in the application's desktop file.
@ -3777,6 +3676,9 @@ GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* window, int numer, int denom);
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_ERROR.
 *
 *  @remark @wayland A full screen window will not attempt to change the mode,
 *  no matter what the requested size.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_size
@ -4108,11 +4010,11 @@ GLFWAPI void glfwHideWindow(GLFWwindow* window);
 *
 *  @param[in] window The window to give input focus.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
+ *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_ERROR.
+ *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
 *
- *  @remark @wayland The compositor will likely ignore focus requests unless
+ *  @remark @wayland It is not possible for an application to set the input
- *  another window created by the same application already has input focus.
+ *  focus.  This function will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
@ -4217,6 +4119,9 @@ GLFWAPI GLFWmonitor* glfwGetWindowMonitor(GLFWwindow* window);
 *  @remark @wayland The desired window position is ignored, as there is no way
 *  for an application to set this property.
 *
 *  @remark @wayland Setting the window to full screen will not attempt to
 *  change the mode, no matter what the requested size or refresh rate.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_monitor
@ -4290,14 +4195,11 @@ GLFWAPI int glfwGetWindowAttrib(GLFWwindow* window, int attrib);
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
 *  GLFW_INVALID_ENUM, @ref GLFW_INVALID_VALUE, @ref GLFW_PLATFORM_ERROR and @ref
- *  GLFW_FEATURE_UNAVAILABLE (see remarks).
+ *  GLFW_FEATURE_UNAVAILABLE.
 *
 *  @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
 *  not supported.  Setting this will emit @ref GLFW_FEATURE_UNAVAILABLE.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref window_attribs
@ -4833,8 +4735,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:
@ -4874,11 +4776,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
@ -5073,11 +4970,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
@ -5453,15 +5347,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
@ -5611,6 +5500,8 @@ GLFWAPI GLFWscrollfun glfwSetScrollCallback(GLFWwindow* window, GLFWscrollfun ca
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
 *
 *  @remark @wayland File drop is currently unimplemented.
 *
 *  @thread_safety This function must only be called from the main thread.
 *
 *  @sa @ref path_drop
--- 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
@ -286,23 +286,6 @@ GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor);
 *  @ingroup native
 */
 GLFWAPI id glfwGetCocoaWindow(GLFWwindow* window);
 /*! @brief Returns the `NSView` of the specified window.
 *
 *  @return The `NSView` of the specified window, or `nil` if an
 *  [error](@ref error_handling) occurred.
 *
 *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
 *  GLFW_PLATFORM_UNAVAILABLE.
 *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
 *  @since Added in version 3.4.
 *
 *  @ingroup native
 */
 GLFWAPI id glfwGetCocoaView(GLFWwindow* window);
 #endif
 #if defined(GLFW_EXPOSE_NATIVE_NSGL)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -102,8 +102,6 @@ if (GLFW_BUILD_WAYLAND)
    generate_wayland_protocol("idle-inhibit-unstable-v1.xml")
    generate_wayland_protocol("pointer-constraints-unstable-v1.xml")
    generate_wayland_protocol("relative-pointer-unstable-v1.xml")
    generate_wayland_protocol("fractional-scale-v1.xml")
    generate_wayland_protocol("xdg-activation-v1.xml")
    generate_wayland_protocol("xdg-decoration-unstable-v1.xml")
 endif()
@ -152,11 +150,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)
--- 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>
 //
@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@ -493,81 +495,81 @@ GLFWbool _glfwConnectCocoa(int platformID, _GLFWplatform* platform)
 {
    const _GLFWplatform cocoa =
    {
-        .platformID = GLFW_PLATFORM_COCOA,
+        GLFW_PLATFORM_COCOA,
-        .init = _glfwInitCocoa,
+        _glfwInitCocoa,
-        .terminate = _glfwTerminateCocoa,
+        _glfwTerminateCocoa,
-        .getCursorPos = _glfwGetCursorPosCocoa,
+        _glfwGetCursorPosCocoa,
-        .setCursorPos = _glfwSetCursorPosCocoa,
+        _glfwSetCursorPosCocoa,
-        .setCursorMode = _glfwSetCursorModeCocoa,
+        _glfwSetCursorModeCocoa,
-        .setRawMouseMotion = _glfwSetRawMouseMotionCocoa,
+        _glfwSetRawMouseMotionCocoa,
-        .rawMouseMotionSupported = _glfwRawMouseMotionSupportedCocoa,
+        _glfwRawMouseMotionSupportedCocoa,
-        .createCursor = _glfwCreateCursorCocoa,
+        _glfwCreateCursorCocoa,
-        .createStandardCursor = _glfwCreateStandardCursorCocoa,
+        _glfwCreateStandardCursorCocoa,
-        .destroyCursor = _glfwDestroyCursorCocoa,
+        _glfwDestroyCursorCocoa,
-        .setCursor = _glfwSetCursorCocoa,
+        _glfwSetCursorCocoa,
-        .getScancodeName = _glfwGetScancodeNameCocoa,
+        _glfwGetScancodeNameCocoa,
-        .getKeyScancode = _glfwGetKeyScancodeCocoa,
+        _glfwGetKeyScancodeCocoa,
-        .setClipboardString = _glfwSetClipboardStringCocoa,
+        _glfwSetClipboardStringCocoa,
-        .getClipboardString = _glfwGetClipboardStringCocoa,
+        _glfwGetClipboardStringCocoa,
-        .initJoysticks = _glfwInitJoysticksCocoa,
+        _glfwInitJoysticksCocoa,
-        .terminateJoysticks = _glfwTerminateJoysticksCocoa,
+        _glfwTerminateJoysticksCocoa,
-        .pollJoystick = _glfwPollJoystickCocoa,
+        _glfwPollJoystickCocoa,
-        .getMappingName = _glfwGetMappingNameCocoa,
+        _glfwGetMappingNameCocoa,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDCocoa,
+        _glfwUpdateGamepadGUIDCocoa,
-        .freeMonitor = _glfwFreeMonitorCocoa,
+        _glfwFreeMonitorCocoa,
-        .getMonitorPos = _glfwGetMonitorPosCocoa,
+        _glfwGetMonitorPosCocoa,
-        .getMonitorContentScale = _glfwGetMonitorContentScaleCocoa,
+        _glfwGetMonitorContentScaleCocoa,
-        .getMonitorWorkarea = _glfwGetMonitorWorkareaCocoa,
+        _glfwGetMonitorWorkareaCocoa,
-        .getVideoModes = _glfwGetVideoModesCocoa,
+        _glfwGetVideoModesCocoa,
-        .getVideoMode = _glfwGetVideoModeCocoa,
+        _glfwGetVideoModeCocoa,
-        .getGammaRamp = _glfwGetGammaRampCocoa,
+        _glfwGetGammaRampCocoa,
-        .setGammaRamp = _glfwSetGammaRampCocoa,
+        _glfwSetGammaRampCocoa,
-        .createWindow = _glfwCreateWindowCocoa,
+        _glfwCreateWindowCocoa,
-        .destroyWindow = _glfwDestroyWindowCocoa,
+        _glfwDestroyWindowCocoa,
-        .setWindowTitle = _glfwSetWindowTitleCocoa,
+        _glfwSetWindowTitleCocoa,
-        .setWindowIcon = _glfwSetWindowIconCocoa,
+        _glfwSetWindowIconCocoa,
-        .setWindowProgressIndicator = _glfwSetWindowProgressIndicatorCocoa,
+        _glfwSetWindowProgressIndicatorCocoa,
-        .setWindowBadge = _glfwSetWindowBadgeCocoa,
+        _glfwSetWindowBadgeCocoa,
-        .setWindowBadgeString = _glfwSetWindowBadgeStringCocoa,
+        _glfwSetWindowBadgeStringCocoa,
-        .getWindowPos = _glfwGetWindowPosCocoa,
+        _glfwGetWindowPosCocoa,
-        .setWindowPos = _glfwSetWindowPosCocoa,
+        _glfwSetWindowPosCocoa,
-        .getWindowSize = _glfwGetWindowSizeCocoa,
+        _glfwGetWindowSizeCocoa,
-        .setWindowSize = _glfwSetWindowSizeCocoa,
+        _glfwSetWindowSizeCocoa,
-        .setWindowSizeLimits = _glfwSetWindowSizeLimitsCocoa,
+        _glfwSetWindowSizeLimitsCocoa,
-        .setWindowAspectRatio = _glfwSetWindowAspectRatioCocoa,
+        _glfwSetWindowAspectRatioCocoa,
-        .getFramebufferSize = _glfwGetFramebufferSizeCocoa,
+        _glfwGetFramebufferSizeCocoa,
-        .getWindowFrameSize = _glfwGetWindowFrameSizeCocoa,
+        _glfwGetWindowFrameSizeCocoa,
-        .getWindowContentScale = _glfwGetWindowContentScaleCocoa,
+        _glfwGetWindowContentScaleCocoa,
-        .iconifyWindow = _glfwIconifyWindowCocoa,
+        _glfwIconifyWindowCocoa,
-        .restoreWindow = _glfwRestoreWindowCocoa,
+        _glfwRestoreWindowCocoa,
-        .maximizeWindow = _glfwMaximizeWindowCocoa,
+        _glfwMaximizeWindowCocoa,
-        .showWindow = _glfwShowWindowCocoa,
+        _glfwShowWindowCocoa,
-        .hideWindow = _glfwHideWindowCocoa,
+        _glfwHideWindowCocoa,
-        .requestWindowAttention = _glfwRequestWindowAttentionCocoa,
+        _glfwRequestWindowAttentionCocoa,
-        .focusWindow = _glfwFocusWindowCocoa,
+        _glfwFocusWindowCocoa,
-        .setWindowMonitor = _glfwSetWindowMonitorCocoa,
+        _glfwSetWindowMonitorCocoa,
-        .windowFocused = _glfwWindowFocusedCocoa,
+        _glfwWindowFocusedCocoa,
-        .windowIconified = _glfwWindowIconifiedCocoa,
+        _glfwWindowIconifiedCocoa,
-        .windowVisible = _glfwWindowVisibleCocoa,
+        _glfwWindowVisibleCocoa,
-        .windowMaximized = _glfwWindowMaximizedCocoa,
+        _glfwWindowMaximizedCocoa,
-        .windowHovered = _glfwWindowHoveredCocoa,
+        _glfwWindowHoveredCocoa,
-        .framebufferTransparent = _glfwFramebufferTransparentCocoa,
+        _glfwFramebufferTransparentCocoa,
-        .getWindowOpacity = _glfwGetWindowOpacityCocoa,
+        _glfwGetWindowOpacityCocoa,
-        .setWindowResizable = _glfwSetWindowResizableCocoa,
+        _glfwSetWindowResizableCocoa,
-        .setWindowDecorated = _glfwSetWindowDecoratedCocoa,
+        _glfwSetWindowDecoratedCocoa,
-        .setWindowFloating = _glfwSetWindowFloatingCocoa,
+        _glfwSetWindowFloatingCocoa,
-        .setWindowOpacity = _glfwSetWindowOpacityCocoa,
+        _glfwSetWindowOpacityCocoa,
-        .setWindowMousePassthrough = _glfwSetWindowMousePassthroughCocoa,
+        _glfwSetWindowMousePassthroughCocoa,
-        .pollEvents = _glfwPollEventsCocoa,
+        _glfwPollEventsCocoa,
-        .waitEvents = _glfwWaitEventsCocoa,
+        _glfwWaitEventsCocoa,
-        .waitEventsTimeout = _glfwWaitEventsTimeoutCocoa,
+        _glfwWaitEventsTimeoutCocoa,
-        .postEmptyEvent = _glfwPostEmptyEventCocoa,
+        _glfwPostEmptyEventCocoa,
-        .getEGLPlatform = _glfwGetEGLPlatformCocoa,
+        _glfwGetEGLPlatformCocoa,
-        .getEGLNativeDisplay = _glfwGetEGLNativeDisplayCocoa,
+        _glfwGetEGLNativeDisplayCocoa,
-        .getEGLNativeWindow = _glfwGetEGLNativeWindowCocoa,
+        _glfwGetEGLNativeWindowCocoa,
-        .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsCocoa,
+        _glfwGetRequiredInstanceExtensionsCocoa,
-        .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportCocoa,
+        _glfwGetPhysicalDevicePresentationSupportCocoa,
-        .createWindowSurface = _glfwCreateWindowSurfaceCocoa
+        _glfwCreateWindowSurfaceCocoa,
    };
    *platform = cocoa;
--- 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>
@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
--- 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>
@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@ -32,7 +34,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
 #include <assert.h>
 #include <IOKit/graphics/IOGraphicsLib.h>
 #include <ApplicationServices/ApplicationServices.h>
@ -137,7 +138,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 +165,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 +181,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;
@ -550,20 +551,13 @@ GLFWvidmode* _glfwGetVideoModesCocoa(_GLFWmonitor* monitor, int* count)
    } // autoreleasepool
 }
-GLFWbool _glfwGetVideoModeCocoa(_GLFWmonitor* monitor, GLFWvidmode *mode)
+void _glfwGetVideoModeCocoa(_GLFWmonitor* monitor, GLFWvidmode *mode)
 {
    @autoreleasepool {
    CGDisplayModeRef native = CGDisplayCopyDisplayMode(monitor->ns.displayID);
    if (!native)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR, "Cocoa: Failed to query display mode");
        return GLFW_FALSE;
    }
    *mode = vidmodeFromCGDisplayMode(native, monitor->ns.fallbackRefreshRate);
    CGDisplayModeRelease(native);
    return GLFW_TRUE;
    } // autoreleasepool
 }
@ -628,17 +622,8 @@ void _glfwSetGammaRampCocoa(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(kCGNullDirectDisplay);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Cocoa: Platform not initialized");
        return kCGNullDirectDisplay;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(kCGNullDirectDisplay);
    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>
 //
@ -145,7 +145,7 @@ typedef struct _GLFWwindowNS
    GLFWbool        maximized;
    GLFWbool        occluded;
-    GLFWbool        scaleFramebuffer;
+    GLFWbool        retina;
    // Cached window properties to filter out duplicate events
    int             width, height;
@ -296,7 +296,7 @@ void _glfwGetMonitorPosCocoa(_GLFWmonitor* monitor, int* xpos, int* ypos);
 void _glfwGetMonitorContentScaleCocoa(_GLFWmonitor* monitor, float* xscale, float* yscale);
 void _glfwGetMonitorWorkareaCocoa(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
 GLFWvidmode* _glfwGetVideoModesCocoa(_GLFWmonitor* monitor, int* count);
-GLFWbool _glfwGetVideoModeCocoa(_GLFWmonitor* monitor, GLFWvidmode* mode);
+void _glfwGetVideoModeCocoa(_GLFWmonitor* monitor, GLFWvidmode* mode);
 GLFWbool _glfwGetGammaRampCocoa(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
 void _glfwSetGammaRampCocoa(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
--- 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>
 //
@ -23,16 +23,15 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
 #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
@ -389,6 +388,7 @@ static void setDockProgressIndicator(int progressState, double value)
 - (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)
@ -396,6 +396,7 @@ static void setDockProgressIndicator(int progressState, double value)
        else
            window->ns.occluded = GLFW_TRUE;
    }
 #endif
 }
@end
@ -591,7 +592,7 @@ static void setDockProgressIndicator(int progressState, double value)
    if (xscale != window->ns.xscale || yscale != window->ns.yscale)
    {
-        if (window->ns.scaleFramebuffer && window->ns.layer)
+        if (window->ns.retina && window->ns.layer)
            [window->ns.layer setContentsScale:[window->ns.object backingScaleFactor]];
        window->ns.xscale = xscale;
@ -950,7 +951,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
        [window->ns.object setFrameAutosaveName:@(wndconfig->ns.frameName)];
    window->ns.view = [[GLFWContentView alloc] initWithGlfwWindow:window];
-    window->ns.scaleFramebuffer = wndconfig->scaleFramebuffer;
+    window->ns.retina = wndconfig->ns.retina;
    if (fbconfig->transparent)
    {
@ -1838,15 +1839,14 @@ const char* _glfwGetScancodeNameCocoa(int scancode)
 {
    @autoreleasepool {
-    if (scancode < 0 || scancode > 0xff)
+    if (scancode < 0 || scancode > 0xff ||
        _glfw.ns.keycodes[scancode] == GLFW_KEY_UNKNOWN)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid scancode %i", scancode);
        return NULL;
    }
    const int key = _glfw.ns.keycodes[scancode];
    if (key == GLFW_KEY_UNKNOWN)
        return NULL;
    UInt32 deadKeyState = 0;
    UniChar characters[4];
@ -2130,8 +2130,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,
@ -2139,7 +2150,7 @@ VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance,
        return VK_ERROR_EXTENSION_NOT_PRESENT;
    }
-    if (window->ns.scaleFramebuffer)
+    if (window->ns.retina)
        [window->ns.layer setContentsScale:[window->ns.object backingScaleFactor]];
    [window->ns.view setLayer:window->ns.layer];
@ -2196,6 +2207,9 @@ VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance,
    }
    return err;
 #else
    return VK_ERROR_EXTENSION_NOT_PRESENT;
 #endif
    } // autoreleasepool
 }
@ -2207,37 +2221,18 @@ 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)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE,
                        "Cocoa: Platform not initialized");
-        return nil;
+        return NULL;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->ns.object;
 }
 GLFWAPI id glfwGetCocoaView(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(nil);
    if (_glfw.platform.platformID != GLFW_PLATFORM_COCOA)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE,
                        "Cocoa: Platform not initialized");
        return nil;
    }
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    return window->ns.view;
 }
 #endif // _GLFW_COCOA
--- 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)
@ -717,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)
@ -908,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;
@ -928,19 +897,13 @@ 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_CONTEXT;
        }
    }
    return window->context.egl.surface;
--- 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>
@ -677,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)
@ -685,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);
@ -699,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)
@ -707,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);
--- 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>
@ -49,22 +49,19 @@ static GLFWerrorfun _glfwErrorCallback;
 static GLFWallocator _glfwInitAllocator;
 static _GLFWinitconfig _glfwInitHints =
 {
-    .hatButtons = GLFW_TRUE,
+    GLFW_TRUE,      // hat buttons
-    .angleType = GLFW_ANGLE_PLATFORM_TYPE_NONE,
+    GLFW_ANGLE_PLATFORM_TYPE_NONE, // ANGLE backend
-    .platformID = GLFW_ANY_PLATFORM,
+    GLFW_ANY_PLATFORM, // preferred platform
-    .vulkanLoader = NULL,
+    NULL,           // vkGetInstanceProcAddr function
    .ns =
    {
-        .menubar = GLFW_TRUE,
+        GLFW_TRUE,  // macOS menu bar
-        .chdir = GLFW_TRUE
+        GLFW_TRUE   // macOS bundle chdir
    },
    .x11 =
    {
-        .xcbVulkanSurface = GLFW_TRUE,
+        GLFW_TRUE,  // X11 XCB Vulkan surface
    },
    .wl =
    {
-        .libdecorMode = GLFW_WAYLAND_PREFER_LIBDECOR
+        GLFW_WAYLAND_PREFER_LIBDECOR // Wayland libdecor mode
    },
 };
@ -246,6 +243,30 @@ int _glfw_max(int a, int b)
    return a > b ? a : b;
 }
 float _glfw_fminf(float a, float b)
 {
    if (a != a)
        return b;
    else if (b != b)
        return a;
    else if (a < b)
        return a;
    else
        return b;
 }
 float _glfw_fmaxf(float a, float b)
 {
    if (a != a)
        return b;
    else if (b != b)
        return a;
    else if (a > b)
        return a;
    else
        return b;
 }
 void* _glfw_calloc(size_t count, size_t size)
 {
    if (count && size)
--- 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);
@ -731,7 +721,7 @@ GLFWAPI const char* glfwGetKeyName(int key, int scancode)
 GLFWAPI int glfwGetKeyScancode(int key)
 {
-    _GLFW_REQUIRE_INIT_OR_RETURN(0);
+    _GLFW_REQUIRE_INIT_OR_RETURN(-1);
    if (key < GLFW_KEY_SPACE || key > GLFW_KEY_LAST)
    {
@ -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;
 }
@ -1456,7 +1438,7 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state)
        if (e->type == _GLFW_JOYSTICK_AXIS)
        {
            const float value = js->axes[e->index] * e->axisScale + e->axisOffset;
-            state->axes[i] = fminf(fmaxf(value, -1.f), 1.f);
+            state->axes[i] = _glfw_fminf(_glfw_fmaxf(value, -1.f), 1.f);
        }
        else if (e->type == _GLFW_JOYSTICK_HATBIT)
        {
--- 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
@ -110,6 +108,12 @@ typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGPROC)(GLenum);
 typedef void (APIENTRY * PFNGLGETINTEGERVPROC)(GLenum,GLint*);
 typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint);
 #if defined(_GLFW_WIN32)
 #define EGLAPIENTRY __stdcall
 #else
 #define EGLAPIENTRY
 #endif
 #define EGL_SUCCESS 0x3000
 #define EGL_NOT_INITIALIZED 0x3001
 #define EGL_BAD_ACCESS 0x3002
@ -152,9 +156,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 +187,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;
@ -200,23 +200,22 @@ typedef void* EGLNativeDisplayType;
 typedef void* EGLNativeWindowType;
 // EGL function pointer typedefs
-typedef EGLBoolean (APIENTRY * PFN_eglGetConfigAttrib)(EGLDisplay,EGLConfig,EGLint,EGLint*);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglGetConfigAttrib)(EGLDisplay,EGLConfig,EGLint,EGLint*);
-typedef EGLBoolean (APIENTRY * PFN_eglGetConfigs)(EGLDisplay,EGLConfig*,EGLint,EGLint*);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglGetConfigs)(EGLDisplay,EGLConfig*,EGLint,EGLint*);
-typedef EGLDisplay (APIENTRY * PFN_eglGetDisplay)(EGLNativeDisplayType);
+typedef EGLDisplay (EGLAPIENTRY * PFN_eglGetDisplay)(EGLNativeDisplayType);
-typedef EGLint (APIENTRY * PFN_eglGetError)(void);
+typedef EGLint (EGLAPIENTRY * PFN_eglGetError)(void);
-typedef EGLBoolean (APIENTRY * PFN_eglInitialize)(EGLDisplay,EGLint*,EGLint*);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglInitialize)(EGLDisplay,EGLint*,EGLint*);
-typedef EGLBoolean (APIENTRY * PFN_eglTerminate)(EGLDisplay);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglTerminate)(EGLDisplay);
-typedef EGLBoolean (APIENTRY * PFN_eglBindAPI)(EGLenum);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglBindAPI)(EGLenum);
-typedef EGLContext (APIENTRY * PFN_eglCreateContext)(EGLDisplay,EGLConfig,EGLContext,const EGLint*);
+typedef EGLContext (EGLAPIENTRY * PFN_eglCreateContext)(EGLDisplay,EGLConfig,EGLContext,const EGLint*);
-typedef EGLBoolean (APIENTRY * PFN_eglDestroySurface)(EGLDisplay,EGLSurface);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglDestroySurface)(EGLDisplay,EGLSurface);
-typedef EGLBoolean (APIENTRY * PFN_eglDestroyContext)(EGLDisplay,EGLContext);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglDestroyContext)(EGLDisplay,EGLContext);
-typedef EGLSurface (APIENTRY * PFN_eglCreateWindowSurface)(EGLDisplay,EGLConfig,EGLNativeWindowType,const EGLint*);
+typedef EGLSurface (EGLAPIENTRY * PFN_eglCreateWindowSurface)(EGLDisplay,EGLConfig,EGLNativeWindowType,const EGLint*);
-typedef EGLSurface (APIENTRY * PFN_eglCreatePbufferSurface)(EGLDisplay,EGLContext,const EGLint*);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglMakeCurrent)(EGLDisplay,EGLSurface,EGLSurface,EGLContext);
-typedef EGLBoolean (APIENTRY * PFN_eglMakeCurrent)(EGLDisplay,EGLSurface,EGLSurface,EGLContext);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglSwapBuffers)(EGLDisplay,EGLSurface);
-typedef EGLBoolean (APIENTRY * PFN_eglSwapBuffers)(EGLDisplay,EGLSurface);
+typedef EGLBoolean (EGLAPIENTRY * PFN_eglSwapInterval)(EGLDisplay,EGLint);
-typedef EGLBoolean (APIENTRY * PFN_eglSwapInterval)(EGLDisplay,EGLint);
+typedef const char* (EGLAPIENTRY * PFN_eglQueryString)(EGLDisplay,EGLint);
-typedef const char* (APIENTRY * PFN_eglQueryString)(EGLDisplay,EGLint);
+typedef GLFWglproc (EGLAPIENTRY * PFN_eglGetProcAddress)(const char*);
 typedef GLFWglproc (APIENTRY * PFN_eglGetProcAddress)(const char*);
 #define eglGetConfigAttrib _glfw.egl.GetConfigAttrib
 #define eglGetConfigs _glfw.egl.GetConfigs
 #define eglGetDisplay _glfw.egl.GetDisplay
@ -228,15 +227,14 @@ 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
 #define eglQueryString _glfw.egl.QueryString
 #define eglGetProcAddress _glfw.egl.GetProcAddress
-typedef EGLDisplay (APIENTRY * PFNEGLGETPLATFORMDISPLAYEXTPROC)(EGLenum,void*,const EGLint*);
+typedef EGLDisplay (EGLAPIENTRY * PFNEGLGETPLATFORMDISPLAYEXTPROC)(EGLenum,void*,const EGLint*);
-typedef EGLSurface (APIENTRY * PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)(EGLDisplay,EGLConfig,void*,const EGLint*);
+typedef EGLSurface (EGLAPIENTRY * PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)(EGLDisplay,EGLConfig,void*,const EGLint*);
 #define eglGetPlatformDisplayEXT _glfw.egl.GetPlatformDisplayEXT
 #define eglCreatePlatformWindowSurfaceEXT _glfw.egl.CreatePlatformWindowSurfaceEXT
@ -285,7 +283,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;
@ -333,9 +330,6 @@ typedef VkResult (APIENTRY * PFN_vkEnumerateInstanceExtensionProperties)(const c
 #include "platform.h"
 #define GLFW_NATIVE_INCLUDE_NONE
 #include "../include/GLFW/glfw3native.h"
 // Checks for whether the library has been initialized
 #define _GLFW_REQUIRE_INIT()                         \
    if (!_glfw.initialized)                          \
@ -414,8 +408,8 @@ struct _GLFWwndconfig
    GLFWbool      focusOnShow;
    GLFWbool      mousePassthrough;
    GLFWbool      scaleToMonitor;
    GLFWbool      scaleFramebuffer;
    struct {
        GLFWbool  retina;
        char      frameName[256];
    } ns;
    struct {
@ -424,7 +418,6 @@ struct _GLFWwndconfig
    } x11;
    struct {
        GLFWbool  keymenu;
        GLFWbool  showDefault;
        GLFWbool  genericBadge;
    } win32;
    struct {
@ -545,7 +538,6 @@ struct _GLFWwindow
    GLFWvidmode         videoMode;
    _GLFWmonitor*       monitor;
    _GLFWcursor*        cursor;
    char*               title;
    int                 minwidth, minheight;
    int                 maxwidth, maxheight;
@ -554,7 +546,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];
@ -711,7 +702,7 @@ struct _GLFWplatform
    void (*getMonitorContentScale)(_GLFWmonitor*,float*,float*);
    void (*getMonitorWorkarea)(_GLFWmonitor*,int*,int*,int*,int*);
    GLFWvidmode* (*getVideoModes)(_GLFWmonitor*,int*);
-    GLFWbool (*getVideoMode)(_GLFWmonitor*,GLFWvidmode*);
+    void (*getVideoMode)(_GLFWmonitor*,GLFWvidmode*);
    GLFWbool (*getGammaRamp)(_GLFWmonitor*,GLFWgammaramp*);
    void (*setGammaRamp)(_GLFWmonitor*,const GLFWgammaramp*);
    // window
@ -825,7 +816,6 @@ struct _GLFWlibrary
        GLFWbool        ANGLE_platform_angle_d3d;
        GLFWbool        ANGLE_platform_angle_vulkan;
        GLFWbool        ANGLE_platform_angle_metal;
        GLFWbool        MESA_platform_surfaceless;
        void*           handle;
@ -840,7 +830,6 @@ struct _GLFWlibrary
        PFN_eglDestroySurface       DestroySurface;
        PFN_eglDestroyContext       DestroyContext;
        PFN_eglCreateWindowSurface  CreateWindowSurface;
        PFN_eglCreatePbufferSurface CreatePbufferSurface;
        PFN_eglMakeCurrent          MakeCurrent;
        PFN_eglSwapBuffers          SwapBuffers;
        PFN_eglSwapInterval         SwapInterval;
@ -876,7 +865,6 @@ struct _GLFWlibrary
        GLFWbool        KHR_xlib_surface;
        GLFWbool        KHR_xcb_surface;
        GLFWbool        KHR_wayland_surface;
        GLFWbool        EXT_headless_surface;
    } vk;
    struct {
@ -1020,6 +1008,8 @@ char** _glfwParseUriList(char* text, int* count);
 char* _glfw_strdup(const char* source);
 int _glfw_min(int a, int b);
 int _glfw_max(int a, int b);
 float _glfw_fminf(float a, float b);
 float _glfw_fmaxf(float a, float b);
 void* _glfw_calloc(size_t count, size_t size);
 void* _glfw_realloc(void* pointer, size_t size);
--- 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>
@ -135,7 +135,7 @@ static GLFWbool openJoystickDevice(const char* path)
    }
    _GLFWjoystickLinux linjs = {0};
-    linjs.fd = open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
+    linjs.fd = open(path, O_RDONLY | O_NONBLOCK);
    if (linjs.fd == -1)
        return GLFW_FALSE;
--- 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,14 +445,12 @@ 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);
-    if (!_glfw.platform.getVideoMode(monitor, &monitor->currentMode))
+    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
        return NULL;
    _glfw.platform.getVideoMode(monitor, &monitor->currentMode);
    return &monitor->currentMode;
 }
@ -467,13 +460,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);
@ -495,7 +487,7 @@ GLFWAPI void glfwSetGamma(GLFWmonitor* handle, float gamma)
        // Apply gamma curve
        value = powf(value, 1.f / gamma) * 65535.f + 0.5f;
        // Clamp to value range
-        value = fminf(value, 65535.f);
+        value = _glfw_fminf(value, 65535.f);
        values[i] = (unsigned short) value;
    }
@ -511,11 +503,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 +517,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 +527,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>
 //
@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@ -30,7 +32,6 @@
 #include <unistd.h>
 #include <math.h>
 #include <assert.h>
 static void makeContextCurrentNSGL(_GLFWwindow* window)
 {
@ -162,7 +163,7 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
    if (ctxconfig->client == GLFW_OPENGL_ES_API)
    {
        _glfwInputError(GLFW_API_UNAVAILABLE,
-                        "NSGL: OpenGL ES is not available via NSGL");
+                        "NSGL: OpenGL ES is not available on macOS");
        return GLFW_FALSE;
    }
@ -176,23 +177,16 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
        }
    }
-    if (ctxconfig->major >= 3 && ctxconfig->profile == GLFW_OPENGL_COMPAT_PROFILE)
+    // Context robustness modes (GL_KHR_robustness) are not yet supported by
    {
        _glfwInputError(GLFW_VERSION_UNAVAILABLE,
                        "NSGL: The compatibility profile is not available on macOS");
        return GLFW_FALSE;
    }
    // Context robustness modes (GL_KHR_robustness) are not 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 +212,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);
    }
@ -338,7 +335,7 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
                                  forParameter:NSOpenGLContextParameterSurfaceOpacity];
    }
-    [window->ns.view setWantsBestResolutionOpenGLSurface:window->ns.scaleFramebuffer];
+    [window->ns.view setWantsBestResolutionOpenGLSurface:window->ns.retina];
    [window->context.nsgl.object setView:window->ns.view];
@ -359,6 +356,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 +366,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>
@ -39,81 +39,81 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform)
 {
    const _GLFWplatform null =
    {
-        .platformID = GLFW_PLATFORM_NULL,
+        GLFW_PLATFORM_NULL,
-        .init = _glfwInitNull,
+        _glfwInitNull,
-        .terminate = _glfwTerminateNull,
+        _glfwTerminateNull,
-        .getCursorPos = _glfwGetCursorPosNull,
+        _glfwGetCursorPosNull,
-        .setCursorPos = _glfwSetCursorPosNull,
+        _glfwSetCursorPosNull,
-        .setCursorMode = _glfwSetCursorModeNull,
+        _glfwSetCursorModeNull,
-        .setRawMouseMotion = _glfwSetRawMouseMotionNull,
+        _glfwSetRawMouseMotionNull,
-        .rawMouseMotionSupported = _glfwRawMouseMotionSupportedNull,
+        _glfwRawMouseMotionSupportedNull,
-        .createCursor = _glfwCreateCursorNull,
+        _glfwCreateCursorNull,
-        .createStandardCursor = _glfwCreateStandardCursorNull,
+        _glfwCreateStandardCursorNull,
-        .destroyCursor = _glfwDestroyCursorNull,
+        _glfwDestroyCursorNull,
-        .setCursor = _glfwSetCursorNull,
+        _glfwSetCursorNull,
-        .getScancodeName = _glfwGetScancodeNameNull,
+        _glfwGetScancodeNameNull,
-        .getKeyScancode = _glfwGetKeyScancodeNull,
+        _glfwGetKeyScancodeNull,
-        .setClipboardString = _glfwSetClipboardStringNull,
+        _glfwSetClipboardStringNull,
-        .getClipboardString = _glfwGetClipboardStringNull,
+        _glfwGetClipboardStringNull,
-        .initJoysticks = _glfwInitJoysticksNull,
+        _glfwInitJoysticksNull,
-        .terminateJoysticks = _glfwTerminateJoysticksNull,
+        _glfwTerminateJoysticksNull,
-        .pollJoystick = _glfwPollJoystickNull,
+        _glfwPollJoystickNull,
-        .getMappingName = _glfwGetMappingNameNull,
+        _glfwGetMappingNameNull,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDNull,
+        _glfwUpdateGamepadGUIDNull,
-        .freeMonitor = _glfwFreeMonitorNull,
+        _glfwFreeMonitorNull,
-        .getMonitorPos = _glfwGetMonitorPosNull,
+        _glfwGetMonitorPosNull,
-        .getMonitorContentScale = _glfwGetMonitorContentScaleNull,
+        _glfwGetMonitorContentScaleNull,
-        .getMonitorWorkarea = _glfwGetMonitorWorkareaNull,
+        _glfwGetMonitorWorkareaNull,
-        .getVideoModes = _glfwGetVideoModesNull,
+        _glfwGetVideoModesNull,
-        .getVideoMode = _glfwGetVideoModeNull,
+        _glfwGetVideoModeNull,
-        .getGammaRamp = _glfwGetGammaRampNull,
+        _glfwGetGammaRampNull,
-        .setGammaRamp = _glfwSetGammaRampNull,
+        _glfwSetGammaRampNull,
-        .createWindow = _glfwCreateWindowNull,
+        _glfwCreateWindowNull,
-        .destroyWindow = _glfwDestroyWindowNull,
+        _glfwDestroyWindowNull,
-        .setWindowTitle = _glfwSetWindowTitleNull,
+        _glfwSetWindowTitleNull,
-        .setWindowIcon = _glfwSetWindowIconNull,
+        _glfwSetWindowIconNull,
-        .setWindowProgressIndicator = _glfwSetWindowProgressIndicatorNull,
+        _glfwSetWindowProgressIndicatorNull,
-        .setWindowBadge = _glfwSetWindowBadgeNull,
+        _glfwSetWindowBadgeNull,
-        .setWindowBadgeString = _glfwSetWindowBadgeStringNull,
+        _glfwSetWindowBadgeStringNull,
-        .getWindowPos = _glfwGetWindowPosNull,
+        _glfwGetWindowPosNull,
-        .setWindowPos = _glfwSetWindowPosNull,
+        _glfwSetWindowPosNull,
-        .getWindowSize = _glfwGetWindowSizeNull,
+        _glfwGetWindowSizeNull,
-        .setWindowSize = _glfwSetWindowSizeNull,
+        _glfwSetWindowSizeNull,
-        .setWindowSizeLimits = _glfwSetWindowSizeLimitsNull,
+        _glfwSetWindowSizeLimitsNull,
-        .setWindowAspectRatio = _glfwSetWindowAspectRatioNull,
+        _glfwSetWindowAspectRatioNull,
-        .getFramebufferSize = _glfwGetFramebufferSizeNull,
+        _glfwGetFramebufferSizeNull,
-        .getWindowFrameSize = _glfwGetWindowFrameSizeNull,
+        _glfwGetWindowFrameSizeNull,
-        .getWindowContentScale = _glfwGetWindowContentScaleNull,
+        _glfwGetWindowContentScaleNull,
-        .iconifyWindow = _glfwIconifyWindowNull,
+        _glfwIconifyWindowNull,
-        .restoreWindow = _glfwRestoreWindowNull,
+        _glfwRestoreWindowNull,
-        .maximizeWindow = _glfwMaximizeWindowNull,
+        _glfwMaximizeWindowNull,
-        .showWindow = _glfwShowWindowNull,
+        _glfwShowWindowNull,
-        .hideWindow = _glfwHideWindowNull,
+        _glfwHideWindowNull,
-        .requestWindowAttention = _glfwRequestWindowAttentionNull,
+        _glfwRequestWindowAttentionNull,
-        .focusWindow = _glfwFocusWindowNull,
+        _glfwFocusWindowNull,
-        .setWindowMonitor = _glfwSetWindowMonitorNull,
+        _glfwSetWindowMonitorNull,
-        .windowFocused = _glfwWindowFocusedNull,
+        _glfwWindowFocusedNull,
-        .windowIconified = _glfwWindowIconifiedNull,
+        _glfwWindowIconifiedNull,
-        .windowVisible = _glfwWindowVisibleNull,
+        _glfwWindowVisibleNull,
-        .windowMaximized = _glfwWindowMaximizedNull,
+        _glfwWindowMaximizedNull,
-        .windowHovered = _glfwWindowHoveredNull,
+        _glfwWindowHoveredNull,
-        .framebufferTransparent = _glfwFramebufferTransparentNull,
+        _glfwFramebufferTransparentNull,
-        .getWindowOpacity = _glfwGetWindowOpacityNull,
+        _glfwGetWindowOpacityNull,
-        .setWindowResizable = _glfwSetWindowResizableNull,
+        _glfwSetWindowResizableNull,
-        .setWindowDecorated = _glfwSetWindowDecoratedNull,
+        _glfwSetWindowDecoratedNull,
-        .setWindowFloating = _glfwSetWindowFloatingNull,
+        _glfwSetWindowFloatingNull,
-        .setWindowOpacity = _glfwSetWindowOpacityNull,
+        _glfwSetWindowOpacityNull,
-        .setWindowMousePassthrough = _glfwSetWindowMousePassthroughNull,
+        _glfwSetWindowMousePassthroughNull,
-        .pollEvents = _glfwPollEventsNull,
+        _glfwPollEventsNull,
-        .waitEvents = _glfwWaitEventsNull,
+        _glfwWaitEventsNull,
-        .waitEventsTimeout = _glfwWaitEventsTimeoutNull,
+        _glfwWaitEventsTimeoutNull,
-        .postEmptyEvent = _glfwPostEmptyEventNull,
+        _glfwPostEmptyEventNull,
-        .getEGLPlatform = _glfwGetEGLPlatformNull,
+        _glfwGetEGLPlatformNull,
-        .getEGLNativeDisplay = _glfwGetEGLNativeDisplayNull,
+        _glfwGetEGLNativeDisplayNull,
-        .getEGLNativeWindow = _glfwGetEGLNativeWindowNull,
+        _glfwGetEGLNativeWindowNull,
-        .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsNull,
+        _glfwGetRequiredInstanceExtensionsNull,
-        .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportNull,
+        _glfwGetPhysicalDevicePresentationSupportNull,
-        .createWindowSurface = _glfwCreateWindowSurfaceNull
+        _glfwCreateWindowSurfaceNull,
    };
    *platform = null;
--- 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>
@ -109,10 +109,9 @@ GLFWvidmode* _glfwGetVideoModesNull(_GLFWmonitor* monitor, int* found)
    return mode;
 }
-GLFWbool _glfwGetVideoModeNull(_GLFWmonitor* monitor, GLFWvidmode* mode)
+void _glfwGetVideoModeNull(_GLFWmonitor* monitor, GLFWvidmode* mode)
 {
    *mode = getVideoMode();
    return GLFW_TRUE;
 }
 GLFWbool _glfwGetGammaRampNull(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
@ -129,7 +128,7 @@ GLFWbool _glfwGetGammaRampNull(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
            float value;
            value = i / (float) (monitor->null.ramp.size - 1);
            value = powf(value, 1.f / gamma) * 65535.f + 0.5f;
-            value = fminf(value, 65535.f);
+            value = _glfw_fminf(value, 65535.f);
            monitor->null.ramp.red[i]   = (unsigned short) value;
            monitor->null.ramp.green[i] = (unsigned short) value;
--- 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
@ -175,6 +164,7 @@ typedef struct _GLFWwindowNull
    int             ypos;
    int             width;
    int             height;
    char*           title;
    GLFWbool        visible;
    GLFWbool        iconified;
    GLFWbool        maximized;
@ -215,7 +205,7 @@ void _glfwGetMonitorPosNull(_GLFWmonitor* monitor, int* xpos, int* ypos);
 void _glfwGetMonitorContentScaleNull(_GLFWmonitor* monitor, float* xscale, float* yscale);
 void _glfwGetMonitorWorkareaNull(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
 GLFWvidmode* _glfwGetVideoModesNull(_GLFWmonitor* monitor, int* found);
-GLFWbool _glfwGetVideoModeNull(_GLFWmonitor* monitor, GLFWvidmode* mode);
+void _glfwGetVideoModeNull(_GLFWmonitor* monitor, GLFWvidmode* mode);
 GLFWbool _glfwGetGammaRampNull(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
 void _glfwSetGammaRampNull(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
--- 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)
 {
@ -271,9 +270,8 @@ void _glfwSetWindowSizeNull(_GLFWwindow* window, int width, int height)
    {
        window->null.width = width;
        window->null.height = height;
        _glfwInputFramebufferSize(window, width, height);
        _glfwInputWindowDamage(window);
        _glfwInputWindowSize(window, width, height);
        _glfwInputFramebufferSize(window, width, height);
    }
 }
@ -565,15 +563,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)
@ -715,18 +710,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,
@ -734,28 +724,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>
@ -25,12 +25,13 @@
 //
 //========================================================================
 #include "internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "internal.h"
 static void makeContextCurrentOSMesa(_GLFWwindow* window)
 {
    if (window)
@ -296,12 +297,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 +336,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 +370,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>
@ -27,9 +27,6 @@
 #include "internal.h"
 #include <string.h>
 #include <stdlib.h>
 // These construct a string literal from individual numeric constants
 #define _GLFW_CONCAT_VERSION(m, n, r) #m "." #n "." #r
 #define _GLFW_MAKE_VERSION(m, n, r) _GLFW_CONCAT_VERSION(m, n, r)
@ -50,12 +47,12 @@ static const struct
 #if defined(_GLFW_COCOA)
    { GLFW_PLATFORM_COCOA, _glfwConnectCocoa },
 #endif
 #if defined(_GLFW_WAYLAND)
    { GLFW_PLATFORM_WAYLAND, _glfwConnectWayland },
 #endif
 #if defined(_GLFW_X11)
    { GLFW_PLATFORM_X11, _glfwConnectX11 },
 #endif
 #if defined(_GLFW_WAYLAND)
    { GLFW_PLATFORM_WAYLAND, _glfwConnectWayland },
 #endif
 };
 GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
@ -83,22 +80,6 @@ GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
        return GLFW_FALSE;
    }
 #if defined(_GLFW_WAYLAND) && defined(_GLFW_X11)
    if (desiredID == GLFW_ANY_PLATFORM)
    {
        const char* const session = getenv("XDG_SESSION_TYPE");
        if (session)
        {
            // Only follow XDG_SESSION_TYPE if it is set correctly and the
            // environment looks plausble; otherwise fall back to detection
            if (strcmp(session, "wayland") == 0 && getenv("WAYLAND_DISPLAY"))
                desiredID = GLFW_PLATFORM_WAYLAND;
            else if (strcmp(session, "x11") == 0 && getenv("DISPLAY"))
                desiredID = GLFW_PLATFORM_X11;
        }
    }
 #endif
    if (desiredID == GLFW_ANY_PLATFORM)
    {
        // If there is exactly one platform available for auto-selection, let it emit the
--- 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>
@ -38,13 +38,9 @@
 #endif
 #include "null_platform.h"
 #define GLFW_EXPOSE_NATIVE_EGL
 #define GLFW_EXPOSE_NATIVE_OSMESA
 #if defined(_GLFW_WIN32)
 #include "win32_platform.h"
 #define GLFW_EXPOSE_NATIVE_WIN32
 #define GLFW_EXPOSE_NATIVE_WGL
 #else
 #define GLFW_WIN32_WINDOW_STATE
 #define GLFW_WIN32_MONITOR_STATE
@ -56,8 +52,6 @@
 #if defined(_GLFW_COCOA)
 #include "cocoa_platform.h"
 #define GLFW_EXPOSE_NATIVE_COCOA
 #define GLFW_EXPOSE_NATIVE_NSGL
 #else
 #define GLFW_COCOA_WINDOW_STATE
 #define GLFW_COCOA_MONITOR_STATE
@ -69,7 +63,6 @@
 #if defined(_GLFW_WAYLAND)
 #include "wl_platform.h"
 #define GLFW_EXPOSE_NATIVE_WAYLAND
 #else
 #define GLFW_WAYLAND_WINDOW_STATE
 #define GLFW_WAYLAND_MONITOR_STATE
@ -79,8 +72,6 @@
 #if defined(_GLFW_X11)
 #include "x11_platform.h"
 #define GLFW_EXPOSE_NATIVE_X11
 #define GLFW_EXPOSE_NATIVE_GLX
 #else
 #define GLFW_X11_WINDOW_STATE
 #define GLFW_X11_MONITOR_STATE
--- 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>
@ -115,23 +115,6 @@ static int choosePixelFormatWGL(_GLFWwindow* window,
            if (_glfw.wgl.EXT_colorspace)
                ADD_ATTRIB(WGL_COLORSPACE_EXT);
        }
        // NOTE: In a Parallels VM WGL_ARB_pixel_format returns fewer pixel formats than
        //       DescribePixelFormat, violating the guarantees of the extension spec
        // HACK: Iterate through the minimum of both counts
        const int attrib = WGL_NUMBER_PIXEL_FORMATS_ARB;
        int extensionCount;
        if (!wglGetPixelFormatAttribivARB(window->context.wgl.dc,
                                          1, 0, 1, &attrib, &extensionCount))
        {
            _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
                                 "WGL: Failed to retrieve pixel format attribute");
            return 0;
        }
        nativeCount = _glfw_min(nativeCount, extensionCount);
    }
    usableConfigs = _glfw_calloc(nativeCount, sizeof(_GLFWfbconfig));
@ -775,6 +758,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 +768,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>
@ -430,6 +430,46 @@ static GLFWbool createHelperWindow(void)
   return GLFW_TRUE;
 }
 // Creates the blank cursor
 //
 static void createBlankCursor(void)
 {
    // HACK: Create a transparent cursor as using the NULL cursor breaks
    //       using SetCursorPos when connected over RDP
    int cursorWidth = GetSystemMetrics(SM_CXCURSOR);
    int cursorHeight = GetSystemMetrics(SM_CYCURSOR);
    unsigned char* andMask = _glfw_calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char));
    unsigned char* xorMask = _glfw_calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char));
    if (andMask != NULL && xorMask != NULL) {
        memset(andMask, 0xFF, (size_t)(cursorWidth * cursorHeight / 8));
        // Cursor creation might fail, but that's fine as we get NULL in that case,
        // which serves as an acceptable fallback blank cursor (other than on RDP)
        _glfw.win32.blankCursor = CreateCursor(NULL, 0, 0, cursorWidth, cursorHeight, andMask, xorMask);
        _glfw_free(andMask);
        _glfw_free(xorMask);
    }
 }
 // Initialize for remote sessions
 //
 static void initRemoteSession(void)
 {
    //Check if the current progress was started with Remote Desktop.
    _glfw.win32.isRemoteSession = GetSystemMetrics(SM_REMOTESESSION) > 0;
    // With Remote desktop, we need to create a blank cursor because of the cursor is Set to NULL
    // if cannot be moved to center in capture mode. If not Remote Desktop win32.blankCursor stays NULL
    // and will perform has before (normal).
    if (_glfw.win32.isRemoteSession)
    {
        createBlankCursor();
    }
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
@ -602,81 +642,81 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform)
 {
    const _GLFWplatform win32 =
    {
-        .platformID = GLFW_PLATFORM_WIN32,
+        GLFW_PLATFORM_WIN32,
-        .init = _glfwInitWin32,
+        _glfwInitWin32,
-        .terminate = _glfwTerminateWin32,
+        _glfwTerminateWin32,
-        .getCursorPos = _glfwGetCursorPosWin32,
+        _glfwGetCursorPosWin32,
-        .setCursorPos = _glfwSetCursorPosWin32,
+        _glfwSetCursorPosWin32,
-        .setCursorMode = _glfwSetCursorModeWin32,
+        _glfwSetCursorModeWin32,
-        .setRawMouseMotion = _glfwSetRawMouseMotionWin32,
+        _glfwSetRawMouseMotionWin32,
-        .rawMouseMotionSupported = _glfwRawMouseMotionSupportedWin32,
+        _glfwRawMouseMotionSupportedWin32,
-        .createCursor = _glfwCreateCursorWin32,
+        _glfwCreateCursorWin32,
-        .createStandardCursor = _glfwCreateStandardCursorWin32,
+        _glfwCreateStandardCursorWin32,
-        .destroyCursor = _glfwDestroyCursorWin32,
+        _glfwDestroyCursorWin32,
-        .setCursor = _glfwSetCursorWin32,
+        _glfwSetCursorWin32,
-        .getScancodeName = _glfwGetScancodeNameWin32,
+        _glfwGetScancodeNameWin32,
-        .getKeyScancode = _glfwGetKeyScancodeWin32,
+        _glfwGetKeyScancodeWin32,
-        .setClipboardString = _glfwSetClipboardStringWin32,
+        _glfwSetClipboardStringWin32,
-        .getClipboardString = _glfwGetClipboardStringWin32,
+        _glfwGetClipboardStringWin32,
-        .initJoysticks = _glfwInitJoysticksWin32,
+        _glfwInitJoysticksWin32,
-        .terminateJoysticks = _glfwTerminateJoysticksWin32,
+        _glfwTerminateJoysticksWin32,
-        .pollJoystick = _glfwPollJoystickWin32,
+        _glfwPollJoystickWin32,
-        .getMappingName = _glfwGetMappingNameWin32,
+        _glfwGetMappingNameWin32,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDWin32,
+        _glfwUpdateGamepadGUIDWin32,
-        .freeMonitor = _glfwFreeMonitorWin32,
+        _glfwFreeMonitorWin32,
-        .getMonitorPos = _glfwGetMonitorPosWin32,
+        _glfwGetMonitorPosWin32,
-        .getMonitorContentScale = _glfwGetMonitorContentScaleWin32,
+        _glfwGetMonitorContentScaleWin32,
-        .getMonitorWorkarea = _glfwGetMonitorWorkareaWin32,
+        _glfwGetMonitorWorkareaWin32,
-        .getVideoModes = _glfwGetVideoModesWin32,
+        _glfwGetVideoModesWin32,
-        .getVideoMode = _glfwGetVideoModeWin32,
+        _glfwGetVideoModeWin32,
-        .getGammaRamp = _glfwGetGammaRampWin32,
+        _glfwGetGammaRampWin32,
-        .setGammaRamp = _glfwSetGammaRampWin32,
+        _glfwSetGammaRampWin32,
-        .createWindow = _glfwCreateWindowWin32,
+        _glfwCreateWindowWin32,
-        .destroyWindow = _glfwDestroyWindowWin32,
+        _glfwDestroyWindowWin32,
-        .setWindowTitle = _glfwSetWindowTitleWin32,
+        _glfwSetWindowTitleWin32,
-        .setWindowIcon = _glfwSetWindowIconWin32,
+        _glfwSetWindowIconWin32,
-        .setWindowProgressIndicator = _glfwSetWindowProgressIndicatorWin32,
+        _glfwSetWindowProgressIndicatorWin32,
-        .setWindowBadge = _glfwSetWindowBadgeWin32,
+        _glfwSetWindowBadgeWin32,
-        .setWindowBadgeString = _glfwSetWindowBadgeStringWin32,
+        _glfwSetWindowBadgeStringWin32,
-        .getWindowPos = _glfwGetWindowPosWin32,
+        _glfwGetWindowPosWin32,
-        .setWindowPos = _glfwSetWindowPosWin32,
+        _glfwSetWindowPosWin32,
-        .getWindowSize = _glfwGetWindowSizeWin32,
+        _glfwGetWindowSizeWin32,
-        .setWindowSize = _glfwSetWindowSizeWin32,
+        _glfwSetWindowSizeWin32,
-        .setWindowSizeLimits = _glfwSetWindowSizeLimitsWin32,
+        _glfwSetWindowSizeLimitsWin32,
-        .setWindowAspectRatio = _glfwSetWindowAspectRatioWin32,
+        _glfwSetWindowAspectRatioWin32,
-        .getFramebufferSize = _glfwGetFramebufferSizeWin32,
+        _glfwGetFramebufferSizeWin32,
-        .getWindowFrameSize = _glfwGetWindowFrameSizeWin32,
+        _glfwGetWindowFrameSizeWin32,
-        .getWindowContentScale = _glfwGetWindowContentScaleWin32,
+        _glfwGetWindowContentScaleWin32,
-        .iconifyWindow = _glfwIconifyWindowWin32,
+        _glfwIconifyWindowWin32,
-        .restoreWindow = _glfwRestoreWindowWin32,
+        _glfwRestoreWindowWin32,
-        .maximizeWindow = _glfwMaximizeWindowWin32,
+        _glfwMaximizeWindowWin32,
-        .showWindow = _glfwShowWindowWin32,
+        _glfwShowWindowWin32,
-        .hideWindow = _glfwHideWindowWin32,
+        _glfwHideWindowWin32,
-        .requestWindowAttention = _glfwRequestWindowAttentionWin32,
+        _glfwRequestWindowAttentionWin32,
-        .focusWindow = _glfwFocusWindowWin32,
+        _glfwFocusWindowWin32,
-        .setWindowMonitor = _glfwSetWindowMonitorWin32,
+        _glfwSetWindowMonitorWin32,
-        .windowFocused = _glfwWindowFocusedWin32,
+        _glfwWindowFocusedWin32,
-        .windowIconified = _glfwWindowIconifiedWin32,
+        _glfwWindowIconifiedWin32,
-        .windowVisible = _glfwWindowVisibleWin32,
+        _glfwWindowVisibleWin32,
-        .windowMaximized = _glfwWindowMaximizedWin32,
+        _glfwWindowMaximizedWin32,
-        .windowHovered = _glfwWindowHoveredWin32,
+        _glfwWindowHoveredWin32,
-        .framebufferTransparent = _glfwFramebufferTransparentWin32,
+        _glfwFramebufferTransparentWin32,
-        .getWindowOpacity = _glfwGetWindowOpacityWin32,
+        _glfwGetWindowOpacityWin32,
-        .setWindowResizable = _glfwSetWindowResizableWin32,
+        _glfwSetWindowResizableWin32,
-        .setWindowDecorated = _glfwSetWindowDecoratedWin32,
+        _glfwSetWindowDecoratedWin32,
-        .setWindowFloating = _glfwSetWindowFloatingWin32,
+        _glfwSetWindowFloatingWin32,
-        .setWindowOpacity = _glfwSetWindowOpacityWin32,
+        _glfwSetWindowOpacityWin32,
-        .setWindowMousePassthrough = _glfwSetWindowMousePassthroughWin32,
+        _glfwSetWindowMousePassthroughWin32,
-        .pollEvents = _glfwPollEventsWin32,
+        _glfwPollEventsWin32,
-        .waitEvents = _glfwWaitEventsWin32,
+        _glfwWaitEventsWin32,
-        .waitEventsTimeout = _glfwWaitEventsTimeoutWin32,
+        _glfwWaitEventsTimeoutWin32,
-        .postEmptyEvent = _glfwPostEmptyEventWin32,
+        _glfwPostEmptyEventWin32,
-        .getEGLPlatform = _glfwGetEGLPlatformWin32,
+        _glfwGetEGLPlatformWin32,
-        .getEGLNativeDisplay = _glfwGetEGLNativeDisplayWin32,
+        _glfwGetEGLNativeDisplayWin32,
-        .getEGLNativeWindow = _glfwGetEGLNativeWindowWin32,
+        _glfwGetEGLNativeWindowWin32,
-        .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsWin32,
+        _glfwGetRequiredInstanceExtensionsWin32,
-        .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportWin32,
+        _glfwGetPhysicalDevicePresentationSupportWin32,
-        .createWindowSurface = _glfwCreateWindowSurfaceWin32
+        _glfwCreateWindowSurfaceWin32,
    };
    *platform = win32;
@ -701,6 +741,15 @@ int _glfwInitWin32(void)
    if (!createHelperWindow())
        return GLFW_FALSE;
    //Some hacks are needed to support Remote Desktop...
    initRemoteSession();
    if (_glfw.win32.isRemoteSession && _glfw.win32.blankCursor == NULL )
    {
        _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
                             "Win32: Failed to create blank cursor for remote session.");
        return GLFW_FALSE;
    }
    _glfwPollMonitorsWin32();
    return GLFW_TRUE;
 }
@ -708,7 +757,7 @@ int _glfwInitWin32(void)
 void _glfwTerminateWin32(void)
 {
    if (_glfw.win32.blankCursor)
-        DestroyIcon((HICON) _glfw.win32.blankCursor);
+        DestroyCursor(_glfw.win32.blankCursor);
    if (_glfw.win32.deviceNotificationHandle)
        UnregisterDeviceNotification(_glfw.win32.deviceNotificationHandle);
--- 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
@ -471,17 +470,13 @@ GLFWvidmode* _glfwGetVideoModesWin32(_GLFWmonitor* monitor, int* count)
    return result;
 }
-GLFWbool _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode)
+void _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode)
 {
    DEVMODEW dm;
    ZeroMemory(&dm, sizeof(dm));
    dm.dmSize = sizeof(dm);
-    if (!EnumDisplaySettingsW(monitor->win32.adapterName, ENUM_CURRENT_SETTINGS, &dm))
+    EnumDisplaySettingsW(monitor->win32.adapterName, ENUM_CURRENT_SETTINGS, &dm);
    {
        _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to query display settings");
        return GLFW_FALSE;
    }
    mode->width  = dm.dmPelsWidth;
    mode->height = dm.dmPelsHeight;
@ -490,8 +485,6 @@ GLFWbool _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode)
                  &mode->redBits,
                  &mode->greenBits,
                  &mode->blueBits);
    return GLFW_TRUE;
 }
 GLFWbool _glfwGetGammaRampWin32(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
@ -540,33 +533,15 @@ void _glfwSetGammaRampWin32(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI const char* glfwGetWin32Adapter(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Win32: Platform not initialized");
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    return monitor->win32.publicAdapterName;
 }
 GLFWAPI const char* glfwGetWin32Monitor(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WIN32)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Win32: Platform not initialized");
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(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>
@ -497,7 +497,6 @@ typedef struct _GLFWwindowWin32
    GLFWbool            transparent;
    GLFWbool            scaleToMonitor;
    GLFWbool            keymenu;
    GLFWbool            showDefault;
    GLFWbool            genericBadge;
    // Cached size used to filter out duplicate events
@ -535,7 +534,9 @@ typedef struct _GLFWlibraryWin32
    RAWINPUT*           rawInput;
    int                 rawInputSize;
    UINT                mouseTrailSize;
-    // The cursor handle to use to hide the cursor (NULL or a transparent cursor)
+    // Indicate if the process was started behind Remote Destop
    BOOL                isRemoteSession;
    // An invisible cursor, needed for special cases (see WM_INPUT handler)
    HCURSOR             blankCursor;
    struct {
@ -688,7 +689,7 @@ void _glfwGetMonitorPosWin32(_GLFWmonitor* monitor, int* xpos, int* ypos);
 void _glfwGetMonitorContentScaleWin32(_GLFWmonitor* monitor, float* xscale, float* yscale);
 void _glfwGetMonitorWorkareaWin32(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
 GLFWvidmode* _glfwGetVideoModesWin32(_GLFWmonitor* monitor, int* count);
-GLFWbool _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode);
+void _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode);
 GLFWbool _glfwGetGammaRampWin32(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
 void _glfwSetGammaRampWin32(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
--- 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>
 #include <stdio.h>
@ -234,12 +233,10 @@ static void updateCursorImage(_GLFWwindow* window)
            SetCursor(LoadCursorW(NULL, IDC_ARROW));
    }
    else
-    {
+        //Connected via Remote Desktop, NULL cursor will present SetCursorPos the move the cursor.
-        // NOTE: Via Remote Desktop, setting the cursor to NULL does not hide it.
+        //using a blank cursor fix that.
-        // HACK: When running locally, it is set to NULL, but when connected via Remote
+        //When not via Remote Desktop, win32.blankCursor should be NULL
        //       Desktop, this is a transparent cursor.
        SetCursor(_glfw.win32.blankCursor);
    }
 }
 // Sets the cursor clip rect to the window content area
@ -904,6 +901,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
            HRAWINPUT ri = (HRAWINPUT) lParam;
            RAWINPUT* data = NULL;
            int dx, dy;
            int width, height;
            POINT pos;
            if (_glfw.win32.disabledCursorWindow != window)
                break;
@ -930,29 +929,29 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
            data = _glfw.win32.rawInput;
            if (data->data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE)
-            {
+            {   
-                POINT pos = {0};
+                if (_glfw.win32.isRemoteSession)
                int width, height;
                if (data->data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP)
                {
-                    pos.x += GetSystemMetrics(SM_XVIRTUALSCREEN);
+                    //Remote Desktop Mode...
-                    pos.y += GetSystemMetrics(SM_YVIRTUALSCREEN);
+                    // As per https://github.com/Microsoft/DirectXTK/commit/ef56b63f3739381e451f7a5a5bd2c9779d2a7555
-                    width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+                    // MOUSE_MOVE_ABSOLUTE is a range from 0 through 65535, based on the screen size.
-                    height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+                    // As far as I can tell, absolute mode only occurs over RDP though.
                    width = GetSystemMetrics((data->data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP) ? SM_CXVIRTUALSCREEN : SM_CXSCREEN);
                    height = GetSystemMetrics((data->data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP) ? SM_CYVIRTUALSCREEN : SM_CYSCREEN);
                    pos.x = (int)((data->data.mouse.lLastX / 65535.0f) * width);
                    pos.y = (int)((data->data.mouse.lLastY / 65535.0f) * height);
                    ScreenToClient(window->win32.handle, &pos);
                    dx = pos.x - window->win32.lastCursorPosX;
                    dy = pos.y - window->win32.lastCursorPosY;
                }
                else
                {
-                    width = GetSystemMetrics(SM_CXSCREEN);
+                    //Normal mode... We should have the right absolute coords in data.mouse
-                    height = GetSystemMetrics(SM_CYSCREEN);
+                    dx = data->data.mouse.lLastX - window->win32.lastCursorPosX;
                    dy = data->data.mouse.lLastY - window->win32.lastCursorPosY;
                }
                pos.x += (int) ((data->data.mouse.lLastX / 65535.f) * width);
                pos.y += (int) ((data->data.mouse.lLastY / 65535.f) * height);
                ScreenToClient(window->win32.handle, &pos);
                dx = pos.x - window->win32.lastCursorPosX;
                dy = pos.y - window->win32.lastCursorPosY;
            }
            else
            {
@ -1328,34 +1327,6 @@ static int createNativeWindow(_GLFWwindow* window,
        }
    }
    if (GetSystemMetrics(SM_REMOTESESSION))
    {
        // NOTE: On Remote Desktop, setting the cursor to NULL does not hide it
        // HACK: Create a transparent cursor and always set that instead of NULL
        //       When not on Remote Desktop, this handle is NULL and normal hiding is used
        if (!_glfw.win32.blankCursor)
        {
            const int cursorWidth = GetSystemMetrics(SM_CXCURSOR);
            const int cursorHeight = GetSystemMetrics(SM_CYCURSOR);
            unsigned char* cursorPixels = _glfw_calloc(cursorWidth * cursorHeight, 4);
            if (!cursorPixels)
                return GLFW_FALSE;
            // NOTE: Windows checks whether the image is fully transparent and if so
            //       just ignores the alpha channel and makes the whole cursor opaque
            // HACK: Make one pixel slightly less transparent
            cursorPixels[3] = 1;
            const GLFWimage cursorImage = { cursorWidth, cursorHeight, cursorPixels };
            _glfw.win32.blankCursor = createIcon(&cursorImage, 0, 0, FALSE);
            _glfw_free(cursorPixels);
            if (!_glfw.win32.blankCursor)
                return GLFW_FALSE;
        }
    }
    if (window->monitor)
    {
        MONITORINFO mi = { sizeof(mi) };
@ -1436,7 +1407,6 @@ static int createNativeWindow(_GLFWwindow* window,
    window->win32.scaleToMonitor = wndconfig->scaleToMonitor;
    window->win32.keymenu = wndconfig->win32.keymenu;
    window->win32.showDefault = wndconfig->win32.showDefault;
    window->win32.genericBadge = wndconfig->win32.genericBadge;
    if (!window->monitor)
@ -2309,23 +2279,7 @@ void _glfwMaximizeWindowWin32(_GLFWwindow* window)
 void _glfwShowWindowWin32(_GLFWwindow* window)
 {
-    int showCommand = SW_SHOWNA;
+    ShowWindow(window->win32.handle, SW_SHOWNA);
    if (window->win32.showDefault)
    {
        // NOTE: GLFW windows currently do not seem to match the Windows 10 definition of
        //       a main window, so even SW_SHOWDEFAULT does nothing
        //       This definition is undocumented and can change (source: Raymond Chen)
        // HACK: Apply the STARTUPINFO show command manually if available
        STARTUPINFOW si = { sizeof(si) };
        GetStartupInfoW(&si);
        if (si.dwFlags & STARTF_USESHOWWINDOW)
            showCommand = si.wShowWindow;
        window->win32.showDefault = GLFW_FALSE;
    }
    ShowWindow(window->win32.handle, showCommand);
 }
 void _glfwHideWindowWin32(_GLFWwindow* window)
@ -2776,17 +2730,14 @@ void _glfwSetCursorModeWin32(_GLFWwindow* window, int mode)
 const char* _glfwGetScancodeNameWin32(int scancode)
 {
-    if (scancode < 0 || scancode > (KF_EXTENDED | 0xff))
+    if (scancode < 0 || scancode > (KF_EXTENDED | 0xff) ||
        _glfw.win32.keycodes[scancode] == GLFW_KEY_UNKNOWN)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid scancode %i", scancode);
        return NULL;
    }
-    const int key = _glfw.win32.keycodes[scancode];
+    return _glfw.win32.keynames[_glfw.win32.keycodes[scancode]];
    if (key == GLFW_KEY_UNKNOWN)
        return NULL;
    return _glfw.win32.keynames[key];
 }
 int _glfwGetKeyScancodeWin32(int key)
@ -3084,6 +3035,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)
@ -3093,9 +3045,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>
@ -242,7 +242,6 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
    window->maxheight   = GLFW_DONT_CARE;
    window->numer       = GLFW_DONT_CARE;
    window->denom       = GLFW_DONT_CARE;
    window->title       = _glfw_strdup(title);
    if (!_glfw.platform.createWindow(window, &wndconfig, &ctxconfig, &fbconfig))
    {
@ -275,7 +274,6 @@ void glfwDefaultWindowHints(void)
    _glfw.hints.window.focusOnShow  = GLFW_TRUE;
    _glfw.hints.window.xpos         = GLFW_ANY_POSITION;
    _glfw.hints.window.ypos         = GLFW_ANY_POSITION;
    _glfw.hints.window.scaleFramebuffer = GLFW_TRUE;
    // The default is 24 bits of color, 24 bits of depth and 8 bits of stencil,
    // double buffered
@ -290,6 +288,9 @@ void glfwDefaultWindowHints(void)
    // The default is to select the highest available refresh rate
    _glfw.hints.refreshRate = GLFW_DONT_CARE;
    // The default is to use full Retina resolution framebuffers
    _glfw.hints.window.ns.retina = GLFW_TRUE;
 }
 GLFWAPI void glfwWindowHint(int hint, int value)
@ -373,12 +374,12 @@ GLFWAPI void glfwWindowHint(int hint, int value)
        case GLFW_POSITION_Y:
            _glfw.hints.window.ypos = value;
            return;
        case GLFW_COCOA_RETINA_FRAMEBUFFER:
            _glfw.hints.window.ns.retina = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        case GLFW_WIN32_KEYBOARD_MENU:
            _glfw.hints.window.win32.keymenu = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        case GLFW_WIN32_SHOWDEFAULT:
            _glfw.hints.window.win32.showDefault = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        case GLFW_WIN32_GENERIC_BADGE:
            _glfw.hints.window.win32.genericBadge = value ? GLFW_TRUE : GLFW_FALSE;
            return;
@ -388,10 +389,6 @@ GLFWAPI void glfwWindowHint(int hint, int value)
        case GLFW_SCALE_TO_MONITOR:
            _glfw.hints.window.scaleToMonitor = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        case GLFW_SCALE_FRAMEBUFFER:
        case GLFW_COCOA_RETINA_FRAMEBUFFER:
            _glfw.hints.window.scaleFramebuffer = value ? GLFW_TRUE : GLFW_FALSE;
            return;
        case GLFW_CENTER_CURSOR:
            _glfw.hints.window.centerCursor = value ? GLFW_TRUE : GLFW_FALSE;
            return;
@ -470,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;
@ -498,69 +495,49 @@ GLFWAPI void glfwDestroyWindow(GLFWwindow* handle)
        *prev = window->next;
    }
    _glfw_free(window->title);
    _glfw_free(window);
 }
 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)
 {
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    _GLFW_REQUIRE_INIT();
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != NULL);
    window->shouldClose = value;
 }
 GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    _GLFWwindow* window = (_GLFWwindow*) handle;
    assert(window != 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);
    _glfw.platform.setWindowTitle(window, title);
    _glfw_free(prev);
 }
 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");
@ -633,26 +610,25 @@ GLFWAPI void glfwSetWindowBadgeString(GLFWwindow* handle, const char* string)
 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;
@ -661,29 +637,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;
@ -694,11 +668,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)
@ -737,14 +711,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)
@ -767,16 +740,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);
 }
@ -784,6 +756,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)
@ -794,50 +769,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(1.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);
@ -849,31 +817,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;
@ -882,11 +848,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;
@ -898,21 +864,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;
@ -921,21 +887,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:
@ -994,11 +960,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)
@ -1040,11 +1006,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;
 }
@ -1054,15 +1019,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,
@ -1090,32 +1054,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;
 }
@ -1123,11 +1084,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;
 }
@ -1135,11 +1095,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;
 }
@ -1147,11 +1106,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;
 }
@ -1159,11 +1117,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;
 }
@ -1171,11 +1128,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;
 }
@ -1183,11 +1139,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;
 }
@ -1195,11 +1150,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;
 }
@ -1207,11 +1161,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>
 //
@ -46,8 +46,6 @@
 #include "viewporter-client-protocol.h"
 #include "relative-pointer-unstable-v1-client-protocol.h"
 #include "pointer-constraints-unstable-v1-client-protocol.h"
 #include "fractional-scale-v1-client-protocol.h"
 #include "xdg-activation-v1-client-protocol.h"
 #include "idle-inhibit-unstable-v1-client-protocol.h"
 // NOTE: Versions of wayland-scanner prior to 1.17.91 named every global array of
@ -79,14 +77,6 @@
 #include "pointer-constraints-unstable-v1-client-protocol-code.h"
 #undef types
 #define types _glfw_fractional_scale_types
 #include "fractional-scale-v1-client-protocol-code.h"
 #undef types
 #define types _glfw_xdg_activation_types
 #include "xdg-activation-v1-client-protocol-code.h"
 #undef types
 #define types _glfw_idle_inhibit_types
 #include "idle-inhibit-unstable-v1-client-protocol-code.h"
 #undef types
@ -137,13 +127,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)
@ -194,20 +177,6 @@ static void registryHandleGlobal(void* userData,
                             &zwp_idle_inhibit_manager_v1_interface,
                             1);
    }
    else if (strcmp(interface, "xdg_activation_v1") == 0)
    {
        _glfw.wl.activationManager =
            wl_registry_bind(registry, name,
                             &xdg_activation_v1_interface,
                             1);
    }
    else if (strcmp(interface, "wp_fractional_scale_manager_v1") == 0)
    {
        _glfw.wl.fractionalScaleManager =
            wl_registry_bind(registry, name,
                             &wp_fractional_scale_manager_v1_interface,
                             1);
    }
 }
 static void registryHandleGlobalRemove(void* userData,
@ -436,89 +405,89 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
 {
    const _GLFWplatform wayland =
    {
-        .platformID = GLFW_PLATFORM_WAYLAND,
+        GLFW_PLATFORM_WAYLAND,
-        .init = _glfwInitWayland,
+        _glfwInitWayland,
-        .terminate = _glfwTerminateWayland,
+        _glfwTerminateWayland,
-        .getCursorPos = _glfwGetCursorPosWayland,
+        _glfwGetCursorPosWayland,
-        .setCursorPos = _glfwSetCursorPosWayland,
+        _glfwSetCursorPosWayland,
-        .setCursorMode = _glfwSetCursorModeWayland,
+        _glfwSetCursorModeWayland,
-        .setRawMouseMotion = _glfwSetRawMouseMotionWayland,
+        _glfwSetRawMouseMotionWayland,
-        .rawMouseMotionSupported = _glfwRawMouseMotionSupportedWayland,
+        _glfwRawMouseMotionSupportedWayland,
-        .createCursor = _glfwCreateCursorWayland,
+        _glfwCreateCursorWayland,
-        .createStandardCursor = _glfwCreateStandardCursorWayland,
+        _glfwCreateStandardCursorWayland,
-        .destroyCursor = _glfwDestroyCursorWayland,
+        _glfwDestroyCursorWayland,
-        .setCursor = _glfwSetCursorWayland,
+        _glfwSetCursorWayland,
-        .getScancodeName = _glfwGetScancodeNameWayland,
+        _glfwGetScancodeNameWayland,
-        .getKeyScancode = _glfwGetKeyScancodeWayland,
+        _glfwGetKeyScancodeWayland,
-        .setClipboardString = _glfwSetClipboardStringWayland,
+        _glfwSetClipboardStringWayland,
-        .getClipboardString = _glfwGetClipboardStringWayland,
+        _glfwGetClipboardStringWayland,
 #if defined(GLFW_BUILD_LINUX_JOYSTICK)
-        .initJoysticks = _glfwInitJoysticksLinux,
+        _glfwInitJoysticksLinux,
-        .terminateJoysticks = _glfwTerminateJoysticksLinux,
+        _glfwTerminateJoysticksLinux,
-        .pollJoystick = _glfwPollJoystickLinux,
+        _glfwPollJoystickLinux,
-        .getMappingName = _glfwGetMappingNameLinux,
+        _glfwGetMappingNameLinux,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDLinux,
+        _glfwUpdateGamepadGUIDLinux,
 #else
-        .initJoysticks = _glfwInitJoysticksNull,
+        _glfwInitJoysticksNull,
-        .terminateJoysticks = _glfwTerminateJoysticksNull,
+        _glfwTerminateJoysticksNull,
-        .pollJoystick = _glfwPollJoystickNull,
+        _glfwPollJoystickNull,
-        .getMappingName = _glfwGetMappingNameNull,
+        _glfwGetMappingNameNull,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDNull,
+        _glfwUpdateGamepadGUIDNull,
 #endif
-        .freeMonitor = _glfwFreeMonitorWayland,
+        _glfwFreeMonitorWayland,
-        .getMonitorPos = _glfwGetMonitorPosWayland,
+        _glfwGetMonitorPosWayland,
-        .getMonitorContentScale = _glfwGetMonitorContentScaleWayland,
+        _glfwGetMonitorContentScaleWayland,
-        .getMonitorWorkarea = _glfwGetMonitorWorkareaWayland,
+        _glfwGetMonitorWorkareaWayland,
-        .getVideoModes = _glfwGetVideoModesWayland,
+        _glfwGetVideoModesWayland,
-        .getVideoMode = _glfwGetVideoModeWayland,
+        _glfwGetVideoModeWayland,
-        .getGammaRamp = _glfwGetGammaRampWayland,
+        _glfwGetGammaRampWayland,
-        .setGammaRamp = _glfwSetGammaRampWayland,
+        _glfwSetGammaRampWayland,
-        .createWindow = _glfwCreateWindowWayland,
+        _glfwCreateWindowWayland,
-        .destroyWindow = _glfwDestroyWindowWayland,
+        _glfwDestroyWindowWayland,
-        .setWindowTitle = _glfwSetWindowTitleWayland,
+        _glfwSetWindowTitleWayland,
-        .setWindowIcon = _glfwSetWindowIconWayland,
+        _glfwSetWindowIconWayland,
-        .setWindowProgressIndicator = _glfwSetWindowProgressIndicatorWayland,
+        _glfwSetWindowProgressIndicatorWayland,
-        .setWindowBadge = _glfwSetWindowBadgeWayland,
+        _glfwSetWindowBadgeWayland,
-        .setWindowBadgeString = _glfwSetWindowBadgeStringWayland,
+        _glfwSetWindowBadgeStringWayland,
-        .getWindowPos = _glfwGetWindowPosWayland,
+        _glfwGetWindowPosWayland,
-        .setWindowPos = _glfwSetWindowPosWayland,
+        _glfwSetWindowPosWayland,
-        .getWindowSize = _glfwGetWindowSizeWayland,
+        _glfwGetWindowSizeWayland,
-        .setWindowSize = _glfwSetWindowSizeWayland,
+        _glfwSetWindowSizeWayland,
-        .setWindowSizeLimits = _glfwSetWindowSizeLimitsWayland,
+        _glfwSetWindowSizeLimitsWayland,
-        .setWindowAspectRatio = _glfwSetWindowAspectRatioWayland,
+        _glfwSetWindowAspectRatioWayland,
-        .getFramebufferSize = _glfwGetFramebufferSizeWayland,
+        _glfwGetFramebufferSizeWayland,
-        .getWindowFrameSize = _glfwGetWindowFrameSizeWayland,
+        _glfwGetWindowFrameSizeWayland,
-        .getWindowContentScale = _glfwGetWindowContentScaleWayland,
+        _glfwGetWindowContentScaleWayland,
-        .iconifyWindow = _glfwIconifyWindowWayland,
+        _glfwIconifyWindowWayland,
-        .restoreWindow = _glfwRestoreWindowWayland,
+        _glfwRestoreWindowWayland,
-        .maximizeWindow = _glfwMaximizeWindowWayland,
+        _glfwMaximizeWindowWayland,
-        .showWindow = _glfwShowWindowWayland,
+        _glfwShowWindowWayland,
-        .hideWindow = _glfwHideWindowWayland,
+        _glfwHideWindowWayland,
-        .requestWindowAttention = _glfwRequestWindowAttentionWayland,
+        _glfwRequestWindowAttentionWayland,
-        .focusWindow = _glfwFocusWindowWayland,
+        _glfwFocusWindowWayland,
-        .setWindowMonitor = _glfwSetWindowMonitorWayland,
+        _glfwSetWindowMonitorWayland,
-        .windowFocused = _glfwWindowFocusedWayland,
+        _glfwWindowFocusedWayland,
-        .windowIconified = _glfwWindowIconifiedWayland,
+        _glfwWindowIconifiedWayland,
-        .windowVisible = _glfwWindowVisibleWayland,
+        _glfwWindowVisibleWayland,
-        .windowMaximized = _glfwWindowMaximizedWayland,
+        _glfwWindowMaximizedWayland,
-        .windowHovered = _glfwWindowHoveredWayland,
+        _glfwWindowHoveredWayland,
-        .framebufferTransparent = _glfwFramebufferTransparentWayland,
+        _glfwFramebufferTransparentWayland,
-        .getWindowOpacity = _glfwGetWindowOpacityWayland,
+        _glfwGetWindowOpacityWayland,
-        .setWindowResizable = _glfwSetWindowResizableWayland,
+        _glfwSetWindowResizableWayland,
-        .setWindowDecorated = _glfwSetWindowDecoratedWayland,
+        _glfwSetWindowDecoratedWayland,
-        .setWindowFloating = _glfwSetWindowFloatingWayland,
+        _glfwSetWindowFloatingWayland,
-        .setWindowOpacity = _glfwSetWindowOpacityWayland,
+        _glfwSetWindowOpacityWayland,
-        .setWindowMousePassthrough = _glfwSetWindowMousePassthroughWayland,
+        _glfwSetWindowMousePassthroughWayland,
-        .pollEvents = _glfwPollEventsWayland,
+        _glfwPollEventsWayland,
-        .waitEvents = _glfwWaitEventsWayland,
+        _glfwWaitEventsWayland,
-        .waitEventsTimeout = _glfwWaitEventsTimeoutWayland,
+        _glfwWaitEventsTimeoutWayland,
-        .postEmptyEvent = _glfwPostEmptyEventWayland,
+        _glfwPostEmptyEventWayland,
-        .getEGLPlatform = _glfwGetEGLPlatformWayland,
+        _glfwGetEGLPlatformWayland,
-        .getEGLNativeDisplay = _glfwGetEGLNativeDisplayWayland,
+        _glfwGetEGLNativeDisplayWayland,
-        .getEGLNativeWindow = _glfwGetEGLNativeWindowWayland,
+        _glfwGetEGLNativeWindowWayland,
-        .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsWayland,
+        _glfwGetRequiredInstanceExtensionsWayland,
-        .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportWayland,
+        _glfwGetPhysicalDevicePresentationSupportWayland,
-        .createWindowSurface = _glfwCreateWindowSurfaceWayland
+        _glfwCreateWindowSurfaceWayland,
    };
    void* module = _glfwPlatformLoadModule("libwayland-client.so.0");
@ -717,32 +686,6 @@ int _glfwInitWayland(void)
    _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");
    if (!_glfw.wl.xkb.context_new ||
        !_glfw.wl.xkb.context_unref ||
        !_glfw.wl.xkb.keymap_new_from_string ||
        !_glfw.wl.xkb.keymap_unref ||
        !_glfw.wl.xkb.keymap_mod_get_index ||
        !_glfw.wl.xkb.keymap_key_repeats ||
        !_glfw.wl.xkb.keymap_key_get_syms_by_level ||
        !_glfw.wl.xkb.state_new ||
        !_glfw.wl.xkb.state_unref ||
        !_glfw.wl.xkb.state_key_get_syms ||
        !_glfw.wl.xkb.state_update_mask ||
        !_glfw.wl.xkb.state_key_get_layout ||
        !_glfw.wl.xkb.state_mod_index_is_active ||
        !_glfw.wl.xkb.compose_table_new_from_locale ||
        !_glfw.wl.xkb.compose_table_unref ||
        !_glfw.wl.xkb.compose_state_new ||
        !_glfw.wl.xkb.compose_state_unref ||
        !_glfw.wl.xkb.compose_state_feed ||
        !_glfw.wl.xkb.compose_state_get_status ||
        !_glfw.wl.xkb.compose_state_get_one_sym)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
                        "Wayland: Failed to load all entry points from libxkbcommon");
        return GLFW_FALSE;
    }
    if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR)
        _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
@ -865,6 +808,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,
@ -985,10 +934,6 @@ void _glfwTerminateWayland(void)
        zwp_pointer_constraints_v1_destroy(_glfw.wl.pointerConstraints);
    if (_glfw.wl.idleInhibitManager)
        zwp_idle_inhibit_manager_v1_destroy(_glfw.wl.idleInhibitManager);
    if (_glfw.wl.activationManager)
        xdg_activation_v1_destroy(_glfw.wl.activationManager);
    if (_glfw.wl.fractionalScaleManager)
        wp_fractional_scale_manager_v1_destroy(_glfw.wl.fractionalScaleManager);
    if (_glfw.wl.registry)
        wl_registry_destroy(_glfw.wl.registry);
    if (_glfw.wl.display)
--- 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"
@ -113,16 +112,16 @@ static void outputHandleScale(void* userData,
 {
    struct _GLFWmonitor* monitor = userData;
-    monitor->wl.scale = factor;
+    monitor->wl.contentScale = factor;
    for (_GLFWwindow* window = _glfw.windowListHead; window; window = window->next)
    {
-        for (size_t i = 0; i < window->wl.outputScaleCount; i++)
+        for (int i = 0; i < window->wl.scaleCount; i++)
        {
-            if (window->wl.outputScales[i].output == monitor->wl.output)
+            if (window->wl.scales[i].output == monitor->wl.output)
            {
-                window->wl.outputScales[i].factor = monitor->wl.scale;
+                window->wl.scales[i].factor = monitor->wl.contentScale;
-                _glfwUpdateBufferScaleFromOutputsWayland(window);
+                _glfwUpdateContentScaleWayland(window);
                break;
            }
        }
@ -177,7 +176,7 @@ void _glfwAddOutputWayland(uint32_t name, uint32_t version)
    // The actual name of this output will be set in the geometry handler
    _GLFWmonitor* monitor = _glfwAllocMonitor("", 0, 0);
-    monitor->wl.scale = 1;
+    monitor->wl.contentScale = 1;
    monitor->wl.output = output;
    monitor->wl.name = name;
@ -208,9 +207,9 @@ void _glfwGetMonitorContentScaleWayland(_GLFWmonitor* monitor,
                                        float* xscale, float* yscale)
 {
    if (xscale)
-        *xscale = (float) monitor->wl.scale;
+        *xscale = (float) monitor->wl.contentScale;
    if (yscale)
-        *yscale = (float) monitor->wl.scale;
+        *yscale = (float) monitor->wl.contentScale;
 }
 void _glfwGetMonitorWorkareaWayland(_GLFWmonitor* monitor,
@ -233,10 +232,9 @@ GLFWvidmode* _glfwGetVideoModesWayland(_GLFWmonitor* monitor, int* found)
    return monitor->modes;
 }
-GLFWbool _glfwGetVideoModeWayland(_GLFWmonitor* monitor, GLFWvidmode* mode)
+void _glfwGetVideoModeWayland(_GLFWmonitor* monitor, GLFWvidmode* mode)
 {
    *mode = monitor->modes[monitor->wl.currentMode];
    return GLFW_TRUE;
 }
 GLFWbool _glfwGetGammaRampWayland(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
@ -259,17 +257,8 @@ void _glfwSetGammaRampWayland(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (_glfw.platform.platformID != GLFW_PLATFORM_WAYLAND)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Wayland: Platform not initialized");
        return NULL;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(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
@ -127,10 +129,6 @@ struct wl_output;
 #define xdg_surface_interface _glfw_xdg_surface_interface
 #define xdg_toplevel_interface _glfw_xdg_toplevel_interface
 #define xdg_wm_base_interface _glfw_xdg_wm_base_interface
 #define xdg_activation_v1_interface _glfw_xdg_activation_v1_interface
 #define xdg_activation_token_v1_interface _glfw_xdg_activation_token_v1_interface
 #define wl_surface_interface _glfw_wl_surface_interface
 #define wp_fractional_scale_v1_interface _glfw_wp_fractional_scale_v1_interface
 #define GLFW_WAYLAND_WINDOW_STATE         _GLFWwindowWayland  wl;
 #define GLFW_WAYLAND_LIBRARY_WINDOW_STATE _GLFWlibraryWayland wl;
@ -323,12 +321,21 @@ typedef void (* PFN_libdecor_state_free)(struct libdecor_state*);
 #define libdecor_state_new _glfw.wl.libdecor.libdecor_state_new_
 #define libdecor_state_free _glfw.wl.libdecor.libdecor_state_free_
-typedef struct _GLFWfallbackEdgeWayland
+typedef enum _GLFWdecorationSideWayland
 {
    GLFW_MAIN_WINDOW,
    GLFW_TOP_DECORATION,
    GLFW_LEFT_DECORATION,
    GLFW_RIGHT_DECORATION,
    GLFW_BOTTOM_DECORATION
 } _GLFWdecorationSideWayland;
 typedef struct _GLFWdecorationWayland
 {
    struct wl_surface*          surface;
    struct wl_subsurface*       subsurface;
    struct wp_viewport*         viewport;
-} _GLFWfallbackEdgeWayland;
+} _GLFWdecorationWayland;
 typedef struct _GLFWofferWayland
 {
@ -340,7 +347,7 @@ typedef struct _GLFWofferWayland
 typedef struct _GLFWscaleWayland
 {
    struct wl_output*           output;
-    int32_t                     factor;
+    int                         factor;
 } _GLFWscaleWayland;
 // Wayland-specific per-window data
@ -348,14 +355,12 @@ typedef struct _GLFWscaleWayland
 typedef struct _GLFWwindowWayland
 {
    int                         width, height;
    int                         fbWidth, fbHeight;
    GLFWbool                    visible;
    GLFWbool                    maximized;
    GLFWbool                    activated;
    GLFWbool                    fullscreen;
    GLFWbool                    hovered;
    GLFWbool                    transparent;
    GLFWbool                    scaleFramebuffer;
    struct wl_surface*          surface;
    struct wl_callback*         callback;
@ -380,37 +385,33 @@ typedef struct _GLFWwindowWayland
    struct {
        struct libdecor_frame*  frame;
        int                     mode;
    } libdecor;
    _GLFWcursor*                currentCursor;
    double                      cursorPosX, cursorPosY;
    char*                       title;
    char*                       appId;
    // We need to track the monitors the window spans on to calculate the
    // optimal scaling factor.
-    int32_t                     bufferScale;
+    int                         contentScale;
-    _GLFWscaleWayland*          outputScales;
+    _GLFWscaleWayland*          scales;
-    size_t                      outputScaleCount;
+    int                         scaleCount;
-    size_t                      outputScaleSize;
+    int                         scaleSize;
    struct wp_viewport*             scalingViewport;
    uint32_t                        scalingNumerator;
    struct wp_fractional_scale_v1*  fractionalScale;
    struct zwp_relative_pointer_v1* relativePointer;
    struct zwp_locked_pointer_v1*   lockedPointer;
    struct zwp_confined_pointer_v1* confinedPointer;
-    struct zwp_idle_inhibitor_v1*   idleInhibitor;
+    struct zwp_idle_inhibitor_v1*          idleInhibitor;
    struct xdg_activation_token_v1* activationToken;
    struct {
-        GLFWbool                    decorations;
+        struct wl_buffer*                  buffer;
-        struct wl_buffer*           buffer;
+        _GLFWdecorationWayland             top, left, right, bottom;
-        _GLFWfallbackEdgeWayland    top, left, right, bottom;
+        _GLFWdecorationSideWayland         focus;
-        struct wl_surface*          focus;
+    } decorations;
    } fallback;
 } _GLFWwindowWayland;
 // Wayland-specific global data
@ -433,8 +434,6 @@ typedef struct _GLFWlibraryWayland
    struct zwp_relative_pointer_manager_v1* relativePointerManager;
    struct zwp_pointer_constraints_v1*      pointerConstraints;
    struct zwp_idle_inhibit_manager_v1*     idleInhibitManager;
    struct xdg_activation_v1*               activationManager;
    struct wp_fractional_scale_manager_v1*  fractionalScaleManager;
    _GLFWofferWayland*          offers;
    unsigned int                offerCount;
@ -591,7 +590,7 @@ typedef struct _GLFWmonitorWayland
    int                         x;
    int                         y;
-    int32_t                     scale;
+    int                         contentScale;
 } _GLFWmonitorWayland;
 // Wayland-specific per-cursor data
@ -680,12 +679,12 @@ void _glfwGetMonitorPosWayland(_GLFWmonitor* monitor, int* xpos, int* ypos);
 void _glfwGetMonitorContentScaleWayland(_GLFWmonitor* monitor, float* xscale, float* yscale);
 void _glfwGetMonitorWorkareaWayland(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
 GLFWvidmode* _glfwGetVideoModesWayland(_GLFWmonitor* monitor, int* count);
-GLFWbool _glfwGetVideoModeWayland(_GLFWmonitor* monitor, GLFWvidmode* mode);
+void _glfwGetVideoModeWayland(_GLFWmonitor* monitor, GLFWvidmode* mode);
 GLFWbool _glfwGetGammaRampWayland(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
 void _glfwSetGammaRampWayland(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
 void _glfwAddOutputWayland(uint32_t name, uint32_t version);
-void _glfwUpdateBufferScaleFromOutputsWayland(_GLFWwindow* window);
+void _glfwUpdateContentScaleWayland(_GLFWwindow* window);
 void _glfwAddSeatListenerWayland(struct wl_seat* seat);
 void _glfwAddDataDeviceListenerWayland(struct wl_data_device* device);
--- a/src/wl_window.c
+++ b/src/wl_window.c
--- 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>
@ -1166,89 +1166,89 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
 {
    const _GLFWplatform x11 =
    {
-        .platformID = GLFW_PLATFORM_X11,
+        GLFW_PLATFORM_X11,
-        .init = _glfwInitX11,
+        _glfwInitX11,
-        .terminate = _glfwTerminateX11,
+        _glfwTerminateX11,
-        .getCursorPos = _glfwGetCursorPosX11,
+        _glfwGetCursorPosX11,
-        .setCursorPos = _glfwSetCursorPosX11,
+        _glfwSetCursorPosX11,
-        .setCursorMode = _glfwSetCursorModeX11,
+        _glfwSetCursorModeX11,
-        .setRawMouseMotion = _glfwSetRawMouseMotionX11,
+        _glfwSetRawMouseMotionX11,
-        .rawMouseMotionSupported = _glfwRawMouseMotionSupportedX11,
+        _glfwRawMouseMotionSupportedX11,
-        .createCursor = _glfwCreateCursorX11,
+        _glfwCreateCursorX11,
-        .createStandardCursor = _glfwCreateStandardCursorX11,
+        _glfwCreateStandardCursorX11,
-        .destroyCursor = _glfwDestroyCursorX11,
+        _glfwDestroyCursorX11,
-        .setCursor = _glfwSetCursorX11,
+        _glfwSetCursorX11,
-        .getScancodeName = _glfwGetScancodeNameX11,
+        _glfwGetScancodeNameX11,
-        .getKeyScancode = _glfwGetKeyScancodeX11,
+        _glfwGetKeyScancodeX11,
-        .setClipboardString = _glfwSetClipboardStringX11,
+        _glfwSetClipboardStringX11,
-        .getClipboardString = _glfwGetClipboardStringX11,
+        _glfwGetClipboardStringX11,
 #if defined(GLFW_BUILD_LINUX_JOYSTICK)
-        .initJoysticks = _glfwInitJoysticksLinux,
+        _glfwInitJoysticksLinux,
-        .terminateJoysticks = _glfwTerminateJoysticksLinux,
+        _glfwTerminateJoysticksLinux,
-        .pollJoystick = _glfwPollJoystickLinux,
+        _glfwPollJoystickLinux,
-        .getMappingName = _glfwGetMappingNameLinux,
+        _glfwGetMappingNameLinux,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDLinux,
+        _glfwUpdateGamepadGUIDLinux,
 #else
-        .initJoysticks = _glfwInitJoysticksNull,
+        _glfwInitJoysticksNull,
-        .terminateJoysticks = _glfwTerminateJoysticksNull,
+        _glfwTerminateJoysticksNull,
-        .pollJoystick = _glfwPollJoystickNull,
+        _glfwPollJoystickNull,
-        .getMappingName = _glfwGetMappingNameNull,
+        _glfwGetMappingNameNull,
-        .updateGamepadGUID = _glfwUpdateGamepadGUIDNull,
+        _glfwUpdateGamepadGUIDNull,
 #endif
-        .freeMonitor = _glfwFreeMonitorX11,
+        _glfwFreeMonitorX11,
-        .getMonitorPos = _glfwGetMonitorPosX11,
+        _glfwGetMonitorPosX11,
-        .getMonitorContentScale = _glfwGetMonitorContentScaleX11,
+        _glfwGetMonitorContentScaleX11,
-        .getMonitorWorkarea = _glfwGetMonitorWorkareaX11,
+        _glfwGetMonitorWorkareaX11,
-        .getVideoModes = _glfwGetVideoModesX11,
+        _glfwGetVideoModesX11,
-        .getVideoMode = _glfwGetVideoModeX11,
+        _glfwGetVideoModeX11,
-        .getGammaRamp = _glfwGetGammaRampX11,
+        _glfwGetGammaRampX11,
-        .setGammaRamp = _glfwSetGammaRampX11,
+        _glfwSetGammaRampX11,
-        .createWindow = _glfwCreateWindowX11,
+        _glfwCreateWindowX11,
-        .destroyWindow = _glfwDestroyWindowX11,
+        _glfwDestroyWindowX11,
-        .setWindowTitle = _glfwSetWindowTitleX11,
+        _glfwSetWindowTitleX11,
-        .setWindowIcon = _glfwSetWindowIconX11,
+        _glfwSetWindowIconX11,
-        .setWindowProgressIndicator = _glfwSetWindowProgressIndicatorX11,
+        _glfwSetWindowProgressIndicatorX11,
-        .setWindowBadge = _glfwSetWindowBadgeX11,
+        _glfwSetWindowBadgeX11,
-        .setWindowBadgeString = _glfwSetWindowBadgeStringX11,
+        _glfwSetWindowBadgeStringX11,
-        .getWindowPos = _glfwGetWindowPosX11,
+        _glfwGetWindowPosX11,
-        .setWindowPos = _glfwSetWindowPosX11,
+        _glfwSetWindowPosX11,
-        .getWindowSize = _glfwGetWindowSizeX11,
+        _glfwGetWindowSizeX11,
-        .setWindowSize = _glfwSetWindowSizeX11,
+        _glfwSetWindowSizeX11,
-        .setWindowSizeLimits = _glfwSetWindowSizeLimitsX11,
+        _glfwSetWindowSizeLimitsX11,
-        .setWindowAspectRatio = _glfwSetWindowAspectRatioX11,
+        _glfwSetWindowAspectRatioX11,
-        .getFramebufferSize = _glfwGetFramebufferSizeX11,
+        _glfwGetFramebufferSizeX11,
-        .getWindowFrameSize = _glfwGetWindowFrameSizeX11,
+        _glfwGetWindowFrameSizeX11,
-        .getWindowContentScale = _glfwGetWindowContentScaleX11,
+        _glfwGetWindowContentScaleX11,
-        .iconifyWindow = _glfwIconifyWindowX11,
+        _glfwIconifyWindowX11,
-        .restoreWindow = _glfwRestoreWindowX11,
+        _glfwRestoreWindowX11,
-        .maximizeWindow = _glfwMaximizeWindowX11,
+        _glfwMaximizeWindowX11,
-        .showWindow = _glfwShowWindowX11,
+        _glfwShowWindowX11,
-        .hideWindow = _glfwHideWindowX11,
+        _glfwHideWindowX11,
-        .requestWindowAttention = _glfwRequestWindowAttentionX11,
+        _glfwRequestWindowAttentionX11,
-        .focusWindow = _glfwFocusWindowX11,
+        _glfwFocusWindowX11,
-        .setWindowMonitor = _glfwSetWindowMonitorX11,
+        _glfwSetWindowMonitorX11,
-        .windowFocused = _glfwWindowFocusedX11,
+        _glfwWindowFocusedX11,
-        .windowIconified = _glfwWindowIconifiedX11,
+        _glfwWindowIconifiedX11,
-        .windowVisible = _glfwWindowVisibleX11,
+        _glfwWindowVisibleX11,
-        .windowMaximized = _glfwWindowMaximizedX11,
+        _glfwWindowMaximizedX11,
-        .windowHovered = _glfwWindowHoveredX11,
+        _glfwWindowHoveredX11,
-        .framebufferTransparent = _glfwFramebufferTransparentX11,
+        _glfwFramebufferTransparentX11,
-        .getWindowOpacity = _glfwGetWindowOpacityX11,
+        _glfwGetWindowOpacityX11,
-        .setWindowResizable = _glfwSetWindowResizableX11,
+        _glfwSetWindowResizableX11,
-        .setWindowDecorated = _glfwSetWindowDecoratedX11,
+        _glfwSetWindowDecoratedX11,
-        .setWindowFloating = _glfwSetWindowFloatingX11,
+        _glfwSetWindowFloatingX11,
-        .setWindowOpacity = _glfwSetWindowOpacityX11,
+        _glfwSetWindowOpacityX11,
-        .setWindowMousePassthrough = _glfwSetWindowMousePassthroughX11,
+        _glfwSetWindowMousePassthroughX11,
-        .pollEvents = _glfwPollEventsX11,
+        _glfwPollEventsX11,
-        .waitEvents = _glfwWaitEventsX11,
+        _glfwWaitEventsX11,
-        .waitEventsTimeout = _glfwWaitEventsTimeoutX11,
+        _glfwWaitEventsTimeoutX11,
-        .postEmptyEvent = _glfwPostEmptyEventX11,
+        _glfwPostEmptyEventX11,
-        .getEGLPlatform = _glfwGetEGLPlatformX11,
+        _glfwGetEGLPlatformX11,
-        .getEGLNativeDisplay = _glfwGetEGLNativeDisplayX11,
+        _glfwGetEGLNativeDisplayX11,
-        .getEGLNativeWindow = _glfwGetEGLNativeWindowX11,
+        _glfwGetEGLNativeWindowX11,
-        .getRequiredInstanceExtensions = _glfwGetRequiredInstanceExtensionsX11,
+        _glfwGetRequiredInstanceExtensionsX11,
-        .getPhysicalDevicePresentationSupport = _glfwGetPhysicalDevicePresentationSupportX11,
+        _glfwGetPhysicalDevicePresentationSupportX11,
-        .createWindowSurface = _glfwCreateWindowSurfaceX11
+        _glfwCreateWindowSurfaceX11,
    };
    // HACK: If the application has left the locale as "C" then both wide
--- 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
@ -492,31 +491,24 @@ GLFWvidmode* _glfwGetVideoModesX11(_GLFWmonitor* monitor, int* count)
    return result;
 }
-GLFWbool _glfwGetVideoModeX11(_GLFWmonitor* monitor, GLFWvidmode* mode)
+void _glfwGetVideoModeX11(_GLFWmonitor* monitor, GLFWvidmode* mode)
 {
    if (_glfw.x11.randr.available && !_glfw.x11.randr.monitorBroken)
    {
        XRRScreenResources* sr =
            XRRGetScreenResourcesCurrent(_glfw.x11.display, _glfw.x11.root);
        const XRRModeInfo* mi = NULL;
        XRRCrtcInfo* ci = XRRGetCrtcInfo(_glfw.x11.display, sr, monitor->x11.crtc);
        if (ci)
        {
-            mi = getModeInfo(sr, ci->mode);
+            const XRRModeInfo* mi = getModeInfo(sr, ci->mode);
-            if (mi)
+            if (mi)  // mi can be NULL if the monitor has been disconnected
                *mode = vidmodeFromModeInfo(mi, ci);
            XRRFreeCrtcInfo(ci);
        }
        XRRFreeScreenResources(sr);
        if (!mi)
        {
            _glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to query video mode");
            return GLFW_FALSE;
        }
    }
    else
    {
@ -527,8 +519,6 @@ GLFWbool _glfwGetVideoModeX11(_GLFWmonitor* monitor, GLFWvidmode* mode)
        _glfwSplitBPP(DefaultDepth(_glfw.x11.display, _glfw.x11.screen),
                      &mode->redBits, &mode->greenBits, &mode->blueBits);
    }
    return GLFW_TRUE;
 }
 GLFWbool _glfwGetGammaRampX11(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
@ -612,33 +602,15 @@ void _glfwSetGammaRampX11(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 GLFWAPI RRCrtc glfwGetX11Adapter(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "X11: Platform not initialized");
        return None;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    return monitor->x11.crtc;
 }
 GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    if (_glfw.platform.platformID != GLFW_PLATFORM_X11)
    {
        _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "X11: Platform not initialized");
        return None;
    }
    _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
-    assert(monitor != NULL);
+    _GLFW_REQUIRE_INIT_OR_RETURN(None);
    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>
@ -971,7 +971,7 @@ void _glfwGetMonitorPosX11(_GLFWmonitor* monitor, int* xpos, int* ypos);
 void _glfwGetMonitorContentScaleX11(_GLFWmonitor* monitor, float* xscale, float* yscale);
 void _glfwGetMonitorWorkareaX11(_GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
 GLFWvidmode* _glfwGetVideoModesX11(_GLFWmonitor* monitor, int* count);
-GLFWbool _glfwGetVideoModeX11(_GLFWmonitor* monitor, GLFWvidmode* mode);
+void _glfwGetVideoModeX11(_GLFWmonitor* monitor, GLFWvidmode* mode);
 GLFWbool _glfwGetGammaRampX11(_GLFWmonitor* monitor, GLFWgammaramp* ramp);
 void _glfwSetGammaRampX11(_GLFWmonitor* monitor, const GLFWgammaramp* ramp);
--- 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>
@ -79,25 +79,24 @@ static GLFWbool waitForX11Event(double* timeout)
 //
 static GLFWbool waitForAnyEvent(double* timeout)
 {
-    enum { XLIB_FD, PIPE_FD, INOTIFY_FD };
+    nfds_t count = 2;
-    struct pollfd fds[] =
+    struct pollfd fds[3] =
    {
-        [XLIB_FD] = { ConnectionNumber(_glfw.x11.display), POLLIN },
+        { ConnectionNumber(_glfw.x11.display), POLLIN },
-        [PIPE_FD] = { _glfw.x11.emptyEventPipe[0], POLLIN },
+        { _glfw.x11.emptyEventPipe[0], POLLIN }
        [INOTIFY_FD] = { -1, POLLIN }
    };
 #if defined(GLFW_BUILD_LINUX_JOYSTICK)
    if (_glfw.joysticksInitialized)
-        fds[INOTIFY_FD].fd = _glfw.linjs.inotify;
+        fds[count++] = (struct pollfd) { _glfw.linjs.inotify, POLLIN };
 #endif
    while (!XPending(_glfw.x11.display))
    {
-        if (!_glfwPollPOSIX(fds, sizeof(fds) / sizeof(fds[0]), timeout))
+        if (!_glfwPollPOSIX(fds, count, timeout))
            return GLFW_FALSE;
-        for (int i = 1; i < sizeof(fds) / sizeof(fds[0]); i++)
+        for (int i = 1; i < count; i++)
        {
            if (fds[i].revents & POLLIN)
                return GLFW_TRUE;
@ -1488,9 +1487,6 @@ static void processEvent(XEvent *event)
            if (event->xconfigure.width != window->x11.width ||
                event->xconfigure.height != window->x11.height)
            {
                window->x11.width = event->xconfigure.width;
                window->x11.height = event->xconfigure.height;
                _glfwInputFramebufferSize(window,
                                          event->xconfigure.width,
                                          event->xconfigure.height);
@ -1498,6 +1494,9 @@ static void processEvent(XEvent *event)
                _glfwInputWindowSize(window,
                                     event->xconfigure.width,
                                     event->xconfigure.height);
                window->x11.width = event->xconfigure.width;
                window->x11.height = event->xconfigure.height;
            }
            int xpos = event->xconfigure.x;
@ -1525,10 +1524,9 @@ static void processEvent(XEvent *event)
            if (xpos != window->x11.xpos || ypos != window->x11.ypos)
            {
                _glfwInputWindowPos(window, xpos, ypos);
                window->x11.xpos = xpos;
                window->x11.ypos = ypos;
                _glfwInputWindowPos(window, xpos, ypos);
            }
            return;
@ -2940,16 +2938,14 @@ const char* _glfwGetScancodeNameX11(int scancode)
    if (!_glfw.x11.xkb.available)
        return NULL;
-    if (scancode < 0 || scancode > 0xff)
+    if (scancode < 0 || scancode > 0xff ||
        _glfw.x11.keycodes[scancode] == GLFW_KEY_UNKNOWN)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid scancode %i", scancode);
        return NULL;
    }
    const int key = _glfw.x11.keycodes[scancode];
    if (key == GLFW_KEY_UNKNOWN)
        return NULL;
    const KeySym keysym = XkbKeycodeToKeysym(_glfw.x11.display,
                                             scancode, _glfw.x11.xkb.group, 0);
    if (keysym == NoSymbol)
@ -3339,6 +3335,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)
@ -3347,16 +3344,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
@ -400,34 +400,24 @@ static void scroll_callback(GLFWwindow* window, double x, double y)
 static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
 {
    Slot* slot = glfwGetWindowUserPointer(window);
    const char* name = glfwGetKeyName(key, scancode);
-    if (key == GLFW_KEY_UNKNOWN)
+    if (name)
    {
-        printf("%08x to %i at %0.3f: Key (%s) Scancode 0x%04x (with%s) was %s\n",
+        printf("%08x to %i at %0.3f: Key 0x%04x Scancode 0x%04x (%s) (%s) (with%s) was %s\n",
-                counter++, slot->number, glfwGetTime(),
+               counter++, slot->number, glfwGetTime(), key, scancode,
-                get_key_name(key), scancode,
+               get_key_name(key),
-                get_mods_name(mods),
+               name,
-                get_action_name(action));
+               get_mods_name(mods),
               get_action_name(action));
    }
    else
    {
-        const char* name = glfwGetKeyName(key, scancode);
+        printf("%08x to %i at %0.3f: Key 0x%04x Scancode 0x%04x (%s) (with%s) was %s\n",
-        if (name)
+               counter++, slot->number, glfwGetTime(), key, scancode,
-        {
+               get_key_name(key),
-            printf("%08x to %i at %0.3f: Key 0x%04x (%s) Scancode 0x%04x Name %s (with%s) was %s\n",
+               get_mods_name(mods),
-                   counter++, slot->number, glfwGetTime(),
+               get_action_name(action));
                   key, get_key_name(key), scancode, name,
                   get_mods_name(mods),
                   get_action_name(action));
        }
        else
        {
            printf("%08x to %i at %0.3f: Key 0x%04x (%s) Scancode 0x%04x (with%s) was %s\n",
                   counter++, slot->number, glfwGetTime(),
                   key, get_key_name(key), scancode,
                   get_mods_name(mods),
                   get_action_name(action));
        }
    }
    if (action != GLFW_PRESS)
@ -630,7 +620,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
@ -62,7 +62,6 @@ int main(int argc, char** argv)
    char min_width_buffer[12] = "", min_height_buffer[12] = "";
    char max_width_buffer[12] = "", max_height_buffer[12] = "";
    int may_close = true;
    char window_title[64] = "";
    if (!glfwInit())
        exit(EXIT_FAILURE);
@ -78,7 +77,6 @@ int main(int argc, char** argv)
        glfwTerminate();
        exit(EXIT_FAILURE);
    }
    glfwSetInputMode(window, GLFW_UNLIMITED_MOUSE_BUTTONS, GLFW_TRUE);
    glfwMakeContextCurrent(window);
    gladLoadGL(glfwGetProcAddress);
@ -111,8 +109,6 @@ int main(int argc, char** argv)
    nk_glfw3_font_stash_begin(&atlas);
    nk_glfw3_font_stash_end();
    strncpy(window_title, glfwGetWindowTitle(window), sizeof(window_title));
    while (!(may_close && glfwWindowShouldClose(window)))
    {
        int width, height;
@ -125,20 +121,17 @@ int main(int argc, char** argv)
        nk_glfw3_new_frame();
        if (nk_begin(nk, "main", area, 0))
        {
-            nk_layout_row_dynamic(nk, 30, 4);
+            nk_layout_row_dynamic(nk, 30, 5);
-            if (glfwGetWindowMonitor(window))
+            if (nk_button_label(nk, "Toggle Fullscreen"))
            {
-                if (nk_button_label(nk, "Make Windowed"))
+                if (glfwGetWindowMonitor(window))
                {
                    glfwSetWindowMonitor(window, NULL,
                                         windowed_x, windowed_y,
                                         windowed_width, windowed_height, 0);
                }
-            }
+                else
            else
            {
                if (nk_button_label(nk, "Make Fullscreen"))
                {
                    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
                    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
@ -156,10 +149,7 @@ int main(int argc, char** argv)
                glfwIconifyWindow(window);
            if (nk_button_label(nk, "Restore"))
                glfwRestoreWindow(window);
-
+            if (nk_button_label(nk, "Hide (briefly)"))
            nk_layout_row_dynamic(nk, 30, 2);
            if (nk_button_label(nk, "Hide (for 3s)"))
            {
                glfwHideWindow(window);
@ -169,16 +159,6 @@ int main(int argc, char** argv)
                glfwShowWindow(window);
            }
            if (nk_button_label(nk, "Request Attention (after 3s)"))
            {
                glfwIconifyWindow(window);
                const double time = glfwGetTime() + 3.0;
                while (glfwGetTime() < time)
                    glfwWaitEventsTimeout(1.0);
                glfwRequestWindowAttention(window);
            }
            nk_layout_row_dynamic(nk, 30, 1);
@ -197,16 +177,6 @@ int main(int argc, char** argv)
                                   NK_EDIT_SIG_ENTER |
                                   NK_EDIT_GOTO_END_ON_ACTIVATE;
            nk_layout_row_begin(nk, NK_DYNAMIC, 30, 2);
            nk_layout_row_push(nk, 1.f / 3.f);
            nk_label(nk, "Title", NK_TEXT_LEFT);
            nk_layout_row_push(nk, 2.f / 3.f);
            events = nk_edit_string_zero_terminated(nk, flags, window_title,
                                                    sizeof(window_title), NULL);
            if (events & NK_EDIT_COMMITED)
                glfwSetWindowTitle(window, window_title);
            nk_layout_row_end(nk);
            if (position_supported)
            {
                int xpos, ypos;
@ -241,7 +211,7 @@ int main(int argc, char** argv)
                last_ypos = ypos;
            }
            else
-                nk_label(nk, "Platform does not support window position", NK_TEXT_LEFT);
+                nk_label(nk, "Position not supported", NK_TEXT_LEFT);
            nk_layout_row_dynamic(nk, 30, 3);
            nk_label(nk, "Size", NK_TEXT_LEFT);