2025-06-26 01:17:43 +00:00
195 changed files with 28724 additions and 86570 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,47 +1,22 @@
-image:
-    - Visual Studio 2015
 branches:
    only:
        - ci
        - master
-        - latest
-        - 3.3-stable
 skip_tags: true
 environment:
    matrix:
-        - GENERATOR: MinGW Makefiles
-          BUILD_SHARED_LIBS: ON
-          CFLAGS: -Werror
-        - GENERATOR: MinGW Makefiles
-          BUILD_SHARED_LIBS: OFF
-          CFLAGS: -Werror
-        - GENERATOR: Visual Studio 12 2013
-          BUILD_SHARED_LIBS: ON
-          CFLAGS: /WX
-        - GENERATOR: Visual Studio 12 2013
-          BUILD_SHARED_LIBS: OFF
-          CFLAGS: /WX
+        - BUILD_SHARED_LIBS: ON
+        - BUILD_SHARED_LIBS: OFF
 matrix:
    fast_finish: true
-for:
-
-    matrix:
-        only:
-            - GENERATOR: MinGW Makefiles
-    build_script:
-        - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin%
-        - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
-        - cmake --build build
-
-    matrix:
-        only:
-            - GENERATOR: Visual Studio 12 2013
-    build_script:
-        - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
-        - cmake --build build --target glfw
+build_script:
+    - mkdir build
+    - cd build
+    - cmake -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% ..
+    - cmake --build .
 notifications:
    - provider: Email
      to:
        - ci@glfw.org
-      on_build_failure: true
-      on_build_success: false
+    - on_build_failure: true
+    - on_build_success: false
--- a/.editorconfig
+++ b/.editorconfig
@ -1,67 +0,0 @@
-# EditorConfig for GLFW and its internal dependencies
-#
-# All files created by GLFW should indent with four spaces unless their format requires
-# otherwise.  A few files still use other indent styles for historical reasons.
-#
-# Dependencies have (what seemed to be) their existing styles described.  Those with
-# existing trailing whitespace have it preserved to avoid cluttering future commits.
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-
-[include/GLFW/*.h]
-indent_style = space
-indent_size = 4
-
-[{src,examples,tests}/*.{c,m,h,rc,in}]
-indent_style = space
-indent_size = 4
-
-[CMakeLists.txt]
-indent_style = space
-indent_size = 4
-
-[CMake/**.{cmake,in}]
-indent_style = space
-indent_size = 4
-
-[*.{md}]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = false
-
-[DoxygenLayout.xml]
-indent_style = space
-indent_size = 2
-
-[docs/*.{scss,html}]
-indent_style = tab
-indent_size = unset
-
-[deps/mingw/*.h]
-indent_style = space
-indent_size = 4
-tab_width = 8
-trim_trailing_whitespace = false
-
-[deps/getopt.{c,h}]
-indent_style = space
-indent_size = 2
-
-[deps/linmath.h]
-indent_style = tab
-tab_width = 4
-indent_size = 4
-trim_trailing_whitespace = false
-
-[deps/nuklear*.h]
-indent_style = space
-indent_size = 4
-
-[deps/tinycthread.{c,h}]
-indent_style = space
-indent_size = 2
-
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +0,0 @@
-*.m linguist-language=Objective-C
-.gitignore export-ignore
-.gitattributes export-ignore
-.travis.yml export-ignore
-.appveyor.yml export-ignore
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,8 +0,0 @@
-
-*               @elmindreda
-
-docs/*.css      @glfw/webdev
-docs/*.scss     @glfw/webdev
-docs/*.html     @glfw/webdev
-docs/*.xml      @glfw/webdev
-
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -0,0 +1,106 @@
+# Contribution Guide
+
+This file is a work in progress and you can report errors or submit patches for
+it the same as any other file.
+
+
+## Reporting a bug
+
+If GLFW is behaving unexpectedly, make sure you have set an error callback.
+GLFW will often tell you the cause of an issue via this callback.
+
+If GLFW is crashing or triggering asserts, make sure that all your object
+handles and other pointers are valid.
+
+Always include the __operating system name and version__ (i.e. `Windows
+7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
+include the __GLFW release version__ (i.e. `3.1.2`), otherwise include the
+__GLFW commit ID__ (i.e.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
+If possible, please also include the __GLFW version string__ (`3.2.0 X11 EGL
+clock_gettime /dev/js XI Xf86vm`), as described
+[here](http://www.glfw.org/docs/latest/intro.html#intro_version_string).
+
+
+### Reporting a compile or link bug
+
+__Note:__ GLFW needs many system APIs to do its job.  See the [Building
+applications](http://www.glfw.org/docs/latest/build.html) guide for more
+information.
+
+In addition to the information above, always include the complete build log from
+your compiler and linker.  Issue posts are editable so it can always be
+shortened later.
+
+
+### Reporting a context creation bug
+
+__Note:__ Windows ships with graphics drivers that do not support OpenGL.  If
+GLFW says that your machine lacks support for OpenGL, it very likely does.
+Install drivers from the computer manufacturer or graphics card manufacturer
+([Nvidia](http://www.geforce.com/drivers),
+ [AMD](http://support.amd.com/en-us/download),
+ [Intel](https://www-ssl.intel.com/content/www/us/en/support/detect.html)) to
+fix this.
+
+__Note:__ AMD only supports OpenGL ES on Windows via EGL.  EGL support is not
+enabled in GLFW by default.  You need to [enable EGL when
+compiling](http://www.glfw.org/docs/latest/compile.html) GLFW to use this.
+
+The `glfwinfo` tool is included in the GLFW source tree as `tests/glfwinfo.c`
+and is built along with the library.  It lets you request any kind of context
+and framebuffer format supported by the GLFW API without having to recompile.
+If context creation fails in your application, please verify that it also fails
+with this tool before reporting it as a bug.
+
+In addition to the information above (OS and GLFW version), always include the
+__GPU model and driver version__ (i.e. `GeForce GTX660 with 352.79`) when
+reporting this kind of bug.
+
+
+### Reporting a monitor or video mode bug
+
+__Note:__ On headless systems on some platforms, no monitors are reported.  This
+causes glfwGetPrimaryMonitor to return `NULL`, which not all applications are
+prepared for.
+
+__Note:__ Some third-party tools report more video modes than those approved of
+by the OS.  For safety and compatbility, GLFW only reports video modes the OS
+wants programs to use.  This is not a bug.
+
+The `monitors` tool is included in the GLFW source tree as `tests/monitors.c`
+and is built along with the library.  lists all information about connected
+monitors made available by GLFW.
+
+In addition to the information above (OS and GLFW version), please also include
+the output of the `monitors` tool when reporting this kind of bug.  If it
+doesn't work at all, please mention this.
+
+
+### Reporting a window event bug
+
+__Note:__ While GLFW tries to provide the exact same behavior between platforms,
+the exact ordering of related window events will sometimes differ.
+
+The `events` tool is included in the GLFW source tree as `tests/events.c` and is
+built along with the library.  It prints all information provided to every
+callback supported by GLFW as events occur.  Each event is listed with the time
+and a unique number to make discussions about event logs easier.  The tool has
+command-line options for creating multiple windows and full screen windows.
+
+
+### Reporting a documentation bug
+
+If you found the error in the generated documentation then it's fine to just
+link to that webpage.  You don't need to figure out which documentation source
+file the text comes from.
+
+
+## Contributing a bug fix
+
+There should be text here, but there isn't.
+
+
+## Contributing a feature
+
+This is not (yet) the text you are looking for.
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,100 +0,0 @@
-name: Build
-on:
-    pull_request:
-    push:
-        branches: [ ci, master, latest, 3.3-stable ]
-    workflow_dispatch:
-permissions:
-    statuses: write
-    contents: read
-
-jobs:
-    build-linux-clang:
-        name: Linux (Clang)
-        runs-on: ubuntu-latest
-        timeout-minutes: 4
-        env:
-            CC: clang
-            CFLAGS: -Werror
-        steps:
-            - uses: actions/checkout@v4
-            - name: Install dependencies
-              run: |
-                  sudo apt update
-                  sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
-
-            - name: Configure Null shared library
-              run: cmake -B build-null-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
-            - name: Build Null shared library
-              run: cmake --build build-null-shared --parallel
-
-            - name: Configure X11 shared library
-              run: cmake -B build-x11-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=ON -D BUILD_SHARED_LIBS=ON
-            - name: Build X11 shared library
-              run: cmake --build build-x11-shared --parallel
-
-            - name: Configure Wayland shared library
-              run: cmake -B build-wayland-shared -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
-            - name: Build Wayland shared library
-              run: cmake --build build-wayland-shared --parallel
-
-            - name: Configure Wayland+X11 static library
-              run: cmake -B build-full-static -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=ON
-            - name: Build Wayland+X11 static library
-              run: cmake --build build-full-static --parallel
-
-            - name: Configure Wayland+X11 shared library
-              run: cmake -B build-full-shared -D GLFW_BUILD_WAYLAND=ON -D BUILD_SHARED_LIBS=ON -D GLFW_BUILD_X11=ON
-            - name: Build Wayland+X11 shared library
-              run: cmake --build build-full-shared --parallel
-
-    build-macos-clang:
-        name: macOS (Clang)
-        runs-on: macos-latest
-        timeout-minutes: 4
-        env:
-            CFLAGS: -Werror
-            MACOSX_DEPLOYMENT_TARGET: 10.11
-            CMAKE_OSX_ARCHITECTURES: x86_64;arm64
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Configure Null shared library
-              run: cmake -B build-null-shared -D GLFW_BUILD_COCOA=OFF -D BUILD_SHARED_LIBS=ON
-            - name: Build Null shared library
-              run: cmake --build build-null-shared --parallel
-
-            - name: Configure Cocoa static library
-              run: cmake -B build-cocoa-static
-            - name: Build Cocoa static library
-              run: cmake --build build-cocoa-static --parallel
-
-            - name: Configure Cocoa shared library
-              run: cmake -B build-cocoa-shared -D BUILD_SHARED_LIBS=ON
-            - name: Build Cocoa shared library
-              run: cmake --build build-cocoa-shared --parallel
-
-    build-windows-vs2022:
-        name: Windows (VS2022)
-        runs-on: windows-latest
-        timeout-minutes: 4
-        env:
-            CFLAGS: /WX
-        steps:
-            - uses: actions/checkout@v4
-
-            - 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
-            - name: Build Win32 shared x86 library
-              run: cmake --build build-win32-shared-x86 --parallel
-
-            - name: Configure Win32 static x64 library
-              run: cmake -B build-win32-static-x64 -G "Visual Studio 17 2022" -A x64
-            - name: Build Win32 static x64 library
-              run: cmake --build build-win32-static-x64 --parallel
-
-            - name: Configure Win32 shared x64 library
-              run: cmake -B build-win32-shared-x64 -G "Visual Studio 17 2022" -A x64 -D BUILD_SHARED_LIBS=ON
-            - name: Build Win32 shared x64 library
-              run: cmake --build build-win32-shared-x64 --parallel
-
--- a/.gitignore
+++ b/.gitignore
@ -1,46 +1,25 @@
-# The canonical out-of-tree build subdirectory
-build
-build-*
-
-# Visual Studio clutter
+# External junk
+.DS_Store
 _ReSharper*
+*.opensdf
 *.sdf
 *.suo
 *.dir
 *.vcxproj*
 *.sln
-.vs
-CMakeSettings.json
 Win32
 x64
 Debug
 Release
 MinSizeRel
 RelWithDebInfo
-*.opensdf
+*.xcodeproj

-# Xcode clutter
-GLFW.build
-GLFW.xcodeproj
-
-# macOS clutter
-.DS_Store
-
-# Makefile generator clutter
+# CMake files
 Makefile
-
-# Ninja generator clutter
-build.ninja
-rules.ninja
-.ninja_deps
-.ninja_log
-
-# CMake clutter
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
-CMakeDoxyfile.in
-CMakeDoxygenDefaults.cmake
 cmake_install.cmake
 cmake_uninstall.cmake

@ -53,15 +32,19 @@ src/glfw_config.h
 src/glfw3.pc
 src/glfw3Config.cmake
 src/glfw3ConfigVersion.cmake
+src/wayland-pointer-constraints-unstable-v1-client-protocol.h
+src/wayland-pointer-constraints-unstable-v1-protocol.c
+src/wayland-relative-pointer-unstable-v1-client-protocol.h
+src/wayland-relative-pointer-unstable-v1-protocol.c

 # Compiled binaries
 src/libglfw.so
 src/libglfw.so.3
-src/libglfw.so.3.5
+src/libglfw.so.3.2
 src/libglfw.dylib
 src/libglfw.dylib
 src/libglfw.3.dylib
-src/libglfw.3.5.dylib
+src/libglfw.3.2.dylib
 src/libglfw3.a
 src/glfw3.lib
 src/glfw3.dll
@ -72,13 +55,10 @@ examples/*.exe
 examples/boing
 examples/gears
 examples/heightmap
-examples/offscreen
 examples/particles
 examples/splitview
-examples/sharing
-examples/triangle-opengl
+examples/simple
 examples/wave
-examples/windows
 tests/*.app
 tests/*.exe
 tests/clipboard
@ -87,18 +67,16 @@ tests/empty
 tests/events
 tests/gamma
 tests/glfwinfo
-tests/icon
 tests/iconify
-tests/inputlag
 tests/joysticks
 tests/monitors
 tests/msaa
 tests/reopen
+tests/sharing
 tests/tearing
 tests/threads
-tests/timeout
 tests/title
-tests/triangle-vulkan
-tests/window
+tests/version
+tests/vulkan
 tests/windows

--- a/.mailmap
+++ b/.mailmap
@ -1,10 +0,0 @@
-Camilla Löwy <elmindreda@glfw.org> <elmindreda@users.sourceforge.net>
-Camilla Löwy <elmindreda@glfw.org> <elmindreda@elmindreda.org>
-Camilla Löwy <elmindreda@glfw.org>
-
-Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-
-Marcus Geelnard <m@bitsnbites.eu> <marcus256@users.sourceforge.net>
-Marcus Geelnard <m@bitsnbites.eu> <marcus@geelnards-pc.(none)>
-Marcus Geelnard <m@bitsnbites.eu>
-
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,30 @@
+language: c
+compiler: clang
+branches:
+    only:
+        - ci
+        - master
+os:
+    - linux
+    - osx
+sudo: false
+addons:
+    apt:
+        sources:
+            - kubuntu-backports
+        packages:
+            - cmake
+env:
+    - BUILD_SHARED_LIBS=ON
+    - BUILD_SHARED_LIBS=OFF
+script:
+    - mkdir build
+    - cd build
+    - cmake -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ..
+    - cmake --build .
+notifications:
+    email:
+        recipients:
+            - ci@glfw.org
+    on_success: never
+    on_failure: always
--- a/CMake/GenerateMappings.cmake
+++ b/CMake/GenerateMappings.cmake
@ -1,50 +0,0 @@
-# Usage:
-# cmake -P GenerateMappings.cmake <path/to/mappings.h.in> <path/to/mappings.h>
-
-cmake_policy(VERSION 3.16)
-
-set(source_url "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt")
-set(source_path "${CMAKE_CURRENT_BINARY_DIR}/gamecontrollerdb.txt")
-set(template_path "${CMAKE_ARGV3}")
-set(target_path "${CMAKE_ARGV4}")
-
-if (NOT EXISTS "${template_path}")
-    message(FATAL_ERROR "Failed to find template file ${template_path}")
-endif()
-
-file(DOWNLOAD "${source_url}" "${source_path}"
-     STATUS download_status
-     TLS_VERIFY on)
-
-list(GET download_status 0 status_code)
-list(GET download_status 1 status_message)
-
-if (status_code)
-    message(FATAL_ERROR "Failed to download ${source_url}: ${status_message}")
-endif()
-
-file(STRINGS "${source_path}" lines)
-list(FILTER lines INCLUDE REGEX "^[0-9a-fA-F]")
-
-foreach(line IN LISTS lines)
-    if (line MATCHES "platform:Windows")
-        if (GLFW_WIN32_MAPPINGS)
-            string(APPEND GLFW_WIN32_MAPPINGS "\n")
-        endif()
-        string(APPEND GLFW_WIN32_MAPPINGS "\"${line}\",")
-    elseif (line MATCHES "platform:Mac OS X")
-        if (GLFW_COCOA_MAPPINGS)
-            string(APPEND GLFW_COCOA_MAPPINGS "\n")
-        endif()
-        string(APPEND GLFW_COCOA_MAPPINGS "\"${line}\",")
-    elseif (line MATCHES "platform:Linux")
-        if (GLFW_LINUX_MAPPINGS)
-            string(APPEND GLFW_LINUX_MAPPINGS "\n")
-        endif()
-        string(APPEND GLFW_LINUX_MAPPINGS "\"${line}\",")
-    endif()
-endforeach()
-
-configure_file("${template_path}" "${target_path}" @ONLY NEWLINE_STYLE UNIX)
-file(REMOVE "${source_path}")
-
--- a/CMake/MacOSXBundleInfo.plist.in
+++ b/CMake/MacOSXBundleInfo.plist.in
--- a/CMake/amd64-mingw32msvc.cmake
+++ b/CMake/amd64-mingw32msvc.cmake
@ -0,0 +1,13 @@
+# Define the environment for cross compiling from Linux to Win64
+SET(CMAKE_SYSTEM_NAME    Windows)
+SET(CMAKE_SYSTEM_VERSION 1)
+SET(CMAKE_C_COMPILER     "amd64-mingw32msvc-gcc")
+SET(CMAKE_CXX_COMPILER   "amd64-mingw32msvc-g++")
+SET(CMAKE_RC_COMPILER    "amd64-mingw32msvc-windres")
+SET(CMAKE_RANLIB         "amd64-mingw32msvc-ranlib")
+
+# Configure the behaviour of the find commands 
+SET(CMAKE_FIND_ROOT_PATH "/usr/amd64-mingw32msvc")
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/CMake/glfw3.pc.in
+++ b/CMake/glfw3.pc.in
@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-
-Name: GLFW
-Description: A multi-platform library for OpenGL, window and input
-Version: @GLFW_VERSION@
-URL: https://www.glfw.org/
-Requires.private: @GLFW_PKG_CONFIG_REQUIRES_PRIVATE@
-Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@
-Libs.private: @GLFW_PKG_CONFIG_LIBS_PRIVATE@
-Cflags: -I${includedir}
--- a/CMake/glfw3Config.cmake.in
+++ b/CMake/glfw3Config.cmake.in
@ -1,3 +0,0 @@
-include(CMakeFindDependencyMacro)
-find_dependency(Threads)
-include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
--- a/CMake/i586-mingw32msvc.cmake
+++ b/CMake/i586-mingw32msvc.cmake
@ -0,0 +1,13 @@
+# Define the environment for cross compiling from Linux to Win32
+SET(CMAKE_SYSTEM_NAME    Windows)
+SET(CMAKE_SYSTEM_VERSION 1)
+SET(CMAKE_C_COMPILER     "i586-mingw32msvc-gcc")
+SET(CMAKE_CXX_COMPILER   "i586-mingw32msvc-g++")
+SET(CMAKE_RC_COMPILER    "i586-mingw32msvc-windres")
+SET(CMAKE_RANLIB         "i586-mingw32msvc-ranlib")
+
+# Configure the behaviour of the find commands 
+SET(CMAKE_FIND_ROOT_PATH "/usr/i586-mingw32msvc")
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/CMake/i686-pc-mingw32.cmake
+++ b/CMake/i686-pc-mingw32.cmake
@ -0,0 +1,13 @@
+# Define the environment for cross compiling from Linux to Win32
+SET(CMAKE_SYSTEM_NAME    Windows) # Target system name
+SET(CMAKE_SYSTEM_VERSION 1)
+SET(CMAKE_C_COMPILER     "i686-pc-mingw32-gcc")
+SET(CMAKE_CXX_COMPILER   "i686-pc-mingw32-g++")
+SET(CMAKE_RC_COMPILER    "i686-pc-mingw32-windres")
+SET(CMAKE_RANLIB         "i686-pc-mingw32-ranlib")
+
+#Configure the behaviour of the find commands 
+SET(CMAKE_FIND_ROOT_PATH "/opt/mingw/usr/i686-pc-mingw32")
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/CMake/i686-w64-mingw32-clang.cmake
+++ b/CMake/i686-w64-mingw32-clang.cmake
@ -1,13 +0,0 @@
-# Define the environment for cross-compiling with 32-bit MinGW-w64 Clang
-SET(CMAKE_SYSTEM_NAME    Windows) # Target system name
-SET(CMAKE_SYSTEM_VERSION 1)
-SET(CMAKE_C_COMPILER     "i686-w64-mingw32-clang")
-SET(CMAKE_CXX_COMPILER   "i686-w64-mingw32-clang++")
-SET(CMAKE_RC_COMPILER    "i686-w64-mingw32-windres")
-SET(CMAKE_RANLIB         "i686-w64-mingw32-ranlib")
-
-# Configure the behaviour of the find commands
-SET(CMAKE_FIND_ROOT_PATH "/usr/i686-w64-mingw32")
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/CMake/i686-w64-mingw32.cmake
+++ b/CMake/i686-w64-mingw32.cmake
@ -1,4 +1,4 @@
-# Define the environment for cross-compiling with 32-bit MinGW-w64 GCC
+# Define the environment for cross compiling from Linux to Win32
 SET(CMAKE_SYSTEM_NAME    Windows) # Target system name
 SET(CMAKE_SYSTEM_VERSION 1)
 SET(CMAKE_C_COMPILER     "i686-w64-mingw32-gcc")
@ -6,7 +6,7 @@ SET(CMAKE_CXX_COMPILER   "i686-w64-mingw32-g++")
 SET(CMAKE_RC_COMPILER    "i686-w64-mingw32-windres")
 SET(CMAKE_RANLIB         "i686-w64-mingw32-ranlib")

-# Configure the behaviour of the find commands
+# Configure the behaviour of the find commands 
 SET(CMAKE_FIND_ROOT_PATH "/usr/i686-w64-mingw32")
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
--- a/CMake/modules/FindEpollShim.cmake
+++ b/CMake/modules/FindEpollShim.cmake
@ -1,17 +0,0 @@
-# Find EpollShim
-# Once done, this will define
-#
-#   EPOLLSHIM_FOUND - System has EpollShim
-#   EPOLLSHIM_INCLUDE_DIRS - The EpollShim include directories
-#   EPOLLSHIM_LIBRARIES - The libraries needed to use EpollShim
-
-find_path(EPOLLSHIM_INCLUDE_DIRS NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim)
-find_library(EPOLLSHIM_LIBRARIES NAMES epoll-shim libepoll-shim HINTS /usr/local/lib)
-
-if (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
-	set(EPOLLSHIM_FOUND TRUE)
-endif (EPOLLSHIM_INCLUDE_DIRS AND EPOLLSHIM_LIBRARIES)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(EpollShim DEFAULT_MSG EPOLLSHIM_LIBRARIES EPOLLSHIM_INCLUDE_DIRS)
-mark_as_advanced(EPOLLSHIM_INCLUDE_DIRS EPOLLSHIM_LIBRARIES)
--- a/CMake/modules/FindMir.cmake
+++ b/CMake/modules/FindMir.cmake
@ -0,0 +1,18 @@
+# Try to find Mir on a Unix system
+#
+# This will define:
+#
+#   MIR_LIBRARIES   - Link these to use Wayland
+#   MIR_INCLUDE_DIR - Include directory for Wayland
+#
+# Copyright (c) 2014 Brandon Schaefer <brandon.schaefer@canonical.com>
+
+if (NOT WIN32)
+
+  find_package (PkgConfig)
+  pkg_check_modules (PKG_MIR QUIET mirclient)
+
+  set (MIR_INCLUDE_DIR ${PKG_MIR_INCLUDE_DIRS})
+  set (MIR_LIBRARIES   ${PKG_MIR_LIBRARIES})
+
+endif ()
--- a/CMake/modules/FindVulkan.cmake
+++ b/CMake/modules/FindVulkan.cmake
@ -0,0 +1,31 @@
+# Find Vulkan
+#
+# VULKAN_INCLUDE_DIR
+# VULKAN_LIBRARY
+# VULKAN_FOUND
+
+if (WIN32)
+    find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS
+        "$ENV{VULKAN_SDK}/Include"
+        "$ENV{VK_SDK_PATH}/Include")
+    if (CMAKE_CL_64)
+        find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
+            "$ENV{VULKAN_SDK}/Bin"
+            "$ENV{VK_SDK_PATH}/Bin")
+    else()
+        find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
+            "$ENV{VULKAN_SDK}/Bin32"
+            "$ENV{VK_SDK_PATH}/Bin32")
+    endif()
+else()
+    find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS
+        "$ENV{VULKAN_SDK}/include")
+    find_library(VULKAN_LIBRARY NAMES vulkan HINTS
+        "$ENV{VULKAN_SDK}/lib")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Vulkan DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR)
+
+mark_as_advanced(VULKAN_INCLUDE_DIR VULKAN_LIBRARY)
+
--- a/CMake/modules/FindWaylandProtocols.cmake
+++ b/CMake/modules/FindWaylandProtocols.cmake
@ -0,0 +1,26 @@
+find_package(PkgConfig)
+
+pkg_check_modules(WaylandProtocols QUIET wayland-protocols>=${WaylandProtocols_FIND_VERSION})
+
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols
+                OUTPUT_VARIABLE WaylandProtocols_PKGDATADIR
+                RESULT_VARIABLE _pkgconfig_failed)
+if (_pkgconfig_failed)
+    message(FATAL_ERROR "Missing wayland-protocols pkgdatadir")
+endif()
+
+string(REGEX REPLACE "[\r\n]" "" WaylandProtocols_PKGDATADIR "${WaylandProtocols_PKGDATADIR}")
+
+find_package_handle_standard_args(WaylandProtocols
+    FOUND_VAR
+        WaylandProtocols_FOUND
+    REQUIRED_VARS
+        WaylandProtocols_PKGDATADIR
+    VERSION_VAR
+        WaylandProtocols_VERSION
+    HANDLE_COMPONENTS
+)
+
+set(WAYLAND_PROTOCOLS_FOUND ${WaylandProtocols_FOUND})
+set(WAYLAND_PROTOCOLS_PKGDATADIR ${WaylandProtocols_PKGDATADIR})
+set(WAYLAND_PROTOCOLS_VERSION ${WaylandProtocols_VERSION})
--- a/CMake/modules/FindXKBCommon.cmake
+++ b/CMake/modules/FindXKBCommon.cmake
@ -0,0 +1,34 @@
+# - Try to find XKBCommon
+# Once done, this will define
+#
+#   XKBCOMMON_FOUND - System has XKBCommon
+#   XKBCOMMON_INCLUDE_DIRS - The XKBCommon include directories
+#   XKBCOMMON_LIBRARIES - The libraries needed to use XKBCommon
+#   XKBCOMMON_DEFINITIONS - Compiler switches required for using XKBCommon
+
+find_package(PkgConfig)
+pkg_check_modules(PC_XKBCOMMON QUIET xkbcommon)
+set(XKBCOMMON_DEFINITIONS ${PC_XKBCOMMON_CFLAGS_OTHER})
+
+find_path(XKBCOMMON_INCLUDE_DIR
+    NAMES xkbcommon/xkbcommon.h
+    HINTS ${PC_XKBCOMMON_INCLUDE_DIR} ${PC_XKBCOMMON_INCLUDE_DIRS}
+)
+
+find_library(XKBCOMMON_LIBRARY
+    NAMES xkbcommon
+    HINTS ${PC_XKBCOMMON_LIBRARY} ${PC_XKBCOMMON_LIBRARY_DIRS}
+)
+
+set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LIBRARY})
+set(XKBCOMMON_LIBRARY_DIRS ${XKBCOMMON_LIBRARY_DIRS})
+set(XKBCOMMON_INCLUDE_DIRS ${XKBCOMMON_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(XKBCommon DEFAULT_MSG
+    XKBCOMMON_LIBRARY
+    XKBCOMMON_INCLUDE_DIR
+)
+
+mark_as_advanced(XKBCOMMON_LIBRARY XKBCOMMON_INCLUDE_DIR)
+
--- a/CMake/x86_64-w64-mingw32-clang.cmake
+++ b/CMake/x86_64-w64-mingw32-clang.cmake
@ -1,13 +0,0 @@
-# Define the environment for cross-compiling with 64-bit MinGW-w64 Clang
-SET(CMAKE_SYSTEM_NAME    Windows) # Target system name
-SET(CMAKE_SYSTEM_VERSION 1)
-SET(CMAKE_C_COMPILER     "x86_64-w64-mingw32-clang")
-SET(CMAKE_CXX_COMPILER   "x86_64-w64-mingw32-clang++")
-SET(CMAKE_RC_COMPILER    "x86_64-w64-mingw32-windres")
-SET(CMAKE_RANLIB         "x86_64-w64-mingw32-ranlib")
-
-# Configure the behaviour of the find commands
-SET(CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32")
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/CMake/x86_64-w64-mingw32.cmake
+++ b/CMake/x86_64-w64-mingw32.cmake
@ -1,4 +1,4 @@
-# Define the environment for cross-compiling with 64-bit MinGW-w64 GCC
+# Define the environment for cross compiling from Linux to Win32
 SET(CMAKE_SYSTEM_NAME    Windows) # Target system name
 SET(CMAKE_SYSTEM_VERSION 1)
 SET(CMAKE_C_COMPILER     "x86_64-w64-mingw32-gcc")
@ -6,7 +6,7 @@ SET(CMAKE_CXX_COMPILER   "x86_64-w64-mingw32-g++")
 SET(CMAKE_RC_COMPILER    "x86_64-w64-mingw32-windres")
 SET(CMAKE_RANLIB         "x86_64-w64-mingw32-ranlib")

-# Configure the behaviour of the find commands
+# Configure the behaviour of the find commands 
 SET(CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32")
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,96 +1,356 @@
-cmake_minimum_required(VERSION 3.16...3.28 FATAL_ERROR)
+set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)

-project(GLFW VERSION 3.5.0 LANGUAGES C HOMEPAGE_URL "https://www.glfw.org/")
+project(GLFW C)
+
+cmake_minimum_required(VERSION 2.8.12)
+
+if (NOT CMAKE_VERSION VERSION_LESS "3.0")
+    # Until all major package systems have moved to CMake 3,
+    # we stick with the older INSTALL_NAME_DIR mechanism
+    cmake_policy(SET CMP0042 OLD)
+endif()
+
+set(GLFW_VERSION_MAJOR "3")
+set(GLFW_VERSION_MINOR "2")
+set(GLFW_VERSION_PATCH "0")
+set(GLFW_VERSION_EXTRA "")
+set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
+set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
+set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib will be installed: lib or lib64")

 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

-string(COMPARE EQUAL "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}" GLFW_STANDALONE)
-
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ${GLFW_STANDALONE})
-option(GLFW_BUILD_TESTS "Build the GLFW test programs" ${GLFW_STANDALONE})
+option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON)
+option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON)
 option(GLFW_BUILD_DOCS "Build the GLFW documentation" ON)
 option(GLFW_INSTALL "Generate installation target" ON)
+option(GLFW_DOCUMENT_INTERNALS "Include internals in documentation" OFF)

-include(GNUInstallDirs)
-include(CMakeDependentOption)
-
-if (GLFW_USE_OSMESA)
-    message(FATAL_ERROR "GLFW_USE_OSMESA has been removed; set the GLFW_PLATFORM init hint")
+if (WIN32)
+    option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF)
 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")
+if (APPLE)
+    option(GLFW_USE_CHDIR "Make glfwInit chdir to Contents/Resources" ON)
+    option(GLFW_USE_MENUBAR "Populate the menu bar on first window creation" ON)
+    option(GLFW_USE_RETINA "Use the full resolution of Retina displays" ON)
 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)
+if (UNIX AND NOT APPLE)
+    option(GLFW_USE_WAYLAND "Use Wayland for window creation" OFF)
+    option(GLFW_USE_MIR     "Use Mir for window creation" OFF)
+endif()

-cmake_dependent_option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF
-                       "WIN32" OFF)
-cmake_dependent_option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" ON
-                       "MSVC" OFF)
+if (MSVC)
+    option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" ON)
+endif()

-set(GLFW_LIBRARY_TYPE "${GLFW_LIBRARY_TYPE}" CACHE STRING
-    "Library type override for GLFW (SHARED, STATIC, OBJECT, or empty to follow BUILD_SHARED_LIBS)")
+if (BUILD_SHARED_LIBS)
+    set(_GLFW_BUILD_DLL 1)
+endif()

-if (GLFW_LIBRARY_TYPE)
-    if (GLFW_LIBRARY_TYPE STREQUAL "SHARED")
-        set(GLFW_BUILD_SHARED_LIBRARY TRUE)
-    else()
-        set(GLFW_BUILD_SHARED_LIBRARY FALSE)
-    endif()
+if (BUILD_SHARED_LIBS AND UNIX)
+    # On Unix-like systems, shared libraries can use the soname system.
+    set(GLFW_LIB_NAME glfw)
 else()
-    set(GLFW_BUILD_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
+    set(GLFW_LIB_NAME glfw3)
 endif()

-list(APPEND CMAKE_MODULE_PATH "${GLFW_SOURCE_DIR}/CMake/modules")
+set(CMAKE_MODULE_PATH "${GLFW_SOURCE_DIR}/CMake/modules")

 find_package(Threads REQUIRED)
+find_package(Vulkan)

-#--------------------------------------------------------------------
-# Report backend selection
-#--------------------------------------------------------------------
-if (GLFW_BUILD_WIN32)
-    message(STATUS "Including Win32 support")
-endif()
-if (GLFW_BUILD_COCOA)
-    message(STATUS "Including Cocoa support")
-endif()
-if (GLFW_BUILD_WAYLAND)
-    message(STATUS "Including Wayland support")
-endif()
-if (GLFW_BUILD_X11)
-    message(STATUS "Including X11 support")
+if (GLFW_BUILD_DOCS)
+    set(DOXYGEN_SKIP_DOT TRUE)
+    find_package(Doxygen)
 endif()

 #--------------------------------------------------------------------
-# Apply Microsoft C runtime library option
-# This is here because it also applies to tests and examples
+# Set compiler specific flags
 #--------------------------------------------------------------------
-if (MSVC AND NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+if (MSVC)
+    if (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
+        foreach (flag CMAKE_C_FLAGS
+                      CMAKE_C_FLAGS_DEBUG
+                      CMAKE_C_FLAGS_RELEASE
+                      CMAKE_C_FLAGS_MINSIZEREL
+                      CMAKE_C_FLAGS_RELWITHDEBINFO)
+
+            if (${flag} MATCHES "/MD")
+                string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
+            endif()
+            if (${flag} MATCHES "/MDd")
+                string(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
+            endif()
+
+        endforeach()
+    endif()
 endif()

+if (MINGW)
+    # Workaround for legacy MinGW not providing XInput and DirectInput
+    include(CheckIncludeFile)
+
+    check_include_file(dinput.h DINPUT_H_FOUND)
+    check_include_file(xinput.h XINPUT_H_FOUND)
+    if (NOT DINPUT_H_FOUND OR NOT XINPUT_H_FOUND)
+        list(APPEND glfw_INCLUDE_DIRS "${GLFW_SOURCE_DIR}/deps/mingw")
+    endif()
+
+    # Enable link-time exploit mitigation features enabled by default on MSVC
+    include(CheckCCompilerFlag)
+
+    # Compatibility with data execution prevention (DEP)
+    set(CMAKE_REQUIRED_FLAGS "-Wl,--nxcompat")
+    check_c_compiler_flag("" _GLFW_HAS_DEP)
+    if (_GLFW_HAS_DEP)
+        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--nxcompat ${CMAKE_SHARED_LINKER_FLAGS}")
+    endif()
+
+    # Compatibility with address space layout randomization (ASLR)
+    set(CMAKE_REQUIRED_FLAGS "-Wl,--dynamicbase")
+    check_c_compiler_flag("" _GLFW_HAS_ASLR)
+    if (_GLFW_HAS_ASLR)
+        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--dynamicbase ${CMAKE_SHARED_LINKER_FLAGS}")
+    endif()
+
+    # Compatibility with 64-bit address space layout randomization (ASLR)
+    set(CMAKE_REQUIRED_FLAGS "-Wl,--high-entropy-va")
+    check_c_compiler_flag("" _GLFW_HAS_64ASLR)
+    if (_GLFW_HAS_64ASLR)
+        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--high-entropy-va ${CMAKE_SHARED_LINKER_FLAGS}")
+    endif()
+endif()
+
+#--------------------------------------------------------------------
+# Detect and select backend APIs
+#--------------------------------------------------------------------
+if (WIN32)
+    set(_GLFW_WIN32 1)
+    message(STATUS "Using Win32 for window creation")
+elseif (APPLE)
+    set(_GLFW_COCOA 1)
+    message(STATUS "Using Cocoa for window creation")
+elseif (UNIX)
+    if (GLFW_USE_WAYLAND)
+        set(_GLFW_WAYLAND 1)
+        message(STATUS "Using Wayland for window creation")
+    elseif (GLFW_USE_MIR)
+        set(_GLFW_MIR 1)
+        message(STATUS "Using Mir for window creation")
+    else()
+        set(_GLFW_X11 1)
+        message(STATUS "Using X11 for window creation")
+    endif()
+else()
+    message(FATAL_ERROR "No supported platform was detected")
+endif()
+
+#--------------------------------------------------------------------
+# Find and add Unix math and time libraries
+#--------------------------------------------------------------------
+if (UNIX AND NOT APPLE)
+    find_library(RT_LIBRARY rt)
+    mark_as_advanced(RT_LIBRARY)
+    if (RT_LIBRARY)
+        list(APPEND glfw_LIBRARIES "${RT_LIBRARY}")
+        list(APPEND glfw_PKG_LIBS "-lrt")
+    endif()
+
+    find_library(MATH_LIBRARY m)
+    mark_as_advanced(MATH_LIBRARY)
+    if (MATH_LIBRARY)
+        list(APPEND glfw_LIBRARIES "${MATH_LIBRARY}")
+        list(APPEND glfw_PKG_LIBS "-lm")
+    endif()
+
+    if (CMAKE_DL_LIBS)
+        list(APPEND glfw_LIBRARIES "${CMAKE_DL_LIBS}")
+        list(APPEND glfw_PKG_LIBS "-l${CMAKE_DL_LIBS}")
+    endif()
+endif()
+
+#--------------------------------------------------------------------
+# Use Win32 for window creation
+#--------------------------------------------------------------------
+if (_GLFW_WIN32)
+
+    list(APPEND glfw_PKG_LIBS "-lgdi32")
+
+    if (GLFW_USE_HYBRID_HPG)
+        set(_GLFW_USE_HYBRID_HPG 1)
+    endif()
+endif()
+
+#--------------------------------------------------------------------
+# Use X11 for window creation
+#--------------------------------------------------------------------
+if (_GLFW_X11)
+
+    find_package(X11 REQUIRED)
+
+    list(APPEND glfw_PKG_DEPS "x11")
+
+    # Set up library and include paths
+    list(APPEND glfw_INCLUDE_DIRS "${X11_X11_INCLUDE_PATH}")
+    list(APPEND glfw_LIBRARIES "${X11_X11_LIB}" "${CMAKE_THREAD_LIBS_INIT}")
+
+    # Check for XRandR (modern resolution switching and gamma control)
+    if (NOT X11_Xrandr_FOUND)
+        message(FATAL_ERROR "The RandR library and headers were not found")
+    endif()
+
+    list(APPEND glfw_INCLUDE_DIRS "${X11_Xrandr_INCLUDE_PATH}")
+    list(APPEND glfw_LIBRARIES "${X11_Xrandr_LIB}")
+    list(APPEND glfw_PKG_DEPS "xrandr")
+
+    # Check for Xinerama (legacy multi-monitor support)
+    if (NOT X11_Xinerama_FOUND)
+        message(FATAL_ERROR "The Xinerama library and headers were not found")
+    endif()
+
+    list(APPEND glfw_INCLUDE_DIRS "${X11_Xinerama_INCLUDE_PATH}")
+    list(APPEND glfw_LIBRARIES "${X11_Xinerama_LIB}")
+    list(APPEND glfw_PKG_DEPS "xinerama")
+
+    # Check for Xf86VidMode (fallback gamma control)
+    if (X11_xf86vmode_FOUND)
+        list(APPEND glfw_INCLUDE_DIRS "${X11_xf86vmode_INCLUDE_PATH}")
+        list(APPEND glfw_PKG_DEPS "xxf86vm")
+
+        if (X11_Xxf86vm_LIB)
+            list(APPEND glfw_LIBRARIES "${X11_Xxf86vm_LIB}")
+        else()
+            # Backwards compatibility (see CMake bug 0006976)
+            list(APPEND glfw_LIBRARIES Xxf86vm)
+        endif()
+
+        set(_GLFW_HAS_XF86VM TRUE)
+    endif()
+
+    # Check for Xkb (X keyboard extension)
+    if (NOT X11_Xkb_FOUND)
+        message(FATAL_ERROR "The X keyboard extension headers were not found")
+    endif()
+
+    list(APPEND glfw_INCLUDE_DIR "${X11_Xkb_INCLUDE_PATH}")
+
+    # Check for Xcursor
+    if (NOT X11_Xcursor_FOUND)
+        message(FATAL_ERROR "The Xcursor libraries and headers were not found")
+    endif()
+
+    list(APPEND glfw_INCLUDE_DIR "${X11_Xcursor_INCLUDE_PATH}")
+    list(APPEND glfw_LIBRARIES "${X11_Xcursor_LIB}")
+    list(APPEND glfw_PKG_DEPS "xcursor")
+
+endif()
+
+#--------------------------------------------------------------------
+# Use Wayland for window creation
+#--------------------------------------------------------------------
+if (_GLFW_WAYLAND)
+    find_package(ECM REQUIRED NO_MODULE)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+
+    find_package(Wayland REQUIRED)
+    find_package(WaylandScanner REQUIRED)
+    find_package(WaylandProtocols 1.1 REQUIRED)
+
+    list(APPEND glfw_PKG_DEPS "wayland-egl")
+
+    list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIR}")
+    list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
+
+    find_package(XKBCommon REQUIRED)
+    list(APPEND glfw_PKG_DEPS "xkbcommon")
+    list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}")
+    list(APPEND glfw_LIBRARIES "${XKBCOMMON_LIBRARY}")
+endif()
+
+#--------------------------------------------------------------------
+# Use Mir for window creation
+#--------------------------------------------------------------------
+if (_GLFW_MIR)
+    find_package(Mir REQUIRED)
+    list(APPEND glfw_PKG_DEPS "mirclient")
+
+    list(APPEND glfw_INCLUDE_DIRS "${MIR_INCLUDE_DIR}")
+    list(APPEND glfw_LIBRARIES "${MIR_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
+
+    find_package(XKBCommon REQUIRED)
+    list(APPEND glfw_PKG_DEPS "xkbcommon")
+    list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}")
+    list(APPEND glfw_LIBRARIES "${XKBCOMMON_LIBRARY}")
+endif()
+
+#--------------------------------------------------------------------
+# Use Cocoa for window creation and NSOpenGL for context creation
+#--------------------------------------------------------------------
+if (_GLFW_COCOA)
+
+    if (GLFW_USE_MENUBAR)
+        set(_GLFW_USE_MENUBAR 1)
+    endif()
+
+    if (GLFW_USE_CHDIR)
+        set(_GLFW_USE_CHDIR 1)
+    endif()
+
+    if (GLFW_USE_RETINA)
+        set(_GLFW_USE_RETINA 1)
+    endif()
+
+    # Set up library and include paths
+    find_library(COCOA_FRAMEWORK Cocoa)
+    find_library(IOKIT_FRAMEWORK IOKit)
+    find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation)
+    find_library(CORE_VIDEO_FRAMEWORK CoreVideo)
+    mark_as_advanced(COCOA_FRAMEWORK
+                     IOKIT_FRAMEWORK
+                     CORE_FOUNDATION_FRAMEWORK
+                     CORE_VIDEO_FRAMEWORK)
+    list(APPEND glfw_LIBRARIES "${COCOA_FRAMEWORK}"
+                               "${IOKIT_FRAMEWORK}"
+                               "${CORE_FOUNDATION_FRAMEWORK}"
+                               "${CORE_VIDEO_FRAMEWORK}")
+
+    set(glfw_PKG_DEPS "")
+    set(glfw_PKG_LIBS "-framework Cocoa -framework IOKit -framework CoreFoundation -framework CoreVideo")
+endif()
+
+#--------------------------------------------------------------------
+# Export GLFW library dependencies
+#--------------------------------------------------------------------
+foreach(arg ${glfw_PKG_DEPS})
+    set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} ${arg}")
+endforeach()
+foreach(arg ${glfw_PKG_LIBS})
+    set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} ${arg}")
+endforeach()
+
 #--------------------------------------------------------------------
 # Create generated files
 #--------------------------------------------------------------------
 include(CMakePackageConfigHelpers)

-set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
+set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")

-configure_package_config_file(CMake/glfw3Config.cmake.in
+configure_package_config_file(src/glfw3Config.cmake.in
                              src/glfw3Config.cmake
                              INSTALL_DESTINATION "${GLFW_CONFIG_PATH}"
                              NO_CHECK_REQUIRED_COMPONENTS_MACRO)

 write_basic_package_version_file(src/glfw3ConfigVersion.cmake
-                                 VERSION ${GLFW_VERSION}
+                                 VERSION ${GLFW_VERSION_FULL}
                                 COMPATIBILITY SameMajorVersion)

+configure_file(src/glfw_config.h.in src/glfw_config.h @ONLY)
+
+configure_file(src/glfw3.pc.in src/glfw3.pc @ONLY)
+
 #--------------------------------------------------------------------
 # Add subdirectories
 #--------------------------------------------------------------------
@ -104,7 +364,7 @@ if (GLFW_BUILD_TESTS)
    add_subdirectory(tests)
 endif()

-if (GLFW_BUILD_DOCS)
+if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
    add_subdirectory(docs)
 endif()

@ -113,7 +373,7 @@ endif()
 # The library is installed by src/CMakeLists.txt
 #--------------------------------------------------------------------
 if (GLFW_INSTALL)
-    install(DIRECTORY include/GLFW DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    install(DIRECTORY include/GLFW DESTINATION include
            FILES_MATCHING PATTERN glfw3.h PATTERN glfw3native.h)

    install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
@ -124,17 +384,16 @@ if (GLFW_INSTALL)
            EXPORT_LINK_INTERFACE_LIBRARIES
            DESTINATION "${GLFW_CONFIG_PATH}")
    install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+            DESTINATION "lib${LIB_SUFFIX}/pkgconfig")

    # Only generate this target if no higher-level project already has
    if (NOT TARGET uninstall)
-        configure_file(CMake/cmake_uninstall.cmake.in
+        configure_file(cmake_uninstall.cmake.in
                       cmake_uninstall.cmake IMMEDIATE @ONLY)

        add_custom_target(uninstall
                          "${CMAKE_COMMAND}" -P
                          "${GLFW_BINARY_DIR}/cmake_uninstall.cmake")
-        set_target_properties(uninstall PROPERTIES FOLDER "GLFW3")
    endif()
 endif()

--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -1,300 +0,0 @@
-# Acknowledgements
-
-GLFW exists because people around the world donated their time and lent their
-skills.  This list only includes contributions to the main repository and
-excludes other invaluable contributions like language bindings and text and
-video tutorials.
-
- - Bobyshev Alexander
- - Laurent Aphecetche
- - Matt Arsenault
- - Takuro Ashie
- - ashishgamedev
- - David Avedissian
- - Luca Bacci
- - Keith Bauer
- - John Bartholomew
- - Coşku Baş
- - Bayemite
- - Niklas Behrens
- - Andrew Belt
- - Nevyn Bengtsson
- - Niklas Bergström
- - Denis Bernard
- - BiBi
- - Doug Binks
- - blanco
- - Waris Boonyasiriwat
- - Kyle Brenneman
- - Rok Breulj
- - TheBrokenRail
- - Kai Burjack
- - Martin Capitanio
- - Nicolas Caramelli
- - David Carlier
- - Arturo Castro
- - Jose Luis Cercós Pita
- - Chi-kwan Chan
- - Victor Chernyakin
- - TheChocolateOre
- - Ali Chraghi
- - Joseph Chua
- - Ian Clarkson
- - Michał Cichoń
- - Lambert Clara
- - Anna Clarke
- - Josh Codd
- - Yaron Cohen-Tal
- - Omar Cornut
- - Andrew Corrigan
- - Bailey Cosier
- - Noel Cower
- - James Cowgill
- - CuriouserThing
- - Bill Currie
- - Jason Daly
- - danhambleton
- - Jarrod Davis
- - Olivier Delannoy
- - Paul R. Deppe
- - Michael Dickens
- - Роман Донченко
- - Mario Dorn
- - Wolfgang Draxinger
- - Jonathan Dummer
- - Ralph Eastwood
- - Fredrik Ehnbom
- - Robin Eklind
- - Jan Ekström
- - Siavash Eliasi
- - er-azh
- - Ahmad Fatoum
- - Nikita Fediuchin
- - Felipe Ferreira
- - Michael Fogleman
- - forworldm
- - Jason Francis
- - Gerald Franz
- - Mário Freitas
- - GeO4d
- - Marcus Geelnard
- - Gegy
- - ghuser404
- - Charles Giessen
- - Ryan C. Gordon
- - Stephen Gowen
- - Kovid Goyal
- - Kevin Grandemange
- - Eloi Marín Gratacós
- - Grzesiek11
- - Stefan Gustavson
- - Andrew Gutekanst
- - Stephen Gutekanst
- - Jonathan Hale
- - Daniel Hauser
- - hdf89shfdfs
- - Moritz Heinemann
- - Sylvain Hellegouarch
- - Björn Hempel
- - Matthew Henry
- - heromyth
- - Lucas Hinderberger
- - Paul Holden
- - Hajime Hoshi
- - Warren Hu
- - Charles Huber
- - Brent Huisman
- - Florian Hülsmann
- - illustris
- - InKryption
- - IntellectualKitty
- - Aaron Jacobs
- - JannikGM
- - Erik S. V. Jansson
- - jjYBdx4IL
- - Peter Johnson
- - Toni Jovanoski
- - Arseny Kapoulkine
- - Cem Karan
- - Osman Keskin
- - Koray Kilinc
- - Josh Kilmer
- - Byunghoon Kim
- - Cameron King
- - Peter Knut
- - Christoph Kubisch
- - Yuri Kunde Schlesner
- - Rokas Kupstys
- - Konstantin Käfer
- - Eric Larson
- - Guillaume Lebrun
- - Francis Lecavalier
- - Jong Won Lee
- - Robin Leffmann
- - Glenn Lewis
- - Shane Liesegang
- - Anders Lindqvist
- - Leon Linhart
- - Marco Lizza
- - lo-v-ol
- - Eyal Lotem
- - Aaron Loucks
- - Ned Loynd
- - Luflosi
- - lukect
- - Tristam MacDonald
- - Jean-Luc Mackail
- - Hans Mackowiak
- - Ramiro Magno
- - Дмитри Малышев
- - Zbigniew Mandziejewicz
- - Adam Marcus
- - Célestin Marot
- - Kyle McDonald
- - David V. McKay
- - David Medlock
- - Bryce Mehring
- - Jonathan Mercier
- - Marcel Metz
- - Liam Middlebrook
- - mightgoyardstill
- - Ave Milia
- - Icyllis Milica
- - Jonathan Miller
- - Kenneth Miller
- - Bruce Mitchener
- - Jack Moffitt
- - Ravi Mohan
- - Jeff Molofee
- - Alexander Monakov
- - Pierre Morel
- - Jon Morton
- - Pierre Moulon
- - Martins Mozeiko
- - 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
- - Ozzy
- - Andri Pálsson
- - luz paz
- - Peoro
- - Braden Pellett
- - Christopher Pelloux
- - Michael Pennington
- - Arturo J. Pérez
- - Vladimir Perminov
- - Olivier Perret
- - Anthony Pesch
- - Orson Peters
- - Emmanuel Gil Peyrot
- - Cyril Pichard
- - Pilzschaf
- - Keith Pitt
- - Stanislav Podgorskiy
- - Konstantin Podsvirov
- - Nathan Poirier
- - Pokechu22
- - Alexandre Pretyman
- - Pablo Prietz
- - przemekmirek
- - pthom
- - Martin Pulec
- - Guillaume Racicot
- - Juan Ramos
- - Christian Rauch
- - Philip Rideout
- - Eddie Ringle
- - Max Risuhin
- - Joe Roback
- - Jorge Rodriguez
- - Jari Ronkainen
- - Luca Rood
- - Ed Ropple
- - Aleksey Rybalkin
- - Mikko Rytkönen
- - Riku Salminen
- - Yoshinori Sano
- - Brandon Schaefer
- - Sebastian Schuberth
- - Scr3amer
- - Jan Schuerkamp
- - Christian Sdunek
- - Matt Sealey
- - Steve Sexton
- - Arkady Shapkin
- - Mingjie Shen
- - Ali Sherief
- - Yoshiki Shibukawa
- - Dmitri Shuralyov
- - Joao da Silva
- - Daniel Sieger
- - Daljit Singh
- - Michael Skec
- - Daniel Skorupski
- - Slemmie
- - Anthony Smith
- - Bradley Smith
- - Cliff Smolinsky
- - Patrick Snape
- - Erlend Sogge Heggen
- - Olivier Sohn
- - Julian Squires
- - Johannes Stein
- - Pontus Stenetorp
- - Michael Stocker
- - Justin Stoecker
- - Elviss Strazdins
- - Paul Sultana
- - Nathan Sweet
- - TTK-Bandit
- - Nuno Teixeira
- - Jared Tiala
- - Sergey Tikhomirov
- - Arthur Tombs
- - TronicLabs
- - Ioannis Tsakpinis
- - Samuli Tuomola
- - Matthew Turner
- - urraka
- - Elias Vanderstuyft
- - Stef Velzel
- - Jari Vetoniemi
- - Ricardo Vieira
- - Nicholas Vitovitch
- - Vladimír Vondruš
- - Simon Voordouw
- - Corentin Wallez
- - Torsten Walluhn
- - Patrick Walton
- - Jim Wang
- - Xo Wang
- - Andre Weissflog
- - Jay Weisskopf
- - Frank Wille
- - Andy Williams
- - Joel Winarske
- - Richard A. Wilkes
- - Tatsuya Yatagawa
- - Ryogo Yoshimura
- - Lukas Zanner
- - Andrey Zholos
- - Aihui Zhu
- - Santi Zupancic
- - Jonas Ådahl
- - Lasse Öörni
- - Leonard König
- - All the unmentioned and anonymous contributors in the GLFW community, for bug
-   reports, patches, feedback, testing and encouragement
-
--- a/COPYING.txt
+++ b/COPYING.txt
@ -1,6 +1,5 @@
 Copyright (c) 2002-2006 Marcus Geelnard
-
-Copyright (c) 2006-2019 Camilla Löwy
+Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>

 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
--- a/README.md
+++ b/README.md
@ -1,97 +1,64 @@
 # GLFW

-[![Build status](https://github.com/glfw/glfw/actions/workflows/build.yml/badge.svg)](https://github.com/glfw/glfw/actions)
+[![Build status](https://travis-ci.org/glfw/glfw.svg?branch=master)](https://travis-ci.org/glfw/glfw)
 [![Build status](https://ci.appveyor.com/api/projects/status/0kf0ct9831i5l6sp/branch/master?svg=true)](https://ci.appveyor.com/project/elmindreda/glfw)

 ## Introduction

-GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan
-application development.  It provides a simple, platform-independent API for
-creating windows, contexts and surfaces, reading input, handling events, etc.
+GLFW is 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.

-GLFW natively supports Windows, macOS and Linux and other Unix-like systems.  On
-Linux both Wayland and X11 are supported.
-
-GLFW is licensed under the [zlib/libpng
-license](https://www.glfw.org/license.html).
-
-You can [download](https://www.glfw.org/download.html) the latest stable release
-as source or Windows binaries.  Each release starting with 3.0 also has
-a corresponding [annotated 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
-notes](https://www.glfw.org/docs/latest/news.html) for new features, caveats and
-deprecations in the latest release.  For more details see the [version
-history](https://www.glfw.org/changelog.html).
-
-The `master` branch is the stable integration branch and _should_ always compile
-and run on all supported platforms, although details of newly added features may
-change until they have been included in a release.  New features and many bug
-fixes live in [other branches](https://github.com/glfw/glfw/branches/all) until
-they are stable enough to merge.
+Version 3.2 adds support for Vulkan surface creation, window mode switching,
+window maximization, window input focus control, window size and aspect ratio
+limits, human-readable key names, window icons, joystick connection events,
+XInput and DirectInput joystick input, event waiting with timeout, 64-bit
+integer raw timer, context-less window creation, error-less contexts via
+`GL_KHR_no_error` (where available), run-time context creation API selection,
+Windows 8.1 per-monitor DPI and the CMake config-file package system, adds
+simpler build-time configuration, improved documentation and fixes for a large
+number of bugs that together affect all supported platforms.

 If you are new to GLFW, you may find the
-[tutorial](https://www.glfw.org/docs/latest/quick.html) for GLFW 3 useful.  If
-you have used GLFW 2 in the past, there is a [transition
-guide](https://www.glfw.org/docs/latest/moving.html) for moving to the GLFW
-3 API.
-
-GLFW exists because of the contributions of [many people](CONTRIBUTORS.md)
-around the world, whether by reporting bugs, providing community support, adding
-features, reviewing or testing code, debugging, proofreading docs, suggesting
-features or fixing bugs.
+[tutorial](http://www.glfw.org/docs/latest/quick.html) for GLFW
+3 useful.  If you have used GLFW 2 in the past, there is a
+[transition guide](http://www.glfw.org/docs/latest/moving.html) for moving to
+the GLFW 3 API.


 ## Compiling GLFW

-GLFW is written primarily in C99, with parts of macOS support being written in
-Objective-C.  GLFW itself requires only the headers and libraries for your OS
-and window system.  It does not need any additional headers for context creation
-APIs (WGL, GLX, EGL, NSGL, OSMesa) or rendering APIs (OpenGL, OpenGL ES, Vulkan)
-to enable support for them.
-
-GLFW supports compilation on Windows with Visual C++ 2013 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
-for all supported compilers on Windows and macOS.
-
-See the [compilation guide](https://www.glfw.org/docs/latest/compile.html) for
-more information about how to compile GLFW yourself.
+See the [Compiling GLFW](http://www.glfw.org/docs/latest/compile.html) guide in
+the GLFW documentation.


 ## Using GLFW

-See the [documentation](https://www.glfw.org/docs/latest/) for tutorials, guides
-and the API reference.
+See the
+[Building programs that use GLFW](http://www.glfw.org/docs/latest/build.html)
+guide in the GLFW documentation.


-## Contributing to GLFW
+## Reporting bugs

-See the [contribution
-guide](https://github.com/glfw/glfw/blob/master/docs/CONTRIBUTING.md) for
-more information.
+Bugs are reported to our [issue tracker](https://github.com/glfw/glfw/issues).
+Please always include the name and version of the OS where the bug occurs and
+the version of GLFW used.  If you have cloned it, include the commit ID used.

+If it's a build issue, please also include the build log and the name and
+version of your development environment.

-## System requirements
+If it's a context creation issue, please also include the make and model of your
+graphics card and the version of your driver.

-GLFW supports Windows XP and later and macOS 10.11 and later.  Linux and other
-Unix-like systems running the X Window System are supported even without
-a desktop environment or modern extensions, although some features require
-a running window or clipboard manager.  The OSMesa backend requires Mesa 6.3.
-
-See the [compatibility guide](https://www.glfw.org/docs/latest/compat.html)
-in the documentation for more information.
+This will help both us and other people experiencing the same bug.


 ## Dependencies

-GLFW itself needs only CMake 3.16 or later and the headers and libraries for your
-OS and window system.
+GLFW itself needs only the headers and libraries for your window system.  It
+does not need the headers for any context creation API (WGL, GLX, EGL, NSGL) or
+rendering API (OpenGL, OpenGL ES, Vulkan) to enable support for them.

 The examples and test programs depend on a number of tiny libraries.  These are
 located in the `deps/` directory.
@ -100,54 +67,225 @@ located in the `deps/` directory.
   with command-line options
 - [TinyCThread](https://github.com/tinycthread/tinycthread) for threaded
   examples
- - [glad2](https://github.com/Dav1dde/glad) for loading OpenGL and Vulkan
-   functions
+ - An OpenGL 3.2 core loader generated by
+   [glad](https://github.com/Dav1dde/glad) for examples using modern OpenGL
 - [linmath.h](https://github.com/datenwolf/linmath.h) for linear algebra in
   examples
- - [Nuklear](https://github.com/Immediate-Mode-UI/Nuklear) for test and example UI
- - [stb\_image\_write](https://github.com/nothings/stb) for writing images to disk
+ - [Vulkan headers](https://www.khronos.org/registry/vulkan/) for Vulkan tests

-The documentation is generated with [Doxygen](https://doxygen.org/) if CMake can
-find that tool.
+The Vulkan example additionally requires the Vulkan SDK to be installed, or it
+will not be included in the build.
+
+The documentation is generated with [Doxygen](http://doxygen.org/).  If CMake
+does not find Doxygen, the documentation will not be generated.


-## Reporting bugs
+## Changelog

-Bugs are reported to our [issue tracker](https://github.com/glfw/glfw/issues).
-Please check the [contribution
-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
-
- - Added `GLFW_UNLIMITED_MOUSE_BUTTONS` input mode that allows mouse buttons beyond
-   the limit of the mouse button tokens to be reported (#2423)
- - Updated minimum CMake version to 3.16 (#2541)
- - [Cocoa] Added `QuartzCore` framework as link-time dependency
- - [Cocoa] Removed support for OS X 10.10 Yosemite and earlier (#2506)
- - [Wayland] Bugfix: The fractional scaling related objects were not destroyed
- - [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
- - [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
- - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
- - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
- - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
- - [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
-   `GLFW_NATIVE_CONTEXT_API` (#2518)
+ - Added `glfwVulkanSupported`, `glfwGetRequiredInstanceExtensions`,
+   `glfwGetInstanceProcAddress`, `glfwGetPhysicalDevicePresentationSupport` and
+   `glfwCreateWindowSurface` for platform independent Vulkan support
+ - Added `glfwSetWindowMonitor` for switching between windowed and full screen
+   modes and updating the monitor and desired video mode of full screen windows
+ - Added `glfwMaximizeWindow` and `GLFW_MAXIMIZED` for window maximization
+ - Added `glfwFocusWindow` for giving windows input focus
+ - Added `glfwSetWindowSizeLimits` and `glfwSetWindowAspectRatio` for setting
+   absolute and relative window size limits
+ - Added `glfwGetKeyName` for querying the layout-specific name of printable
+   keys
+ - Added `glfwWaitEventsTimeout` for waiting for events for a set amount of time
+ - Added `glfwSetWindowIcon` for setting the icon of a window
+ - Added `glfwGetTimerValue` and `glfwGetTimerFrequency` for raw timer access
+ - Added `glfwSetJoystickCallback` and `GLFWjoystickfun` for joystick connection
+   and disconnection events
+ - Added `GLFW_NO_API` for creating window without contexts
+ - Added `GLFW_INCLUDE_VULKAN` for including the Vulkan header
+ - Added `GLFW_CONTEXT_CREATION_API`, `GLFW_NATIVE_CONTEXT_API` and
+   `GLFW_EGL_CONTEXT_API` for run-time context creation API selection
+ - Added `GLFW_CONTEXT_NO_ERROR` context hint for `GL_KHR_no_error` support
+ - Added `GLFW_TRUE` and `GLFW_FALSE` as client API independent boolean values
+ - Added icons to examples on Windows and OS X
+ - Relaxed rules for native access header macros
+ - Removed dependency on external OpenGL or OpenGL ES headers
+ - Removed `_GLFW_USE_OPENGL`, `_GLFW_USE_GLESV1`, `_GLFW_USE_GLESV2`,
+   `_GLFW_WGL`, `_GLFW_NSGL`, `_GLFW_GLX` and `_GLFW_EGL` configuration macros
+ - [Win32] Added support for Windows 8.1 per-monitor DPI
+ - [Win32] Replaced winmm with XInput and DirectInput for joystick input
+ - [Win32] Bugfix: Window creation would segfault if video mode setting required
+                   the system to be restarted
+ - [Win32] Bugfix: MinGW import library lacked the `lib` prefix
+ - [Win32] Bugfix: Monitor connection and disconnection events were not reported
+                   when no windows existed
+ - [Win32] Bugfix: Activating or deactivating displays in software did not
+                   trigger monitor callback
+ - [Win32] Bugfix: No monitors were listed on headless and VMware guest systems
+ - [Win32] Bugfix: Pressing Ctrl+Pause would report `GLFW_KEY_UNKNOWN`
+ - [Win32] Bugfix: Window size events would be reported in wrong order when
+                   restoring a full screen window
+ - [Cocoa] Made joystick polling more efficient
+ - [Cocoa] Removed support for OS X 10.6
+ - [Cocoa] Bugfix: Full screen windows on secondary monitors were mispositioned
+ - [Cocoa] Bugfix: Connecting a joystick that reports no name would segfault
+ - [Cocoa] Bugfix: Modifier flags cache was not updated when window became key
+ - [Cocoa] Bugfix: Dead key character composition did not work
+ - [Cocoa] Bugfix: The CGL context was not released until the autorelease pool
+                   was drained by another function
+ - [X11] Bugfix: Monitor connection and disconnection events were not reported
+ - [X11] Bugfix: Decoding of UTF-8 text from XIM could continue past the end
+ - [X11] Bugfix: An XKB structure was leaked during `glfwInit`
+ - [X11] Bugfix: XInput2 `XI_Motion` events interfered with the Steam overlay
+ - [POSIX] Bugfix: An unrelated TLS key could be deleted by `glfwTerminate`
+ - [Linux] Made joystick polling more efficient
+ - [WGL] Changed extension loading to only be performed once
+ - [WGL] Removed dependency on external WGL headers
+ - [GLX] Added `glfwGetGLXWindow` to query the `GLXWindow` of a window
+ - [GLX] Replaced legacy drawable with `GLXWindow`
+ - [GLX] Removed dependency on external GLX headers
+ - [GLX] Bugfix: NetBSD does not provide `libGL.so.1`
+ - [EGL] Added `_GLFW_USE_EGLPLATFORM_H` configuration macro for controlling
+         whether to use an existing `EGL/eglplatform.h` header
+ - [EGL] Added and documented test for if the context is current on the calling
+         thread during buffer swap
+ - [EGL] Removed dependency on external EGL headers


 ## Contact

-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.
+The official website for GLFW is [glfw.org](http://www.glfw.org/).  There 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/).
+[support forum](http://discourse.glfw.org/), and the IRC
+channel `#glfw` on [Freenode](http://freenode.net/).

 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 GitHub or IRC.
+
+
+## Acknowledgements
+
+GLFW exists because people around the world donated their time and lent their
+skills.
+
+ - Bobyshev Alexander
+ - artblanc
+ - arturo
+ - Matt Arsenault
+ - Keith Bauer
+ - John Bartholomew
+ - Niklas Behrens
+ - Niklas Bergström
+ - Doug Binks
+ - blanco
+ - Martin Capitanio
+ - Chi-kwan Chan
+ - Lambert Clara
+ - Andrew Corrigan
+ - Noel Cower
+ - Jarrod Davis
+ - Olivier Delannoy
+ - Paul R. Deppe
+ - Michael Dickens
+ - Роман Донченко
+ - Mario Dorn
+ - Jonathan Dummer
+ - Ralph Eastwood
+ - Siavash Eliasi
+ - Michael Fogleman
+ - Gerald Franz
+ - GeO4d
+ - Marcus Geelnard
+ - Eloi Marín Gratacós
+ - Stefan Gustavson
+ - Sylvain Hellegouarch
+ - Matthew Henry
+ - heromyth
+ - Lucas Hinderberger
+ - Paul Holden
+ - IntellectualKitty
+ - Aaron Jacobs
+ - Toni Jovanoski
+ - Arseny Kapoulkine
+ - Osman Keskin
+ - Cameron King
+ - Peter Knut
+ - Christoph Kubisch
+ - Eric Larson
+ - Robin Leffmann
+ - Glenn Lewis
+ - Shane Liesegang
+ - Eyal Lotem
+ - Дмитри Малышев
+ - Martins Mozeiko
+ - Tristam MacDonald
+ - Hans Mackowiak
+ - Zbigniew Mandziejewicz
+ - Kyle McDonald
+ - David Medlock
+ - Bryce Mehring
+ - Jonathan Mercier
+ - Marcel Metz
+ - Jonathan Miller
+ - Kenneth Miller
+ - Bruce Mitchener
+ - Jack Moffitt
+ - Jeff Molofee
+ - Jon Morton
+ - Pierre Moulon
+ - Julian Møller
+ - Kamil Nowakowski
+ - Ozzy
+ - Andri Pálsson
+ - Peoro
+ - Braden Pellett
+ - Arturo J. Pérez
+ - Orson Peters
+ - Emmanuel Gil Peyrot
+ - Cyril Pichard
+ - Pieroman
+ - Jorge Rodriguez
+ - Ed Ropple
+ - Aleksey Rybalkin
+ - Riku Salminen
+ - Brandon Schaefer
+ - Sebastian Schuberth
+ - Matt Sealey
+ - SephiRok
+ - Steve Sexton
+ - Systemcluster
+ - Yoshiki Shibukawa
+ - Dmitri Shuralyov
+ - Daniel Skorupski
+ - Bradley Smith
+ - Julian Squires
+ - Johannes Stein
+ - Justin Stoecker
+ - Elviss Strazdins
+ - Nathan Sweet
+ - TTK-Bandit
+ - Sergey Tikhomirov
+ - A. Tombs
+ - Ioannis Tsakpinis
+ - Samuli Tuomola
+ - urraka
+ - Jari Vetoniemi
+ - Ricardo Vieira
+ - Nicholas Vitovitch
+ - Simon Voordouw
+ - Torsten Walluhn
+ - Patrick Walton
+ - Xo Wang
+ - Jay Weisskopf
+ - Frank Wille
+ - yuriks
+ - Santi Zupancic
+ - Jonas Ådahl
+ - Lasse Öörni
+ - All the unmentioned and anonymous contributors in the GLFW community, for bug
+   reports, patches, feedback, testing and encouragement

--- a/CMake/cmake_uninstall.cmake.in
+++ b/CMake/cmake_uninstall.cmake.in
@ -1,9 +1,9 @@

-if (NOT EXISTS "@GLFW_BINARY_DIR@/install_manifest.txt")
-    message(FATAL_ERROR "Cannot find install manifest: \"@GLFW_BINARY_DIR@/install_manifest.txt\"")
+if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
 endif()

-file(READ "@GLFW_BINARY_DIR@/install_manifest.txt" files)
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")

 foreach (file ${files})
--- a/deps/KHR/khrplatform.h
+++ b/deps/KHR/khrplatform.h
@ -0,0 +1,282 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE 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
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by sending them to the public Khronos Bugzilla
+ * (http://khronos.org/bugzilla) by filing a bug against product
+ * "Khronos (general)" component "Registry".
+ *
+ * A predefined template which fills in some of the bug fields can be
+ * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
+ * must create a Bugzilla login first.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64, 
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
--- a/deps/glad.c
+++ b/deps/glad.c
--- a/deps/glad/gl.h
+++ b/deps/glad/gl.h
--- a/deps/glad/glad.h
+++ b/deps/glad/glad.h
--- a/deps/glad/gles2.h
+++ b/deps/glad/gles2.h
--- a/deps/glad/vulkan.h
+++ b/deps/glad/vulkan.h
--- a/deps/linmath.h
+++ b/deps/linmath.h
@ -1,96 +1,70 @@
 #ifndef LINMATH_H
 #define LINMATH_H

-#include <string.h>
 #include <math.h>
-#include <string.h>

-/* 2021-03-21 Camilla Löwy <elmindreda@elmindreda.org>
- * - Replaced double constants with float equivalents
- */
-
-#ifdef LINMATH_NO_INLINE
-#define LINMATH_H_FUNC static
-#else
-#define LINMATH_H_FUNC static inline
+#ifdef _MSC_VER 
+#define inline __inline
 #endif

 #define LINMATH_H_DEFINE_VEC(n) \
 typedef float vec##n[n]; \
-LINMATH_H_FUNC void vec##n##_add(vec##n r, vec##n const a, vec##n const b) \
+static inline void vec##n##_add(vec##n r, vec##n const a, vec##n const b) \
 { \
 	int i; \
 	for(i=0; i<n; ++i) \
 		r[i] = a[i] + b[i]; \
 } \
-LINMATH_H_FUNC void vec##n##_sub(vec##n r, vec##n const a, vec##n const b) \
+static inline void vec##n##_sub(vec##n r, vec##n const a, vec##n const b) \
 { \
 	int i; \
 	for(i=0; i<n; ++i) \
 		r[i] = a[i] - b[i]; \
 } \
-LINMATH_H_FUNC void vec##n##_scale(vec##n r, vec##n const v, float const s) \
+static inline void vec##n##_scale(vec##n r, vec##n const v, float const s) \
 { \
 	int i; \
 	for(i=0; i<n; ++i) \
 		r[i] = v[i] * s; \
 } \
-LINMATH_H_FUNC float vec##n##_mul_inner(vec##n const a, vec##n const b) \
+static inline float vec##n##_mul_inner(vec##n const a, vec##n const b) \
 { \
-	float p = 0.f; \
+	float p = 0.; \
 	int i; \
 	for(i=0; i<n; ++i) \
 		p += b[i]*a[i]; \
 	return p; \
 } \
-LINMATH_H_FUNC float vec##n##_len(vec##n const v) \
+static inline float vec##n##_len(vec##n const v) \
 { \
-	return sqrtf(vec##n##_mul_inner(v,v)); \
+	return (float) sqrt(vec##n##_mul_inner(v,v)); \
 } \
-LINMATH_H_FUNC void vec##n##_norm(vec##n r, vec##n const v) \
+static inline void vec##n##_norm(vec##n r, vec##n const v) \
 { \
 	float k = 1.f / vec##n##_len(v); \
 	vec##n##_scale(r, v, k); \
-} \
-LINMATH_H_FUNC void vec##n##_min(vec##n r, vec##n const a, vec##n const b) \
-{ \
-	int i; \
-	for(i=0; i<n; ++i) \
-		r[i] = a[i]<b[i] ? a[i] : b[i]; \
-} \
-LINMATH_H_FUNC void vec##n##_max(vec##n r, vec##n const a, vec##n const b) \
-{ \
-	int i; \
-	for(i=0; i<n; ++i) \
-		r[i] = a[i]>b[i] ? a[i] : b[i]; \
-} \
-LINMATH_H_FUNC void vec##n##_dup(vec##n r, vec##n const src) \
-{ \
-	int i; \
-	for(i=0; i<n; ++i) \
-		r[i] = src[i]; \
 }

 LINMATH_H_DEFINE_VEC(2)
 LINMATH_H_DEFINE_VEC(3)
 LINMATH_H_DEFINE_VEC(4)

-LINMATH_H_FUNC void vec3_mul_cross(vec3 r, vec3 const a, vec3 const b)
+static inline void vec3_mul_cross(vec3 r, vec3 const a, vec3 const b)
 {
 	r[0] = a[1]*b[2] - a[2]*b[1];
 	r[1] = a[2]*b[0] - a[0]*b[2];
 	r[2] = a[0]*b[1] - a[1]*b[0];
 }

-LINMATH_H_FUNC void vec3_reflect(vec3 r, vec3 const v, vec3 const n)
+static inline void vec3_reflect(vec3 r, vec3 const v, vec3 const n)
 {
-	float p = 2.f * vec3_mul_inner(v, n);
+	float p  = 2.f*vec3_mul_inner(v, n);
 	int i;
 	for(i=0;i<3;++i)
 		r[i] = v[i] - p*n[i];
 }

-LINMATH_H_FUNC void vec4_mul_cross(vec4 r, vec4 const a, vec4 const b)
+static inline void vec4_mul_cross(vec4 r, vec4 a, vec4 b)
 {
 	r[0] = a[1]*b[2] - a[2]*b[1];
 	r[1] = a[2]*b[0] - a[0]*b[2];
@ -98,7 +72,7 @@ LINMATH_H_FUNC void vec4_mul_cross(vec4 r, vec4 const a, vec4 const b)
 	r[3] = 1.f;
 }

-LINMATH_H_FUNC void vec4_reflect(vec4 r, vec4 const v, vec4 const n)
+static inline void vec4_reflect(vec4 r, vec4 v, vec4 n)
 {
 	float p  = 2.f*vec4_mul_inner(v, n);
 	int i;
@ -107,66 +81,68 @@ LINMATH_H_FUNC void vec4_reflect(vec4 r, vec4 const v, vec4 const n)
 }

 typedef vec4 mat4x4[4];
-LINMATH_H_FUNC void mat4x4_identity(mat4x4 M)
+static inline void mat4x4_identity(mat4x4 M)
 {
 	int i, j;
 	for(i=0; i<4; ++i)
 		for(j=0; j<4; ++j)
 			M[i][j] = i==j ? 1.f : 0.f;
 }
-LINMATH_H_FUNC void mat4x4_dup(mat4x4 M, mat4x4 const N)
+static inline void mat4x4_dup(mat4x4 M, mat4x4 N)
 {
-	int i;
+	int i, j;
 	for(i=0; i<4; ++i)
-		vec4_dup(M[i], N[i]);
+		for(j=0; j<4; ++j)
+			M[i][j] = N[i][j];
 }
-LINMATH_H_FUNC void mat4x4_row(vec4 r, mat4x4 const M, int i)
+static inline void mat4x4_row(vec4 r, mat4x4 M, int i)
 {
 	int k;
 	for(k=0; k<4; ++k)
 		r[k] = M[k][i];
 }
-LINMATH_H_FUNC void mat4x4_col(vec4 r, mat4x4 const M, int i)
+static inline void mat4x4_col(vec4 r, mat4x4 M, int i)
 {
 	int k;
 	for(k=0; k<4; ++k)
 		r[k] = M[i][k];
 }
-LINMATH_H_FUNC void mat4x4_transpose(mat4x4 M, mat4x4 const N)
+static inline void mat4x4_transpose(mat4x4 M, mat4x4 N)
 {
-    // Note: if M and N are the same, the user has to
-    // explicitly make a copy of M and set it to N.
 	int i, j;
 	for(j=0; j<4; ++j)
 		for(i=0; i<4; ++i)
 			M[i][j] = N[j][i];
 }
-LINMATH_H_FUNC void mat4x4_add(mat4x4 M, mat4x4 const a, mat4x4 const b)
+static inline void mat4x4_add(mat4x4 M, mat4x4 a, mat4x4 b)
 {
 	int i;
 	for(i=0; i<4; ++i)
 		vec4_add(M[i], a[i], b[i]);
 }
-LINMATH_H_FUNC void mat4x4_sub(mat4x4 M, mat4x4 const a, mat4x4 const b)
+static inline void mat4x4_sub(mat4x4 M, mat4x4 a, mat4x4 b)
 {
 	int i;
 	for(i=0; i<4; ++i)
 		vec4_sub(M[i], a[i], b[i]);
 }
-LINMATH_H_FUNC void mat4x4_scale(mat4x4 M, mat4x4 const a, float k)
+static inline void mat4x4_scale(mat4x4 M, mat4x4 a, float k)
 {
 	int i;
 	for(i=0; i<4; ++i)
 		vec4_scale(M[i], a[i], k);
 }
-LINMATH_H_FUNC void mat4x4_scale_aniso(mat4x4 M, mat4x4 const a, float x, float y, float z)
+static inline void mat4x4_scale_aniso(mat4x4 M, mat4x4 a, float x, float y, float z)
 {
+	int i;
 	vec4_scale(M[0], a[0], x);
 	vec4_scale(M[1], a[1], y);
 	vec4_scale(M[2], a[2], z);
-	vec4_dup(M[3], a[3]);
+	for(i = 0; i < 4; ++i) {
+		M[3][i] = a[3][i];
+	}
 }
-LINMATH_H_FUNC void mat4x4_mul(mat4x4 M, mat4x4 const a, mat4x4 const b)
+static inline void mat4x4_mul(mat4x4 M, mat4x4 a, mat4x4 b)
 {
 	mat4x4 temp;
 	int k, r, c;
@ -177,7 +153,7 @@ LINMATH_H_FUNC void mat4x4_mul(mat4x4 M, mat4x4 const a, mat4x4 const b)
 	}
 	mat4x4_dup(M, temp);
 }
-LINMATH_H_FUNC void mat4x4_mul_vec4(vec4 r, mat4x4 const M, vec4 const v)
+static inline void mat4x4_mul_vec4(vec4 r, mat4x4 M, vec4 v)
 {
 	int i, j;
 	for(j=0; j<4; ++j) {
@ -186,14 +162,14 @@ LINMATH_H_FUNC void mat4x4_mul_vec4(vec4 r, mat4x4 const M, vec4 const v)
 			r[j] += M[i][j] * v[i];
 	}
 }
-LINMATH_H_FUNC void mat4x4_translate(mat4x4 T, float x, float y, float z)
+static inline void mat4x4_translate(mat4x4 T, float x, float y, float z)
 {
 	mat4x4_identity(T);
 	T[3][0] = x;
 	T[3][1] = y;
 	T[3][2] = z;
 }
-LINMATH_H_FUNC void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z)
+static inline void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z)
 {
 	vec4 t = {x, y, z, 0};
 	vec4 r;
@ -203,13 +179,13 @@ LINMATH_H_FUNC void mat4x4_translate_in_place(mat4x4 M, float x, float y, float
 		M[3][i] += vec4_mul_inner(r, t);
 	}
 }
-LINMATH_H_FUNC void mat4x4_from_vec3_mul_outer(mat4x4 M, vec3 const a, vec3 const b)
+static inline void mat4x4_from_vec3_mul_outer(mat4x4 M, vec3 a, vec3 b)
 {
 	int i, j;
 	for(i=0; i<4; ++i) for(j=0; j<4; ++j)
 		M[i][j] = i<3 && j<3 ? a[i] * b[j] : 0.f;
 }
-LINMATH_H_FUNC void mat4x4_rotate(mat4x4 R, mat4x4 const M, float x, float y, float z, float angle)
+static inline void mat4x4_rotate(mat4x4 R, mat4x4 M, float x, float y, float z, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
@ -237,13 +213,13 @@ LINMATH_H_FUNC void mat4x4_rotate(mat4x4 R, mat4x4 const M, float x, float y, fl
 		mat4x4_add(T, T, C);
 		mat4x4_add(T, T, S);

-		T[3][3] = 1.f;
+		T[3][3] = 1.;		
 		mat4x4_mul(R, M, T);
 	} else {
 		mat4x4_dup(R, M);
 	}
 }
-LINMATH_H_FUNC void mat4x4_rotate_X(mat4x4 Q, mat4x4 const M, float angle)
+static inline void mat4x4_rotate_X(mat4x4 Q, mat4x4 M, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
@ -255,19 +231,19 @@ LINMATH_H_FUNC void mat4x4_rotate_X(mat4x4 Q, mat4x4 const M, float angle)
 	};
 	mat4x4_mul(Q, M, R);
 }
-LINMATH_H_FUNC void mat4x4_rotate_Y(mat4x4 Q, mat4x4 const M, float angle)
+static inline void mat4x4_rotate_Y(mat4x4 Q, mat4x4 M, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
 	mat4x4 R = {
-		{   c, 0.f,  -s, 0.f},
+		{   c, 0.f,   s, 0.f},
 		{ 0.f, 1.f, 0.f, 0.f},
-		{   s, 0.f,   c, 0.f},
+		{  -s, 0.f,   c, 0.f},
 		{ 0.f, 0.f, 0.f, 1.f}
 	};
 	mat4x4_mul(Q, M, R);
 }
-LINMATH_H_FUNC void mat4x4_rotate_Z(mat4x4 Q, mat4x4 const M, float angle)
+static inline void mat4x4_rotate_Z(mat4x4 Q, mat4x4 M, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
@ -279,7 +255,7 @@ LINMATH_H_FUNC void mat4x4_rotate_Z(mat4x4 Q, mat4x4 const M, float angle)
 	};
 	mat4x4_mul(Q, M, R);
 }
-LINMATH_H_FUNC void mat4x4_invert(mat4x4 T, mat4x4 const M)
+static inline void mat4x4_invert(mat4x4 T, mat4x4 M)
 {
 	float s[6];
 	float c[6];
@ -320,10 +296,10 @@ LINMATH_H_FUNC void mat4x4_invert(mat4x4 T, mat4x4 const M)
 	T[3][2] = (-M[3][0] * s[3] + M[3][1] * s[1] - M[3][2] * s[0]) * idet;
 	T[3][3] = ( M[2][0] * s[3] - M[2][1] * s[1] + M[2][2] * s[0]) * idet;
 }
-LINMATH_H_FUNC void mat4x4_orthonormalize(mat4x4 R, mat4x4 const M)
+static inline void mat4x4_orthonormalize(mat4x4 R, mat4x4 M)
 {
 	mat4x4_dup(R, M);
-	float s = 1.f;
+	float s = 1.;
 	vec3 h;

 	vec3_norm(R[2], R[2]);
@ -331,11 +307,12 @@ LINMATH_H_FUNC void mat4x4_orthonormalize(mat4x4 R, mat4x4 const M)
 	s = vec3_mul_inner(R[1], R[2]);
 	vec3_scale(h, R[2], s);
 	vec3_sub(R[1], R[1], h);
-	vec3_norm(R[1], R[1]);
+	vec3_norm(R[2], R[2]);

-	s = vec3_mul_inner(R[0], R[2]);
+	s = vec3_mul_inner(R[1], R[2]);
 	vec3_scale(h, R[2], s);
-	vec3_sub(R[0], R[0], h);
+	vec3_sub(R[1], R[1], h);
+	vec3_norm(R[1], R[1]);

 	s = vec3_mul_inner(R[0], R[1]);
 	vec3_scale(h, R[1], s);
@ -343,7 +320,7 @@ LINMATH_H_FUNC void mat4x4_orthonormalize(mat4x4 R, mat4x4 const M)
 	vec3_norm(R[0], R[0]);
 }

-LINMATH_H_FUNC void mat4x4_frustum(mat4x4 M, float l, float r, float b, float t, float n, float f)
+static inline void mat4x4_frustum(mat4x4 M, float l, float r, float b, float t, float n, float f)
 {
 	M[0][0] = 2.f*n/(r-l);
 	M[0][1] = M[0][2] = M[0][3] = 0.f;
@ -359,7 +336,7 @@ LINMATH_H_FUNC void mat4x4_frustum(mat4x4 M, float l, float r, float b, float t,
 	M[3][2] = -2.f*(f*n)/(f-n);
 	M[3][0] = M[3][1] = M[3][3] = 0.f;
 }
-LINMATH_H_FUNC void mat4x4_ortho(mat4x4 M, float l, float r, float b, float t, float n, float f)
+static inline void mat4x4_ortho(mat4x4 M, float l, float r, float b, float t, float n, float f)
 {
 	M[0][0] = 2.f/(r-l);
 	M[0][1] = M[0][2] = M[0][3] = 0.f;
@ -375,11 +352,11 @@ LINMATH_H_FUNC void mat4x4_ortho(mat4x4 M, float l, float r, float b, float t, f
 	M[3][2] = -(f+n)/(f-n);
 	M[3][3] = 1.f;
 }
-LINMATH_H_FUNC void mat4x4_perspective(mat4x4 m, float y_fov, float aspect, float n, float f)
+static inline void mat4x4_perspective(mat4x4 m, float y_fov, float aspect, float n, float f)
 {
 	/* NOTE: Degrees are an unhandy unit to work with.
 	 * linmath.h uses radians for everything! */
-	float const a = 1.f / tanf(y_fov / 2.f);
+	float const a = 1.f / (float) tan(y_fov / 2.f);

 	m[0][0] = a / aspect;
 	m[0][1] = 0.f;
@ -401,7 +378,7 @@ LINMATH_H_FUNC void mat4x4_perspective(mat4x4 m, float y_fov, float aspect, floa
 	m[3][2] = -((2.f * f * n) / (f - n));
 	m[3][3] = 0.f;
 }
-LINMATH_H_FUNC void mat4x4_look_at(mat4x4 m, vec3 const eye, vec3 const center, vec3 const up)
+static inline void mat4x4_look_at(mat4x4 m, vec3 eye, vec3 center, vec3 up)
 {
 	/* Adapted from Android's OpenGL Matrix.java.                        */
 	/* See the OpenGL GLUT documentation for gluLookAt for a description */
@ -444,18 +421,24 @@ LINMATH_H_FUNC void mat4x4_look_at(mat4x4 m, vec3 const eye, vec3 const center,
 }

 typedef float quat[4];
-#define quat_add vec4_add
-#define quat_sub vec4_sub
-#define quat_norm vec4_norm
-#define quat_scale vec4_scale
-#define quat_mul_inner vec4_mul_inner
-
-LINMATH_H_FUNC void quat_identity(quat q)
+static inline void quat_identity(quat q)
 {
 	q[0] = q[1] = q[2] = 0.f;
 	q[3] = 1.f;
 }
-LINMATH_H_FUNC void quat_mul(quat r, quat const p, quat const q)
+static inline void quat_add(quat r, quat a, quat b)
+{
+	int i;
+	for(i=0; i<4; ++i)
+		r[i] = a[i] + b[i];
+}
+static inline void quat_sub(quat r, quat a, quat b)
+{
+	int i;
+	for(i=0; i<4; ++i)
+		r[i] = a[i] - b[i];
+}
+static inline void quat_mul(quat r, quat p, quat q)
 {
 	vec3 w;
 	vec3_mul_cross(r, p, q);
@ -465,42 +448,56 @@ LINMATH_H_FUNC void quat_mul(quat r, quat const p, quat const q)
 	vec3_add(r, r, w);
 	r[3] = p[3]*q[3] - vec3_mul_inner(p, q);
 }
-LINMATH_H_FUNC void quat_conj(quat r, quat const q)
+static inline void quat_scale(quat r, quat v, float s)
+{
+	int i;
+	for(i=0; i<4; ++i)
+		r[i] = v[i] * s;
+}
+static inline float quat_inner_product(quat a, quat b)
+{
+	float p = 0.f;
+	int i;
+	for(i=0; i<4; ++i)
+		p += b[i]*a[i];
+	return p;
+}
+static inline void quat_conj(quat r, quat q)
 {
 	int i;
 	for(i=0; i<3; ++i)
 		r[i] = -q[i];
 	r[3] = q[3];
 }
-LINMATH_H_FUNC void quat_rotate(quat r, float angle, vec3 const axis) {
-    vec3 axis_norm;
-    vec3_norm(axis_norm, axis);
-    float s = sinf(angle / 2);
-    float c = cosf(angle / 2);
-    vec3_scale(r, axis_norm, s);
-    r[3] = c;
+static inline void quat_rotate(quat r, float angle, vec3 axis) {
+	vec3 v;
+	vec3_scale(v, axis, sinf(angle / 2));
+	int i;
+	for(i=0; i<3; ++i)
+		r[i] = v[i];
+	r[3] = cosf(angle / 2);
 }
-LINMATH_H_FUNC void quat_mul_vec3(vec3 r, quat const q, vec3 const v)
+#define quat_norm vec4_norm
+static inline void quat_mul_vec3(vec3 r, quat q, vec3 v)
 {
 /*
 * Method by Fabian 'ryg' Giessen (of Farbrausch)
 t = 2 * cross(q.xyz, v)
 v' = v + q.w * t + cross(q.xyz, t)
 */
-	vec3 t;
-	vec3 q_xyz = {q[0], q[1], q[2]};
+	vec3 t = {q[0], q[1], q[2]};
 	vec3 u = {q[0], q[1], q[2]};

-	vec3_mul_cross(t, q_xyz, v);
+	vec3_mul_cross(t, t, v);
 	vec3_scale(t, t, 2);

-	vec3_mul_cross(u, q_xyz, t);
+	vec3_mul_cross(u, u, t);
 	vec3_scale(t, t, q[3]);

 	vec3_add(r, v, t);
 	vec3_add(r, r, u);
 }
-LINMATH_H_FUNC void mat4x4_from_quat(mat4x4 M, quat const q)
+static inline void mat4x4_from_quat(mat4x4 M, quat q)
 {
 	float a = q[3];
 	float b = q[0];
@ -530,21 +527,18 @@ LINMATH_H_FUNC void mat4x4_from_quat(mat4x4 M, quat const q)
 	M[3][3] = 1.f;
 }

-LINMATH_H_FUNC void mat4x4o_mul_quat(mat4x4 R, mat4x4 const M, quat const q)
+static inline void mat4x4o_mul_quat(mat4x4 R, mat4x4 M, quat q)
 {
-/*  XXX: The way this is written only works for orthogonal matrices. */
+/*  XXX: The way this is written only works for othogonal matrices. */
 /* TODO: Take care of non-orthogonal case. */
 	quat_mul_vec3(R[0], q, M[0]);
 	quat_mul_vec3(R[1], q, M[1]);
 	quat_mul_vec3(R[2], q, M[2]);

 	R[3][0] = R[3][1] = R[3][2] = 0.f;
-	R[0][3] = M[0][3];
-	R[1][3] = M[1][3];
-	R[2][3] = M[2][3];
-	R[3][3] = M[3][3];  // typically 1.0, but here we make it general
+	R[3][3] = 1.f;
 }
-LINMATH_H_FUNC void quat_from_mat4x4(quat q, mat4x4 const M)
+static inline void quat_from_mat4x4(quat q, mat4x4 M)
 {
 	float r=0.f;
 	int i;
@ -560,7 +554,7 @@ LINMATH_H_FUNC void quat_from_mat4x4(quat q, mat4x4 const M)
 		p = &perm[i];
 	}

-	r = sqrtf(1.f + M[p[0]][p[0]] - M[p[1]][p[1]] - M[p[2]][p[2]] );
+	r = (float) sqrt(1.f + M[p[0]][p[0]] - M[p[1]][p[1]] - M[p[2]][p[2]] );

 	if(r < 1e-6) {
 		q[0] = 1.f;
@ -574,33 +568,4 @@ LINMATH_H_FUNC void quat_from_mat4x4(quat q, mat4x4 const M)
 	q[3] = (M[p[2]][p[1]] - M[p[1]][p[2]])/(2.f*r);
 }

-LINMATH_H_FUNC void mat4x4_arcball(mat4x4 R, mat4x4 const M, vec2 const _a, vec2 const _b, float s)
-{
-	vec2 a; memcpy(a, _a, sizeof(a));
-	vec2 b; memcpy(b, _b, sizeof(b));
-	
-	float z_a = 0.f;
-	float z_b = 0.f;
-
-	if(vec2_len(a) < 1.f) {
-		z_a = sqrtf(1.f - vec2_mul_inner(a, a));
-	} else {
-		vec2_norm(a, a);
-	}
-
-	if(vec2_len(b) < 1.f) {
-		z_b = sqrtf(1.f - vec2_mul_inner(b, b));
-	} else {
-		vec2_norm(b, b);
-	}
-	
-	vec3 a_ = {a[0], a[1], z_a};
-	vec3 b_ = {b[0], b[1], z_b};
-
-	vec3 c_;
-	vec3_mul_cross(c_, a_, b_);
-
-	float const angle = acos(vec3_mul_inner(a_, b_)) * s;
-	mat4x4_rotate(R, M, c_[0], c_[1], c_[2], angle);
-}
 #endif
--- a/deps/nuklear.h
+++ b/deps/nuklear.h
--- a/deps/nuklear_glfw_gl2.h
+++ b/deps/nuklear_glfw_gl2.h
@ -1,381 +0,0 @@
-/*
- * Nuklear - v1.32.0 - public domain
- * no warrenty implied; use at your own risk.
- * authored from 2015-2017 by Micha Mettke
- */
-/*
- * ==============================================================
- *
- *                              API
- *
- * ===============================================================
- */
-#ifndef NK_GLFW_GL2_H_
-#define NK_GLFW_GL2_H_
-
-#include <GLFW/glfw3.h>
-
-enum nk_glfw_init_state{
-    NK_GLFW3_DEFAULT = 0,
-    NK_GLFW3_INSTALL_CALLBACKS
-};
-NK_API struct nk_context*   nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state);
-NK_API void                 nk_glfw3_font_stash_begin(struct nk_font_atlas **atlas);
-NK_API void                 nk_glfw3_font_stash_end(void);
-
-NK_API void                 nk_glfw3_new_frame(void);
-NK_API void                 nk_glfw3_render(enum nk_anti_aliasing);
-NK_API void                 nk_glfw3_shutdown(void);
-
-NK_API void                 nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint);
-NK_API void                 nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff);
-
-#endif
-
-/*
- * ==============================================================
- *
- *                          IMPLEMENTATION
- *
- * ===============================================================
- */
-#ifdef NK_GLFW_GL2_IMPLEMENTATION
-
-#ifndef NK_GLFW_TEXT_MAX
-#define NK_GLFW_TEXT_MAX 256
-#endif
-#ifndef NK_GLFW_DOUBLE_CLICK_LO
-#define NK_GLFW_DOUBLE_CLICK_LO 0.02
-#endif
-#ifndef NK_GLFW_DOUBLE_CLICK_HI
-#define NK_GLFW_DOUBLE_CLICK_HI 0.2
-#endif
-
-struct nk_glfw_device {
-    struct nk_buffer cmds;
-    struct nk_draw_null_texture null;
-    GLuint font_tex;
-};
-
-struct nk_glfw_vertex {
-    float position[2];
-    float uv[2];
-    nk_byte col[4];
-};
-
-static struct nk_glfw {
-    GLFWwindow *win;
-    int width, height;
-    int display_width, display_height;
-    struct nk_glfw_device ogl;
-    struct nk_context ctx;
-    struct nk_font_atlas atlas;
-    struct nk_vec2 fb_scale;
-    unsigned int text[NK_GLFW_TEXT_MAX];
-    int text_len;
-    struct nk_vec2 scroll;
-    double last_button_click;
-    int is_double_click_down;
-    struct nk_vec2 double_click_pos;
-} glfw;
-
-NK_INTERN void
-nk_glfw3_device_upload_atlas(const void *image, int width, int height)
-{
-    struct nk_glfw_device *dev = &glfw.ogl;
-    glGenTextures(1, &dev->font_tex);
-    glBindTexture(GL_TEXTURE_2D, dev->font_tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0,
-                GL_RGBA, GL_UNSIGNED_BYTE, image);
-}
-
-NK_API void
-nk_glfw3_render(enum nk_anti_aliasing AA)
-{
-    /* setup global state */
-    struct nk_glfw_device *dev = &glfw.ogl;
-    glPushAttrib(GL_ENABLE_BIT|GL_COLOR_BUFFER_BIT|GL_TRANSFORM_BIT);
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-    glEnable(GL_SCISSOR_TEST);
-    glEnable(GL_BLEND);
-    glEnable(GL_TEXTURE_2D);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    /* setup viewport/project */
-    glViewport(0,0,(GLsizei)glfw.display_width,(GLsizei)glfw.display_height);
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-    glOrtho(0.0f, glfw.width, glfw.height, 0.0f, -1.0f, 1.0f);
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_COLOR_ARRAY);
-    {
-        GLsizei vs = sizeof(struct nk_glfw_vertex);
-        size_t vp = offsetof(struct nk_glfw_vertex, position);
-        size_t vt = offsetof(struct nk_glfw_vertex, uv);
-        size_t vc = offsetof(struct nk_glfw_vertex, col);
-
-        /* convert from command queue into draw list and draw to screen */
-        const struct nk_draw_command *cmd;
-        const nk_draw_index *offset = NULL;
-        struct nk_buffer vbuf, ebuf;
-
-        /* fill convert configuration */
-        struct nk_convert_config config;
-        static const struct nk_draw_vertex_layout_element vertex_layout[] = {
-            {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_glfw_vertex, position)},
-            {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_glfw_vertex, uv)},
-            {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)},
-            {NK_VERTEX_LAYOUT_END}
-        };
-        NK_MEMSET(&config, 0, sizeof(config));
-        config.vertex_layout = vertex_layout;
-        config.vertex_size = sizeof(struct nk_glfw_vertex);
-        config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
-        config.null = dev->null;
-        config.circle_segment_count = 22;
-        config.curve_segment_count = 22;
-        config.arc_segment_count = 22;
-        config.global_alpha = 1.0f;
-        config.shape_AA = AA;
-        config.line_AA = AA;
-
-        /* convert shapes into vertexes */
-        nk_buffer_init_default(&vbuf);
-        nk_buffer_init_default(&ebuf);
-        nk_convert(&glfw.ctx, &dev->cmds, &vbuf, &ebuf, &config);
-
-        /* setup vertex buffer pointer */
-        {const void *vertices = nk_buffer_memory_const(&vbuf);
-        glVertexPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vp));
-        glTexCoordPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vt));
-        glColorPointer(4, GL_UNSIGNED_BYTE, vs, (const void*)((const nk_byte*)vertices + vc));}
-
-        /* iterate over and execute each draw command */
-        offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf);
-        nk_draw_foreach(cmd, &glfw.ctx, &dev->cmds)
-        {
-            if (!cmd->elem_count) continue;
-            glBindTexture(GL_TEXTURE_2D, (GLuint)cmd->texture.id);
-            glScissor(
-                (GLint)(cmd->clip_rect.x * glfw.fb_scale.x),
-                (GLint)((glfw.height - (GLint)(cmd->clip_rect.y + cmd->clip_rect.h)) * glfw.fb_scale.y),
-                (GLint)(cmd->clip_rect.w * glfw.fb_scale.x),
-                (GLint)(cmd->clip_rect.h * glfw.fb_scale.y));
-            glDrawElements(GL_TRIANGLES, (GLsizei)cmd->elem_count, GL_UNSIGNED_SHORT, offset);
-            offset += cmd->elem_count;
-        }
-        nk_clear(&glfw.ctx);
-        nk_buffer_free(&vbuf);
-        nk_buffer_free(&ebuf);
-    }
-
-    /* default OpenGL state */
-    glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_COLOR_ARRAY);
-
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_BLEND);
-    glDisable(GL_TEXTURE_2D);
-
-    glBindTexture(GL_TEXTURE_2D, 0);
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-    glPopAttrib();
-}
-
-NK_API void
-nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint)
-{
-    (void)win;
-    if (glfw.text_len < NK_GLFW_TEXT_MAX)
-        glfw.text[glfw.text_len++] = codepoint;
-}
-
-NK_API void
-nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff)
-{
-    (void)win; (void)xoff;
-    glfw.scroll.x += (float)xoff;
-    glfw.scroll.y += (float)yoff;
-}
-
-NK_API void
-nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int mods)
-{
-    double x, y;
-    if (button != GLFW_MOUSE_BUTTON_LEFT) return;
-    glfwGetCursorPos(window, &x, &y);
-    if (action == GLFW_PRESS)  {
-        double dt = glfwGetTime() - glfw.last_button_click;
-        if (dt > NK_GLFW_DOUBLE_CLICK_LO && dt < NK_GLFW_DOUBLE_CLICK_HI) {
-            glfw.is_double_click_down = nk_true;
-            glfw.double_click_pos = nk_vec2((float)x, (float)y);
-        }
-        glfw.last_button_click = glfwGetTime();
-    } else glfw.is_double_click_down = nk_false;
-}
-
-NK_INTERN void
-nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
-{
-    const char *text = glfwGetClipboardString(glfw.win);
-    if (text) nk_textedit_paste(edit, text, nk_strlen(text));
-    (void)usr;
-}
-
-NK_INTERN void
-nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
-{
-    char *str = 0;
-    (void)usr;
-    if (!len) return;
-    str = (char*)malloc((size_t)len+1);
-    if (!str) return;
-    NK_MEMCPY(str, text, (size_t)len);
-    str[len] = '\0';
-    glfwSetClipboardString(glfw.win, str);
-    free(str);
-}
-
-NK_API struct nk_context*
-nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
-{
-    glfw.win = win;
-    if (init_state == NK_GLFW3_INSTALL_CALLBACKS) {
-        glfwSetScrollCallback(win, nk_gflw3_scroll_callback);
-        glfwSetCharCallback(win, nk_glfw3_char_callback);
-        glfwSetMouseButtonCallback(win, nk_glfw3_mouse_button_callback);
-    }
-    nk_init_default(&glfw.ctx, 0);
-    glfw.ctx.clip.copy = nk_glfw3_clipboard_copy;
-    glfw.ctx.clip.paste = nk_glfw3_clipboard_paste;
-    glfw.ctx.clip.userdata = nk_handle_ptr(0);
-    nk_buffer_init_default(&glfw.ogl.cmds);
-
-    glfw.is_double_click_down = nk_false;
-    glfw.double_click_pos = nk_vec2(0, 0);
-
-    return &glfw.ctx;
-}
-
-NK_API void
-nk_glfw3_font_stash_begin(struct nk_font_atlas **atlas)
-{
-    nk_font_atlas_init_default(&glfw.atlas);
-    nk_font_atlas_begin(&glfw.atlas);
-    *atlas = &glfw.atlas;
-}
-
-NK_API void
-nk_glfw3_font_stash_end(void)
-{
-    const void *image; int w, h;
-    image = nk_font_atlas_bake(&glfw.atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
-    nk_glfw3_device_upload_atlas(image, w, h);
-    nk_font_atlas_end(&glfw.atlas, nk_handle_id((int)glfw.ogl.font_tex), &glfw.ogl.null);
-    if (glfw.atlas.default_font)
-        nk_style_set_font(&glfw.ctx, &glfw.atlas.default_font->handle);
-}
-
-NK_API void
-nk_glfw3_new_frame(void)
-{
-    int i;
-    double x, y;
-    struct nk_context *ctx = &glfw.ctx;
-    struct GLFWwindow *win = glfw.win;
-
-    glfwGetWindowSize(win, &glfw.width, &glfw.height);
-    glfwGetFramebufferSize(win, &glfw.display_width, &glfw.display_height);
-    glfw.fb_scale.x = (float)glfw.display_width/(float)glfw.width;
-    glfw.fb_scale.y = (float)glfw.display_height/(float)glfw.height;
-
-    nk_input_begin(ctx);
-    for (i = 0; i < glfw.text_len; ++i)
-        nk_input_unicode(ctx, glfw.text[i]);
-
-    /* optional grabbing behavior */
-    if (ctx->input.mouse.grab)
-        glfwSetInputMode(glfw.win, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
-    else if (ctx->input.mouse.ungrab)
-        glfwSetInputMode(glfw.win, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
-
-    nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_DOWN, glfwGetKey(win, GLFW_KEY_DOWN) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_TEXT_START, glfwGetKey(win, GLFW_KEY_HOME) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_TEXT_END, glfwGetKey(win, GLFW_KEY_END) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_SCROLL_START, glfwGetKey(win, GLFW_KEY_HOME) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_SCROLL_END, glfwGetKey(win, GLFW_KEY_END) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_SCROLL_DOWN, glfwGetKey(win, GLFW_KEY_PAGE_DOWN) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_SCROLL_UP, glfwGetKey(win, GLFW_KEY_PAGE_UP) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_SHIFT, glfwGetKey(win, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS||
-                                    glfwGetKey(win, GLFW_KEY_RIGHT_SHIFT) == GLFW_PRESS);
-
-    if (glfwGetKey(win, GLFW_KEY_LEFT_CONTROL) == GLFW_PRESS ||
-        glfwGetKey(win, GLFW_KEY_RIGHT_CONTROL) == GLFW_PRESS) {
-        nk_input_key(ctx, NK_KEY_COPY, glfwGetKey(win, GLFW_KEY_C) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_PASTE, glfwGetKey(win, GLFW_KEY_V) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_CUT, glfwGetKey(win, GLFW_KEY_X) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_UNDO, glfwGetKey(win, GLFW_KEY_Z) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_REDO, glfwGetKey(win, GLFW_KEY_R) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, glfwGetKey(win, GLFW_KEY_LEFT) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, glfwGetKey(win, GLFW_KEY_RIGHT) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_LINE_START, glfwGetKey(win, GLFW_KEY_B) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_TEXT_LINE_END, glfwGetKey(win, GLFW_KEY_E) == GLFW_PRESS);
-    } else {
-        nk_input_key(ctx, NK_KEY_LEFT, glfwGetKey(win, GLFW_KEY_LEFT) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_RIGHT, glfwGetKey(win, GLFW_KEY_RIGHT) == GLFW_PRESS);
-        nk_input_key(ctx, NK_KEY_COPY, 0);
-        nk_input_key(ctx, NK_KEY_PASTE, 0);
-        nk_input_key(ctx, NK_KEY_CUT, 0);
-        nk_input_key(ctx, NK_KEY_SHIFT, 0);
-    }
-
-    glfwGetCursorPos(win, &x, &y);
-    nk_input_motion(ctx, (int)x, (int)y);
-    if (ctx->input.mouse.grabbed) {
-        glfwSetCursorPos(glfw.win, (double)ctx->input.mouse.prev.x, (double)ctx->input.mouse.prev.y);
-        ctx->input.mouse.pos.x = ctx->input.mouse.prev.x;
-        ctx->input.mouse.pos.y = ctx->input.mouse.prev.y;
-    }
-
-    nk_input_button(ctx, NK_BUTTON_LEFT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS);
-    nk_input_button(ctx, NK_BUTTON_MIDDLE, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS);
-    nk_input_button(ctx, NK_BUTTON_RIGHT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS);
-    nk_input_button(ctx, NK_BUTTON_DOUBLE, (int)glfw.double_click_pos.x, (int)glfw.double_click_pos.y, glfw.is_double_click_down);
-    nk_input_scroll(ctx, glfw.scroll);
-    nk_input_end(&glfw.ctx);
-    glfw.text_len = 0;
-    glfw.scroll = nk_vec2(0,0);
-}
-
-NK_API
-void nk_glfw3_shutdown(void)
-{
-    struct nk_glfw_device *dev = &glfw.ogl;
-    nk_font_atlas_clear(&glfw.atlas);
-    nk_free(&glfw.ctx);
-    glDeleteTextures(1, &dev->font_tex);
-    nk_buffer_free(&dev->cmds);
-    NK_MEMSET(&glfw, 0, sizeof(glfw));
-}
-
-#endif
--- a/deps/stb_image_write.h
+++ b/deps/stb_image_write.h
--- a/deps/tinycthread.c
+++ b/deps/tinycthread.c
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
    distribution.
 */

-/* 2013-01-06 Camilla Löwy <elmindreda@glfw.org>
+/* 2013-01-06 Camilla Berglund <elmindreda@glfw.org>
 *
 * Added casts from time_t to DWORD to avoid warnings on VC++.
 * Fixed time retrieval on POSIX systems.
--- a/deps/tinycthread.h
+++ b/deps/tinycthread.h
@ -123,9 +123,7 @@ typedef int _tthread_clockid_t;
 /* Emulate clock_gettime */
 int _tthread_clock_gettime(clockid_t clk_id, struct timespec *ts);
 #define clock_gettime _tthread_clock_gettime
-#ifndef CLOCK_REALTIME
-  #define CLOCK_REALTIME 0
-#endif
+#define CLOCK_REALTIME 0
 #endif


--- a/deps/vulkan/vk_platform.h
+++ b/deps/vulkan/vk_platform.h
@ -0,0 +1,120 @@
+//
+// File: vk_platform.h
+//
+/*
+** Copyright (c) 2014-2015 The Khronos Group Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+
+#ifndef VK_PLATFORM_H_
+#define VK_PLATFORM_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*
+***************************************************************************************************
+*   Platform-specific directives and type declarations
+***************************************************************************************************
+*/
+
+/* Platform-specific calling convention macros.
+ *
+ * Platforms should define these so that Vulkan clients call Vulkan commands
+ * with the same calling conventions that the Vulkan implementation expects.
+ *
+ * VKAPI_ATTR - Placed before the return type in function declarations.
+ *              Useful for C++11 and GCC/Clang-style function attribute syntax.
+ * VKAPI_CALL - Placed after the return type in function declarations.
+ *              Useful for MSVC-style calling convention syntax.
+ * VKAPI_PTR  - Placed between the '(' and '*' in function pointer types.
+ *
+ * Function declaration:  VKAPI_ATTR void VKAPI_CALL vkCommand(void);
+ * Function pointer type: typedef void (VKAPI_PTR *PFN_vkCommand)(void);
+ */
+#if defined(_WIN32)
+    // On Windows, Vulkan commands use the stdcall convention
+    #define VKAPI_ATTR
+    #define VKAPI_CALL __stdcall
+    #define VKAPI_PTR  VKAPI_CALL
+#elif defined(__ANDROID__) && defined(__ARM_EABI__) && !defined(__ARM_ARCH_7A__)
+    // Android does not support Vulkan in native code using the "armeabi" ABI.
+    #error "Vulkan requires the 'armeabi-v7a' or 'armeabi-v7a-hard' ABI on 32-bit ARM CPUs"
+#elif defined(__ANDROID__) && defined(__ARM_ARCH_7A__)
+    // On Android/ARMv7a, Vulkan functions use the armeabi-v7a-hard calling
+    // convention, even if the application's native code is compiled with the
+    // armeabi-v7a calling convention.
+    #define VKAPI_ATTR __attribute__((pcs("aapcs-vfp")))
+    #define VKAPI_CALL
+    #define VKAPI_PTR  VKAPI_ATTR
+#else
+    // On other platforms, use the default calling convention
+    #define VKAPI_ATTR
+    #define VKAPI_CALL
+    #define VKAPI_PTR
+#endif
+
+#include <stddef.h>
+
+#if !defined(VK_NO_STDINT_H)
+    #if defined(_MSC_VER) && (_MSC_VER < 1600)
+        typedef signed   __int8  int8_t;
+        typedef unsigned __int8  uint8_t;
+        typedef signed   __int16 int16_t;
+        typedef unsigned __int16 uint16_t;
+        typedef signed   __int32 int32_t;
+        typedef unsigned __int32 uint32_t;
+        typedef signed   __int64 int64_t;
+        typedef unsigned __int64 uint64_t;
+    #else
+        #include <stdint.h>
+    #endif
+#endif // !defined(VK_NO_STDINT_H)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+// Platform-specific headers required by platform window system extensions.
+// These are enabled prior to #including "vulkan.h". The same enable then
+// controls inclusion of the extension interfaces in vulkan.h.
+
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#include <android/native_window.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_MIR_KHR
+#include <mir_toolkit/client_types.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#include <wayland-client.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+#include <windows.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+#include <X11/Xlib.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+#include <xcb/xcb.h>
+#endif
+
+#endif
--- a/deps/vulkan/vulkan.h
+++ b/deps/vulkan/vulkan.h
--- 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/idle-inhibit-unstable-v1.xml
+++ b/deps/wayland/idle-inhibit-unstable-v1.xml
@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="idle_inhibit_unstable_v1">
-
-  <copyright>
-    Copyright © 2015 Samsung Electronics Co., Ltd
-
-    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>
-
-  <interface name="zwp_idle_inhibit_manager_v1" version="1">
-    <description summary="control behavior when display idles">
-      This interface permits inhibiting the idle behavior such as screen
-      blanking, locking, and screensaving.  The client binds the idle manager
-      globally, then creates idle-inhibitor objects for each surface.
-
-      Warning! The protocol described in this file is experimental and
-      backward incompatible changes may be made. Backward compatible changes
-      may be added together with the corresponding interface version bump.
-      Backward incompatible changes are done by bumping the version number in
-      the protocol and interface names and resetting the interface version.
-      Once the protocol is to be declared stable, the 'z' prefix and the
-      version number in the protocol and interface names are removed and the
-      interface version number is reset.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the idle inhibitor object">
-	Destroy the inhibit manager.
-      </description>
-    </request>
-
-    <request name="create_inhibitor">
-      <description summary="create a new inhibitor object">
-	Create a new inhibitor object associated with the given surface.
-      </description>
-      <arg name="id" type="new_id" interface="zwp_idle_inhibitor_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"
-	   summary="the surface that inhibits the idle behavior"/>
-    </request>
-
-  </interface>
-
-  <interface name="zwp_idle_inhibitor_v1" version="1">
-    <description summary="context object for inhibiting idle behavior">
-      An idle inhibitor prevents the output that the associated surface is
-      visible on from being set to a state where it is not visually usable due
-      to lack of user interaction (e.g. blanked, dimmed, locked, set to power
-      save, etc.)  Any screensaver processes are also blocked from displaying.
-
-      If the surface is destroyed, unmapped, becomes occluded, loses
-      visibility, or otherwise becomes not visually relevant for the user, the
-      idle inhibitor will not be honored by the compositor; if the surface
-      subsequently regains visibility the inhibitor takes effect once again.
-      Likewise, the inhibitor isn't honored if the system was already idled at
-      the time the inhibitor was established, although if the system later
-      de-idles and re-idles the inhibitor will take effect.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the idle inhibitor object">
-	Remove the inhibitor effect from the associated wl_surface.
-      </description>
-    </request>
-
-  </interface>
-</protocol>
--- a/deps/wayland/pointer-constraints-unstable-v1.xml
+++ b/deps/wayland/pointer-constraints-unstable-v1.xml
@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="pointer_constraints_unstable_v1">
-
-  <copyright>
-    Copyright © 2014      Jonas Ådahl
-    Copyright © 2015      Red Hat Inc.
-
-    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 constraining pointer motions">
-    This protocol specifies a set of interfaces used for adding constraints to
-    the motion of a pointer. Possible constraints include confining pointer
-    motions to a given region, or locking it to its current position.
-
-    In order to constrain the pointer, a client must first bind the global
-    interface "wp_pointer_constraints" which, if a compositor supports pointer
-    constraints, is exposed by the registry. Using the bound global object, the
-    client uses the request that corresponds to the type of constraint it wants
-    to make. See wp_pointer_constraints for more details.
-
-    Warning! The protocol described in this file is experimental and backward
-    incompatible changes may be made. Backward compatible changes may be added
-    together with the corresponding interface version bump. Backward
-    incompatible changes are done by bumping the version number in the protocol
-    and interface names and resetting the interface version. Once the protocol
-    is to be declared stable, the 'z' prefix and the version number in the
-    protocol and interface names are removed and the interface version number is
-    reset.
-  </description>
-
-  <interface name="zwp_pointer_constraints_v1" version="1">
-    <description summary="constrain the movement of a pointer">
-      The global interface exposing pointer constraining functionality. It
-      exposes two requests: lock_pointer for locking the pointer to its
-      position, and confine_pointer for locking the pointer to a region.
-
-      The lock_pointer and confine_pointer requests create the objects
-      wp_locked_pointer and wp_confined_pointer respectively, and the client can
-      use these objects to interact with the lock.
-
-      For any surface, only one lock or confinement may be active across all
-      wl_pointer objects of the same seat. If a lock or confinement is requested
-      when another lock or confinement is active or requested on the same surface
-      and with any of the wl_pointer objects of the same seat, an
-      'already_constrained' error will be raised.
-    </description>
-
-    <enum name="error">
-      <description summary="wp_pointer_constraints error values">
-	These errors can be emitted in response to wp_pointer_constraints
-	requests.
-      </description>
-      <entry name="already_constrained" value="1"
-	     summary="pointer constraint already requested on that surface"/>
-    </enum>
-
-    <enum name="lifetime">
-      <description summary="constraint lifetime">
-	These values represent different lifetime semantics. They are passed
-	as arguments to the factory requests to specify how the constraint
-	lifetimes should be managed.
-      </description>
-      <entry name="oneshot" value="1">
-	<description summary="the pointer constraint is defunct once deactivated">
-	  A oneshot pointer constraint will never reactivate once it has been
-	  deactivated. See the corresponding deactivation event
-	  (wp_locked_pointer.unlocked and wp_confined_pointer.unconfined) for
-	  details.
-	</description>
-      </entry>
-      <entry name="persistent" value="2">
-	<description summary="the pointer constraint may reactivate">
-	  A persistent pointer constraint may again reactivate once it has
-	  been deactivated. See the corresponding deactivation event
-	  (wp_locked_pointer.unlocked and wp_confined_pointer.unconfined) for
-	  details.
-	</description>
-      </entry>
-    </enum>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the pointer constraints manager object">
-	Used by the client to notify the server that it will no longer use this
-	pointer constraints object.
-      </description>
-    </request>
-
-    <request name="lock_pointer">
-      <description summary="lock pointer to a position">
-	The lock_pointer request lets the client request to disable movements of
-	the virtual pointer (i.e. the cursor), effectively locking the pointer
-	to a position. This request may not take effect immediately; in the
-	future, when the compositor deems implementation-specific constraints
-	are satisfied, the pointer lock will be activated and the compositor
-	sends a locked event.
-
-	The protocol provides no guarantee that the constraints are ever
-	satisfied, and does not require the compositor to send an error if the
-	constraints cannot ever be satisfied. It is thus possible to request a
-	lock that will never activate.
-
-	There may not be another pointer constraint of any kind requested or
-	active on the surface for any of the wl_pointer objects of the seat of
-	the passed pointer when requesting a lock. If there is, an error will be
-	raised. See general pointer lock documentation for more details.
-
-	The intersection of the region passed with this request and the input
-	region of the surface is used to determine where the pointer must be
-	in order for the lock to activate. It is up to the compositor whether to
-	warp the pointer or require some kind of user interaction for the lock
-	to activate. If the region is null the surface input region is used.
-
-	A surface may receive pointer focus without the lock being activated.
-
-	The request creates a new object wp_locked_pointer which is used to
-	interact with the lock as well as receive updates about its state. See
-	the the description of wp_locked_pointer for further information.
-
-	Note that while a pointer is locked, the wl_pointer objects of the
-	corresponding seat will not emit any wl_pointer.motion events, but
-	relative motion events will still be emitted via wp_relative_pointer
-	objects of the same seat. wl_pointer.axis and wl_pointer.button events
-	are unaffected.
-      </description>
-      <arg name="id" type="new_id" interface="zwp_locked_pointer_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"
-	   summary="surface to lock pointer to"/>
-      <arg name="pointer" type="object" interface="wl_pointer"
-	   summary="the pointer that should be locked"/>
-      <arg name="region" type="object" interface="wl_region" allow-null="true"
-	   summary="region of surface"/>
-      <arg name="lifetime" type="uint" enum="lifetime" summary="lock lifetime"/>
-    </request>
-
-    <request name="confine_pointer">
-      <description summary="confine pointer to a region">
-	The confine_pointer request lets the client request to confine the
-	pointer cursor to a given region. This request may not take effect
-	immediately; in the future, when the compositor deems implementation-
-	specific constraints are satisfied, the pointer confinement will be
-	activated and the compositor sends a confined event.
-
-	The intersection of the region passed with this request and the input
-	region of the surface is used to determine where the pointer must be
-	in order for the confinement to activate. It is up to the compositor
-	whether to warp the pointer or require some kind of user interaction for
-	the confinement to activate. If the region is null the surface input
-	region is used.
-
-	The request will create a new object wp_confined_pointer which is used
-	to interact with the confinement as well as receive updates about its
-	state. See the the description of wp_confined_pointer for further
-	information.
-      </description>
-      <arg name="id" type="new_id" interface="zwp_confined_pointer_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"
-	   summary="surface to lock pointer to"/>
-      <arg name="pointer" type="object" interface="wl_pointer"
-	   summary="the pointer that should be confined"/>
-      <arg name="region" type="object" interface="wl_region" allow-null="true"
-	   summary="region of surface"/>
-      <arg name="lifetime" type="uint" enum="lifetime" summary="confinement lifetime"/>
-    </request>
-  </interface>
-
-  <interface name="zwp_locked_pointer_v1" version="1">
-    <description summary="receive relative pointer motion events">
-      The wp_locked_pointer interface represents a locked pointer state.
-
-      While the lock of this object is active, the wl_pointer objects of the
-      associated seat will not emit any wl_pointer.motion events.
-
-      This object will send the event 'locked' when the lock is activated.
-      Whenever the lock is activated, it is guaranteed that the locked surface
-      will already have received pointer focus and that the pointer will be
-      within the region passed to the request creating this object.
-
-      To unlock the pointer, send the destroy request. This will also destroy
-      the wp_locked_pointer object.
-
-      If the compositor decides to unlock the pointer the unlocked event is
-      sent. See wp_locked_pointer.unlock for details.
-
-      When unlocking, the compositor may warp the cursor position to the set
-      cursor position hint. If it does, it will not result in any relative
-      motion events emitted via wp_relative_pointer.
-
-      If the surface the lock was requested on is destroyed and the lock is not
-      yet activated, the wp_locked_pointer object is now defunct and must be
-      destroyed.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the locked pointer object">
-	Destroy the locked pointer object. If applicable, the compositor will
-	unlock the pointer.
-      </description>
-    </request>
-
-    <request name="set_cursor_position_hint">
-      <description summary="set the pointer cursor position hint">
-	Set the cursor position hint relative to the top left corner of the
-	surface.
-
-	If the client is drawing its own cursor, it should update the position
-	hint to the position of its own cursor. A compositor may use this
-	information to warp the pointer upon unlock in order to avoid pointer
-	jumps.
-
-	The cursor position hint is double buffered. The new hint will only take
-	effect when the associated surface gets it pending state applied. See
-	wl_surface.commit for details.
-      </description>
-      <arg name="surface_x" type="fixed"
-	   summary="surface-local x coordinate"/>
-      <arg name="surface_y" type="fixed"
-	   summary="surface-local y coordinate"/>
-    </request>
-
-    <request name="set_region">
-      <description summary="set a new lock region">
-	Set a new region used to lock the pointer.
-
-	The new lock region is double-buffered. The new lock region will
-	only take effect when the associated surface gets its pending state
-	applied. See wl_surface.commit for details.
-
-	For details about the lock region, see wp_locked_pointer.
-      </description>
-      <arg name="region" type="object" interface="wl_region" allow-null="true"
-	   summary="region of surface"/>
-    </request>
-
-    <event name="locked">
-      <description summary="lock activation event">
-	Notification that the pointer lock of the seat's pointer is activated.
-      </description>
-    </event>
-
-    <event name="unlocked">
-      <description summary="lock deactivation event">
-	Notification that the pointer lock of the seat's pointer is no longer
-	active. If this is a oneshot pointer lock (see
-	wp_pointer_constraints.lifetime) this object is now defunct and should
-	be destroyed. If this is a persistent pointer lock (see
-	wp_pointer_constraints.lifetime) this pointer lock may again
-	reactivate in the future.
-      </description>
-    </event>
-  </interface>
-
-  <interface name="zwp_confined_pointer_v1" version="1">
-    <description summary="confined pointer object">
-      The wp_confined_pointer interface represents a confined pointer state.
-
-      This object will send the event 'confined' when the confinement is
-      activated. Whenever the confinement is activated, it is guaranteed that
-      the surface the pointer is confined to will already have received pointer
-      focus and that the pointer will be within the region passed to the request
-      creating this object. It is up to the compositor to decide whether this
-      requires some user interaction and if the pointer will warp to within the
-      passed region if outside.
-
-      To unconfine the pointer, send the destroy request. This will also destroy
-      the wp_confined_pointer object.
-
-      If the compositor decides to unconfine the pointer the unconfined event is
-      sent. The wp_confined_pointer object is at this point defunct and should
-      be destroyed.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the confined pointer object">
-	Destroy the confined pointer object. If applicable, the compositor will
-	unconfine the pointer.
-      </description>
-    </request>
-
-    <request name="set_region">
-      <description summary="set a new confine region">
-	Set a new region used to confine the pointer.
-
-	The new confine region is double-buffered. The new confine region will
-	only take effect when the associated surface gets its pending state
-	applied. See wl_surface.commit for details.
-
-	If the confinement is active when the new confinement region is applied
-	and the pointer ends up outside of newly applied region, the pointer may
-	warped to a position within the new confinement region. If warped, a
-	wl_pointer.motion event will be emitted, but no
-	wp_relative_pointer.relative_motion event.
-
-	The compositor may also, instead of using the new region, unconfine the
-	pointer.
-
-	For details about the confine region, see wp_confined_pointer.
-      </description>
-      <arg name="region" type="object" interface="wl_region" allow-null="true"
-	   summary="region of surface"/>
-    </request>
-
-    <event name="confined">
-      <description summary="pointer confined">
-	Notification that the pointer confinement of the seat's pointer is
-	activated.
-      </description>
-    </event>
-
-    <event name="unconfined">
-      <description summary="pointer unconfined">
-	Notification that the pointer confinement of the seat's pointer is no
-	longer active. If this is a oneshot pointer confinement (see
-	wp_pointer_constraints.lifetime) this object is now defunct and should
-	be destroyed. If this is a persistent pointer confinement (see
-	wp_pointer_constraints.lifetime) this pointer confinement may again
-	reactivate in the future.
-      </description>
-    </event>
-  </interface>
-
-</protocol>
--- a/deps/wayland/relative-pointer-unstable-v1.xml
+++ b/deps/wayland/relative-pointer-unstable-v1.xml
@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="relative_pointer_unstable_v1">
-
-  <copyright>
-    Copyright © 2014      Jonas Ådahl
-    Copyright © 2015      Red Hat Inc.
-
-    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 relative pointer motion events">
-    This protocol specifies a set of interfaces used for making clients able to
-    receive relative pointer events not obstructed by barriers (such as the
-    monitor edge or other pointer barriers).
-
-    To start receiving relative pointer events, a client must first bind the
-    global interface "wp_relative_pointer_manager" which, if a compositor
-    supports relative pointer motion events, is exposed by the registry. After
-    having created the relative pointer manager proxy object, the client uses
-    it to create the actual relative pointer object using the
-    "get_relative_pointer" request given a wl_pointer. The relative pointer
-    motion events will then, when applicable, be transmitted via the proxy of
-    the newly created relative pointer object. See the documentation of the
-    relative pointer interface for more details.
-
-    Warning! The protocol described in this file is experimental and backward
-    incompatible changes may be made. Backward compatible changes may be added
-    together with the corresponding interface version bump. Backward
-    incompatible changes are done by bumping the version number in the protocol
-    and interface names and resetting the interface version. Once the protocol
-    is to be declared stable, the 'z' prefix and the version number in the
-    protocol and interface names are removed and the interface version number is
-    reset.
-  </description>
-
-  <interface name="zwp_relative_pointer_manager_v1" version="1">
-    <description summary="get relative pointer objects">
-      A global interface used for getting the relative pointer object for a
-      given pointer.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the relative pointer manager object">
-	Used by the client to notify the server that it will no longer use this
-	relative pointer manager object.
-      </description>
-    </request>
-
-    <request name="get_relative_pointer">
-      <description summary="get a relative pointer object">
-	Create a relative pointer interface given a wl_pointer object. See the
-	wp_relative_pointer interface for more details.
-      </description>
-      <arg name="id" type="new_id" interface="zwp_relative_pointer_v1"/>
-      <arg name="pointer" type="object" interface="wl_pointer"/>
-    </request>
-  </interface>
-
-  <interface name="zwp_relative_pointer_v1" version="1">
-    <description summary="relative pointer object">
-      A wp_relative_pointer object is an extension to the wl_pointer interface
-      used for emitting relative pointer events. It shares the same focus as
-      wl_pointer objects of the same seat and will only emit events when it has
-      focus.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="release the relative pointer object"/>
-    </request>
-
-    <event name="relative_motion">
-      <description summary="relative pointer motion">
-	Relative x/y pointer motion from the pointer of the seat associated with
-	this object.
-
-	A relative motion is in the same dimension as regular wl_pointer motion
-	events, except they do not represent an absolute position. For example,
-	moving a pointer from (x, y) to (x', y') would have the equivalent
-	relative motion (x' - x, y' - y). If a pointer motion caused the
-	absolute pointer position to be clipped by for example the edge of the
-	monitor, the relative motion is unaffected by the clipping and will
-	represent the unclipped motion.
-
-	This event also contains non-accelerated motion deltas. The
-	non-accelerated delta is, when applicable, the regular pointer motion
-	delta as it was before having applied motion acceleration and other
-	transformations such as normalization.
-
-	Note that the non-accelerated delta does not represent 'raw' events as
-	they were read from some device. Pointer motion acceleration is device-
-	and configuration-specific and non-accelerated deltas and accelerated
-	deltas may have the same value on some devices.
-
-	Relative motions are not coupled to wl_pointer.motion events, and can be
-	sent in combination with such events, but also independently. There may
-	also be scenarios where wl_pointer.motion is sent, but there is no
-	relative motion. The order of an absolute and relative motion event
-	originating from the same physical motion is not guaranteed.
-
-	If the client needs button events or focus state, it can receive them
-	from a wl_pointer object of the same seat that the wp_relative_pointer
-	object is associated with.
-      </description>
-      <arg name="utime_hi" type="uint"
-	   summary="high 32 bits of a 64 bit timestamp with microsecond granularity"/>
-      <arg name="utime_lo" type="uint"
-	   summary="low 32 bits of a 64 bit timestamp with microsecond granularity"/>
-      <arg name="dx" type="fixed"
-	   summary="the x component of the motion vector"/>
-      <arg name="dy" type="fixed"
-	   summary="the y component of the motion vector"/>
-      <arg name="dx_unaccel" type="fixed"
-	   summary="the x component of the unaccelerated motion vector"/>
-      <arg name="dy_unaccel" type="fixed"
-	   summary="the y component of the unaccelerated motion vector"/>
-    </event>
-  </interface>
-
-</protocol>
--- a/deps/wayland/viewporter.xml
+++ b/deps/wayland/viewporter.xml
@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="viewporter">
-
-  <copyright>
-    Copyright © 2013-2016 Collabora, Ltd.
-
-    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>
-
-  <interface name="wp_viewporter" version="1">
-    <description summary="surface cropping and scaling">
-      The global interface exposing surface cropping and scaling
-      capabilities is used to instantiate an interface extension for a
-      wl_surface object. This extended interface will then allow
-      cropping and scaling the surface contents, effectively
-      disconnecting the direct relationship between the buffer and the
-      surface size.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="unbind from the cropping and scaling interface">
-	Informs the server that the client will not be using this
-	protocol object anymore. This does not affect any other objects,
-	wp_viewport objects included.
-      </description>
-    </request>
-
-    <enum name="error">
-      <entry name="viewport_exists" value="0"
-             summary="the surface already has a viewport object associated"/>
-    </enum>
-
-    <request name="get_viewport">
-      <description summary="extend surface interface for crop and scale">
-	Instantiate an interface extension for the given wl_surface to
-	crop and scale its content. If the given wl_surface already has
-	a wp_viewport object associated, the viewport_exists
-	protocol error is raised.
-      </description>
-      <arg name="id" type="new_id" interface="wp_viewport"
-           summary="the new viewport interface id"/>
-      <arg name="surface" type="object" interface="wl_surface"
-           summary="the surface"/>
-    </request>
-  </interface>
-
-  <interface name="wp_viewport" version="1">
-    <description summary="crop and scale interface to a wl_surface">
-      An additional interface to a wl_surface object, which allows the
-      client to specify the cropping and scaling of the surface
-      contents.
-
-      This interface works with two concepts: the source rectangle (src_x,
-      src_y, src_width, src_height), and the destination size (dst_width,
-      dst_height). The contents of the source rectangle are scaled to the
-      destination size, and content outside the source rectangle is ignored.
-      This state is double-buffered, and is applied on the next
-      wl_surface.commit.
-
-      The two parts of crop and scale state are independent: the source
-      rectangle, and the destination size. Initially both are unset, that
-      is, no scaling is applied. The whole of the current wl_buffer is
-      used as the source, and the surface size is as defined in
-      wl_surface.attach.
-
-      If the destination size is set, it causes the surface size to become
-      dst_width, dst_height. The source (rectangle) is scaled to exactly
-      this size. This overrides whatever the attached wl_buffer size is,
-      unless the wl_buffer is NULL. If the wl_buffer is NULL, the surface
-      has no content and therefore no size. Otherwise, the size is always
-      at least 1x1 in surface local coordinates.
-
-      If the source rectangle is set, it defines what area of the wl_buffer is
-      taken as the source. If the source rectangle is set and the destination
-      size is not set, then src_width and src_height must be integers, and the
-      surface size becomes the source rectangle size. This results in cropping
-      without scaling. If src_width or src_height are not integers and
-      destination size is not set, the bad_size protocol error is raised when
-      the surface state is applied.
-
-      The coordinate transformations from buffer pixel coordinates up to
-      the surface-local coordinates happen in the following order:
-        1. buffer_transform (wl_surface.set_buffer_transform)
-        2. buffer_scale (wl_surface.set_buffer_scale)
-        3. crop and scale (wp_viewport.set*)
-      This means, that the source rectangle coordinates of crop and scale
-      are given in the coordinates after the buffer transform and scale,
-      i.e. in the coordinates that would be the surface-local coordinates
-      if the crop and scale was not applied.
-
-      If src_x or src_y are negative, the bad_value protocol error is raised.
-      Otherwise, if the source rectangle is partially or completely outside of
-      the non-NULL wl_buffer, then the out_of_buffer protocol error is raised
-      when the surface state is applied. A NULL wl_buffer does not raise the
-      out_of_buffer error.
-
-      If the wl_surface associated with the wp_viewport is destroyed,
-      all wp_viewport requests except 'destroy' raise the protocol error
-      no_surface.
-
-      If the wp_viewport object is destroyed, the crop and scale
-      state is removed from the wl_surface. The change will be applied
-      on the next wl_surface.commit.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="remove scaling and cropping from the surface">
-	The associated wl_surface's crop and scale state is removed.
-	The change is applied on the next wl_surface.commit.
-      </description>
-    </request>
-
-    <enum name="error">
-      <entry name="bad_value" value="0"
-	     summary="negative or zero values in width or height"/>
-      <entry name="bad_size" value="1"
-	     summary="destination size is not integer"/>
-      <entry name="out_of_buffer" value="2"
-	     summary="source rectangle extends outside of the content area"/>
-      <entry name="no_surface" value="3"
-	     summary="the wl_surface was destroyed"/>
-    </enum>
-
-    <request name="set_source">
-      <description summary="set the source rectangle for cropping">
-	Set the source rectangle of the associated wl_surface. See
-	wp_viewport for the description, and relation to the wl_buffer
-	size.
-
-	If all of x, y, width and height are -1.0, the source rectangle is
-	unset instead. Any other set of values where width or height are zero
-	or negative, or x or y are negative, raise the bad_value protocol
-	error.
-
-	The crop and scale state is double-buffered state, and will be
-	applied on the next wl_surface.commit.
-      </description>
-      <arg name="x" type="fixed" summary="source rectangle x"/>
-      <arg name="y" type="fixed" summary="source rectangle y"/>
-      <arg name="width" type="fixed" summary="source rectangle width"/>
-      <arg name="height" type="fixed" summary="source rectangle height"/>
-    </request>
-
-    <request name="set_destination">
-      <description summary="set the surface size for scaling">
-	Set the destination size of the associated wl_surface. See
-	wp_viewport for the description, and relation to the wl_buffer
-	size.
-
-	If width is -1 and height is -1, the destination size is unset
-	instead. Any other pair of values for width and height that
-	contains zero or negative values raises the bad_value protocol
-	error.
-
-	The crop and scale state is double-buffered state, and will be
-	applied on the next wl_surface.commit.
-      </description>
-      <arg name="width" type="int" summary="surface width"/>
-      <arg name="height" type="int" summary="surface height"/>
-    </request>
-  </interface>
-
-</protocol>
--- a/deps/wayland/wayland.xml
+++ b/deps/wayland/wayland.xml
--- 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/deps/wayland/xdg-decoration-unstable-v1.xml
+++ b/deps/wayland/xdg-decoration-unstable-v1.xml
@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="xdg_decoration_unstable_v1">
-  <copyright>
-    Copyright © 2018 Simon Ser
-
-    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>
-
-  <interface name="zxdg_decoration_manager_v1" version="1">
-    <description summary="window decoration manager">
-      This interface allows a compositor to announce support for server-side
-      decorations.
-
-      A window decoration is a set of window controls as deemed appropriate by
-      the party managing them, such as user interface components used to move,
-      resize and change a window's state.
-
-      A client can use this protocol to request being decorated by a supporting
-      compositor.
-
-      If compositor and client do not negotiate the use of a server-side
-      decoration using this protocol, clients continue to self-decorate as they
-      see fit.
-
-      Warning! The protocol described in this file is experimental and
-      backward incompatible changes may be made. Backward compatible changes
-      may be added together with the corresponding interface version bump.
-      Backward incompatible changes are done by bumping the version number in
-      the protocol and interface names and resetting the interface version.
-      Once the protocol is to be declared stable, the 'z' prefix and the
-      version number in the protocol and interface names are removed and the
-      interface version number is reset.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the decoration manager object">
-        Destroy the decoration manager. This doesn't destroy objects created
-        with the manager.
-      </description>
-    </request>
-
-    <request name="get_toplevel_decoration">
-      <description summary="create a new toplevel decoration object">
-        Create a new decoration object associated with the given toplevel.
-
-        Creating an xdg_toplevel_decoration from an xdg_toplevel which has a
-        buffer attached or committed is a client error, and any attempts by a
-        client to attach or manipulate a buffer prior to the first
-        xdg_toplevel_decoration.configure event must also be treated as
-        errors.
-      </description>
-      <arg name="id" type="new_id" interface="zxdg_toplevel_decoration_v1"/>
-      <arg name="toplevel" type="object" interface="xdg_toplevel"/>
-    </request>
-  </interface>
-
-  <interface name="zxdg_toplevel_decoration_v1" version="1">
-    <description summary="decoration object for a toplevel surface">
-      The decoration object allows the compositor to toggle server-side window
-      decorations for a toplevel surface. The client can request to switch to
-      another mode.
-
-      The xdg_toplevel_decoration object must be destroyed before its
-      xdg_toplevel.
-    </description>
-
-    <enum name="error">
-      <entry name="unconfigured_buffer" value="0"
-        summary="xdg_toplevel has a buffer attached before configure"/>
-      <entry name="already_constructed" value="1"
-        summary="xdg_toplevel already has a decoration object"/>
-      <entry name="orphaned" value="2"
-        summary="xdg_toplevel destroyed before the decoration object"/>
-    </enum>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the decoration object">
-        Switch back to a mode without any server-side decorations at the next
-        commit.
-      </description>
-    </request>
-
-    <enum name="mode">
-      <description summary="window decoration modes">
-        These values describe window decoration modes.
-      </description>
-      <entry name="client_side" value="1"
-        summary="no server-side window decoration"/>
-      <entry name="server_side" value="2"
-        summary="server-side window decoration"/>
-    </enum>
-
-    <request name="set_mode">
-      <description summary="set the decoration mode">
-        Set the toplevel surface decoration mode. This informs the compositor
-        that the client prefers the provided decoration mode.
-
-        After requesting a decoration mode, the compositor will respond by
-        emitting an xdg_surface.configure event. The client should then update
-        its content, drawing it without decorations if the received mode is
-        server-side decorations. The client must also acknowledge the configure
-        when committing the new content (see xdg_surface.ack_configure).
-
-        The compositor can decide not to use the client's mode and enforce a
-        different mode instead.
-
-        Clients whose decoration mode depend on the xdg_toplevel state may send
-        a set_mode request in response to an xdg_surface.configure event and wait
-        for the next xdg_surface.configure event to prevent unwanted state.
-        Such clients are responsible for preventing configure loops and must
-        make sure not to send multiple successive set_mode requests with the
-        same decoration mode.
-      </description>
-      <arg name="mode" type="uint" enum="mode" summary="the decoration mode"/>
-    </request>
-
-    <request name="unset_mode">
-      <description summary="unset the decoration mode">
-        Unset the toplevel surface decoration mode. This informs the compositor
-        that the client doesn't prefer a particular decoration mode.
-
-        This request has the same semantics as set_mode.
-      </description>
-    </request>
-
-    <event name="configure">
-      <description summary="suggest a surface change">
-        The configure event asks the client to change its decoration mode. The
-        configured state should not be applied immediately. Clients must send an
-        ack_configure in response to this event. See xdg_surface.configure and
-        xdg_surface.ack_configure for details.
-
-        A configure event can be sent at any time. The specified mode must be
-        obeyed by the client.
-      </description>
-      <arg name="mode" type="uint" enum="mode" summary="the decoration mode"/>
-    </event>
-  </interface>
-</protocol>
--- a/deps/wayland/xdg-shell.xml
+++ b/deps/wayland/xdg-shell.xml
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@ -1,57 +1,32 @@

-# 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
-    news.md
-    quick.md
-    moving.md
-    compile.md
-    build.md
-    intro.md
-    context.md
-    monitor.md
-    window.md
-    input.md
-    vulkan.md
-    compat.md
-    internal.md)
-
-set(extra_files DoxygenLayout.xml header.html footer.html extra.css spaces.svg)
-
-set(header_paths
+set(glfw_DOCS_SOURCES
    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
-    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h")
+    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h"
+    "${GLFW_SOURCE_DIR}/docs/main.dox"
+    "${GLFW_SOURCE_DIR}/docs/news.dox"
+    "${GLFW_SOURCE_DIR}/docs/moving.dox"
+    "${GLFW_SOURCE_DIR}/docs/quick.dox"
+    "${GLFW_SOURCE_DIR}/docs/compile.dox"
+    "${GLFW_SOURCE_DIR}/docs/build.dox"
+    "${GLFW_SOURCE_DIR}/docs/intro.dox"
+    "${GLFW_SOURCE_DIR}/docs/context.dox"
+    "${GLFW_SOURCE_DIR}/docs/monitor.dox"
+    "${GLFW_SOURCE_DIR}/docs/window.dox"
+    "${GLFW_SOURCE_DIR}/docs/input.dox"
+    "${GLFW_SOURCE_DIR}/docs/vulkan.dox"
+    "${GLFW_SOURCE_DIR}/docs/compat.dox")

-# Format the source list into a Doxyfile INPUT value that Doxygen can parse
-foreach(path IN LISTS header_paths)
-    string(APPEND GLFW_DOXYGEN_INPUT " \\\n\"${path}\"")
-endforeach()
-foreach(file IN LISTS source_files)
-    string(APPEND GLFW_DOXYGEN_INPUT " \\\n\"${CMAKE_CURRENT_SOURCE_DIR}/${file}\"")
-endforeach()
-
-set(DOXYGEN_SKIP_DOT TRUE)
-find_package(Doxygen)
-
-if (NOT DOXYGEN_FOUND OR DOXYGEN_VERSION VERSION_LESS "1.9.8")
-    message(STATUS "Documentation generation requires Doxygen 1.9.8 or later")
-else()
-    configure_file(Doxyfile.in Doxyfile @ONLY)
-    add_custom_command(OUTPUT "html/index.html"
-                       COMMAND "${DOXYGEN_EXECUTABLE}"
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-                       MAIN_DEPENDENCY Doxyfile
-                       DEPENDS ${header_paths} ${source_files} ${extra_files}
-                       COMMENT "Generating HTML documentation"
-                       VERBATIM)
-
-    add_custom_target(docs ALL SOURCES "html/index.html")
-    set_target_properties(docs PROPERTIES FOLDER "GLFW3")
-
-    if (GLFW_INSTALL)
-        install(DIRECTORY "${GLFW_BINARY_DIR}/docs/html"
-                DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-    endif()
+if (GLFW_DOCUMENT_INTERNALS)
+    list(APPEND glfw_DOCS_SOURCES "${GLFW_SOURCE_DIR}/src/internal.h")
 endif()

+foreach(arg ${glfw_DOCS_SOURCES})
+    set(GLFW_DOCS_SOURCES "${GLFW_DOCS_SOURCES} ${arg}")
+endforeach()
+
+configure_file(Doxyfile.in Doxyfile @ONLY)
+                     
+add_custom_target(docs ALL "${DOXYGEN_EXECUTABLE}"
+                  WORKING_DIRECTORY "${GLFW_BINARY_DIR}/docs"
+                  COMMENT "Generating HTML documentation" VERBATIM)
+
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@ -1,390 +0,0 @@
-# Contribution Guide
-
-## Contents
-
- [Asking a question](#asking-a-question)
- [Reporting a bug](#reporting-a-bug)
-    - [Reporting a compile or link bug](#reporting-a-compile-or-link-bug)
-    - [Reporting a segfault or other crash bug](#reporting-a-segfault-or-other-crash-bug)
-    - [Reporting a context creation bug](#reporting-a-context-creation-bug)
-    - [Reporting a monitor or video mode bug](#reporting-a-monitor-or-video-mode-bug)
-    - [Reporting a window, input or event bug](#reporting-a-window-input-or-event-bug)
-    - [Reporting some other library bug](#reporting-some-other-library-bug)
-    - [Reporting a documentation bug](#reporting-a-documentation-bug)
-    - [Reporting a website bug](#reporting-a-website-bug)
- [Requesting a feature](#requesting-a-feature)
- [Contributing a bug fix](#contributing-a-bug-fix)
- [Contributing a feature](#contributing-a-feature)
-
-
-## Asking a question
-
-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.
-
-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
-first checking with a maintainer.
-
-
-## Reporting a bug
-
-If GLFW is behaving unexpectedly at run-time, start by setting an [error
-callback](https://www.glfw.org/docs/latest/intro_guide.html#error_handling).
-GLFW will often tell you the cause of an error via this callback.  If it
-doesn't, that might be a separate bug.
-
-If GLFW is crashing or triggering asserts, make sure that all your object
-handles and other pointers are valid.
-
-For bugs where it makes sense, a short, self contained example is absolutely
-invaluable.  Just put it inline in the body text.  Note that if the bug is
-reproducible with one of the test programs that come with GLFW, just mention
-that instead.
-
-__Don't worry about adding too much information__.  Unimportant information can
-be abbreviated or removed later, but missing information can stall bug fixing,
-especially when your schedule doesn't align with that of the maintainer.
-
-__Please provide text as text, not as images__.  This includes code, error
-messages and any other text.  Text in images cannot be found by other users
-searching for the same problem and may have to be re-typed by maintainers when
-debugging.
-
-You don't need to manually indent your code or other text to quote it with
-GitHub Markdown; just surround it with triple backticks:
-
-    ```
-    Some quoted text.
-    ```
-
-You can also add syntax highlighting by appending the common file extension:
-
-    ```c
-    int five(void)
-    {
-        return 5;
-    }
-    ```
-
-There are issue labels for both platforms and GPU manufacturers, so there is no
-need to mention these in the subject line.  If you do, it will be removed when
-the issue is labeled.
-
-If your bug is already reported, please add any new information you have, or if
-it already has everything, give it a :+1:.
-
-
-### Reporting a compile or link bug
-
-__Note:__ GLFW needs many system APIs to do its job, which on some platforms
-means linking to many system libraries.  If you are using GLFW as a static
-library, that means your application needs to link to these in addition to GLFW.
-
-__Note:__ Check the [Compiling
-GLFW](https://www.glfw.org/docs/latest/compile.html) guide and or [Building
-applications](https://www.glfw.org/docs/latest/build.html) guide for before
-opening an issue of this kind.  Most issues are caused by a missing package or
-linker flag.
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`) and the __compiler name and version__ (e.g. `Visual
-C++ 2015 Update 2`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-Please also include the __complete build log__ from your compiler and linker,
-even if it's long.  It can always be shortened later, if necessary.
-
-
-#### Quick template
-
-```
-OS and version:
-Compiler version:
-Release or commit:
-Build log:
-```
-
-
-### Reporting a segfault or other crash bug
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-Please also include any __error messages__ provided to your application via the
-[error
-callback](https://www.glfw.org/docs/latest/intro_guide.html#error_handling) and
-the __full call stack__ of the crash, or if the crash does not occur in debug
-mode, mention that instead.
-
-
-#### Quick template
-
-```
-OS and version:
-Release or commit:
-Error messages:
-Call stack:
-```
-
-
-### Reporting a context creation bug
-
-__Note:__ Windows ships with graphics drivers that do not support OpenGL.  If
-GLFW says that your machine lacks support for OpenGL, it very likely does.
-Install drivers from the computer manufacturer or graphics card manufacturer
-([Nvidia](https://www.geforce.com/drivers),
-[AMD](https://www.amd.com/en/support),
-[Intel](https://www-ssl.intel.com/content/www/us/en/support/detect.html)) to
-fix this.
-
-__Note:__ AMD only supports OpenGL ES on Windows via EGL.  See the
-[GLFW\_CONTEXT\_CREATION\_API](https://www.glfw.org/docs/latest/window_guide.html#window_hints_ctx)
-hint for how to select EGL.
-
-Please verify that context creation also fails with the `glfwinfo` tool before
-reporting it as a bug.  This tool is included in the GLFW source tree as
-`tests/glfwinfo.c` and is built along with the library.  It has switches for all
-GLFW context and framebuffer hints.  Run `glfwinfo -h` for a complete list.
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-If you are running your program in a virtual machine, please mention this and
-include the __VM name and version__ (e.g. `VirtualBox 5.1`).
-
-Please also include the __GLFW version string__ (`3.2.0 X11 EGL clock_gettime
-/dev/js`), as described
-[here](https://www.glfw.org/docs/latest/intro.html#intro_version_string), the
-__GPU model and driver version__ (e.g. `GeForce GTX660 with 352.79`), and the
-__output of `glfwinfo`__ (with switches matching any hints you set in your
-code) when reporting this kind of bug.  If this tool doesn't run on the machine,
-mention that instead.
-
-
-#### Quick template
-
-```
-OS and version:
-GPU and driver:
-Release or commit:
-Version string:
-glfwinfo output:
-```
-
-
-### Reporting a monitor or video mode bug
-
-__Note:__ On headless systems on some platforms, no monitors are reported.  This
-causes glfwGetPrimaryMonitor to return `NULL`, which not all applications are
-prepared for.
-
-__Note:__ Some third-party tools report more video modes than are approved of
-by the OS.  For safety and compatibility, GLFW only reports video modes the OS
-wants programs to use.  This is not a bug.
-
-The `monitors` tool is included in the GLFW source tree as `tests/monitors.c`
-and is built along with the library.  It lists all information GLFW provides
-about monitors it detects.
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-If you are running your program in a virtual machine, please mention this and
-include the __VM name and version__ (e.g. `VirtualBox 5.1`).
-
-Please also include any __error messages__ provided to your application via the
-[error
-callback](https://www.glfw.org/docs/latest/intro_guide.html#error_handling) and
-the __output of `monitors`__ when reporting this kind of bug.  If this tool
-doesn't run on the machine, mention this instead.
-
-
-#### Quick template
-
-```
-OS and version:
-Release or commit:
-Error messages:
-monitors output:
-```
-
-
-### Reporting a window, input or event bug
-
-__Note:__ The exact ordering of related window events will sometimes differ.
-
-__Note:__ Window moving and resizing (by the user) will block the main thread on
-some platforms.  This is not a bug.  Set a [refresh
-callback](https://www.glfw.org/docs/latest/window.html#window_refresh) if you
-want to keep the window contents updated during a move or size operation.
-
-The `events` tool is included in the GLFW source tree as `tests/events.c` and is
-built along with the library.  It prints all information provided to every
-callback supported by GLFW as events occur.  Each event is listed with the time
-and a unique number to make discussions about event logs easier.  The tool has
-command-line options for creating multiple windows and full screen windows.
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-If you are running your program in a virtual machine, please mention this and
-include the __VM name and version__ (e.g. `VirtualBox 5.1`).
-
-Please also include any __error messages__ provided to your application via the
-[error
-callback](https://www.glfw.org/docs/latest/intro_guide.html#error_handling) and
-if relevant, the __output of `events`__ when reporting this kind of bug.  If
-this tool doesn't run on the machine, mention this instead.
-
-__X11:__ If possible, please include what desktop environment (e.g. GNOME,
-Unity, KDE) and/or window manager (e.g. Openbox, dwm, Window Maker) you are
-running.  If the bug is related to keyboard input, please include any input
-method (e.g. ibus, SCIM) you are using.
-
-
-#### Quick template
-
-```
-OS and version:
-Release or commit:
-Error messages:
-events output:
-```
-
-
-### Reporting some other library bug
-
-Always include the __operating system name and version__ (e.g. `Windows
-7 64-bit` or `Ubuntu 15.10`).  If you are using an official release of GLFW,
-include the __GLFW release version__ (e.g. `3.1.2`), otherwise include the
-__GLFW commit ID__ (e.g.  `3795d78b14ef06008889cc422a1fb8d642597751`) from Git.
-
-Please also include any __error messages__ provided to your application via the
-[error
-callback](https://www.glfw.org/docs/latest/intro_guide.html#error_handling), if
-relevant.
-
-
-#### Quick template
-
-```
-OS and version:
-Release or commit:
-Error messages:
-```
-
-
-### Reporting a documentation bug
-
-If you found a bug in the documentation, including this file, then it's fine to
-just link to that web page or mention that source file.  You don't need to match
-the source to the output or vice versa.
-
-
-### Reporting a website bug
-
-If the bug is in the documentation (anything under `/docs/`) then please see the
-section above.  Bugs in the rest of the site are reported to the [website
-source repository](https://github.com/glfw/website/issues).
-
-
-## Requesting a feature
-
-Please explain why you need the feature and how you intend to use it.  If you
-have a specific API design in mind, please add that as well.  If you have or are
-planning to write code for the feature, see the section below.
-
-If there already is a request for the feature you need, add your specific use
-case unless it is already mentioned.  If it is, give it a :+1:.
-
-
-## Contributing a bug fix
-
-__Note:__ You must have all necessary [intellectual
-property rights](https://en.wikipedia.org/wiki/Intellectual_property) to any
-code you contribute.  If you did not write the code yourself, you must explain
-where it came from and under what license you received it.  Even code using the
-same license as GLFW may not be copied without attribution.
-
-__There is no preferred patch size__.  A one character fix is just as welcome as
-a thousand line one, if that is the appropriate size for the fix.
-
-In addition to the code, a complete bug fix includes:
-
- Change log entry in `README.md`, describing the incorrect behavior
- Credits entries in `CONTRIBUTORS.md` for all authors of the bug fix
-
-Bug fixes will not be rejected because they don't include all the above parts,
-but please keep in mind that maintainer time is finite and that there are many
-other bugs and features to work on.
-
-If the patch fixes a bug introduced after the last release, it should not get
-a change log entry.
-
-If you haven't already, read the excellent article [How to Write a Git Commit
-Message](https://chris.beams.io/posts/git-commit/).
-
-
-## Contributing a feature
-
-__Note:__ You must have all necessary rights to any code you contribute.  If you
-did not write the code yourself, you must explain where it came from and under
-what license.  Even code using the same license as GLFW may not be copied
-without attribution.
-
-__Note:__ If you haven't already implemented the feature, check first if there
-already is an open issue for it and if it's already being developed in an
-[experimental branch](https://github.com/glfw/glfw/branches/all).
-
-__There is no preferred patch size__.  A one-character change is just as welcome
-as one adding a thousand lines, if that is the appropriate size for the
-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
- 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
- Credits entries in `CONTRIBUTORS.md` for all authors of the feature
-
-If the feature requires platform-specific code, at minimum stubs must be added
-for the new platform function to all supported and experimental platforms.
-
-If it adds a new callback, support for it must be added to `tests/event.c`.
-
-If it adds a new monitor property, support for it must be added to
-`tests/monitor.c`.
-
-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`.
-
-If you haven't already, read the excellent article [How to Write a Git Commit
-Message](https://chris.beams.io/posts/git-commit/).
-
-Features will not be rejected because they don't include all the above parts,
-but please keep in mind that maintainer time is finite and that there are many
-other features and bugs to work on.
-
-Please also keep in mind that any part of the public API that has been included
-in a release cannot be changed until the next _major_ version.  Features can be
-added and existing parts can sometimes be overloaded (in the general sense of
-doing more things, not in the C++ sense), but code written to the API of one
-minor release should both compile and run on subsequent minor releases.
-
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
--- a/docs/DoxygenLayout.xml
+++ b/docs/DoxygenLayout.xml
@ -1,21 +1,115 @@
 <doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.14 -->
+  <!-- Generated by doxygen 1.8.3.1 -->
  <!-- Navigation index tabs for HTML output -->
  <navindex>
    <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="filelist" visible="yes" title="Files"/>
+    <tab type="modules" visible="yes" title="Reference" intro=""/>
+    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="no" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="Header Files">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>  
  </navindex>

+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
  <!-- Layout definition for a file page -->
  <file>
-    <detaileddescription title="Description"/>
+    <briefdescription visible="yes"/>
    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
    <sourcelink visible="yes"/>
    <memberdecl>
-      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
      <defines title=""/>
      <typedefs title=""/>
      <enums title=""/>
@ -23,7 +117,9 @@
      <variables title=""/>
      <membergroups visible="yes"/>
    </memberdecl>
+    <detaileddescription title=""/>
    <memberdef>
+      <inlineclasses title=""/>
      <defines title=""/>
      <typedefs title=""/>
      <enums title=""/>
@ -35,26 +131,46 @@

  <!-- Layout definition for a group page -->
  <group>
+    <briefdescription visible="yes"/>
    <detaileddescription title="Description"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
    <memberdecl>
      <nestedgroups visible="yes" title=""/>
      <dirs visible="yes" title=""/>
      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
      <defines title=""/>
      <typedefs title=""/>
      <enums title=""/>
      <enumvalues title=""/>
      <functions title=""/>
      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
    </memberdecl>
    <memberdef>
      <pagedocs/>
+      <inlineclasses title=""/>
      <defines title=""/>
      <typedefs title=""/>
      <enums title=""/>
      <enumvalues title=""/>
      <functions title=""/>
      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
    </memberdef>
    <authorsection visible="yes"/>
  </group>
@ -62,6 +178,7 @@
  <!-- Layout definition for a directory page -->
  <directory>
    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
    <memberdecl>
      <dirs visible="yes"/>
      <files visible="yes"/>
--- a/docs/SUPPORT.md
+++ b/docs/SUPPORT.md
@ -1,13 +0,0 @@
-# Support resources
-
-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/).
-
-Bugs are reported to our [issue tracker](https://github.com/glfw/glfw/issues).
-Please check the [contribution
-guide](https://github.com/glfw/glfw/blob/master/docs/CONTRIBUTING.md) for
-information on what to include when reporting a bug.
-
--- a/docs/build.dox
+++ b/docs/build.dox
@ -0,0 +1,323 @@
+/*!
+
+@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
+[introductory tutorial](@ref quick_guide).  For information on how to compile
+the GLFW library itself, see @ref compile_guide.
+
+This is not a tutorial on compilation or linking.  It assumes basic
+understanding of how to compile and link a C program as well as how to use the
+specific compiler of your chosen development environment.  The compilation
+and linking process should be explained in your C programming material and in
+the documentation for your development environment.
+
+@section build_include Including the GLFW header file
+
+In the source files of your application where you use OpenGL or GLFW, you should
+include the GLFW header file, i.e.:
+
+@code
+#include <GLFW/glfw3.h>
+@endcode
+
+The GLFW header declares the GLFW API and by default also includes the OpenGL
+header of your development environment, which in turn defines all the constants,
+types and function prototypes of the OpenGL API.
+
+The GLFW header also defines everything necessary for your OpenGL header to
+function.  For example, under Windows you are normally required to include
+`windows.h` before the OpenGL header, which would pollute your code namespace
+with the entire Win32 API.
+
+Instead, the GLFW header takes care of this for you, not by including
+`windows.h`, but by duplicating only the very few necessary parts of it.  It
+does this only when needed, so if `windows.h` _is_ included, the GLFW header
+does not try to redefine those symbols.  The reverse is not true, i.e.
+`windows.h` cannot cope if any of its symbols have already been defined.
+
+In other words:
+
+ - Do _not_ include the OpenGL headers yourself, as GLFW does this for you
+ - Do _not_ include `windows.h` or other platform-specific headers unless you
+   plan on using those APIs directly
+ - If you _do_ need to include such headers, do it _before_ including
+   the GLFW header and it will handle this
+
+If you are using an OpenGL extension loading library such as
+[glad](https://github.com/Dav1dde/glad), the extension loader header should
+either be included _before_ the GLFW one, or the `GLFW_INCLUDE_NONE` macro
+(described below) should be defined.
+
+
+@subsection build_macros GLFW header option macros
+
+These macros may be defined before the inclusion of the GLFW header and affect
+its behavior.
+
+`GLFW_DLL` is required on Windows when using the GLFW DLL, to tell the compiler
+that the GLFW functions are defined in a DLL.
+
+The following macros control which OpenGL or OpenGL ES API header is included.
+Only one of these may be defined at a time.
+
+`GLFW_INCLUDE_GLCOREARB` makes the GLFW header include the modern
+`GL/glcorearb.h` header (`OpenGL/gl3.h` on OS X) instead of the regular OpenGL
+header.
+
+`GLFW_INCLUDE_ES1` makes the GLFW header include the OpenGL ES 1.x `GLES/gl.h`
+header instead of the regular OpenGL header.
+
+`GLFW_INCLUDE_ES2` makes the GLFW header include the OpenGL ES 2.0 `GLES2/gl2.h`
+header instead of the regular OpenGL header.
+
+`GLFW_INCLUDE_ES3` makes the GLFW header include the OpenGL ES 3.0 `GLES3/gl3.h`
+header instead of the regular OpenGL header.
+
+`GLFW_INCLUDE_ES31` makes the GLFW header include the OpenGL ES 3.1 `GLES3/gl31.h`
+header instead of the regular OpenGL header.
+
+`GLFW_INCLUDE_VULKAN` makes the GLFW header include the Vulkan `vulkan/vulkan.h`
+header instead of the regular OpenGL header.
+
+`GLFW_INCLUDE_NONE` makes the GLFW header not include any OpenGL or OpenGL ES API
+header.  This is useful in combination with an extension loading library.
+
+If none of the above inclusion macros are defined, the standard OpenGL `GL/gl.h`
+header (`OpenGL/gl.h` on OS X) is included.
+
+The following macros control the inclusion of additional API headers.  Any
+number of these may be defined simultaneously, and/or together with one of the
+above macros.
+
+`GLFW_INCLUDE_GLEXT` makes the GLFW header include the appropriate extension
+header for the OpenGL or OpenGL ES header selected above after and in addition
+to that header.
+
+`GLFW_INCLUDE_GLU` makes the header include the GLU header in addition to the
+header selected above.  This should only be used with the standard OpenGL header
+and only for compatibility with legacy code.  GLU has been deprecated and should
+not be used in new code.
+
+@note GLFW does not provide any of the API headers mentioned above.  They must
+be provided by your development environment or your OpenGL or OpenGL ES SDK.
+
+@note None of these macros may be defined during the compilation of GLFW itself.
+If your build includes GLFW and you define any these in your build files, make
+sure they are not applied to the GLFW sources.
+
+
+@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
+a shared library / dynamic library / DLL then it takes care of these links.
+However, if you are using GLFW as a static library then your executable will
+need to link against these libraries.
+
+On Windows and OS X, the list of system libraries is static and can be
+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 Linkers](http://www.lurklurk.org/linkers/linkers.html) by
+David Drysdale.
+
+
+@subsection build_link_win32 With MinGW or Visual C++ on Windows
+
+The static version of the GLFW library is named `glfw3`.  When using this
+version, it is also necessary to link with some libraries that GLFW uses.
+
+When linking an application under Windows that uses the static version of GLFW,
+you must link with `opengl32`.  On some versions of MinGW, you must also
+explicitly link with `gdi32`, while other versions of MinGW include it in the
+set of default libraries along with other dependencies like `user32` and
+`kernel32`.  If you are using GLU, you must also link with `glu32`.
+
+The link library for the GLFW DLL is named `glfw3dll`.  When compiling an
+application that uses the DLL version of GLFW, you need to define the `GLFW_DLL`
+macro _before_ any inclusion of the GLFW header.  This can be done either with
+a compiler switch or by defining it in your source code.
+
+An application using the GLFW DLL does not need to link against any of its
+dependencies, but you still have to link against `opengl32` if your application
+uses OpenGL and `glu32` if it uses GLU.
+
+
+@subsection build_link_cmake_source With CMake and GLFW 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
+build_link_cmake_package.
+
+With just a few changes to your `CMakeLists.txt` you can have the GLFW source
+tree built along with your application.
+
+When including GLFW as part of your build, you probably don't want to build the
+GLFW tests, examples and documentation.  To disable these, set the corresponding
+cache variables before adding the GLFW source tree.
+
+@code
+set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+@endcode
+
+Then add the root directory of the GLFW source tree to your project.  This
+will add the `glfw` target and the necessary cache variables to your project.
+
+@code{.cmake}
+add_subdirectory(path/to/glfw)
+@endcode
+
+Once GLFW has been added to the project, link against it with the `glfw` target.
+This adds all link-time dependencies of GLFW as it is currently configured,
+the include directory for the GLFW header and, when applicable, the
+[GLFW_DLL](@ref build_macros) macro.
+
+@code{.cmake}
+target_link_libraries(myapp glfw)
+@endcode
+
+Note that it does not include GLU, as GLFW does not use it.  If your application
+needs GLU, you can find it by requiring the OpenGL package.
+
+@code{.cmake}
+find_package(OpenGL REQUIRED)
+@endcode
+
+If GLU is found, the `OPENGL_GLU_FOUND` variable is true and the
+`OPENGL_INCLUDE_DIR` and `OPENGL_glu_LIBRARY` cache variables can be used.
+
+@code{.cmake}
+target_include_directories(myapp ${OPENGL_INCLUDE_DIR})
+target_link_libraries(myapp ${OPENGL_glu_LIBRARY})
+@endcode
+
+
+@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
+@ref build_link_cmake_source.
+
+With just a few changes to your `CMakeLists.txt`, you can locate the package and
+target files generated when GLFW is installed.
+
+@code{.cmake}
+find_package(glfw3 3.2 REQUIRED)
+@endcode
+
+Once GLFW has been located, link against it with the `glfw` target.  This adds
+all link-time dependencies of GLFW as it is currently configured, the include
+directory for the GLFW header and, when applicable, the
+[GLFW_DLL](@ref build_macros) macro.
+
+@code{.cmake}
+target_link_libraries(myapp glfw)
+@endcode
+
+Note that it does not include GLU, as GLFW does not use it.  If your application
+needs GLU, you can find it by requiring the OpenGL package.
+
+@code{.cmake}
+find_package(OpenGL REQUIRED)
+@endcode
+
+If GLU is found, the `OPENGL_GLU_FOUND` variable is true and the
+`OPENGL_INCLUDE_DIR` and `OPENGL_glu_LIBRARY` cache variables can be used.
+
+@code{.cmake}
+target_include_directories(myapp ${OPENGL_INCLUDE_DIR})
+target_link_libraries(myapp ${OPENGL_glu_LIBRARY})
+@endcode
+
+
+@subsection build_link_pkgconfig With makefiles and pkg-config on Unix
+
+GLFW supports [pkg-config](http://www.freedesktop.org/wiki/Software/pkg-config/),
+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
+compile-time and link-time flags and dependencies needed to use a library.  When
+they are updated or if they differ between systems, you will get the correct
+ones automatically.
+
+A typical compile and link command-line when using the static version of the
+GLFW library may look like this:
+
+@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, simply omit the
+`--static` flag.
+
+@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.
+
+@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 GLU, as GLFW does not use it.  On OS X, GLU is
+built into the OpenGL framework, so if you need GLU you don't need to do
+anything extra.  If you need GLU and are using Linux or BSD, you should add the
+`glu` pkg-config package.
+
+@code{.sh}
+cc `pkg-config --cflags glfw3 glu` -o myprog myprog.c `pkg-config --libs glfw3 glu`
+@endcode
+
+If you are using the static version of the GLFW library, make sure you don't
+link statically against GLU.
+
+@code{.sh}
+cc `pkg-config --cflags glfw3 glu` -o myprog myprog.c `pkg-config --static --libs glfw3` `pkg-config --libs glu`
+@endcode
+
+
+@subsection build_link_xcode With Xcode on OS X
+
+If you are using the dynamic library version of GLFW, simply add it to the
+project dependencies.
+
+If you are using the static library version of GLFW, add it and the Cocoa,
+OpenGL, IOKit and CoreVideo frameworks to the project as dependencies.  They can
+all be found in `/System/Library/Frameworks`.
+
+
+@subsection build_link_osx With command-line on OS X
+
+It is recommended that you use [pkg-config](@ref build_link_pkgconfig) when
+building from the command line on OS X.  That way you will get any new
+dependencies added automatically.  If you still wish to build manually, you need
+to add the required frameworks and libraries to your command-line yourself using
+the `-l` and `-framework` switches.
+
+If you are using the dynamic GLFW library, which is named `libglfw.3.dylib`, do:
+
+@code{.sh}
+cc -o myprog myprog.c -lglfw -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo
+@endcode
+
+If you are using the static library, named `libglfw3.a`, substitute `-lglfw3`
+for `-lglfw`.
+
+Note that you do not add the `.framework` extension to a framework when linking
+against it from the command-line.
+
+The OpenGL framework contains both the OpenGL and GLU APIs, so there is nothing
+special to do when using GLU.  Also note that even though your machine may have
+`libGL`-style OpenGL libraries, they are for use with the X Window System and
+will _not_ work with the OS X native version of GLFW.
+
+*/
--- a/docs/build.md
+++ b/docs/build.md
@ -1,419 +0,0 @@
-# Building applications {#build_guide}
-
-[TOC]
-
-This is about compiling and linking applications that use GLFW.  For information on
-how to write such applications, start with the
-[introductory tutorial](@ref quick_guide).  For information on how to compile
-the GLFW library itself, see @ref compile_guide.
-
-This is not a tutorial on compilation or linking.  It assumes basic
-understanding of how to compile and link a C program as well as how to use the
-specific compiler of your chosen development environment.  The compilation
-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}
-
-You should include the GLFW header in the source files where you use OpenGL or
-GLFW.
-
-```c
-#include <GLFW/glfw3.h>
-```
-
-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
-your development environment.  See [option macros](@ref build_macros) below for
-how to select OpenGL ES headers and more.
-
-The GLFW header also defines any platform-specific macros needed by your OpenGL
-header, so that it can be included without needing any window system headers.
-
-It does this only when needed, so if window system headers are included, the
-GLFW header does not try to redefine those symbols.  The reverse is not true,
-i.e. `windows.h` cannot cope if any Win32 symbols have already been defined.
-
-In other words:
-
- - Use the GLFW header to include OpenGL or OpenGL ES headers portably
- - 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
-extension loader header should be included before the GLFW one.  GLFW attempts
-to detect any OpenGL or OpenGL ES header or extension loader header included
-before it and will then disable 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
-
-```c
-#include <glad/gl.h>
-#include <GLFW/glfw3.h>
-```
-
-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
-@ref GLFW_INCLUDE_NONE macro will explicitly prevent the GLFW header from
-including the OpenGL header.  This will also allow you to include the two
-headers in any order.
-
-```c
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-#include <glad/gl.h>
-```
-
-
-### GLFW header option macros {#build_macros}
-
-These macros may be defined before the inclusion of the GLFW header and affect
-its behavior.
-
-@anchor GLFW_DLL
-__GLFW_DLL__ is required on Windows when using the GLFW DLL, to tell the
-compiler that the GLFW functions are defined in a DLL.
-
-The following macros control which OpenGL or OpenGL ES API header is included.
-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].
-
-[registry]: https://www.khronos.org/registry/
-
-@anchor GLFW_INCLUDE_GLCOREARB
-__GLFW_INCLUDE_GLCOREARB__ makes the GLFW header include the modern
-`GL/glcorearb.h` header (`OpenGL/gl3.h` on macOS) instead of the regular OpenGL
-header.
-
-@anchor GLFW_INCLUDE_ES1
-__GLFW_INCLUDE_ES1__ makes the GLFW header include the OpenGL ES 1.x `GLES/gl.h`
-header instead of the regular OpenGL header.
-
-@anchor GLFW_INCLUDE_ES2
-__GLFW_INCLUDE_ES2__ makes the GLFW header include the OpenGL ES 2.0
-`GLES2/gl2.h` header instead of the regular OpenGL header.
-
-@anchor GLFW_INCLUDE_ES3
-__GLFW_INCLUDE_ES3__ makes the GLFW header include the OpenGL ES 3.0
-`GLES3/gl3.h` header instead of the regular OpenGL header.
-
-@anchor GLFW_INCLUDE_ES31
-__GLFW_INCLUDE_ES31__ makes the GLFW header include the OpenGL ES 3.1
-`GLES3/gl31.h` header instead of the regular OpenGL header.
-
-@anchor GLFW_INCLUDE_ES32
-__GLFW_INCLUDE_ES32__ makes the GLFW header include the OpenGL ES 3.2
-`GLES3/gl32.h` header instead of the regular OpenGL header.
-
-@anchor GLFW_INCLUDE_NONE
-__GLFW_INCLUDE_NONE__ makes the GLFW header not include any OpenGL or OpenGL ES
-API header.  This is useful in combination with an extension loading library.
-
-If none of the above inclusion macros are defined, the standard OpenGL `GL/gl.h`
-header (`OpenGL/gl.h` on macOS) is included, unless GLFW detects the inclusion
-guards of any OpenGL, OpenGL ES or extension loader header it knows about.
-
-The following macros control the inclusion of additional API headers.  Any
-number of these may be defined simultaneously, and/or together with one of the
-above macros.
-
-@anchor GLFW_INCLUDE_VULKAN
-__GLFW_INCLUDE_VULKAN__ makes the GLFW header include the Vulkan
-`vulkan/vulkan.h` header in addition to any selected OpenGL or OpenGL ES header.
-
-@anchor GLFW_INCLUDE_GLEXT
-__GLFW_INCLUDE_GLEXT__ makes the GLFW header include the appropriate extension
-header for the OpenGL or OpenGL ES header selected above after and in addition
-to that header.
-
-@anchor GLFW_INCLUDE_GLU
-__GLFW_INCLUDE_GLU__ makes the header include the GLU header in addition to the
-header selected above.  This should only be used with the standard OpenGL header
-and only for compatibility with legacy code.  GLU has been deprecated and should
-not be used in new code.
-
-@note None of these macros may be defined during the compilation of GLFW itself.
-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}
-
-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
-a shared library / dynamic library / DLL then it takes care of these links.
-However, if you are using GLFW as a static library then your executable will
-need to link against these libraries.
-
-On Windows and macOS, the list of system libraries is static and can be
-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
-Linkers][linker_guide] by David Drysdale.
-
-[linker_guide]: https://www.lurklurk.org/linkers/linkers.html
-
-
-### With Visual C++ and GLFW binaries {#build_link_win32}
-
-If you are using a downloaded [binary
-archive](https://www.glfw.org/download.html), 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.  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
-it needs to use the same base run-time library variant as the rest of your
-executable.
-
-One is named `glfw3.lib` and is for projects with the _Runtime Library_ project
-option set to _Multi-threaded DLL_ or _Multi-threaded Debug DLL_.  The other is
-named `glfw3_mt.lib` and is for projects with _Runtime Library_ set to
-_Multi-threaded_ or _Multi-threaded Debug_.  To use the static GLFW library you
-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}
-
-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
-build_link_cmake_package.
-
-With a few changes to your `CMakeLists.txt` you can have the GLFW source tree
-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
-add_subdirectory(path/to/glfw)
-```
-
-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
-target_link_libraries(myapp glfw)
-```
-
-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
-OpenGL directly, instead of using a modern
-[extension loader library](@ref context_glext_auto), use the OpenGL CMake
-package.
-
-```cmake
-find_package(OpenGL REQUIRED)
-```
-
-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
-target_link_libraries(myapp OpenGL::GL)
-```
-
-For a minimal example of a program and GLFW sources built with CMake, see the
-[GLFW CMake Starter][cmake_starter] on GitHub.
-
-[cmake_starter]: https://github.com/juliettef/GLFW-CMake-starter
-
-
-### With CMake and installed GLFW binaries {#build_link_cmake_package}
-
-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
-@ref build_link_cmake_source.
-
-With a few changes to your `CMakeLists.txt` you can locate the package and
-target files generated when GLFW is installed.
-
-```cmake
-find_package(glfw3 3.5 REQUIRED)
-```
-
-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
-target_link_libraries(myapp glfw)
-```
-
-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
-OpenGL directly, instead of using a modern
-[extension loader library](@ref context_glext_auto), use the OpenGL CMake
-package.
-
-```cmake
-find_package(OpenGL REQUIRED)
-```
-
-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
-target_link_libraries(myapp OpenGL::GL)
-```
-
-
-### With pkg-config and GLFW binaries on Unix {#build_link_pkgconfig}
-
-This is intended for building a program from the command-line or by writing
-a makefile, on macOS or any Unix-like system like Linux, FreeBSD and Cygwin.
-
-GLFW supports [pkg-config][], 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 compile-time and link-time flags and dependencies
-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
-cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --static --libs glfw3)
-```
-
-If you are using the shared version of the GLFW library, omit the `--static`
-flag.
-
-```sh
-cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --libs glfw3)
-```
-
-You can also use the `glfw3.pc` file without installing it first, by using the
-`PKG_CONFIG_PATH` environment variable.
-
-```sh
-env PKG_CONFIG_PATH=path/to/glfw/src cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --libs glfw3)
-```
-
-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
-directly, instead of using a modern
-[extension loader library](@ref context_glext_auto), you should add the `gl`
-pkg-config package.
-
-```sh
-cc $(pkg-config --cflags glfw3 gl) -o myprog myprog.c $(pkg-config --libs glfw3 gl)
-```
-
-
-### With Xcode on macOS {#build_link_xcode}
-
-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
-can all be found in `/System/Library/Frameworks`.
-
-
-### With command-line or makefile on macOS {#build_link_osx}
-
-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
-get any new dependencies added automatically.  If you still wish to build
-manually, you need to add the required frameworks and libraries to your
-command-line yourself using the `-l` and `-framework` switches.
-
-If you are using the dynamic GLFW library, which is named `libglfw.3.dylib`, do:
-
-```sh
-cc -o myprog myprog.c -lglfw -framework Cocoa -framework OpenGL -framework IOKit -framework QuartzCore
-```
-
-If you are using the static library, named `libglfw3.a`, substitute `-lglfw3`
-for `-lglfw`.
-
-Note that you do not add the `.framework` extension to a framework when linking
-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
@ -0,0 +1,224 @@
+/*!
+
+@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
+vital knowledge for developers intending to deploy their applications on a wide
+range of machines.
+
+The information in this guide is not a part of GLFW API, but merely
+preconditions for some parts of the library to function on a given machine.  Any
+part of this information may change in future versions of GLFW and that will not
+be considered a breaking API change.
+
+
+@section compat_x11 X11 extensions, protocols and IPC standards
+
+As GLFW uses Xlib directly, without any intervening toolkit
+library, it has sole responsibility for interacting well with the many and
+varied window managers in use on Unix-like systems.  In order for applications
+and window managers to work well together, a number of standards and
+conventions have been developed that regulate behavior outside the scope of the
+X11 API; most importantly the
+[Inter-Client Communication Conventions Manual](http://www.tronche.com/gui/x/icccm/)
+(ICCCM) and
+[Extended Window Manager Hints](http://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
+`GLFW_DECORATED` hint will have no effect.
+
+GLFW uses the ICCCM `WM_DELETE_WINDOW` protocol to intercept the user
+attempting to close the GLFW window.  If the running window manager does not
+support this protocol, the close callback will never be called.
+
+GLFW uses the EWMH `_NET_WM_PING` protocol, allowing the window manager notify
+the user when the application has stopped responding, i.e. when it has ceased to
+process events.  If the running window manager does not support this protocol,
+the user will not be notified if the application locks up.
+
+GLFW uses the EWMH `_NET_WM_STATE_FULLSCREEN` window state to tell the window
+manager to make the GLFW window full screen.  If the running window manager does
+not support this state, full screen windows may not work properly.  GLFW has
+a fallback code path in case this state is unavailable, but every window manager
+behaves slightly differently in this regard.
+
+GLFW uses the EWMH `_NET_WM_BYPASS_COMPOSITOR` window property to tell a
+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](http://www.freedesktop.org/wiki/ClipboardManager/)
+to push a clipboard string (i.e. selection) owned by a GLFW window about to be
+destroyed to the clipboard manager.  If there is no running clipboard manager,
+the clipboard string will be unavailable once the window has been destroyed.
+
+GLFW uses the
+[X drag-and-drop protocol](http://www.freedesktop.org/wiki/Specifications/XDND/)
+to provide file drop events.  If the application originating the drag does not
+support this protocol, drag and drop will not work.
+
+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
+support will not function and only a single, desktop-spanning monitor will be
+reported.
+
+GLFW uses the XRandR 1.3 and Xf86vidmode extensions to provide gamma ramp
+support.  If the running X server does not support either or both of these
+extensions, gamma ramp support will not function.
+
+GLFW uses the Xkb extension and detectable auto-repeat to provide keyboard
+input.  If the running X server does not support this extension, a non-Xkb
+fallback path is used.
+
+
+@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.
+
+GLFW uses the GLX 1.3 `GLXFBConfig` functions to enumerate and select framebuffer pixel
+formats.  If GLX 1.3 is not supported, @ref glfwInit will fail.
+
+GLFW uses the `GLX_MESA_swap_control,` `GLX_EXT_swap_control` and
+`GLX_SGI_swap_control` extensions to provide vertical retrace synchronization
+(or _vsync_), in that order of preference.  Where none of these extension are
+available, calling @ref glfwSwapInterval will have no effect.
+
+GLFW uses the `GLX_ARB_multisample` extension to create contexts with
+multisampling anti-aliasing.  Where this extension is unavailable, the
+`GLFW_SAMPLES` hint will have no effect.
+
+GLFW uses the `GLX_ARB_create_context` extension when available, even when
+creating OpenGL contexts of version 2.1 and below.  Where this extension is
+unavailable, the `GLFW_CONTEXT_VERSION_MAJOR` and `GLFW_CONTEXT_VERSION_MINOR`
+hints will only be partially supported, the `GLFW_OPENGL_DEBUG_CONTEXT` hint
+will have no effect, and setting the `GLFW_OPENGL_PROFILE` or
+`GLFW_OPENGL_FORWARD_COMPAT` hints to `GLFW_TRUE` will cause @ref
+glfwCreateWindow to fail.
+
+GLFW uses the `GLX_ARB_create_context_profile` extension to provide support for
+context profiles.  Where this extension is unavailable, setting the
+`GLFW_OPENGL_PROFILE` hint to anything but `GLFW_OPENGL_ANY_PROFILE`, or setting
+`GLFW_CLIENT_API` to anything but `GLFW_OPENGL_API` or `GLFW_NO_API` will cause
+@ref glfwCreateWindow to fail.
+
+GLFW uses the `GLX_ARB_context_flush_control` extension to provide control over
+whether a context is flushed when it is released (made non-current).  Where this
+extension is unavailable, the `GLFW_CONTEXT_RELEASE_BEHAVIOR` hint will have no
+effect and the context will always be flushed when released.
+
+GLFW uses the `GLX_ARB_framebuffer_sRGB` and `GLX_EXT_framebuffer_sRGB`
+extensions to provide support for sRGB framebuffers.  Where both of these
+extensions are unavailable, the `GLFW_SRGB_CAPABLE` hint will have no effect.
+
+
+@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.
+
+GLFW uses either the `WGL_EXT_extension_string` or the
+`WGL_ARB_extension_string` extension to check for the presence of all other WGL
+extensions listed below.  If both are available, the EXT one is preferred.  If
+neither is available, no other extensions are used and many GLFW features
+related to context creation will have no effect or cause errors when used.
+
+GLFW uses the `WGL_EXT_swap_control` extension to provide vertical retrace
+synchronization (or _vsync_).  Where this extension is unavailable, calling @ref
+glfwSwapInterval will have no effect.
+
+GLFW uses the `WGL_ARB_pixel_format` and `WGL_ARB_multisample` extensions to
+create contexts with multisampling anti-aliasing.  Where these extensions are
+unavailable, the `GLFW_SAMPLES` hint will have no effect.
+
+GLFW uses the `WGL_ARB_create_context` extension when available, even when
+creating OpenGL contexts of version 2.1 and below.  Where this extension is
+unavailable, the `GLFW_CONTEXT_VERSION_MAJOR` and `GLFW_CONTEXT_VERSION_MINOR`
+hints will only be partially supported, the `GLFW_OPENGL_DEBUG_CONTEXT` hint
+will have no effect, and setting the `GLFW_OPENGL_PROFILE` or
+`GLFW_OPENGL_FORWARD_COMPAT` hints to `GLFW_TRUE` will cause @ref
+glfwCreateWindow to fail.
+
+GLFW uses the `WGL_ARB_create_context_profile` extension to provide support for
+context profiles.  Where this extension is unavailable, setting the
+`GLFW_OPENGL_PROFILE` hint to anything but `GLFW_OPENGL_ANY_PROFILE` will cause
+@ref glfwCreateWindow to fail.
+
+GLFW uses the `WGL_ARB_context_flush_control` extension to provide control over
+whether a context is flushed when it is released (made non-current).  Where this
+extension is unavailable, the `GLFW_CONTEXT_RELEASE_BEHAVIOR` hint will have no
+effect and the context will always be flushed when released.
+
+GLFW uses the `WGL_ARB_framebuffer_sRGB` and `WGL_EXT_framebuffer_sRGB`
+extensions to provide support for sRGB framebuffers.  Where both of these
+extension are unavailable, the `GLFW_SRGB_CAPABLE` hint will have no effect.
+
+
+@section compat_osx OpenGL 3.2 and later on OS X
+
+Support for OpenGL 3.2 and above was introduced with OS X 10.7 and even then
+only forward-compatible, core profile contexts are supported.  Support for
+OpenGL 4.1 was introduced with OS X 10.9, also limited to forward-compatible,
+core profile contexts.  There is also still no mechanism for requesting debug
+contexts.  Versions of Mac OS X earlier than 10.7 support at most OpenGL
+version 2.1.
+
+Because of this, on OS X 10.7 and later, the `GLFW_CONTEXT_VERSION_MAJOR` and
+`GLFW_CONTEXT_VERSION_MINOR` hints will cause @ref glfwCreateWindow to fail if
+given version 3.0 or 3.1, the `GLFW_OPENGL_FORWARD_COMPAT` hint must be set to
+`GLFW_TRUE` and the `GLFW_OPENGL_PROFILE` hint must be set to
+`GLFW_OPENGL_CORE_PROFILE` when creating OpenGL 3.2 and later contexts and the
+`GLFW_OPENGL_DEBUG_CONTEXT` hint is ignored.
+
+Also, on Mac OS X 10.6 and below, the `GLFW_CONTEXT_VERSION_MAJOR` and
+`GLFW_CONTEXT_VERSION_MINOR` hints will fail if given a version above 2.1,
+setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT` hints to
+a non-default value will cause @ref glfwCreateWindow to fail and the
+`GLFW_OPENGL_DEBUG_CONTEXT` hint is ignored.
+
+
+@section compat_vulkan Vulkan loader and API
+
+GLFW uses the standard system-wside Vulkan loader to access the Vulkan API.
+This should be installed by graphics drivers and Vulkan SDKs.  If this is not
+available, @ref glfwVulkanSupported will return `GLFW_FALSE` and all other
+Vulkan-related functions will fail with an @ref GLFW_API_UNAVAILABLE error.
+
+
+@section compat_wsi Vulkan WSI extensions
+
+The Vulkan WSI extensions are used to create Vulkan surfaces for GLFW windows on
+all supported platforms.
+
+GLFW uses the `VK_KHR_surface` and `VK_KHR_win32_surface` extensions to create
+surfaces on Microsoft Windows.  If any of these extensions are not available,
+@ref glfwGetRequiredInstanceExtensions will return an empty list and window
+surface creation will fail.
+
+GLFW uses the `VK_KHR_surface` and either the `VK_KHR_xlib_surface` or
+`VK_KHR_xcb_surface` extensions to create surfaces on X11.  If `VK_KHR_surface`
+or both `VK_KHR_xlib_surface` and `VK_KHR_xcb_surface` are not available, @ref
+glfwGetRequiredInstanceExtensions will return an empty list and window surface
+creation will fail.
+
+GLFW uses the `VK_KHR_surface` and `VK_KHR_wayland_surface` extensions to create
+surfaces on Wayland.  If any of these extensions are not available, @ref
+glfwGetRequiredInstanceExtensions will return an empty list and window surface
+creation will fail.
+
+GLFW uses the `VK_KHR_surface` and `VK_KHR_mir_surface` extensions to create
+surfaces on Mir.  If any of these extensions are not available, @ref
+glfwGetRequiredInstanceExtensions will return an empty list and window surface
+creation will fail.
+
+GLFW does not support any extensions for window surface creation on OS X,
+meaning@ref glfwGetRequiredInstanceExtensions will return an empty list and
+window surface creation will fail.
+
+*/
--- a/docs/compat.md
+++ b/docs/compat.md
@ -1,303 +0,0 @@
-# Standards conformance {#compat_guide}
-
-[TOC]
-
-This guide describes the various API extensions used by this version of GLFW.
-It lists what are essentially implementation details, but which are nonetheless
-vital knowledge for developers intending to deploy their applications on a wide
-range of machines.
-
-The information in this guide is not a part of GLFW API, but merely
-preconditions for some parts of the library to function on a given machine.  Any
-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}
-
-As GLFW uses Xlib directly, without any intervening toolkit library, it has sole
-responsibility for interacting well with the many and varied window managers in
-use on Unix-like systems.  In order for applications and window managers to work
-well together, a number of standards and conventions have been developed that
-regulate behavior outside the scope of the X11 API; most importantly the
-[Inter-Client Communication Conventions Manual][ICCCM] (ICCCM) and [Extended
-Window Manager Hints][EWMH] (EWMH) standards.
-
-[ICCCM]: https://www.tronche.com/gui/x/icccm/
-[EWMH]: https://standards.freedesktop.org/wm-spec/wm-spec-latest.html
-
-GLFW uses the `_MOTIF_WM_HINTS` window property to support borderless windows.
-If the running window manager does not support this property, the
-`GLFW_DECORATED` hint will have no effect.
-
-GLFW uses the ICCCM `WM_DELETE_WINDOW` protocol to intercept the user
-attempting to close the GLFW window.  If the running window manager does not
-support this protocol, the close callback will never be called.
-
-GLFW uses the EWMH `_NET_WM_PING` protocol, allowing the window manager notify
-the user when the application has stopped responding, i.e. when it has ceased to
-process events.  If the running window manager does not support this protocol,
-the user will not be notified if the application locks up.
-
-GLFW uses the EWMH `_NET_WM_STATE_FULLSCREEN` window state to tell the window
-manager to make the GLFW window full screen.  If the running window manager does
-not support this state, full screen windows may not work properly.  GLFW has
-a fallback code path in case this state is unavailable, but every window manager
-behaves slightly differently in this regard.
-
-GLFW uses the EWMH `_NET_WM_BYPASS_COMPOSITOR` window property to tell a
-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
-string (i.e. selection) owned by a GLFW window about to be 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][XDND] to provide file drop events.  If
-the application originating the drag does not support this protocol, drag and
-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
-support will not function and only a single, desktop-spanning monitor will be
-reported.
-
-GLFW uses the XRandR 1.3 and Xf86vidmode extensions to provide gamma ramp
-support.  If the running X server does not support either or both of these
-extensions, gamma ramp support will not function.
-
-GLFW uses the Xkb extension and detectable auto-repeat to provide keyboard
-input.  If the running X server does not support this extension, a non-Xkb
-fallback path is used.
-
-GLFW uses the XInput2 extension to provide raw, non-accelerated mouse motion
-when the cursor is disabled.  If the running X server does not support this
-extension, regular accelerated mouse motion will be used.
-
-GLFW uses both the XRender extension and the compositing manager to support
-transparent window framebuffers.  If the running X server does not support this
-extension or there is no running compositing manager, the
-`GLFW_TRANSPARENT_FRAMEBUFFER` framebuffer hint will have no effect.
-
-GLFW uses both the Xcursor extension and the freedesktop cursor conventions to
-provide an expanded set of standard cursor shapes.  If the running X server does
-not support this extension or the current cursor theme does not support the
-conventions, the `GLFW_RESIZE_NWSE_CURSOR`, `GLFW_RESIZE_NESW_CURSOR` and
-`GLFW_NOT_ALLOWED_CURSOR` shapes will not be available and other shapes may use
-legacy images.
-
-
-## Wayland protocols and IPC standards {#compat_wayland}
-
-As GLFW uses libwayland directly, without any intervening toolkit library, it
-has sole responsibility for interacting well with every compositor in use on
-Unix-like systems.  Most of the features are provided by the core protocol,
-while cursor support is provided by the libwayland-cursor helper library, EGL
-integration by libwayland-egl, and keyboard handling by
-[libxkbcommon](https://xkbcommon.org/).  In addition, GLFW uses some additional
-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
-protocol is mandatory for GLFW to display a window.
-
-[xdg-shell]: https://wayland.app/protocols/xdg-shell
-
-GLFW uses the [relative-pointer-unstable-v1][] protocol alongside the
-[pointer-constraints-unstable-v1][] protocol to implement disabled cursor.  If
-the running compositor does not support both of these protocols, disabling the
-cursor will have no effect.
-
-[relative-pointer-unstable-v1]: https://wayland.app/protocols/relative-pointer-unstable-v1
-[pointer-constraints-unstable-v1]: https://wayland.app/protocols/pointer-constraints-unstable-v1
-
-GLFW uses the [idle-inhibit-unstable-v1][] protocol to prohibit the screensaver
-from starting.  If the running compositor does not support this protocol, the
-screensaver may start even for full screen windows.
-
-[idle-inhibit-unstable-v1]: https://wayland.app/protocols/idle-inhibit-unstable-v1
-
-GLFW uses the [libdecor][] library 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.
-
-[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}
-
-The GLX API is the default API used to create OpenGL contexts on Unix-like
-systems using the X Window System.
-
-GLFW uses the GLX 1.3 `GLXFBConfig` functions to enumerate and select framebuffer pixel
-formats.  If GLX 1.3 is not supported, @ref glfwInit will fail.
-
-GLFW uses the `GLX_MESA_swap_control,` `GLX_EXT_swap_control` and
-`GLX_SGI_swap_control` extensions to provide vertical retrace synchronization
-(or _vsync_), in that order of preference.  When none of these extensions are
-available, calling @ref glfwSwapInterval will have no effect.
-
-GLFW uses the `GLX_ARB_multisample` extension to create contexts with
-multisampling anti-aliasing.  Where this extension is unavailable, the
-`GLFW_SAMPLES` hint will have no effect.
-
-GLFW uses the `GLX_ARB_create_context` extension when available, even when
-creating OpenGL contexts of version 2.1 and below.  Where this extension is
-unavailable, the `GLFW_CONTEXT_VERSION_MAJOR` and `GLFW_CONTEXT_VERSION_MINOR`
-hints will only be partially supported, the `GLFW_CONTEXT_DEBUG` hint will have
-no effect, and setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT`
-hints to `GLFW_TRUE` will cause @ref glfwCreateWindow to fail.
-
-GLFW uses the `GLX_ARB_create_context_profile` extension to provide support for
-context profiles.  Where this extension is unavailable, setting the
-`GLFW_OPENGL_PROFILE` hint to anything but `GLFW_OPENGL_ANY_PROFILE`, or setting
-`GLFW_CLIENT_API` to anything but `GLFW_OPENGL_API` or `GLFW_NO_API` will cause
-@ref glfwCreateWindow to fail.
-
-GLFW uses the `GLX_ARB_context_flush_control` extension to provide control over
-whether a context is flushed when it is released (made non-current).  Where this
-extension is unavailable, the `GLFW_CONTEXT_RELEASE_BEHAVIOR` hint will have no
-effect and the context will always be flushed when released.
-
-GLFW uses the `GLX_ARB_framebuffer_sRGB` and `GLX_EXT_framebuffer_sRGB`
-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}
-
-The WGL API is used to create OpenGL contexts on Microsoft Windows and other
-implementations of the Win32 API, such as Wine.
-
-GLFW uses either the `WGL_EXT_extension_string` or the
-`WGL_ARB_extension_string` extension to check for the presence of all other WGL
-extensions listed below.  If both are available, the EXT one is preferred.  If
-neither is available, no other extensions are used and many GLFW features
-related to context creation will have no effect or cause errors when used.
-
-GLFW uses the `WGL_EXT_swap_control` extension to provide vertical retrace
-synchronization (or _vsync_).  Where this extension is unavailable, calling @ref
-glfwSwapInterval will have no effect.
-
-GLFW uses the `WGL_ARB_pixel_format` and `WGL_ARB_multisample` extensions to
-create contexts with multisampling anti-aliasing.  Where these extensions are
-unavailable, the `GLFW_SAMPLES` hint will have no effect.
-
-GLFW uses the `WGL_ARB_create_context` extension when available, even when
-creating OpenGL contexts of version 2.1 and below.  Where this extension is
-unavailable, the `GLFW_CONTEXT_VERSION_MAJOR` and `GLFW_CONTEXT_VERSION_MINOR`
-hints will only be partially supported, the `GLFW_CONTEXT_DEBUG` hint will have
-no effect, and setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT`
-hints to `GLFW_TRUE` will cause @ref glfwCreateWindow to fail.
-
-GLFW uses the `WGL_ARB_create_context_profile` extension to provide support for
-context profiles.  Where this extension is unavailable, setting the
-`GLFW_OPENGL_PROFILE` hint to anything but `GLFW_OPENGL_ANY_PROFILE` will cause
-@ref glfwCreateWindow to fail.
-
-GLFW uses the `WGL_ARB_context_flush_control` extension to provide control over
-whether a context is flushed when it is released (made non-current).  Where this
-extension is unavailable, the `GLFW_CONTEXT_RELEASE_BEHAVIOR` hint will have no
-effect and the context will always be flushed when released.
-
-GLFW uses the `WGL_ARB_framebuffer_sRGB` and `WGL_EXT_framebuffer_sRGB`
-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}
-
-macOS (as of version 14) still provides OpenGL but it has been deprecated by
-Apple.  While the API is still available, it is poorly maintained and frequently
-develops new issues.  On modern systems, OpenGL is implemented on top of Metal
-and is not fully thread-safe.
-
-macOS does not support OpenGL stereo rendering.  If the `GLFW_STEREO` hint is
-set to true, OpenGL context creation will always fail.
-
-macOS only supports OpenGL core profile contexts that are forward-compatible,
-but the `GLFW_OPENGL_FORWARD_COMPAT` hint is ignored since GLFW 3.4.  Even if
-this hint is set to false (the default), a forward-compatible context will be
-returned if available.
-
-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}
-
-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
-drivers and Vulkan SDKs.  If either the loader or at least one minimally
-functional ICD is missing, @ref glfwVulkanSupported will return `GLFW_FALSE` and
-all other Vulkan-related functions will fail with an @ref GLFW_API_UNAVAILABLE
-error.
-
-
-## Vulkan WSI extensions {#compat_wsi}
-
-The Vulkan WSI extensions are used to create Vulkan surfaces for GLFW windows on
-all supported platforms.
-
-GLFW uses the `VK_KHR_surface` and `VK_KHR_win32_surface` extensions to create
-surfaces on Microsoft Windows.  If any of these extensions are not available,
-@ref glfwGetRequiredInstanceExtensions will return an empty list and window
-surface creation will fail.
-
-GLFW uses the `VK_KHR_surface` and either the `VK_MVK_macos_surface` or
-`VK_EXT_metal_surface` extensions to create surfaces on macOS.  If any of these
-extensions are not available, @ref glfwGetRequiredInstanceExtensions will
-return an empty list and window surface creation will fail.
-
-GLFW uses the `VK_KHR_surface` and either the `VK_KHR_xlib_surface` or
-`VK_KHR_xcb_surface` extensions to create surfaces on X11.  If `VK_KHR_surface`
-or both `VK_KHR_xlib_surface` and `VK_KHR_xcb_surface` are not available, @ref
-glfwGetRequiredInstanceExtensions will return an empty list and window surface
-creation will fail.
-
-GLFW uses the `VK_KHR_surface` and `VK_KHR_wayland_surface` extensions to create
-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
@ -0,0 +1,279 @@
+/*!
+
+@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.
+
+
+@section compile_cmake Using CMake
+
+GLFW uses [CMake](http://www.cmake.org/) to generate project files or makefiles
+for a particular development environment.  If you are on a Unix-like system such
+as Linux or FreeBSD or have a package system like Fink, MacPorts, Cygwin or
+Homebrew, you can simply install its CMake package.  If not, you can download
+installers for Windows and OS X from the [CMake website](http://www.cmake.org/).
+
+@note CMake only generates project files or makefiles.  It does not compile the
+actual GLFW library.  To compile GLFW, first generate these files for your
+chosen development environment and then use them to compile the actual GLFW
+library.
+
+
+@subsection compile_deps Dependencies
+
+Once you have installed CMake, make sure that all other dependencies are
+available.  On some platforms, GLFW needs a few additional packages to be
+installed.  See the section for your chosen platform and development environment
+below.
+
+
+@subsubsection compile_deps_msvc Dependencies for Visual C++ on Windows
+
+The Microsoft Platform SDK that is installed along with Visual C++ already
+contains all the necessary headers, link libraries and tools except for CMake.
+Move on to @ref compile_generate.
+
+
+@subsubsection compile_deps_mingw Dependencies for MinGW or MinGW-w64 on Windows
+
+Both the MinGW and the MinGW-w64 packages already contain all the necessary
+headers, link libraries and tools except for CMake.  Move on to @ref
+compile_generate.
+
+
+@subsubsection compile_deps_mingw_cross Dependencies for MinGW or MinGW-w64 cross-compilation
+
+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
+for 32- and 64-bit version of MinGW-w64, while Debian GNU/Linux and derivatives
+like Ubuntu have the `mingw-w64` package for both.
+
+GLFW has CMake toolchain files in the `CMake/` directory that allow for easy
+cross-compilation of Windows binaries.  To use these files you need to add a
+special parameter when generating the project files or makefiles:
+
+@code{.sh}
+cmake -DCMAKE_TOOLCHAIN_FILE=<toolchain-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
+directory.  For example, both the Debian/Ubuntu and Cygwin MinGW-w64 packages
+have `/usr/x86_64-w64-mingw32` for the 64-bit compilers, so the correct
+invocation would be:
+
+@code{.sh}
+cmake -DCMAKE_TOOLCHAIN_FILE=CMake/x86_64-w64-mingw32.cmake .
+@endcode
+
+For more details see the article
+[CMake Cross Compiling](http://www.paraview.org/Wiki/CMake_Cross_Compiling) on
+the CMake wiki.
+
+Once you have this set up, move on to @ref compile_generate.
+
+
+@subsubsection compile_deps_xcode Dependencies for Xcode on OS X
+
+Xcode comes with all necessary tools except for CMake.  The required headers
+and libraries are included in the core OS X frameworks.  Xcode can be downloaded
+from the Mac App Store or from the ADC Member Center.
+
+Once you have Xcode installed, move on to @ref compile_generate.
+
+
+@subsubsection compile_deps_x11 Dependencies for Linux and X11
+
+To compile GLFW for X11, you need to have the X11 packages installed, as well as
+the basic development tools like GCC and make.  For example, on Ubuntu and other
+distributions based on Debian GNU/Linux, you need to install the `xorg-dev`
+package, which pulls in all X.org header packages.
+
+Once you have installed the necessary packages, 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 to know two
+paths for this: the path to the _root_ directory of the GLFW source tree (i.e.
+_not_ the `src` subdirectory) and the target path for the generated files and
+compiled binaries.  If these are the same, it is called an in-tree build,
+otherwise it is called an out-of-tree build.
+
+One of several advantages of out-of-tree builds is that you can generate files
+and compile for different development environments using a single source tree.
+
+@note This section is about generating the project files or makefiles necessary
+to compile the GLFW library, not about compiling the actual library.
+
+
+@subsubsection compile_generate_cli Generating files with the CMake command-line tool
+
+To make an in-tree build, enter the _root_ directory of the GLFW source tree
+(i.e. _not_ the `src` subdirectory) and run CMake.  The current directory is
+used as target path, while the path provided as an argument is used to find the
+source tree.
+
+@code{.sh}
+cd <glfw-root-dir>
+cmake .
+@endcode
+
+To make an out-of-tree build, make a directory outside of the source tree, enter
+it and run CMake with the (relative or absolute) path to the root of the source
+tree as an argument.
+
+@code{.sh}
+mkdir glfw-build
+cd glfw-build
+cmake <glfw-root-dir>
+@endcode
+
+Once you have generated the project files or makefiles for your chosen
+development environment, move on to @ref compile_compile.
+
+
+@subsubsection compile_generate_gui Generating files with the CMake GUI
+
+If you are using the GUI version, choose the root of the GLFW source tree as
+source location and the same directory or another, empty directory as the
+destination for binaries.  Choose _Configure_, change any options you wish to,
+_Configure_ again to let the changes take effect and then _Generate_.
+
+Once you have generated the project files or makefiles for your chosen
+development environment, move on to @ref 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
+these files, as you would with any other project.
+
+Once the GLFW library is compiled, you are ready to build your applications,
+linking it to the GLFW library.  See @ref build_guide for more information.
+
+
+@subsection 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
+among projects using CMake and so have no `GLFW_` prefix.
+
+If you are using the GUI version of CMake, these are listed and can be changed
+from there.  If you are using the command-line version of CMake you can use the
+`ccmake` ncurses GUI to set options.  Some package systems like Ubuntu and other
+distributions based on Debian GNU/Linux have this tool in a separate
+`cmake-curses-gui` package.
+
+Finally, if you don't want to use any GUI, you can set options from the `cmake`
+command-line with the `-D` flag.
+
+@code{.sh}
+cmake -DBUILD_SHARED_LIBS=ON .
+@endcode
+
+
+@subsubsection compile_options_shared Shared CMake options
+
+`BUILD_SHARED_LIBS` determines whether GLFW is built as a static
+library or as a DLL / shared library / dynamic library.
+
+`LIB_SUFFIX` affects where the GLFW shared /dynamic library is installed.  If it
+is empty, it is installed to `${CMAKE_INSTALL_PREFIX}/lib`.  If it is set to
+`64`, it is installed to `${CMAKE_INSTALL_PREFIX}/lib64`.
+
+`GLFW_BUILD_EXAMPLES` determines whether the GLFW examples are built
+along with the library.
+
+`GLFW_BUILD_TESTS` determines whether the GLFW test programs are
+built along with the library.
+
+`GLFW_BUILD_DOCS` determines whether the GLFW documentation is built along with
+the library.
+
+
+@subsubsection compile_options_osx OS X specific CMake options
+
+`GLFW_USE_CHDIR` determines whether `glfwInit` changes the current
+directory of bundled applications to the `Contents/Resources` directory.
+
+`GLFW_USE_MENUBAR` determines whether the first call to
+`glfwCreateWindow` sets up a minimal menu bar.
+
+`GLFW_USE_RETINA` determines whether windows will use the full resolution of
+Retina displays.
+
+
+@subsubsection compile_options_win32 Windows specific CMake options
+
+`USE_MSVC_RUNTIME_LIBRARY_DLL` determines whether to use the DLL version or the
+static library version of the Visual C++ runtime library.  If set to `ON`, the
+DLL version of the Visual C++ library is used.  It is recommended to set this to
+`ON`, as this keeps the executable smaller and benefits from security and bug
+fix updates of the Visual C++ runtime.
+
+`GLFW_USE_HYBRID_HPG` determines whether to export the `NvOptimusEnablement` and
+`AmdPowerXpressRequestHighPerformance` symbols, which force the use of the
+high-performance GPU on Nvidia Optimus and AMD PowerXpress systems.  These symbols
+need to be exported by the EXE to be detected by the driver, so the override
+will not work if GLFW is built as a DLL.
+
+
+@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 of the platform detection yourself.  GLFW needs
+a configuration macro to be defined in order to know what window system it's
+being compiled for and also has optional, platform-specific ones for various
+features.
+
+When building with CMake, the `glfw_config.h` configuration header is generated
+based on the current platform and CMake options.  The GLFW CMake environment
+defines `_GLFW_USE_CONFIG_H`, which causes this header to be included by
+`internal.h`.  Without this macro, GLFW will expect the necessary configuration
+macros to be defined on the command-line.
+
+The window creation API is used to create windows, handle input, monitors, gamma
+ramps and clipboard.  The options are:
+
+ - `_GLFW_COCOA` to use the Cocoa frameworks
+ - `_GLFW_WIN32` to use the Win32 API
+ - `_GLFW_X11` to use the X Window System
+ - `_GLFW_WAYLAND` to use the Wayland API (experimental and incomplete)
+ - `_GLFW_MIR` to use the Mir API (experimental and incomplete)
+
+If you are building GLFW as a shared library / dynamic library / DLL then you
+must also define `_GLFW_BUILD_DLL`.  Otherwise, you must not define it.
+
+For the EGL context creation API, the following options are available:
+
+ - `_GLFW_USE_EGLPLATFORM_H` to use `EGL/eglplatform.h` for native handle
+   definitions (fallback)
+
+If you are using the X11 window creation API, support for the following X11
+extensions can be enabled:
+
+ - `_GLFW_HAS_XF86VM` to use Xxf86vm as a fallback when RandR gamma is broken
+ (recommended)
+
+If you are using the Cocoa window creation API, the following options are
+available:
+
+ - `_GLFW_USE_CHDIR` to `chdir` to the `Resources` subdirectory of the
+   application bundle during @ref glfwInit (recommended)
+ - `_GLFW_USE_MENUBAR` to create and populate the menu bar when the first window
+   is created (recommended)
+ - `_GLFW_USE_RETINA` to have windows use the full resolution of Retina displays
+   (recommended)
+
+@note None of the @ref build_macros may be defined during the compilation of
+GLFW.  If you define any of these in your build files, make sure they are not
+applied to the GLFW sources.
+
+*/
--- a/docs/compile.md
+++ b/docs/compile.md
@ -1,371 +0,0 @@
-# Compiling GLFW {#compile_guide}
-
-[TOC]
-
-This is about compiling the GLFW library itself.  For information on how to
-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}
-
-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
-familiar with this from other projects, you may want to focus on the @ref
-compile_deps and @ref compile_options sections for GLFW-specific information.
-
-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
-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
-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
-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}
-
-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}
-
-By default, both the Wayland and X11 backends are enabled on Linux and other Unix-like
-systems (except macOS).  To disable one or both of these, set the @ref GLFW_BUILD_WAYLAND
-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
-development packages installed.  On some systems a few other packages are also required.
-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`
-and `libxkbcommon-dev` packages to compile for Wayland and the `xorg-dev` meta-package to
-compile for X11.  These will pull in all other dependencies.
-
-```sh
-sudo apt install libwayland-dev libxkbcommon-dev xorg-dev
-```
-
-On Fedora and derivatives like Red Hat you will need the `wayland-devel` and
-`libxkbcommon-devel` packages to compile for Wayland and the `libXcursor-devel`,
-`libXi-devel`, `libXinerama-devel` and `libXrandr-devel` packages to compile for X11.
-These will pull in all other dependencies.
-
-```sh
-sudo dnf install wayland-devel libxkbcommon-devel libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel
-```
-
-On FreeBSD you will need the `wayland`, `libxkbcommon` and `evdev-proto` packages to
-compile for Wayland.  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 to compile for X11.
-
-```sh
-pkg install wayland libxkbcommon evdev-proto xorgproto
-```
-
-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}
-
-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
-this:
-
- - the path to the root directory of the GLFW source tree (not its `src`
-   subdirectory)
- - the path to the directory where the generated build files and compiled
-   binaries will be placed
-
-If these are the same, it is called an in-tree build, otherwise it is called an
-out-of-tree build.
-
-Out-of-tree builds are recommended as they avoid cluttering up the source tree.
-They also allow you to have several build directories for different
-configurations all using the same source tree.
-
-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}
-
-Start the CMake GUI and set the paths to the source and build directories
-described above.  Then press _Configure_ and _Generate_.
-
-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
-macOS.  To disable support for one or both of these, set the @ref GLFW_BUILD_WAYLAND
-and/or @ref GLFW_BUILD_X11 option in the GLFW section of the variable list, then apply the
-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}
-
-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
-cmake -S path/to/glfw -B path/to/build
-```
-
-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
-cd path/to/glfw
-cmake -S . -B build
-```
-
-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
-cmake -S path/to/glfw -B path/to/build -G Xcode
-```
-
-By default, GLFW will use Wayland and X11 on Linux and other Unix-like systems other than
-macOS.  To disable support for one or both of these, set the @ref GLFW_BUILD_WAYLAND
-and/or @ref GLFW_BUILD_X11 CMake option.
-
-```sh
-cmake -S path/to/glfw -B path/to/build -D GLFW_BUILD_X11=0
-```
-
-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}
-
-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
-these files as you would with any other project.
-
-With Visual Studio open `GLFW.sln` and use the Build menu.  With Xcode open
-`GLFW.xcodeproj` and use the Project menu.
-
-With Linux, macOS and other forms of Unix, run `make`.
-
-```sh
-cd path/to/build
-make
-```
-
-With MinGW, it is `mingw32-make`.
-
-```sh
-cd path/to/build
-mingw32-make
-```
-
-Any CMake build directory can also be built with the `cmake` command and the
-`--build` flag.
-
-```sh
-cmake --build path/to/build
-```
-
-This will run the platform specific build tool the directory was generated for.
-
-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}
-
-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
-among projects using CMake and so have no `GLFW_` prefix.
-
-If you are using the GUI version of CMake, these are listed and can be changed
-from there.  If you are using the command-line version of CMake you can use the
-`ccmake` ncurses GUI to set options.  Some package systems like Ubuntu and other
-distributions based on Debian GNU/Linux have this tool in a separate
-`cmake-curses-gui` package.
-
-Finally, if you don't want to use any GUI, you can set options from the `cmake`
-command-line with the `-D` flag.
-
-```sh
-cmake -S path/to/glfw -B path/to/build -D BUILD_SHARED_LIBS=ON
-```
-
-
-### Shared CMake options {#compile_options_shared}
-
-@anchor BUILD_SHARED_LIBS
-__BUILD_SHARED_LIBS__ determines whether GLFW is built as a static library or as
-a DLL / shared library / dynamic library.  This is disabled by default,
-producing a static GLFW library.  This variable has no `GLFW_` prefix because it
-is defined by CMake.  If you want to change the library only for GLFW when it is
-part of a larger project, see @ref GLFW_LIBRARY_TYPE.
-
-@anchor GLFW_LIBRARY_TYPE
-__GLFW_LIBRARY_TYPE__ allows you to override @ref BUILD_SHARED_LIBS only for
-GLFW, without affecting other libraries in a larger project.  When set, the
-value of this option must be a valid CMake library type.  Set it to `STATIC` to
-build GLFW as a static library, `SHARED` to build it as a shared library
-/ dynamic library / DLL, or `OBJECT` to make GLFW a CMake object library.
-
-@anchor GLFW_BUILD_EXAMPLES
-__GLFW_BUILD_EXAMPLES__ determines whether the GLFW examples are built
-along with the library.  This is enabled by default unless GLFW is being built
-as a subproject of a larger CMake project.
-
-@anchor GLFW_BUILD_TESTS
-__GLFW_BUILD_TESTS__ determines whether the GLFW test programs are
-built along with the library.  This is enabled by default unless GLFW is being
-built as a subproject of a larger CMake project.
-
-@anchor GLFW_BUILD_DOCS
-__GLFW_BUILD_DOCS__ determines whether the GLFW documentation is built along
-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}
-
-@anchor GLFW_BUILD_WIN32
-__GLFW_BUILD_WIN32__ determines whether to include support for Win32 when compiling the
-library.  This option is only available when compiling for Windows.  This is enabled by
-default.
-
-@anchor USE_MSVC_RUNTIME_LIBRARY_DLL
-__USE_MSVC_RUNTIME_LIBRARY_DLL__ determines whether to use the DLL version or the
-static library version of the Visual C++ runtime library.  When enabled, the
-DLL version of the Visual C++ library is used.  This is enabled by default.
-
-It is recommended to set the standard CMake variable [CMAKE_MSVC_RUNTIME_LIBRARY][]
-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
-high-performance GPU on Nvidia Optimus and AMD PowerXpress systems.  These symbols
-need to be exported by the EXE to be detected by the driver, so the override
-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}
-
-@anchor GLFW_BUILD_COCOA
-__GLFW_BUILD_COCOA__ determines whether to include support for Cocoa when compiling the
-library.  This option is only available when compiling for macOS.  This is enabled by
-default.
-
-
-### Unix-like system specific CMake options {#compile_options_unix}
-
-@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.
-
-@anchor GLFW_BUILD_X11
-__GLFW_BUILD_X11__ determines whether to include support for X11 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.
-
-
-## Cross-compilation with CMake and MinGW {#compile_mingw_cross}
-
-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
-for 32- and 64-bit version of MinGW-w64, while Debian GNU/Linux and derivatives
-like Ubuntu have the `mingw-w64` package for both.
-
-GLFW has CMake toolchain files in the `CMake` subdirectory that set up
-cross-compilation of Windows binaries.  To use these files you set the
-`CMAKE_TOOLCHAIN_FILE` CMake variable with the `-D` flag add an option when
-configuring and generating the build files.
-
-```sh
-cmake -S path/to/glfw -B path/to/build -D CMAKE_TOOLCHAIN_FILE=path/to/file
-```
-
-The exact toolchain file to use depends on the prefix used by the MinGW or
-MinGW-w64 binaries on your system.  You can usually see this in the /usr
-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
-cmake -S path/to/glfw -B path/to/build -D CMAKE_TOOLCHAIN_FILE=CMake/x86_64-w64-mingw32.cmake
-```
-
-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].
-
-[cmake-toolchains]: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html
-
-
-## Compiling GLFW manually {#compile_manual}
-
-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
-enabling support for the platforms (window systems) available.  There are also optional,
-platform-specific macros for various features.
-
-When building, GLFW will expect the necessary configuration macros to be defined
-on the command-line.  The GLFW CMake files set these as private compile
-definitions on the GLFW target but if you compile the GLFW sources manually you
-will need to define them yourself.
-
-The window system is used to create windows, handle input, monitors, gamma ramps and
-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
-
-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.
-
-If you are building GLFW as a shared library / dynamic library / DLL then you
-must also define @b _GLFW_BUILD_DLL.  Otherwise, you must not define it.
-
-If you are using a custom name for the Vulkan, EGL, GLX, OSMesa, OpenGL, GLESv1
-or GLESv2 library, you can override the default names by defining those you need
-of @b _GLFW_VULKAN_LIBRARY, @b _GLFW_EGL_LIBRARY, @b _GLFW_GLX_LIBRARY, @b
-_GLFW_OSMESA_LIBRARY, @b _GLFW_OPENGL_LIBRARY, @b _GLFW_GLESV1_LIBRARY and @b
-_GLFW_GLESV2_LIBRARY.  Otherwise, GLFW will use the built-in default names.
-
-@note None of the @ref build_macros may be defined during the compilation of
-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,10 +1,13 @@
-# 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
-context.  There are also guides for the other areas of the GLFW API.
+GLFW.  For details on a specific function, see the
+[reference documentation](@ref context).  There are also guides for the other
+areas of the GLFW API.

 - @ref intro_guide
 - @ref window_guide
@ -13,7 +16,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
@ -28,51 +31,51 @@ the `glfwinfo` test program.

@note Vulkan does not have a context and the Vulkan instance is created via the
 Vulkan API itself.  If you will be using Vulkan to render to a window, disable
-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 by setting the [GLFW_CLIENT_API](@ref window_hints_ctx) 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
 requests that all types are shared.

 See the relevant chapter of the [OpenGL](https://www.opengl.org/registry/) or
-[OpenGL ES](https://www.khronos.org/opengles/) reference documents for more
+[OpenGL ES](http://www.khronos.org/opengles/) reference documents for more
 information.  The name and number of this chapter unfortunately varies between
 versions and APIs, but has at times been named _Shared Objects and Multiple
 Contexts_.

-GLFW comes with a bare-bones object sharing example program called `sharing`.
+GLFW comes with a simple object sharing test 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.
+[GLFW_VISIBLE](@ref window_hints_wnd) 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
@ -82,36 +85,37 @@ objects are recommended for rendering with such contexts.
 You should still [process events](@ref events) as long as you have at least one
 window, even if none of them are visible.

+__OS X:__ The first time a window is created the menu bar is populated with
+common commands like Hide, Quit and About.  This is not desirable for example
+when writing a command-line only application.  The menu bar setup can be
+disabled with a [compile-time option](@ref compile_options_osx).

-### 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`.
-
-Windows without contexts should not be passed to @ref glfwMakeContextCurrent or
-@ref glfwSwapBuffers.  Doing this generates a @ref GLFW_NO_WINDOW_CONTEXT error.
+[GLFW_CLIENT_API](@ref window_hints_ctx) hint to `GLFW_NO_API`.  Windows without
+contexts must not be passed to @ref glfwMakeContextCurrent or @ref
+glfwSwapBuffers.


-## 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
 at a time, and a thread can only have a single context current at a time.

-When moving a context between threads, you must make it non-current on the old
-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 +126,13 @@ error.
 - @ref glfwGetProcAddress


-## Buffer swapping {#context_swap}
+@section context_swap Buffer swapping

-See @ref buffer_swap in the window guide.
+Buffer swapping is part of the window and framebuffer, not the context.  See
+@ref buffer_swap.


-## 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
@ -137,26 +142,26 @@ as extensions until they become obsolete.

 An extension is defined by:

- An extension name (e.g. `GL_ARB_gl_spirv`)
- New OpenGL tokens (e.g. `GL_SPIR_V_BINARY_ARB`)
- New OpenGL functions (e.g. `glSpecializeShaderARB`)
+- An extension name (e.g. `GL_ARB_debug_output`)
+- New OpenGL tokens (e.g. `GL_DEBUG_SEVERITY_HIGH_ARB`)
+- New OpenGL functions (e.g. `glGetDebugMessageLogARB`)

 Note the `ARB` affix, which stands for Architecture Review Board and is used
 for official extensions.  The extension above was created by the ARB, but there
 are many different affixes, like `NV` for Nvidia and `AMD` for, well, AMD.  Any
 group may also use the generic `EXT` affix.  Lists of extensions, together with
 their specifications, can be found at the
-[OpenGL Registry](https://www.opengl.org/registry/) and
+[OpenGL Registry](http://www.opengl.org/registry/) and
 [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.
 They will take care of all the details of declaring and loading everything you
 need.  One such library is [glad](https://github.com/Dav1dde/glad) and there are
-several others.
+several others.  

 The following example will use glad but all extension loader libraries work
 similarly.
@ -167,9 +172,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 +188,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.
+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,11 +205,11 @@ 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
-generated. After that, you are ready to start rendering.
+generated and you are ready to start rendering.

 You can specify a minimum required OpenGL or OpenGL ES version with
 [context hints](@ref window_hints_ctx).  If your needs are more complex, you can
@ -213,25 +218,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
-if (GLAD_GL_ARB_gl_spirv)
+@code
+if (GLAD_GL_ARB_debug_output)
 {
-    // Use GL_ARB_gl_spirv
+    // Use GL_ARB_debug_output
 }
-```
+@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,11 +251,11 @@ 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
-found at the [OpenGL Registry](https://www.opengl.org/registry/).  There are also
+found at the [OpenGL Registry](http://www.opengl.org/registry/).  There are also
 extension headers for the various versions of OpenGL ES at the
 [OpenGL ES Registry](https://www.khronos.org/registry/gles/).  It it strongly
 recommended that you use your own copy of the extension header, as the one
@ -258,48 +263,48 @@ included in your development environment may be several years out of date and
 may not include the extensions you wish to use.

 The header defines function pointer types for all functions of all extensions it
-supports.  These have names like `PFNGLSPECIALIZESHADERARBPROC` (for
-`glSpecializeShaderARB`), i.e. the name is made uppercase and `PFN` (pointer
+supports.  These have names like `PFNGLGETDEBUGMESSAGELOGARBPROC` (for
+`glGetDebugMessageLogARB`), i.e. the name is made uppercase and `PFN` (pointer
 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.
+To include the extension header, define [GLFW_INCLUDE_GLEXT](@ref build_macros)
+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
-if (glfwExtensionSupported("GL_ARB_gl_spirv"))
+@code
+if (glfwExtensionSupported("GL_ARB_debug_output"))
 {
    // 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
-PFNGLSPECIALIZESHADERARBPROC pfnSpecializeShaderARB = glfwGetProcAddress("glSpecializeShaderARB");
-```
+@code
+PFNGLGETDEBUGMESSAGELOGARBPROC pfnGetDebugMessageLog = glfwGetProcAddress("glGetDebugMessageLogARB");
+@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,33 +313,34 @@ 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>

-#define glSpecializeShaderARB pfnSpecializeShaderARB
-PFNGLSPECIALIZESHADERARBPROC pfnSpecializeShaderARB;
+#define glGetDebugMessageLogARB pfnGetDebugMessageLog
+PFNGLGETDEBUGMESSAGELOGARBPROC pfnGetDebugMessageLog;

 // Flag indicating whether the extension is supported
-int has_ARB_gl_spirv = 0;
+int has_ARB_debug_output = 0;

 void load_extensions(void)
 {
-    if (glfwExtensionSupported("GL_ARB_gl_spirv"))
+    if (glfwExtensionSupported("GL_ARB_debug_output"))
    {
-        pfnSpecializeShaderARB = (PFNGLSPECIALIZESHADERARBPROC)
-            glfwGetProcAddress("glSpecializeShaderARB");
-        has_ARB_gl_spirv = 1;
+        pfnGetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGARBPROC)
+            glfwGetProcAddress("glGetDebugMessageLogARB");
+        has_ARB_debug_output = 1;
    }
 }

 void some_function(void)
 {
-    if (has_ARB_gl_spirv)
+    if (has_ARB_debug_output)
    {
        // Now the extension function can be called as usual
-        glSpecializeShaderARB(...);
+        glGetDebugMessageLogARB(...);
    }
 }
-```
+@endcode

+*/
--- a/docs/extra.css
+++ b/docs/extra.css
--- a/docs/extra.css.map
+++ b/docs/extra.css.map
@ -1,7 +0,0 @@
-{
-"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",
-"sources": ["extra.scss"],
-"names": [],
-"file": "extra.css"
-}
--- a/docs/extra.less
+++ b/docs/extra.less
@ -0,0 +1,370 @@
+// NOTE: Please use this file to perform modifications on default style sheets.
+//
+// You need to install a few Ruby gems to generate extra.css from this file:
+// gem install less therubyracer
+//
+// Run this command to regenerate extra.css after you're finished with changes:
+// lessc --compress extra.less > extra.css
+//
+// Alternatively you can use online services to regenerate extra.css.
+
+
+// Default text color for page contents
+@default-text-color: hsl(0,0%,30%);
+
+// Page header, footer, table rows, inline codes and definition lists
+@header-footer-background-color: hsl(0,0%,95%);
+
+// Page header, footer links and navigation bar background
+@header-footer-link-color: hsl(0,0%,40%);
+
+// Doxygen navigation bar links
+@navbar-link-color: @header-footer-background-color;
+
+// Page content background color
+@content-background-color: hsl(0,0%,100%);
+
+// Bold, italic, h1, h2, ... and table of contents
+@heading-color: hsl(0,0%,10%);
+
+// Function, enum and macro definition separator
+@def-separator-color: @header-footer-background-color;
+
+// Base color hue
+@base-hue: 24;
+
+// Default color used for links
+@default-link-color: hsl(@base-hue,100%,50%);
+
+// Doxygen navigation bar active tab
+@tab-text-color: hsl(0,0%,100%);
+@tab-background-color1: @default-link-color;
+@tab-background-color2: lighten(spin(@tab-background-color1, 10), 10%);
+
+// Table borders
+@default-border-color: @default-link-color;
+
+// Table header
+@table-text-color: @tab-text-color;
+@table-background-color1: @tab-background-color1;
+@table-background-color2: @tab-background-color2;
+
+// Table of contents, data structure index and prototypes
+@toc-background-color1: hsl(0,0%,90%);
+@toc-background-color2: lighten(@toc-background-color1, 5%);
+
+// Function prototype parameters color
+@prototype-param-color: darken(@default-link-color, 25%);
+
+// Message box color: note, pre, post and invariant
+@box-note-color: hsl(103,80%,85%);
+
+// Message box color: warning and attention
+@box-warning-color: hsl(34,80%,85%);
+
+// Message box color: deprecated and bug
+@box-bug-color: hsl(333,80%,85%);
+
+// Message box color: todo and test
+@box-todo-color: hsl(200,80%,85%);
+
+// Message box helper function
+.message-box(@base-color) {
+	background:linear-gradient(to bottom,lighten(@base-color, 5%) 0%,@base-color 100%);
+	box-shadow:inset 0 0 32px darken(@base-color, 5%);
+	color:darken(@base-color, 67%);
+	border:2px solid desaturate(darken(@base-color, 10%), 20%);
+}
+
+
+#navrow1,#navrow2,#navrow3,#navrow4,.tablist a,.tablist a:visited,.tablist a:hover,.tablist li,.tablist li.current a,.memdoc,dl.reflist dd,div.toc li,.ah,span.lineno,span.lineno a,span.lineno a:hover,.note code,.pre code,.post code,.invariant code,.warning code,.attention code,.deprecated code,.bug code,.todo code,.test code,.doxtable code {
+	background:none;
+}
+
+#titlearea,.footer,.contents,div.header,.memdoc,table.doxtable td,table.doxtable th,hr,.memSeparator {
+	border:none;
+}
+
+.tablist a,.tablist a:visited,.tablist a:hover,.tablist li,.tablist li.current a,.reflist dt a.el,.levels span,.directory .levels span {
+	text-shadow:none;
+}
+
+.memdoc,dl.reflist dd {
+	box-shadow:none;
+}
+
+div.headertitle,.note code,.pre code,.post code,.invariant code,.warning code,.attention code,.deprecated code,.bug code,.todo code,.test code,table.doxtable code {
+	padding:0;
+}
+
+#nav-path,.directory .levels,span.lineno {
+	display:none;
+}
+
+html,#titlearea,.footer,tr.even,.directory tr.even,.doxtable tr:nth-child(even),.mdescLeft,.mdescRight,.memItemLeft,.memItemRight,code {
+	background:@header-footer-background-color;
+}
+
+body {
+	color:@default-text-color;
+}
+
+h1,h2,h2.groupheader,h3,div.toc h3,h4,h5,h6,strong,em {
+	color:@heading-color;
+	border-bottom:none;
+}
+
+h1 {
+  padding-top:0.5em;
+  font-size:180%;
+}
+
+h2 {
+  padding-top:0.5em;
+  margin-bottom:0;
+  font-size:140%;
+}
+
+h3 {
+  padding-top:0.5em;
+  margin-bottom:0;
+  font-size:110%;
+}
+
+.glfwheader {
+	font-size:16px;
+	height:64px;
+	max-width:920px;
+	min-width:800px;
+	padding:0 32px;
+	margin:0 auto;
+}
+
+#glfwhome {
+	line-height:64px;
+	padding-right:48px;
+	color:@header-footer-link-color;
+	font-size:2.5em;
+	background:url("http://www.glfw.org/css/arrow.png") no-repeat right;
+}
+
+.glfwnavbar {
+	list-style-type:none;
+	margin:0 auto;
+	float:right;
+}
+
+#glfwhome,.glfwnavbar li {
+	float:left;
+}
+
+.glfwnavbar a,.glfwnavbar a:visited {
+	line-height:64px;
+	margin-left:2em;
+	display:block;
+	color:@header-footer-link-color;
+}
+
+#glfwhome,.glfwnavbar a,.glfwnavbar a:visited {
+	transition:.35s ease;
+}
+
+#titlearea,.footer {
+	color:@header-footer-link-color;
+}
+
+address.footer {
+	text-align:center;
+	padding:2em;
+	margin-top:3em;
+}
+
+#top {
+	background:@header-footer-link-color;
+}
+
+#navrow1,#navrow2,#navrow3,#navrow4 {
+	max-width:920px;
+	min-width:800px;
+	margin:0 auto;
+	font-size:13px;
+}
+
+.tablist {
+	height:36px;
+	display:block;
+	position:relative;
+}
+
+.tablist a,.tablist a:visited,.tablist a:hover,.tablist li,.tablist li.current a {
+	color:@navbar-link-color;
+}
+
+.tablist li.current a {
+	background:linear-gradient(to bottom,@tab-background-color2 0%,@tab-background-color1 100%);
+	box-shadow:inset 0 0 32px @tab-background-color1;
+	text-shadow:0 -1px 1px darken(@tab-background-color1, 15%);
+	color:@tab-text-color;
+}
+
+.contents {
+	min-height:590px;
+}
+
+div.contents,div.header {
+	max-width:920px;
+	margin:0 auto;
+	padding:0 32px;
+	background:@content-background-color none;
+}
+
+table.doxtable th,dl.reflist dt {
+	background:linear-gradient(to bottom,@table-background-color2 0%,@table-background-color1 100%);
+	box-shadow:inset 0 0 32px @table-background-color1;
+	text-shadow:0 -1px 1px darken(@table-background-color1, 15%);
+	color:@table-text-color;
+}
+
+dl.reflist dt a.el {
+	color:@default-link-color;
+	padding:.2em;
+	border-radius:4px;
+	background-color:lighten(@default-link-color, 40%);
+}
+
+div.toc {
+	float:none;
+	width:auto;
+}
+
+div.toc h3 {
+	font-size:1.17em;
+}
+
+div.toc ul {
+	padding-left:1.5em;
+}
+
+div.toc li {
+	font-size:1em;
+	padding-left:0;
+	list-style-type:disc;
+}
+
+div.toc,.memproto,div.qindex,div.ah {
+	background:linear-gradient(to bottom,@toc-background-color2 0%,@toc-background-color1 100%);
+	box-shadow:inset 0 0 32px @toc-background-color1;
+	text-shadow:0 1px 1px lighten(@toc-background-color2, 10%);
+	color:@heading-color;
+	border:2px solid @toc-background-color1;
+	border-radius:4px;
+}
+
+.paramname {
+	color:@prototype-param-color;
+}
+
+dl.reflist dt {
+	border:2px solid @default-border-color;
+	border-top-left-radius:4px;
+	border-top-right-radius:4px;
+	border-bottom:none;
+}
+
+dl.reflist dd {
+	border:2px solid @default-border-color;
+	border-bottom-right-radius:4px;
+	border-bottom-left-radius:4px;
+	border-top:none;
+}
+
+table.doxtable {
+	border-collapse:inherit;
+	border-spacing:0;
+	border:2px solid @default-border-color;
+	border-radius:4px;
+}
+
+a,a:hover,a:visited,a:visited:hover,.contents a:visited,.el,a.el:visited,#glfwhome:hover,.tablist a:hover,span.lineno a:hover {
+	color:@default-link-color;
+	text-decoration:none;
+}
+
+div.directory {
+	border-collapse:inherit;
+	border-spacing:0;
+	border:2px solid @default-border-color;
+	border-radius:4px;
+}
+
+hr,.memSeparator {
+	height:2px;
+	background:linear-gradient(to right,@def-separator-color 0%,darken(@def-separator-color, 10%) 50%,@def-separator-color 100%);
+}
+
+dl.note,dl.pre,dl.post,dl.invariant {
+	.message-box(@box-note-color);
+}
+
+dl.warning,dl.attention {
+	.message-box(@box-warning-color);
+}
+
+dl.deprecated,dl.bug {
+	.message-box(@box-bug-color);
+}
+
+dl.todo,dl.test {
+	.message-box(@box-todo-color);
+}
+
+dl.note,dl.pre,dl.post,dl.invariant,dl.warning,dl.attention,dl.deprecated,dl.bug,dl.todo,dl.test {
+	border-radius:4px;
+	padding:1em;
+	text-shadow:0 1px 1px hsl(0,0%,100%);
+	margin:1em 0;
+}
+
+.note a,.pre a,.post a,.invariant a,.warning a,.attention a,.deprecated a,.bug a,.todo a,.test a,.note a:visited,.pre a:visited,.post a:visited,.invariant a:visited,.warning a:visited,.attention a:visited,.deprecated a:visited,.bug a:visited,.todo a:visited,.test a:visited {
+	color:inherit;
+}
+
+div.line {
+	line-height:inherit;
+}
+
+div.fragment,pre.fragment {
+	background:hsl(0,0%,95%);
+	border-radius:4px;
+	border:none;
+	padding:1em;
+	overflow:auto;
+	border-left:4px solid hsl(0,0%,80%);
+	margin:1em 0;
+}
+
+.lineno a,.lineno a:visited,.line,pre.fragment {
+	color:@default-text-color;
+}
+
+span.preprocessor,span.comment {
+	color:hsl(193,100%,30%);
+}
+
+a.code,a.code:visited {
+	color:hsl(18,100%,45%);
+}
+
+span.keyword,span.keywordtype,span.keywordflow {
+	color:darken(@default-text-color, 5%);
+	font-weight:bold;
+}
+
+span.stringliteral {
+	color:hsl(261,100%,30%);
+}
+
+code {
+	padding:.1em;
+	border-radius:4px;
+}
--- a/docs/extra.scss
+++ b/docs/extra.scss
@ -1,453 +0,0 @@
-// NOTE: Please use this file to perform modifications on default style sheets.
-//
-// You need to install the official Sass CLI tool:
-// npm install -g sass
-//
-// Run this command to regenerate extra.css after you're finished with changes:
-// sass --style=compressed extra.scss extra.css
-//
-// Alternatively you can use online services to regenerate extra.css.
-
-
-// Default text color for page contents
-$default-text-color: hsl(0,0%,30%);
-
-// Page header, footer, table rows, inline codes and definition lists
-$header-footer-background-color: hsl(0,0%,95%);
-
-// Page header, footer links and navigation bar background
-$header-footer-link-color: hsl(0,0%,40%);
-
-// Doxygen navigation bar links
-$navbar-link-color: $header-footer-background-color;
-
-// Page content background color
-$content-background-color: hsl(0,0%,100%);
-
-// Bold, italic, h1, h2, ... and table of contents
-$heading-color: hsl(0,0%,10%);
-
-// Function, enum and macro definition separator
-$def-separator-color: $header-footer-background-color;
-
-// Base color hue
-$base-hue: 24;
-
-// Default color used for links
-$default-link-color: hsl($base-hue,100%,50%);
-
-// Doxygen navigation bar active tab
-$tab-text-color: hsl(0,0%,100%);
-$tab-background-color1: $default-link-color;
-$tab-background-color2: lighten(adjust-hue($tab-background-color1, 10), 10%);
-
-// Table borders
-$default-border-color: $default-link-color;
-
-// Table header
-$table-text-color: $tab-text-color;
-$table-background-color1: $tab-background-color1;
-$table-background-color2: $tab-background-color2;
-
-// Table of contents, data structure index and prototypes
-$toc-background-color1: hsl(0,0%,90%);
-$toc-background-color2: lighten($toc-background-color1, 5%);
-
-// Function prototype parameters color
-$prototype-param-color: darken($default-link-color, 25%);
-
-// Message box color: note, pre, post and invariant
-$box-note-color: hsl(103,80%,85%);
-
-// Message box color: warning and attention
-$box-warning-color: hsl(34,80%,85%);
-
-// Message box color: deprecated and bug
-$box-bug-color: hsl(333,80%,85%);
-
-// Message box color: todo and test
-$box-todo-color: hsl(200,80%,85%);
-
-// Message box helper function
-@mixin message-box($base-color){
-	background:linear-gradient(to bottom,lighten($base-color, 5%) 0%,$base-color 100%);
-	box-shadow:inset 0 0 32px darken($base-color, 5%);
-	color:darken($base-color, 67%);
-	border:2px solid desaturate(darken($base-color, 10%), 20%);
-}
-
-.sm-dox,.sm-dox a,.sm-dox a:focus,.sm-dox a:active,.sm-dox a:hover,.sm-dox a.highlighted,.sm-dox ul a:hover {
-	background:none;
-	text-shadow:none;
-}
-
-.sm-dox a span.sub-arrow {
-	border-color:$navbar-link-color transparent transparent transparent;
-}
-
-.sm-dox a span.sub-arrow:active,.sm-dox a span.sub-arrow:focus,.sm-dox a span.sub-arrow:hover,.sm-dox a:hover span.sub-arrow {
-	border-color:$default-link-color transparent transparent transparent;
-}
-
-.sm-dox ul a span.sub-arrow:active,.sm-dox ul a span.sub-arrow:focus,.sm-dox ul a span.sub-arrow:hover,.sm-dox ul a:hover span.sub-arrow {
-	border-color:transparent transparent transparent $default-link-color;
-}
-
-.sm-dox ul a:hover {
-	background:$header-footer-link-color;
-	text-shadow:none;
-}
-
-.sm-dox ul.sm-nowrap a {
-	color:$default-text-color;
-	text-shadow:none;
-}
-
-#main-nav,#main-menu,#main-menu a,#main-menu a:visited,#main-menu a:hover,#main-menu li,.memdoc,dl.reflist dd,div.toc li,.ah,span.lineno,span.lineno a,span.lineno a:hover,.note code,.pre code,.post code,.invariant code,.warning code,.attention code,.deprecated code,.bug code,.todo code,.test code,.doxtable code,.markdownTable code {
-	background:none;
-}
-
-#titlearea,.footer,.contents,div.header,.memdoc,table.doxtable td,table.doxtable th,table.markdownTable td,table.markdownTable th,hr,.memSeparator {
-	border:none;
-}
-
-#main-menu a,#main-menu a:visited,#main-menu a:hover,#main-menu li,.reflist dt a.el,.levels span,.directory .levels span {
-	text-shadow:none;
-}
-
-.memdoc,dl.reflist dd {
-	box-shadow:none;
-}
-
-div.headertitle,.note code,.pre code,.post code,.invariant code,.warning code,.attention code,.deprecated code,.bug code,.todo code,.test code,table.doxtable code,table.markdownTable code {
-	padding:0;
-}
-
-#nav-path,.directory .levels,span.lineno {
-	display:none;
-}
-
-html,#titlearea,.footer,tr.even,.directory tr.even,.doxtable tr:nth-child(even),tr.markdownTableBody:nth-child(even),.mdescLeft,.mdescRight,.memItemLeft,.memItemRight,code,.markdownTableRowEven {
-	background:$header-footer-background-color;
-}
-
-body {
-	color:$default-text-color;
-}
-
-div.title {
-    font-size: 170%;
-    margin: 1em 0 0.5em 0;
-}
-
-h1,h2,h2.groupheader,h3,div.toc h3,h4,h5,h6,strong,em {
-	color:$heading-color;
-	border-bottom:none;
-}
-
-h1 {
-	padding-top:0.5em;
-	font-size:150%;
-}
-
-h2 {
-	padding-top:0.5em;
-	margin-bottom:0;
-	font-size:130%;
-}
-
-h3 {
-	padding-top:0.5em;
-	margin-bottom:0;
-	font-size:110%;
-}
-
-.glfwheader {
-	font-size:16px;
-	min-height:64px;
-	max-width:920px;
-	padding:0 32px;
-	margin:0 auto;
-
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	justify-content: flex-start;
-	align-items: center;
-	align-content: stretch;
-}
-
-#glfwhome {
-	line-height:64px;
-	padding-right:48px;
-	color:$header-footer-link-color;
-	font-size:2.5em;
-	background:url("https://www.glfw.org/css/arrow.png") no-repeat right;
-}
-
-.glfwnavbar {
-	list-style-type:none;
-	margin:0 0 0 auto;
-	float:right;
-}
-
-#glfwhome,.glfwnavbar li {
-	float:left;
-}
-
-.glfwnavbar a,.glfwnavbar a:visited {
-	line-height:64px;
-	margin-left:2em;
-	display:block;
-	color:$header-footer-link-color;
-}
-
-.glfwnavbar {
-	padding-left: 0;
-}
-
-#glfwhome,.glfwnavbar a,.glfwnavbar a:visited {
-	transition:.35s ease;
-}
-
-#titlearea,.footer {
-	color:$header-footer-link-color;
-}
-
-address.footer {
-	text-align:center;
-	padding:2em;
-	margin-top:3em;
-}
-
-#top {
-	background:$header-footer-link-color;
-}
-
-#main-nav {
-	max-width:960px;
-	margin:0 auto;
-	font-size:13px;
-}
-
-#main-menu {
-	max-width:920px;
-	margin:0 auto;
-	font-size:13px;
-}
-
-.memtitle {
-	display:none;
-}
-
-.memproto,.memname {
-	font-weight:bold;
-	text-shadow:none;
-}
-
-#main-menu {
-	min-height:36px;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	justify-content: flex-start;
-	align-items: center;
-	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;
-}
-
-#main-menu li ul.sm-nowrap li a {
-	color:$default-text-color;
-}
-
-#main-menu li ul.sm-nowrap li a:hover {
-	color:$default-link-color;
-}
-
-#main-menu > li:last-child {
-	margin: 0 0 0 auto;
-}
-
-.contents {
-	min-height:590px;
-}
-
-div.contents,div.header {
-	max-width:920px;
-	margin:0 auto;
-	padding:0 32px;
-	background:$content-background-color none;
-}
-
-table.doxtable th,table.markdownTable th,dl.reflist dt {
-	background:linear-gradient(to bottom,$table-background-color2 0%,$table-background-color1 100%);
-	box-shadow:inset 0 0 32px $table-background-color1;
-	text-shadow:0 -1px 1px darken($table-background-color1, 15%);
-	text-align:left;
-	color:$table-text-color;
-}
-
-dl.reflist dt a.el {
-	color:$default-link-color;
-	padding:.2em;
-	border-radius:4px;
-	background-color:lighten($default-link-color, 40%);
-}
-
-div.toc {
-	float:right;
-	width:35%;
-}
-
-@media screen and (max-width:600px) {
-	div.toc {
-		float:none;
-		width:inherit;
-		margin:0;
-	}
-}
-
-div.toc h3 {
-	font-size:1.17em;
-}
-
-div.toc ul {
-	padding-left:1.5em;
-}
-
-div.toc li {
-	font-size:1em;
-	padding-left:0;
-	list-style-type:disc;
-}
-
-div.toc {
-    li.level2, li.level3 {
-        margin-left:0.5em;
-    }
-}
-
-div.toc,.memproto,div.qindex,div.ah {
-	background:linear-gradient(to bottom,$toc-background-color2 0%,$toc-background-color1 100%);
-	box-shadow:inset 0 0 32px $toc-background-color1;
-	text-shadow:0 1px 1px lighten($toc-background-color2, 10%);
-	color:$heading-color;
-	border:2px solid $toc-background-color1;
-	border-radius:4px;
-}
-
-.paramname {
-	color:$prototype-param-color;
-}
-
-dl.reflist dt {
-	border:2px solid $default-border-color;
-	border-top-left-radius:4px;
-	border-top-right-radius:4px;
-	border-bottom:none;
-}
-
-dl.reflist dd {
-	border:2px solid $default-border-color;
-	border-bottom-right-radius:4px;
-	border-bottom-left-radius:4px;
-	border-top:none;
-}
-
-table.doxtable,table.markdownTable {
-	border-collapse:inherit;
-	border-spacing:0;
-	border:2px solid $default-border-color;
-	border-radius:4px;
-}
-
-a,a:hover,a:visited,a:visited:hover,.contents a:visited,.el,a.el:visited,#glfwhome:hover,#main-menu a:hover,span.lineno a:hover {
-	color:$default-link-color;
-	text-decoration:none;
-}
-
-div.directory {
-	border-collapse:inherit;
-	border-spacing:0;
-	border:2px solid $default-border-color;
-	border-radius:4px;
-}
-
-hr,.memSeparator {
-	height:2px;
-	background:linear-gradient(to right,$def-separator-color 0%,darken($def-separator-color, 10%) 50%,$def-separator-color 100%);
-}
-
-dl.note,dl.pre,dl.post,dl.invariant {
-	@include message-box($box-note-color);
-}
-
-dl.warning,dl.attention {
-	@include message-box($box-warning-color);
-}
-
-dl.deprecated,dl.bug {
-	@include message-box($box-bug-color);
-}
-
-dl.todo,dl.test {
-	@include message-box($box-todo-color);
-}
-
-dl.note,dl.pre,dl.post,dl.invariant,dl.warning,dl.attention,dl.deprecated,dl.bug,dl.todo,dl.test {
-	border-radius:4px;
-	padding:1em;
-	text-shadow:0 1px 1px hsl(0,0%,100%);
-	margin:1em 0;
-}
-
-.note a,.pre a,.post a,.invariant a,.warning a,.attention a,.deprecated a,.bug a,.todo a,.test a,.note a:visited,.pre a:visited,.post a:visited,.invariant a:visited,.warning a:visited,.attention a:visited,.deprecated a:visited,.bug a:visited,.todo a:visited,.test a:visited {
-	color:inherit;
-}
-
-div.line {
-	line-height:inherit;
-}
-
-div.fragment,pre.fragment {
-	background:hsl(0,0%,95%);
-	border-radius:4px;
-	border:none;
-	padding:1em;
-	overflow:auto;
-	border-left:4px solid hsl(0,0%,80%);
-	margin:1em 0;
-}
-
-.lineno a,.lineno a:visited,.line,pre.fragment {
-	color:$default-text-color;
-}
-
-span.preprocessor,span.comment {
-	color:hsl(193,100%,30%);
-}
-
-a.code,a.code:visited {
-	color:hsl(18,100%,45%);
-}
-
-span.keyword,span.keywordtype,span.keywordflow {
-	color:darken($default-text-color, 5%);
-	font-weight:bold;
-}
-
-span.stringliteral {
-	color:hsl(261,100%,30%);
-}
-
-code {
-	padding:.1em;
-	border-radius:4px;
-}
--- a/docs/header.html
+++ b/docs/header.html
@ -1,8 +1,7 @@
-<!DOCTYPE html>
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen $doxygenversion"/>
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
@ -22,11 +21,12 @@ $extrastylesheet
 <!--BEGIN TITLEAREA-->
 <div id="titlearea">
 	<div class="glfwheader">
-		<a href="https://www.glfw.org/" id="glfwhome">GLFW</a>
+		<a href="http://www.glfw.org/" id="glfwhome">GLFW</a>
 		<ul class="glfwnavbar">
-			<li><a href="https://www.glfw.org/documentation.html">Documentation</a></li>
-			<li><a href="https://www.glfw.org/download.html">Download</a></li>
-			<li><a href="https://www.glfw.org/community.html">Community</a></li>
+			<li><a href="http://www.glfw.org/documentation.html">Documentation</a></li>
+			<li><a href="http://www.glfw.org/download.html">Download</a></li>
+			<li><a href="http://www.glfw.org/media.html">Media</a></li>
+			<li><a href="http://www.glfw.org/community.html">Community</a></li>
 		</ul>
 	</div>
 </div>
--- a/docs/input.dox
+++ b/docs/input.dox
@ -0,0 +1,664 @@
+/*!
+
+@page input_guide Input guide
+ 
+@tableofcontents
+
+This guide introduces the input related functions of GLFW.  For details on
+a specific function, see the [reference documentation](@ref input).  There are
+also guides for the other areas of GLFW.
+
+ - @ref intro_guide
+ - @ref window_guide
+ - @ref context_guide
+ - @ref monitor_guide
+
+GLFW provides many kinds of input.  While some can only be polled, like time, or
+only received via callbacks, like scrolling, there are those that provide both
+callbacks and polling.  Where a callback is provided, that is the recommended
+way to receive that kind of input.  The more you can use callbacks the less time
+your users' machines will need to spend polling.
+
+All input callbacks receive a window handle.  By using the
+[window user pointer](@ref window_userptr), you can access non-global structures
+or objects from your callbacks.
+
+To get a better feel for how the various events callbacks behave, run the
+`events` test program.  It register every callback supported by GLFW and prints
+out all arguments provided for every event, along with time and sequence
+information.
+
+
+@section events Event processing
+
+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
+processing must be done regularly while you have any windows and is normally
+done each frame after [buffer swapping](@ref buffer_swap).  Even when you have
+no windows, event polling needs to be done in order to receive monitor
+connection events.
+
+There are two functions for processing pending events.  @ref glfwPollEvents,
+processes only those events that have already been received and then returns
+immediately.
+
+@code
+glfwPollEvents();
+@endcode
+
+This is the best choice when rendering continually, 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.
+
+@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
+useful for, for example, editing tools.  There must be at least one GLFW window
+for this function to sleep.
+
+If you want to wait for events but have UI elements that need periodic updates,
+call @ref glfwWaitEventsTimeout.
+
+@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
+events.
+
+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.
+
+@code
+glfwPostEmptyEvent();
+@endcode
+
+Do not assume that callbacks will _only_ be called through either of the above
+functions.  While it is necessary to process events in the event queue, some
+window systems will send some events directly to the application, which in turn
+causes callbacks to be called outside of regular event processing.
+
+
+@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
+events relate to the Unicode code points generated by pressing some of them.
+
+Keys and characters do not map 1:1.  A single key press may produce several
+characters, and a single character may require several keys to produce.  This
+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.
+
+
+@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.
+
+@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).
+
+@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`.  The key
+will be `GLFW_KEY_UNKNOWN` if GLFW lacks a key token for it, for example
+_E-mail_ and _Play_ keys.
+
+The scancode is unique for every key, regardless of whether it has a key token.
+Scancodes are platform-specific but consistent over time, so keys will have
+different scancodes depending on the platform but they are safe to save to disk.
+
+Key states for [named keys](@ref keys) are also saved in per-window state arrays
+that can be polled with @ref glfwGetKey.
+
+@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`.
+
+This function only returns cached key event state.  It does not poll the
+system for the current state of the key.
+
+Whenever you poll state, you risk missing the state change you are looking for.
+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.
+
+@code
+glfwSetInputMode(window, GLFW_STICKY_KEYS, 1);
+@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
+it has been polled, if a key release event had been processed in the meantime,
+the state will reset to `GLFW_RELEASE`, otherwise it will remain `GLFW_PRESS`.
+
+The `GLFW_KEY_LAST` constant holds the highest value of any
+[named key](@ref keys).
+
+
+@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
+operating system text input system.  Unlike key input, text input obeys keyboard
+layouts and modifier keys and supports composing characters using
+[dead keys](https://en.wikipedia.org/wiki/Dead_key).  Once received, you can
+encode the code points into
+[UTF-8](https://en.wikipedia.org/wiki/UTF-8) or any other encoding you prefer.
+
+Because an `unsigned int` is 32 bits long on all platforms supported by GLFW,
+you can treat the code point argument as native endian
+[UTF-32](https://en.wikipedia.org/wiki/UTF-32).
+
+There are two callbacks for receiving Unicode code points.  If you wish to
+offer regular text input, set a character callback.
+
+@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.
+
+@code
+void character_callback(GLFWwindow* window, unsigned int codepoint)
+{
+}
+@endcode
+
+If you wish to receive even those Unicode code points generated with modifier
+key combinations that a plain text field would ignore, or just want to know
+exactly what modifier keys were used, set a character with modifiers callback.
+
+@code
+glfwSetCharModsCallback(window, charmods_callback);
+@endcode
+
+The callback function receives Unicode code points and
+[modifier bits](@ref mods).
+
+@code
+void charmods_callback(GLFWwindow* window, unsigned int codepoint, int mods)
+{
+}
+@endcode
+
+
+@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.
+
+@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
+ignored.  This matches the behavior of the key callback, meaning the callback
+arguments can always be passed unmodified to this function.
+
+
+@section input_mouse Mouse input
+
+Mouse input comes in many forms, including cursor 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.
+
+
+@subsection cursor_pos Cursor position
+
+If you wish to be notified when the cursor moves over the window, set a cursor
+position callback.
+
+@code
+glfwSetCursorPosCallback(window, cursor_pos_callback);
+@endcode
+
+The callback functions receives the cursor position, measured in screen
+coordinates but relative to the top-left corner of the window client area.  On
+platforms that provide it, the full sub-pixel cursor position is passed on.
+
+@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.
+
+@code
+double xpos, ypos;
+glfwGetCursorPos(window, &xpos, &ypos);
+@endcode
+
+
+@subsection cursor_mode Cursor modes
+
+The `GLFW_CURSOR` input mode provides several cursor modes for special forms of
+mouse motion input.  By default, the cursor mode is `GLFW_CURSOR_NORMAL`,
+meaning the regular arrow cursor (or another cursor set with @ref glfwSetCursor)
+is used and cursor motion is not limited.
+
+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`.
+
+@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
+providing the application with a virtual cursor position.  This virtual position
+is provided normally via both the cursor position callback and through polling.
+
+@note You should not implement your own version of this functionality using
+other features of GLFW.  It is not supported and will not work as robustly as
+`GLFW_CURSOR_DISABLED`.
+
+If you just wish the cursor to become hidden when it is over a window, set
+the cursor mode to `GLFW_CURSOR_HIDDEN`.
+
+@code
+glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+@endcode
+
+This mode puts no limit on the motion of the cursor.
+
+To exit out of either of these special modes, restore the `GLFW_CURSOR_NORMAL`
+cursor mode.
+
+@code
+glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+@endcode
+
+
+@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
+glfwCreateStandardCursor and destroyed with @ref glfwDestroyCursor, or @ref
+glfwTerminate, if any remain.
+
+
+@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:
+
+@code
+unsigned char pixels[16 * 16 * 4];
+memset(pixels, 0xff, sizeof(pixels));
+
+GLFWimage image;
+image.width = 16;
+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.
+
+The image data is 32-bit, little-endian, non-premultiplied RGBA, i.e. eight bits
+per channel.  The pixels are arranged canonically as sequential rows, starting
+from the top-left corner.
+
+
+@subsubsection cursor_standard Standard cursor creation
+
+A cursor with a [standard shape](@ref shapes) from the current system cursor
+theme can be can be created with @ref glfwCreateStandardCursor.
+
+@code
+GLFWcursor* cursor = glfwCreateStandardCursor(GLFW_HRESIZE_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.
+
+
+@subsubsection cursor_destruction Cursor destruction
+
+When a cursor is no longer needed, destroy it with @ref glfwDestroyCursor.
+
+@code
+glfwDestroyCursor(cursor);
+@endcode
+
+Cursor destruction always succeeds.  All cursors remaining when @ref
+glfwTerminate is called are destroyed as well.
+
+
+@subsubsection cursor_set Cursor setting
+
+A cursor can be set as current for a window with @ref glfwSetCursor.
+
+@code
+glfwSetCursor(window, cursor);
+@endcode
+
+Once set, the cursor image will be used as long as the system cursor is over the
+client area of the window and the [cursor mode](@ref cursor_mode) is set
+to `GLFW_CURSOR_NORMAL`.
+
+A single cursor may be set for any number of windows.
+
+To remove a cursor from a window, set the cursor of that window to `NULL`.
+
+@code
+glfwSetCursor(window, NULL);
+@endcode
+
+When a cursor is destroyed, it is removed from any window where it is set.  This
+does not affect the cursor modes of those windows.
+
+
+@subsection cursor_enter Cursor enter/leave events
+
+If you wish to be notified when the cursor enters or leaves the client area of
+a window, set a cursor enter/leave callback.
+
+@code
+glfwSetCursorEnterCallback(window, cursor_enter_callback);
+@endcode
+
+The callback function receives the new classification of the cursor.
+
+@code
+void cursor_enter_callback(GLFWwindow* window, int entered)
+{
+    if (entered)
+    {
+        // The cursor entered the client area of the window
+    }
+    else
+    {
+        // The cursor left the client area of the window
+    }
+}
+@endcode
+
+
+@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.
+
+@code
+glfwSetMouseButtonCallback(window, mouse_button_callback);
+@endcode
+
+The callback function receives the [mouse button](@ref buttons), button action
+and [modifier bits](@ref mods).
+
+@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 action is one of `GLFW_PRESS` or `GLFW_RELEASE`.
+
+Mouse button states for [named buttons](@ref buttons) are also saved in
+per-window state arrays that can be polled with @ref glfwGetMouseButton.
+
+@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`.
+
+This function only returns cached mouse button event state.  It does not poll
+the system for the current state of the mouse button.
+
+Whenever you poll state, you risk missing the state change you are looking for.
+If a pressed mouse button is released again before you poll its state, you will have
+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.
+
+@code
+glfwSetInputMode(window, GLFW_STICKY_MOUSE_BUTTONS, 1);
+@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
+glfwGetMouseButton.  Once it has been polled, if a mouse button release event
+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
+[named button](@ref buttons).
+
+
+@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.
+
+@code
+glfwSetScrollCallback(window, scroll_callback);
+@endcode
+
+The callback function receives two-dimensional scroll offsets.
+
+@code
+void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
+{
+}
+@endcode
+
+A simple mouse wheel, being vertical, provides offsets along the Y-axis.
+
+
+@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
+`GLFW_JOYSTICK_1`, `GLFW_JOYSTICK_2` up to `GLFW_JOYSTICK_LAST`.  You can test
+whether a [joystick](@ref joysticks) is present with @ref glfwJoystickPresent.
+
+@code
+int present = glfwJoystickPresent(GLFW_JOYSTICK_1);
+@endcode
+
+When GLFW is initialized, detected joysticks are added to to the beginning of
+the array, starting with `GLFW_JOYSTICK_1`.  Once a joystick is detected, it
+keeps its assigned index until it is disconnected, so as joysticks are connected
+and disconnected, they will become spread out.
+
+Joystick state is updated as needed when a joystick function is called and does
+not require a window to be created or @ref glfwPollEvents or @ref glfwWaitEvents
+to be called.
+
+
+@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.
+
+@code
+int count;
+const float* axes = glfwGetJoystickAxes(GLFW_JOYSTICK_1, &count);
+@endcode
+
+Each element in the returned array is a value between -1.0 and 1.0.
+
+
+@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.
+
+@code
+int count;
+const unsigned char* axes = glfwGetJoystickButtons(GLFW_JOYSTICK_1, &count);
+@endcode
+
+Each element in the returned array is either `GLFW_PRESS` or `GLFW_RELEASE`.
+
+
+@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.           
+
+@code
+const char* name = glfwGetJoystickName(GLFW_JOYSTICK_1);
+@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 token](@ref joysticks) is
+guaranteed to be unique, and only until that joystick is disconnected.
+
+
+@subsection joystick_event Joystick configuration changes
+
+If you wish to be notified when a joystick is connected or disconnected, set
+a joystick callback.
+
+@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.
+
+@code
+void joystick_callback(int joy, int event)
+{
+    if (event == GLFW_CONNECTED)
+    {
+        // The joystick was connected
+    }
+    else if (event == GLFW_DISCONNECTED)
+    {
+        // The joystick was disconnected
+    }
+}
+@endcode
+
+
+@section time Time input
+
+GLFW provides high-resolution time input, in seconds, with @ref glfwGetTime.
+
+@code
+double seconds = glfwGetTime();
+@endcode
+
+It returns the number of seconds since the timer was started when the library
+was initialized with @ref glfwInit.  The platform-specific time sources used
+usually have micro- or nanosecond resolution.
+
+You can modify the reference time with @ref glfwSetTime.
+
+@code
+glfwSetTime(4.0);
+@endcode
+
+This sets the timer to the specified time, in seconds.
+
+You can also access the raw timer value, measured in 1&nbsp;/&nbsp;frequency
+seconds, with @ref glfwGetTimerValue.
+
+@code
+uint64_t value = glfwGetTimerValue();
+@endcode
+
+The frequency of the raw timer varies depending on what time sources are
+available on the machine.  You can query its frequency, in Hz, with @ref
+glfwGetTimerFrequency.
+
+@code
+uint64_t freqency = glfwGetTimerFrequency();
+@endcode
+
+
+@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.
+
+@code
+const char* text = glfwGetClipboardString(window);
+if (text)
+    insert_text(text);
+@endcode
+
+If the clipboard is empty or if its contents could not be converted, `NULL` is
+returned.
+
+The contents of the system clipboard can be set to a UTF-8 encoded string with
+@ref glfwSetClipboardString.
+
+@code
+glfwSetClipboardString(window, "A string with words in it");
+@endcode
+
+The clipboard functions take a window handle argument because some window
+systems require a window to communicate with the system clipboard.  Any valid
+window may be used.
+
+
+@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.
+
+@code
+glfwSetDropCallback(window, drop_callback);
+@endcode
+
+The callback function receives an array of paths encoded as UTF-8.
+
+@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/input.md
+++ b/docs/input.md
--- 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
@ -17,10 +19,11 @@ The public interface uses the OpenGL naming conventions except with GLFW and
 glfw instead of GL and gl.  For struct members, where OpenGL sets no precedent,
 it use headless camel case.

-Examples: `glfwCreateWindow`, `GLFWwindow`, `GLFW_RED_BITS`
+Examples: @ref glfwCreateWindow, @ref GLFWwindow, @ref GLFWvidmode.redBits,
+`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
@ -31,10 +34,10 @@ The function names of the native interface are similar to those of the public
 interface, but embeds the name of the interface that the returned handle is
 from.

-Examples: `glfwGetX11Window`, `glfwGetWGLContext`
+Examples: @ref glfwGetX11Window, @ref 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
@ -47,10 +50,10 @@ a `_GLFWlibrary` struct named `_glfw`.
 The internal interface uses the same style as the public interface, except all
 global names have a leading underscore.

-Examples: `_glfwIsValidContextConfig`, `_GLFWwindow`, `_glfw.monitorCount`
+Examples: @ref _glfwIsValidContextConfig, @ref _GLFWwindow, `_glfw.currentRamp`


-## 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
@ -59,21 +62,12 @@ application-provided callbacks.  It is also prohibited from modifying the
 platform-independent part of the internal structs.  Instead, it calls the event
 interface when events interesting to GLFW are received.

-The platform interface mostly mirrors those parts of the public interface that needs to
-perform platform-specific operations on some or all platforms.
+The platform interface mirrors those parts of the public interface that needs to
+perform platform-specific operations on some or all platforms.  The are also
+named the same except that the glfw function prefix is replaced by
+_glfwPlatform.

-The window system bits of the platform API is called through the `_GLFWplatform` struct of
-function pointers, to allow runtime selection of platform.  This includes the window and
-context creation, input and event processing, monitor and Vulkan surface creation parts of
-GLFW.  This is located in the global `_glfw` struct.
-
-Examples: `_glfw.platform.createWindow`
-
-The timer, threading and module loading bits of the platform API are plain functions with
-a `_glfwPlatform` prefix, as these things are independent of what window system is being
-used.
-
-Examples: `_glfwPlatformGetTimerValue`
+Examples: @ref _glfwPlatformCreateWindow

 The platform interface also defines structs that contain platform-specific
 global and per-object state.  Their names mirror those of the internal
@ -85,10 +79,10 @@ These structs are incorporated as members into the internal interface structs
 using special macros that name them after the specific interface used.  This
 prevents shared code from accidentally using these members.

-Examples: `window->win32.handle`, `_glfw.x11.display`
+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
@ -97,24 +91,26 @@ application, either via callbacks, via window state changes or both.
 The function names of the event interface use a `_glfwInput` prefix and the
 ObjectEvent pattern.

-Examples: `_glfwInputWindowFocus`, `_glfwInputCursorPos`
+Examples: @ref _glfwInputWindowFocus, @ref _glfwInputCursorMotion


-## 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.

-Examples: `isValidElementForJoystick`
+Examples: `clearScrollOffsets`


-## 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.
+interfaces and code paths to use.  They are defined in the glfw_config.h header file,
+which is generated from the `glfw_config.h.in` file by CMake.

 Configuration macros the same style as tokens in the public interface, except
 with a leading underscore.

-Examples: `_GLFW_WIN32`, `_GLFW_BUILD_DLL`
+Examples: `_GLFW_HAS_XF86VM` 

+*/
--- a/docs/intro.dox
+++ b/docs/intro.dox
@ -0,0 +1,369 @@
+/*! 
+
+@page intro_guide Introduction to the API
+ 
+@tableofcontents
+
+This guide introduces the basic concepts of GLFW and describes initialization reference
+error handling and API guarantees and limitations.  For a broad but shallow
+tutorial, see @ref quick_guide instead.  For details on a specific function, see the
+[reference documentation](@ref init).
+
+There are also guides for the other areas of GLFW.
+
+ - @ref window_guide
+ - @ref context_guide
+ - @ref vulkan_guide
+ - @ref monitor_guide
+ - @ref input_guide
+
+
+@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,
+enumerates monitors and joysticks, initializes the timer and performs any
+required platform-specific initialization.
+
+Only the following functions may be called before the library has been
+successfully initialized, and only from the main thread.
+
+ - @ref glfwGetVersion
+ - @ref glfwGetVersionString
+ - @ref glfwSetErrorCallback
+ - @ref glfwInit
+ - @ref glfwTerminate
+
+Calling any other function before that time will cause a @ref
+GLFW_NOT_INITIALIZED error. 
+
+
+@subsection intro_init_init Initializing GLFW
+
+The library is initialized with @ref glfwInit, which returns `GLFW_FALSE` if an
+error occurred.
+
+@code
+if (!glfwInit())
+{
+    // Handle initialization failure
+}
+@endcode
+
+If any part of initialization fails, all remaining bits are terminated as if
+@ref glfwTerminate was called.  The library only needs to be initialized once
+and additional calls to an already initialized library will simply return
+`GLFW_TRUE` immediately.
+
+Once the library has been successfully initialized, it should be terminated
+before the application exits.
+
+
+@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.
+
+@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
+any resources allocated by GLFW.
+
+Once the library is terminated, it is as if it had never been initialized and
+you will need to initialize it again before being able to use GLFW.  If the
+library was not initialized or had already been terminated, it return
+immediately. 
+
+
+@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 _why_ the error occurred.  Some
+functions also return otherwise valid values on error.  Finally, far from all
+GLFW functions have return values.
+
+This is where the error callback comes in.  This callback is called whenever an
+error occurs.  It is set with @ref glfwSetErrorCallback, a function that may be
+called regardless of whether GLFW is initialized.
+
+@code
+glfwSetErrorCallback(error_callback);
+@endcode
+
+The error callback receives a human-readable description of the error and (when
+possible) its cause.  The description encoded as UTF-8.  The callback is also
+provided with an [error code](@ref errors). 
+
+@code
+void error_callback(int error, const char* description)
+{
+    puts(description);
+}
+@endcode
+
+The error code indicates the general category of the error.  Some error codes,
+such as @ref GLFW_NOT_INITIALIZED has only a single meaning, whereas others like
+@ref GLFW_PLATFORM_ERROR are used for many different errors.
+
+The description string is only valid until the error callback returns, as it may
+have been generated specifically for that error.  This lets GLFW provide much
+more specific error descriptions but means you must make a copy if you want to
+keep the description string.
+
+@note Relying on erroneous behavior is not forward compatible.  In other words,
+do not rely on a currently invalid call to generate a specific error, as that
+same call may in future versions generate a different error or become valid.
+
+
+@section coordinate_systems Coordinate systems
+
+GLFW has two primary coordinate systems: the _virtual screen_ and the window
+_client area_ or _content area_.  Both use the same unit: _virtual screen
+coordinates_, or just _screen coordinates_, which don't necessarily correspond
+to pixels.
+
+<img src="spaces.svg" width="90%" />
+
+Both the virtual screen and the client area coordinate systems have the X-axis
+pointing to the right and the Y-axis pointing down.
+
+Window and monitor positions are specified as the position of the upper-left
+corners of their content areas relative to the virtual screen, while cursor
+positions are specified relative to a window's client area.
+
+Because the origin of the window's client area coordinate system is also the
+point from which the window position is specified, you can translate client area
+coordinates to the virtual screen by adding the window position.  The window
+frame, when present, extends out from the client area but does not affect the
+window position.
+
+Almost all positions and sizes in GLFW are measured in screen coordinates
+relative to one of the two origins above.  This includes cursor positions,
+window positions and sizes, window frame sizes, monitor positions and video mode
+resolutions.
+
+Two exceptions are the [monitor physical size](@ref monitor_size), which is
+measured in millimetres, and [framebuffer size](@ref window_fbsize), which is
+measured in pixels.
+
+Pixels and screen coordinates may map 1:1 on your machine, but they won't on
+every other machine, for example on a Mac with a Retina display.  The ratio
+between screen coordinates and pixels may also change at run-time depending on
+which monitor the window is currently considered to be on.
+
+
+@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
+of these limits may work on some platforms, or on some machines, or some of the
+time, or on some versions of GLFW, but it may break at any time and this will
+not be considered a bug.
+
+
+@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.
+
+Many GLFW functions return pointers to dynamically allocated structures, strings
+or arrays, and some callbacks are provided with strings or arrays.  These are
+always managed by GLFW and should never be freed by the application.  The
+lifetime of these pointers is documented for each GLFW function and callback.
+If you need to keep this data, you must copy it before its lifetime expires.
+
+Many GLFW functions accept pointers to structures or strings allocated by the
+application.  These are never freed by GLFW and are always the responsibility of
+the application.  If GLFW needs to keep the data in these structures or strings,
+it is copied before the function returns.
+
+Pointer lifetimes are guaranteed not to be shortened in future minor or patch
+releases.
+
+
+@subsection reentrancy Reentrancy
+
+GLFW event processing and object creation and destruction are not reentrant.
+This means that the following functions must not be called from any callback
+function:
+
+ - @ref glfwCreateWindow
+ - @ref glfwDestroyWindow
+ - @ref glfwCreateCursor
+ - @ref glfwCreateStandardCursor
+ - @ref glfwDestroyCursor
+ - @ref glfwPollEvents
+ - @ref glfwWaitEvents
+ - @ref glfwWaitEventsTimeout
+ - @ref glfwTerminate
+
+These functions may be made reentrant in future minor or patch releases, but
+functions not on this list will not be made non-reentrant.
+
+
+@subsection thread_safety Thread safety
+
+Most GLFW functions must only be called from the main thread, but some may be
+called from any thread.  However, no GLFW function may be called from any thread
+but the main thread until GLFW has been successfully initialized, including
+functions that may called before initialization.
+
+The reference documentation for every GLFW function states whether it is limited
+to the main thread.                                                        
+
+Initialization and termination, event processing and the creation and
+destruction of windows, contexts and cursors are all limited to the main thread
+due to limitations of one or several platforms.
+
+Because event processing must be performed on the main thread, all callbacks
+except for the error callback will only be called on that thread.  The error
+callback may be called on any thread, as any GLFW function may generate errors.
+
+The posting of empty events may be done from any thread.  The window user
+pointer and close flag may also be accessed and modified from any thread, but
+this is not synchronized by GLFW.  The following window related functions may
+be called from any thread:
+
+ - @ref glfwPostEmptyEvent
+ - @ref glfwGetWindowUserPointer
+ - @ref glfwSetWindowUserPointer
+ - @ref glfwWindowShouldClose
+ - @ref glfwSetWindowShouldClose
+
+Rendering may be done on any thread.  The following context related functions
+may be called from any thread:
+
+ - @ref glfwMakeContextCurrent
+ - @ref glfwGetCurrentContext
+ - @ref glfwSwapBuffers
+ - @ref glfwSwapInterval
+ - @ref glfwExtensionSupported
+ - @ref glfwGetProcAddress
+
+The raw timer may be queried from any thread.  The following raw timer related
+functions may be called from any thread:
+
+ - @ref glfwGetTimerFrequency
+ - @ref glfwGetTimerValue
+
+The regular timer may be used from any thread, but the reading and writing of
+the timer offset is not synchronized by GLFW.  The following timer related
+functions may be called from any thread:
+
+ - @ref glfwGetTime
+ - @ref glfwSetTime
+
+Library version information may be queried from any thread.  The following
+version related functions may be called from any thread:
+
+ - @ref glfwGetVersion
+ - @ref glfwGetVersionString
+
+Vulkan objects may be created and information queried from any thread.  The
+following Vulkan related functions may be called from any thread:
+
+ - @ref glfwVulkanSupported
+ - @ref glfwGetRequiredInstanceExtensions
+ - @ref glfwGetInstanceProcAddress
+ - @ref glfwGetPhysicalDevicePresentationSupport
+ - @ref glfwCreateWindowSurface
+
+GLFW uses no synchronization objects internally except for thread-local storage
+to keep track of the current context for each thread.  Synchronization is left
+to the application.
+
+Functions that may currently be called from any thread will always remain so,
+but functions that are currently limited to the main thread may be updated to
+allow calls from any thread in future releases.
+
+
+@subsection compatibility Version compatibility
+
+GLFW guarantees binary backward compatibility with earlier minor versions of the
+API.  This means that you can drop in a newer version of the GLFW DLL / shared
+library / dynamic library and existing applications will continue to run.
+
+Once a function or constant has been added, the signature of that function or
+value of that constant will remain unchanged until the next major version of
+GLFW.  No compatibility of any kind is guaranteed between major versions.
+
+Undocumented behavior, i.e. behavior that is not described in the documentation,
+may change at any time until it is documented.
+
+If the reference documentation and the implementation differ, the reference
+documentation is correct and the implementation will be fixed in the next
+release.
+
+
+@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.
+
+
+@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.
+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.
+
+
+@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.
+
+@code
+printf("Compiled against GLFW %i.%i.%i\n",
+       GLFW_VERSION_MAJOR,
+       GLFW_VERSION_MINOR,
+       GLFW_VERSION_REVISION);
+@endcode
+
+
+@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.
+
+@code
+int major, minor, revision;
+glfwGetVersion(&major, &minor, &revision);
+
+printf("Running against GLFW %i.%i.%i\n", major, minor, revision);
+@endcode
+
+
+@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.
+This is primarily intended for submitting bug reports, to allow developers to
+see which code paths are enabled in a binary.
+
+The version string is returned by @ref glfwGetVersionString, a function that may
+be called regardless of whether GLFW is initialized.
+
+__Do not use the version string__ to parse the GLFW library version.  The @ref
+glfwGetVersion function already provides the version of the running library
+binary.
+
+The format of the string is as follows:
+ - The version of GLFW
+ - The name of the window system API
+ - The name of the context creation API
+ - Any additional options or APIs
+
+For example, when compiling GLFW 3.0 with MinGW using the Win32 and WGL
+back ends, the version string may look something like this:
+
+@code
+3.0.0 Win32 WGL MinGW
+@endcode
+
+*/
--- a/docs/intro.md
+++ b/docs/intro.md
@ -1,637 +0,0 @@
-# Introduction to the API {#intro_guide}
-
-[TOC]
-
-This guide introduces the basic concepts of GLFW and describes initialization,
-error handling and API guarantees and limitations.  For a broad but shallow
-tutorial, see @ref quick_guide instead.  For details on a specific function in
-this category, see the @ref init.
-
-There are also guides for the other areas of GLFW.
-
- - @ref window_guide
- - @ref context_guide
- - @ref vulkan_guide
- - @ref monitor_guide
- - @ref input_guide
-
-
-## Initialization and termination {#intro_init}
-
-Before most GLFW functions may be called, the library must be initialized.
-This initialization checks what features are available on the machine,
-enumerates monitors, initializes the timer and performs any required
-platform-specific initialization.
-
-Only the following functions may be called before the library has been
-successfully initialized, and only from the main thread.
-
- - @ref glfwGetVersion
- - @ref glfwGetVersionString
- - @ref glfwPlatformSupported
- - @ref glfwGetError
- - @ref glfwSetErrorCallback
- - @ref glfwInitHint
- - @ref glfwInitAllocator
- - @ref glfwInitVulkanLoader
- - @ref glfwInit
- - @ref glfwTerminate
-
-Calling any other function before successful initialization will cause a @ref
-GLFW_NOT_INITIALIZED error.
-
-
-### Initializing GLFW {#intro_init_init}
-
-The library is initialized with @ref glfwInit, which returns `GLFW_FALSE` if an
-error occurred.
-
-```c
-if (!glfwInit())
-{
-    // Handle initialization failure
-}
-```
-
-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
-once and additional calls to an already initialized library will return
-`GLFW_TRUE` immediately.
-
-Once the library has been successfully initialized, it should be terminated
-before the application exits.  Modern systems are very good at freeing resources
-allocated by programs that exit, but GLFW sometimes has to change global system
-settings and these might not be restored without termination.
-
-@macos When the library is initialized the main menu and dock icon are created.
-These are not desirable for a command-line only program.  The creation of the
-main menu and dock icon can be disabled with the @ref GLFW_COCOA_MENUBAR init
-hint.
-
-
-### Initialization hints {#init_hints}
-
-Initialization hints are set before @ref glfwInit and affect how the library
-behaves until termination.  Hints are set with @ref glfwInitHint.
-
-```c
-glfwInitHint(GLFW_JOYSTICK_HAT_BUTTONS, GLFW_FALSE);
-```
-
-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
-be ignored until the library is terminated and initialized again.
-
-Some hints are platform specific.  These may be set on any platform but they
-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}
-
-@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_NULL`.  The default value is `GLFW_ANY_PLATFORM`, which will
-choose any platform the library includes support for except for the Null
-backend.
-
-
-@anchor GLFW_JOYSTICK_HAT_BUTTONS
-__GLFW_JOYSTICK_HAT_BUTTONS__ specifies whether to also expose joystick hats as
-buttons, for compatibility with earlier versions of GLFW that did not have @ref
-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
-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}
-
-@anchor GLFW_COCOA_CHDIR_RESOURCES_hint
-__GLFW_COCOA_CHDIR_RESOURCES__ specifies whether to set the current directory to
-the application to the `Contents/Resources` subdirectory of the application's
-bundle, if present.  Possible values are `GLFW_TRUE` and `GLFW_FALSE`.  This is
-ignored on other platforms.
-
-@anchor GLFW_COCOA_MENUBAR_hint
-__GLFW_COCOA_MENUBAR__ specifies whether to create the menu bar and dock icon
-when GLFW is initialized.  This applies whether the menu bar is created from
-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}
-
-@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
-`VK_KHR_xcb_surface` extension for creating Vulkan surfaces, or whether to use
-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}
-
-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_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`
-
-
-### Runtime platform selection {#platform}
-
-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.
-
-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
-glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
-```
-
-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
-glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_NULL);
-```
-
-You can test whether a library binary was compiled with support for a specific platform
-with @ref glfwPlatformSupported.
-
-```c
-if (glfwPlatformSupported(GLFW_PLATFORM_WAYLAND))
-    glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_WAYLAND);
-```
-
-Once GLFW has been initialized, you can query which platform was selected with @ref
-glfwGetPlatform.
-
-```c
-int platform = glfwGetPlatform();
-```
-
-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}
-
-The heap memory allocator can be customized before initialization with @ref
-glfwInitAllocator.
-
-```c
-GLFWallocator allocator;
-allocator.allocate = my_malloc;
-allocator.reallocate = my_realloc;
-allocator.deallocate = my_free;
-allocator.user = NULL;
-
-glfwInitAllocator(&allocator);
-```
-
-The allocator will be made active at the beginning of initialization and will be used by
-GLFW until the library has been fully terminated.  Any allocator set after 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
-specific APIs will still use those.
-
-The allocation function must have a signature matching @ref GLFWallocatefun.  It receives
-the desired size, in bytes, and the user pointer passed to @ref glfwInitAllocator and
-returns the address to the allocated memory block.
-
-```c
-void* my_malloc(size_t size, void* user)
-{
-    ...
-}
-```
-
-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
-void* my_realloc(void* block, size_t size, void* user)
-{
-    ...
-}
-```
-
-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
-void my_free(void* block, void* user)
-{
-    ...
-}
-```
-
-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}
-
-Before your application exits, you should terminate the GLFW library if it has
-been initialized.  This is done with @ref glfwTerminate.
-
-```c
-glfwTerminate();
-```
-
-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
-any other resources allocated by GLFW.
-
-Once the library is terminated, it is as if it had never been initialized, therefore
-you will need to initialize it again before being able to use GLFW.  If the
-library was not initialized or had already been terminated, it returns
-immediately.
-
-
-## 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.
-Other functions have no return value reserved for errors, so error notification
-needs a separate channel.  Finally, far from all GLFW functions have return
-values.
-
-The last [error code](@ref errors) for the calling thread can be queried at any
-time with @ref glfwGetError.
-
-```c
-int code = glfwGetError(NULL);
-
-if (code != GLFW_NO_ERROR)
-    handle_error(code);
-```
-
-If no error has occurred since the last call, @ref GLFW_NO_ERROR (zero) is
-returned.  The error is cleared before the function returns.
-
-The error code indicates the general category of the error.  Some error codes,
-such as @ref GLFW_NOT_INITIALIZED has only a single meaning, whereas others like
-@ref GLFW_PLATFORM_ERROR are used for many different errors.
-
-GLFW often has more information about an error than its general category.  You
-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
-const char* description;
-int code = glfwGetError(&description);
-
-if (description)
-    display_error_message(code, description);
-```
-
-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.
-
-You can also set an error callback, which will be called each time an error
-occurs.  It is set with @ref glfwSetErrorCallback.
-
-```c
-glfwSetErrorCallback(error_callback);
-```
-
-The error callback receives the same error code and human-readable description
-returned by @ref glfwGetError.
-
-```c
-void error_callback(int code, const char* description)
-{
-    display_error_message(code, description);
-}
-```
-
-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
-callback argument.
-
-The description string passed to the callback is only valid until the error
-callback returns.  This means you must make a copy of it if you want to keep it.
-
-__Reported errors are never fatal.__  As long as GLFW was successfully
-initialized, it will remain initialized and in a safe state until terminated
-regardless of how many errors occur.  If an error occurs during initialization
-that causes @ref glfwInit to fail, any part of the library that was initialized
-will be safely terminated.
-
-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}
-
-GLFW has two primary coordinate systems: the _virtual screen_ and the window
-_content area_ or _content area_.  Both use the same unit: _virtual screen
-coordinates_, or just _screen coordinates_, which don't necessarily correspond
-to pixels.
-
-<img src="spaces.svg" width="90%" />
-
-Both the virtual screen and the content area coordinate systems have the X-axis
-pointing to the right and the Y-axis pointing down.
-
-Window and monitor positions are specified as the position of the upper-left
-corners of their content areas relative to the virtual screen, while cursor
-positions are specified relative to a window's content area.
-
-Because the origin of the window's content area coordinate system is also the
-point from which the window position is specified, you can translate content
-area coordinates to the virtual screen by adding the window position.  The
-window frame, when present, extends out from the content area but does not
-affect the window position.
-
-Almost all positions and sizes in GLFW are measured in screen coordinates
-relative to one of the two origins above.  This includes cursor positions,
-window positions and sizes, window frame sizes, monitor positions and video mode
-resolutions.
-
-Two exceptions are the [monitor physical size](@ref monitor_size), which is
-measured in millimetres, and [framebuffer size](@ref window_fbsize), which is
-measured in pixels.
-
-Pixels and screen coordinates may map 1:1 on your machine, but they won't on
-every other machine, for example on a Mac with a Retina display.  The ratio
-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}
-
-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
-these limits may work on some platforms, or on some machines, or some of the
-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}
-
-GLFW will never free any pointer you provide to it, and you must never free any
-pointer it provides to you.
-
-Many GLFW functions return pointers to dynamically allocated structures, strings
-or arrays, and some callbacks are provided with strings or arrays.  These are
-always managed by GLFW and should never be freed by the application.  The
-lifetime of these pointers is documented for each GLFW function and callback.
-If you need to keep this data, you must copy it before its lifetime expires.
-
-Many GLFW functions accept pointers to structures or strings allocated by the
-application.  These are never freed by GLFW and are always the responsibility of
-the application.  If GLFW needs to keep the data in these structures or strings,
-it is copied before the function returns.
-
-Pointer lifetimes are guaranteed not to be shortened in future minor or patch
-releases.
-
-
-### 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:
-
- - @ref glfwDestroyWindow
- - @ref glfwDestroyCursor
- - @ref glfwPollEvents
- - @ref glfwWaitEvents
- - @ref glfwWaitEventsTimeout
- - @ref glfwTerminate
-
-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}
-
-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
-initialized.  Before initialization the whole library is thread-unsafe.
-
-The reference documentation for every GLFW function states whether it is limited
-to the main thread.
-
-Initialization, termination, event processing and the creation and
-destruction of windows, cursors and OpenGL and OpenGL ES contexts are all
-restricted to the main thread due to limitations of one or several platforms.
-
-Because event processing must be performed on the main thread, all callbacks
-except for the error callback will only be called on that thread.  The error
-callback may be called on any thread, as any GLFW function may generate errors.
-
-The error code and description may be queried from any thread.
-
- - @ref glfwGetError
-
-Empty events may be posted from any thread.
-
- - @ref glfwPostEmptyEvent
-
-The window user pointer and close flag may be read and written from any thread,
-but this is not synchronized by GLFW.
-
- - @ref glfwGetWindowUserPointer
- - @ref glfwSetWindowUserPointer
- - @ref glfwWindowShouldClose
- - @ref glfwSetWindowShouldClose
-
-These functions for working with OpenGL and OpenGL ES contexts may be called
-from any thread, but the window object is not synchronized by GLFW.
-
- - @ref glfwMakeContextCurrent
- - @ref glfwGetCurrentContext
- - @ref glfwSwapBuffers
- - @ref glfwSwapInterval
- - @ref glfwExtensionSupported
- - @ref glfwGetProcAddress
-
-The raw timer functions may be called from any thread.
-
- - @ref glfwGetTimerFrequency
- - @ref glfwGetTimerValue
-
-The regular timer may be used from any thread, but reading and writing the timer
-offset is not synchronized by GLFW.
-
- - @ref glfwGetTime
- - @ref glfwSetTime
-
-Library version information may be queried from any thread.
-
- - @ref glfwGetVersion
- - @ref glfwGetVersionString
-
-Platform information may be queried from any thread.
-
- - @ref glfwPlatformSupported
- - @ref glfwGetPlatform
-
-All Vulkan related functions may be called from any thread.
-
- - @ref glfwVulkanSupported
- - @ref glfwGetRequiredInstanceExtensions
- - @ref glfwGetInstanceProcAddress
- - @ref glfwGetPhysicalDevicePresentationSupport
- - @ref glfwCreateWindowSurface
-
-GLFW uses synchronization objects internally only to manage the per-thread
-context and error states.  Additional synchronization is left to the
-application.
-
-Functions that may currently be called from any thread will always remain so,
-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}
-
-GLFW uses [Semantic Versioning](https://semver.org/).  This guarantees source
-and binary backward compatibility with earlier minor versions of the API.  This
-means that you can drop in a newer version of the library and existing programs
-will continue to compile and existing binaries will continue to run.
-
-Once a function or constant has been added, the signature of that function or
-value of that constant will remain unchanged until the next major version of
-GLFW.  No compatibility of any kind is guaranteed between major versions.
-
-Undocumented behavior, i.e. behavior that is not described in the documentation,
-may change at any time until it is documented.
-
-If the reference documentation and the implementation differ, the reference
-documentation will almost always take precedence and the implementation will be
-fixed in the next release.  The reference documentation will also take
-precedence over anything stated in a guide.
-
-
-### 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}
-
-GLFW provides mechanisms for identifying what version of GLFW your application
-was compiled against as well as what version it is currently running against.
-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}
-
-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
-printf("Compiled against GLFW %i.%i.%i\n",
-       GLFW_VERSION_MAJOR,
-       GLFW_VERSION_MINOR,
-       GLFW_VERSION_REVISION);
-```
-
-
-### Run-time version {#intro_version_runtime}
-
-The run-time version can be retrieved with @ref glfwGetVersion, a function that
-may be called regardless of whether GLFW is initialized.
-
-```c
-int major, minor, revision;
-glfwGetVersion(&major, &minor, &revision);
-
-printf("Running against GLFW %i.%i.%i\n", major, minor, revision);
-```
-
-
-### Version string {#intro_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.
-This is primarily intended for submitting bug reports, to allow developers to
-see which code paths are enabled in a binary.
-
-The version string is returned by @ref glfwGetVersionString, a function that may
-be called regardless of whether GLFW is initialized.
-
-__Do not use the version string__ to parse the GLFW library version.  The @ref
-glfwGetVersion function already provides the version of the running library
-binary.
-
-__Do not use the version string__ to parse what platforms are supported.  The @ref
-glfwPlatformSupported function lets you query platform support.
-
-__GLFW 3.4:__ The format of this string was changed to support the addition of
-[runtime platform selection](@ref platform).
-
-The format of the string is as follows:
- - The version of GLFW
- - For each supported platform:
-   - The name of the window system API
-   - The name of the window system specific context creation API, if applicable
- - 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
-like this:
-
-```c
-3.5.0 Win32 WGL Null EGL OSMesa MinGW DLL
-```
-
-Compiling GLFW as a static library for Linux, with both Wayland and X11 enabled, may
-result in a version string like this:
-
-```c
-3.5.0 Wayland X11 GLX Null EGL OSMesa monotonic
-```
-
--- a/docs/main.dox
+++ b/docs/main.dox
@ -1,10 +1,15 @@
-# 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.
+See @ref news_32 for release highlights or the
+[version history](http://www.glfw.org/changelog.html) for details.

@ref quick_guide is a guide for users new to GLFW.  It takes you through how to
 write a small but complete program.
@ -29,10 +34,14 @@ 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](http://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.

 This documentation was generated with Doxygen.  The sources for it are available
-in both the [source distribution](https://www.glfw.org/download.html) and
+in both the [source distribution](http://www.glfw.org/download.html) and
 [GitHub repository](https://github.com/glfw/glfw).

+*/
--- a/docs/monitor.dox
+++ b/docs/monitor.dox
@ -1,19 +1,20 @@
-# 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
-guides for the other areas of GLFW.
+a specific function, see the [reference documentation](@ref monitor).  There are
+also guides for the other areas of GLFW.

 - @ref intro_guide
 - @ref window_guide
 - @ref context_guide
- - @ref vulkan_guide
 - @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 +35,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,25 +82,23 @@ 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
-glfwGetMonitorName and @ref glfwGetMonitorUserPointer will return useful values
-for a disconnected monitor and only before the monitor callback returns.
+If a monitor is disconnected, any windows that are full screen on it get forced
+into windowed mode.


-## 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.
+a virtual position, a human-readable name, 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
+a full screen window, change its video mode or or make a windowed one full
 screen, but it is sometimes useful to know exactly which video modes are
 supported.

@ -107,109 +106,75 @@ 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
-int width_mm, height_mm;
-glfwGetMonitorPhysicalSize(monitor, &width_mm, &height_mm);
-```
+@code
+int widthMM, heightMM;
+glfwGetMonitorPhysicalSize(monitor, &widthMM, &heightMM);
+@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.
+This can, for example, be used together with the current video mode to calculate
+the DPI of a monitor. 
+
+@code
+const double dpi = mode->width / (widthMM / 25.4);
+@endcode


-### Content scale {#monitor_scale}
-
-The content scale for a monitor can be retrieved with @ref
-glfwGetMonitorContentScale.
-
-```c
-float xscale, yscale;
-glfwGetMonitorContentScale(monitor, &xscale, &yscale);
-```
-
-For more information on what the content scale is and how to use it, see
-[window content scale](@ref window_scale).
-
-
-### 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}
-
-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
-int xpos, ypos, width, height;
-glfwGetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height);
-```
-
-
-### 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}
-
-Each monitor has a user pointer that can be set with @ref
-glfwSetMonitorUserPointer and queried with @ref glfwGetMonitorUserPointer.  This
-can be used for any purpose you need and will not be modified by GLFW.  The
-value will be kept until the monitor is disconnected or until the library is
-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,34 +189,27 @@ 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.

-It is recommended that your gamma ramp have the same size as the current gamma
-ramp for that monitor.
+@note It is recommended to use gamma ramps of size 256, as that is the size
+supported by all graphics cards on all platforms.

 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);
-```
-
-To experiment with gamma correction via the @ref glfwSetGamma function, run the
-`gamma` test program.
-
-@note The software controlled gamma ramp is applied _in addition_ to the
-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.
+@endcode

+*/
--- 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
-
-__Old syntax__
-```c
+@par Old syntax
+@code
 #include <GL/glfw.h>
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@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.
-
-[C++11]: https://en.cppreference.com/w/cpp/thread
-[C11]: https://en.cppreference.com/w/c/thread
+in both [C++11](http://en.cppreference.com/w/cpp/thread) and
+[C11](http://en.cppreference.com/w/c/thread), both of which are gaining
+traction. 

 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__
-> `glfwSleep`, `glfwCreateThread`, `glfwDestroyThread`, `glfwWaitThread`,
-> `glfwGetThreadID`, `glfwCreateMutex`, `glfwDestroyMutex`, `glfwLockMutex`,
-> `glfwUnlockMutex`, `glfwCreateCond`, `glfwDestroyCond`, `glfwWaitCond`,
-> `glfwSignalCond`, `glfwBroadcastCond` and `glfwGetNumberOfProcessors`.
+@par Removed functions
+`glfwSleep`, `glfwCreateThread`, `glfwDestroyThread`, `glfwWaitThread`,
+`glfwGetThreadID`, `glfwCreateMutex`, `glfwDestroyMutex`, `glfwLockMutex`,
+`glfwUnlockMutex`, `glfwCreateCond`, `glfwDestroyCond`, `glfwWaitCond`,
+`glfwSignalCond`, `glfwBroadcastCond` and `glfwGetNumberOfProcessors`.

-__Removed types__
-> `GLFWthreadfun`
+@par Removed types
+`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.
@ -74,103 +73,100 @@ To become of sufficiently high quality to warrant keeping them in GLFW 3, they
 would need not only to support other formats, but also modern extensions to
 OpenGL texturing.  This would either add a number of external
 dependencies (libjpeg, libpng, etc.), or force GLFW to ship with inline versions
-of these libraries.
+of these libraries. 

 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__
-> `glfwReadImage`, `glfwReadMemoryImage`, `glfwFreeImage`, `glfwLoadTexture2D`,
-> `glfwLoadMemoryTexture2D` and `glfwLoadTextureImage2D`.
+@par Removed functions
+`glfwReadImage`, `glfwReadMemoryImage`, `glfwFreeImage`, `glfwLoadTexture2D`,
+`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]
-on Windows, has been removed.  GLFW is written in C, not Pascal.  Removing this
-macro means there's one less thing for application programmers to remember, i.e.
-the requirement to mark all callback functions with `GLFWCALL`.  It also
-simplifies the creation of DLLs and DLL link libraries, as there's no need to
-explicitly disable `@n` entry point suffixes.
+The `GLFWCALL` macro, which made callback functions use
+[__stdcall](http://msdn.microsoft.com/en-us/library/zxk0tw93.aspx) on Windows,
+has been removed.  GLFW is written in C, not Pascal.  Removing this macro means
+there's one less thing for application programmers to remember, i.e. the
+requirement to mark all callback functions with `GLFWCALL`.  It also simplifies
+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
-
-__Old syntax__
-```c
+@par Old syntax
+@code
 void GLFWCALL callback_function(...);
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@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
-
-__Old syntax__
-```c
+@par Old syntax
+@code
 glfwSetWindowTitle("New Window Title");
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@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__
-```c
+@par Old basic full screen
+@code
 glfwOpenWindow(640, 480, 8, 8, 8, 0, 24, 0, GLFW_FULLSCREEN);
-```
+@endcode

-__New basic full screen__
-```c
+@par New basic full screen
+@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__
-```c
+@par Old basic main loop
+@code
 while (...)
 {
    // Process input
    // Render output
    glfwSwapBuffers();
 }
-```
+@endcode

-__New basic main loop__
-```c
+@par New basic main loop
+@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__
-```c
+@par Old basic viewport setup
+@code
 glfwGetWindowSize(&width, &height);
 glViewport(0, 0, width, height);
-```
+@endcode

-__New basic viewport setup__
-```c
+@par New basic viewport setup
+@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
@ -225,48 +221,48 @@ GLFW 2, windows and contexts created with GLFW 3 will never be destroyed unless
 you choose them to be.  Each window now has a close flag that is set to
 `GLFW_TRUE` when the user attempts to close that window.  By default, nothing else
 happens and the window stays visible.  It is then up to you to either destroy
-the window, take some other action or ignore the request.
+the window, take some other action or simply 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__
-```c
+@par Old basic main loop
+@code
 while (glfwGetWindowParam(GLFW_OPENED))
 {
    ...
 }
-```
+@endcode

-__New basic main loop__
-```c
+@par New basic main loop
+@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
+close flag has been set so it can override its value, if it chooses to, before
 event processing completes.  You may however not call @ref glfwDestroyWindow
 from the close callback (or any other window related callback).

-__Old syntax__
-```c
+@par Old syntax
+@code
 int GLFWCALL window_close_callback(void);
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@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__
-```c
+@par Old syntax
+@code
 void GLFWCALL character_callback(int character, int action);
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@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__
-```c
+@par Old syntax
+@code
 void GLFWCALL mouse_wheel_callback(int position);
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@code
 void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
-```
+@endcode

-__Removed functions__
-> `glfwGetMouseWheel`
+@par Removed functions
+`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,15 +346,15 @@ 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
-according to the values they would have in the standard US layout, but this
+according to the values they would have using the standard US layout, but this
 is only a convenience, as most programmers are assumed to know that layout.
 This means that (for example) `GLFW_KEY_LEFT_BRACKET` is always a single key and
 is the same key in the same place regardless of what keyboard layouts the users
-of your program have.
+of your program has.

 The key input facility was never meant for text input, although using it that
 way worked slightly better in GLFW 2.  If you were using it to input text, you
@ -366,11 +362,11 @@ should be using the character callback instead, on both GLFW 2 and 3.  This will
 give you the characters being input, as opposed to the keys being pressed.

 GLFW 3 has key tokens for all keys on a standard 105 key keyboard, so instead of
-having to remember whether to check for `a` or `A`, you now check for
-@ref GLFW_KEY_A.
+having to remember whether to check for `'a'` or `'A'`, you now check for
+`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,
-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
+The Win32 port of GLFW 3 will not compile in
+[MBCS mode](http://msdn.microsoft.com/en-us/library/5z097dxa.aspx).
+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

-
-### Support for versions of Windows older than XP {#moving_windows}
+@subsection moving_windows Support for versions of Windows older than XP

 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,30 @@ 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
-it for legacy code that has been moved to GLFW 3, you can request that the GLFW
-header includes it by defining @ref GLFW_INCLUDE_GLU before the inclusion of the
-GLFW header.
+deprecated by [Khronos](https://en.wikipedia.org/wiki/Khronos_Group).  __New
+projects should not use GLU__, but if you need it for legacy code that
+has been moved to GLFW 3, you can request that the GLFW header includes it by
+defining `GLFW_INCLUDE_GLU` before the inclusion of the GLFW header.

-[Khronos]: https://en.wikipedia.org/wiki/Khronos_Group
-
-__Old syntax__
-```c
+@par Old syntax
+@code
 #include <GL/glfw.h>
-```
+@endcode

-__New syntax__
-```c
+@par New syntax
+@code
 #define GLFW_INCLUDE_GLU
 #include <GLFW/glfw3.h>
-```
-
-There are many libraries that offer replacements for the functionality offered
-by GLU.  For the matrix helper functions, see math libraries like [GLM][] (for
-C++), [linmath.h][] (for C) and others.  For the tessellation functions, see for
-example [libtess2][].
-
-[GLM]: https://github.com/g-truc/glm
-[linmath.h]: https://github.com/datenwolf/linmath.h
-[libtess2]: https://github.com/memononen/libtess2
+@endcode


-## 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 +471,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 +479,7 @@ example [libtess2][].
 | `GLFWmouseposfun`   | @ref GLFWcursorposfun |       |


-### Renamed tokens {#moving_renamed_tokens}
+@subsection moving_renamed_tokens Renamed tokens

 | GLFW 2                      | GLFW 3                       | Notes |
 | --------------------------- | ---------------------------- | ----- |
@ -519,3 +503,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,376 @@
+/*!
+
+@page news New features
+
+@section news_32 New features in 3.2
+
+
+@subsection news_32_vulkan Support for Vulkan
+
+GLFW now supports basic integration with Vulkan with @ref glfwVulkanSupported,
+@ref glfwGetRequiredInstanceExtensions, @ref glfwGetInstanceProcAddress, @ref
+glfwGetPhysicalDevicePresentationSupport and @ref glfwCreateWindowSurface.
+Vulkan header inclusion can be selected with
+[GLFW_INCLUDE_VULKAN](@ref build_macros).
+
+
+@subsection news_32_setwindowmonitor Window mode switching
+
+GLFW now supports switching between windowed and full screen modes and updating
+the monitor and desired resolution and refresh rate of full screen windows with
+@ref glfwSetWindowMonitor.
+
+
+@subsection news_32_maximize Window maxmimization support
+
+GLFW now supports window maximization with @ref glfwMaximizeWindow and the
+[GLFW_MAXIMIZED](@ref window_attribs_wnd) window hint and attribute.
+
+
+@subsection news_32_focus Window input focus control
+
+GLFW now supports giving windows input focus with @ref glfwFocusWindow.
+
+
+@subsection news_32_sizelimits Window size limit support
+
+GLFW now supports setting both absolute and relative window size limits with
+@ref glfwSetWindowSizeLimits and @ref glfwSetWindowAspectRatio.
+
+
+@subsection news_32_keyname Localized key names
+
+GLFW now supports querying the localized name of printable keys with @ref
+glfwGetKeyName, either by key token or by scancode.
+
+
+@subsection news_32_waittimeout Wait for events with timeout
+
+GLFW now supports waiting for events for a set amount of time with @ref
+glfwWaitEventsTimeout.
+
+
+@subsection news_32_icon Window icon support
+
+GLFW now supports setting the icon of windows with @ref glfwSetWindowIcon.
+
+
+@subsection news_32_timer Raw timer access
+
+GLFW now supports raw timer values with @ref glfwGetTimerValue and @ref
+glfwGetTimerFrequency.
+
+
+@subsection news_32_joystick Joystick connection callback
+
+GLFW now supports notifying when a joystick has been connected or disconnected
+with @ref glfwSetJoystickCallback.
+
+
+@subsection news_32_noapi Context-less windows
+
+GLFW now supports creating windows without a OpenGL or OpenGL ES context with
+[GLFW_NO_API](@ref window_hints_ctx).
+
+
+@subsection news_32_contextapi Run-time context creation API selection
+
+GLFW now supports selecting the context creation API at run-time with the
+[GLFW_CONTEXT_CREATION_API](@ref window_hints_ctx) window hint value.
+
+
+@subsection news_32_noerror Error-free context creation
+
+GLFW now supports creating OpenGL and OpenGL ES contexts that do not emit errors
+with the [GLFW_CONTEXT_NO_ERROR](@ref window_hints_ctx) window hint, provided
+the machine supports the `GL_KHR_no_error` extension.
+
+
+@subsection news_32_cmake CMake config-file package support
+
+GLFW now supports being used as a
+[config-file package](@ref build_link_cmake_package) from other projects for
+easy linking with the library and its dependencies.
+
+
+@section news_31 New features in 3.1
+
+These are the release highlights.  For a full list of changes see the
+[version history](http://www.glfw.org/changelog.html).
+
+
+@subsection news_31_cursor Custom mouse cursor images
+
+GLFW now supports creating and setting both custom cursor images and standard
+cursor shapes.  They are created with @ref glfwCreateCursor or @ref
+glfwCreateStandardCursor, set with @ref glfwSetCursor and destroyed with @ref
+glfwDestroyCursor.
+
+@see @ref cursor_object
+
+
+@subsection news_31_drop Path drop event
+
+GLFW now provides a callback for receiving the paths of files and directories
+dropped onto GLFW windows.  The callback is set with @ref glfwSetDropCallback.
+
+@see @ref path_drop
+
+
+@subsection news_31_emptyevent Main thread wake-up
+
+GLFW now provides the @ref glfwPostEmptyEvent function for posting an empty
+event from another thread to the main thread event queue, causing @ref
+glfwWaitEvents to return.
+
+@see @ref events
+
+
+@subsection news_31_framesize Window frame size query
+
+GLFW now supports querying the size, on each side, of the frame around the
+client area of a window, with @ref glfwGetWindowFrameSize.
+
+@see [Window size](@ref window_size)
+
+
+@subsection news_31_autoiconify Simultaneous multi-monitor rendering
+
+GLFW now supports disabling auto-iconification of full screen windows with
+the [GLFW_AUTO_ICONIFY](@ref window_hints_wnd) window hint.  This is intended
+for people building multi-monitor installations, where you need windows to stay
+in full screen despite losing input focus.
+
+
+@subsection news_31_floating Floating windows
+
+GLFW now supports floating windows, also called topmost or always on top, for
+easier debugging with the [GLFW_FLOATING](@ref window_hints_wnd) window hint.
+
+
+@subsection news_31_focused Initially unfocused windows
+
+GLFW now supports preventing a windowed mode window from gaining input focus on
+creation, with the [GLFW_FOCUSED](@ref window_hints_wnd) window hint.
+
+
+@subsection news_31_direct Direct access for window attributes and cursor position
+
+GLFW now queries the window input focus, visibility and iconification attributes
+and the cursor position directly instead of returning cached data.
+
+
+@subsection news_31_charmods Character with modifiers callback
+
+GLFW now provides a callback for character events with modifier key bits.  The
+callback is set with @ref glfwSetCharModsCallback.  Unlike the regular character
+callback, this will report character events that will not result in a character
+being input, for example if the Control key is held down.
+
+@see @ref input_char
+
+
+@subsection news_31_single Single buffered framebuffers
+
+GLFW now supports the creation of single buffered windows, with the
+[GLFW_DOUBLEBUFFER](@ref window_hints_fb) window hint.
+
+
+@subsection news_31_glext Macro for including extension header
+
+GLFW now includes the extension header appropriate for the chosen OpenGL or
+OpenGL ES header when [GLFW_INCLUDE_GLEXT](@ref build_macros) is defined.  GLFW
+does not provide these headers.  They must be provided by your development
+environment or your OpenGL or OpenGL ES SDK.
+
+
+@subsection news_31_release Context release behaviors
+
+GLFW now supports controlling whether the pipeline is flushed when a context is
+made non-current, with the
+[GLFW_CONTEXT_RELEASE_BEHAVIOR](@ref window_hints_ctx) window hint, provided the
+machine supports the `GL_KHR_context_flush_control` extension.
+
+
+@subsection news_31_wayland (Experimental) Wayland support
+
+GLFW now has an _experimental_ Wayland display protocol backend that can be
+selected on Linux with a CMake option.
+
+
+@subsection news_31_mir (Experimental) Mir support
+
+GLFW now has an _experimental_ Mir display server backend that can be selected
+on Linux with a CMake option.
+
+
+@section news_30 New features in 3.0
+
+These are the release highlights.  For a full list of changes see the
+[version history](http://www.glfw.org/changelog.html).
+
+
+@subsection news_30_cmake CMake build system
+
+GLFW now uses the CMake build system instead of the various makefiles and
+project files used by earlier versions.  CMake is available for all platforms
+supported by GLFW, is present in most package systems and can generate
+makefiles and/or project files for most popular development environments.
+
+For more information on how to use CMake, see the
+[CMake manual](http://cmake.org/cmake/help/documentation.html).
+
+
+@subsection news_30_multiwnd Multi-window support
+
+GLFW now supports the creation of multiple windows, each with their own OpenGL
+or OpenGL ES context, and all window functions now take a window handle.  Event
+callbacks are now per-window and are provided with the handle of the window that
+received the event.  The @ref glfwMakeContextCurrent function has been added to
+select which context is current on a given thread.
+
+
+@subsection news_30_multimon Multi-monitor support
+
+GLFW now explicitly supports multiple monitors.  They can be enumerated with
+@ref glfwGetMonitors, queried with @ref glfwGetVideoModes, @ref
+glfwGetMonitorPos, @ref glfwGetMonitorName and @ref glfwGetMonitorPhysicalSize,
+and specified at window creation to make the newly created window full screen on
+that specific monitor.
+
+
+@subsection news_30_unicode Unicode support
+
+All string arguments to GLFW functions and all strings returned by GLFW now use
+the UTF-8 encoding.  This includes the window title, error string, clipboard
+text, monitor and joystick names as well as the extension function arguments (as
+ASCII is a subset of UTF-8).
+
+
+@subsection news_30_clipboard Clipboard text I/O
+
+GLFW now supports reading and writing plain text to and from the system
+clipboard, with the @ref glfwGetClipboardString and @ref glfwSetClipboardString
+functions.
+
+
+@subsection news_30_gamma Gamma ramp support
+
+GLFW now supports setting and reading back the gamma ramp of monitors, with the
+@ref glfwGetGammaRamp and @ref glfwSetGammaRamp functions.  There is also @ref
+glfwSetGamma, which generates a ramp from a gamma value and then sets it.
+
+
+@subsection news_30_gles OpenGL ES support
+
+GLFW now supports the creation of OpenGL ES contexts, by setting the
+`GLFW_CLIENT_API` window hint to `GLFW_OPENGL_ES_API`, where creation of such
+contexts are supported.  Note that GLFW _does not implement_ OpenGL ES, so your
+driver must provide support in a way usable by GLFW.  Modern Nvidia and Intel
+drivers support creation of OpenGL ES context using the GLX and WGL APIs, while
+AMD provides an EGL implementation instead.
+
+
+@subsection news_30_egl (Experimental) EGL support
+
+GLFW now has an experimental EGL context creation back end that can be selected
+through CMake options.
+
+
+@subsection news_30_hidpi High-DPI support
+
+GLFW now supports high-DPI monitors on both Windows and OS X, giving windows full
+resolution framebuffers where other UI elements are scaled up.  To achieve this,
+@ref glfwGetFramebufferSize and @ref glfwSetFramebufferSizeCallback have been
+added.  These work with pixels, while the rest of the GLFW API works with screen
+coordinates.  This is important as OpenGL uses pixels, not screen coordinates.
+
+
+@subsection news_30_error Error callback
+
+GLFW now has an error callback, which can provide your application with much
+more detailed diagnostics than was previously possible.  The callback is passed
+an error code and a description string.
+
+
+@subsection news_30_wndptr Per-window user pointer
+
+Each window now has a user-defined pointer, retrieved with @ref
+glfwGetWindowUserPointer and set with @ref glfwSetWindowUserPointer, to make it
+easier to integrate GLFW into C++ code.
+
+
+@subsection news_30_iconifyfun Window iconification callback
+
+Each window now has a callback for iconification and restoration events,
+which is set with @ref glfwSetWindowIconifyCallback.
+
+
+@subsection news_30_wndposfun Window position callback
+
+Each window now has a callback for position events, which is set with @ref
+glfwSetWindowPosCallback.
+
+
+@subsection news_30_wndpos Window position query
+
+The position of a window can now be retrieved using @ref glfwGetWindowPos.
+
+
+@subsection news_30_focusfun Window focus callback
+
+Each windows now has a callback for focus events, which is set with @ref
+glfwSetWindowFocusCallback.
+
+
+@subsection news_30_enterleave Cursor enter/leave callback
+
+Each window now has a callback for when the mouse cursor enters or leaves its
+client area, which is set with @ref glfwSetCursorEnterCallback.
+
+
+@subsection news_30_wndtitle Initial window title
+
+The title of a window is now specified at creation time, as one of the arguments
+to @ref glfwCreateWindow.
+
+
+@subsection news_30_hidden Hidden windows
+
+Windows can now be hidden with @ref glfwHideWindow, shown using @ref
+glfwShowWindow and created initially hidden with the `GLFW_VISIBLE` window hint.
+This allows for off-screen rendering in a way compatible with most drivers, as
+well as moving a window to a specific position before showing it.
+
+
+@subsection news_30_undecorated Undecorated windows
+
+Windowed mode windows can now be created without decorations, i.e. things like
+a frame, a title bar, with the `GLFW_DECORATED` window hint.  This allows for
+the creation of things like splash screens.
+
+
+@subsection news_30_keymods Modifier key bit masks
+
+[Modifier key bit mask](@ref mods) parameters have been added to the
+[mouse button](@ref GLFWmousebuttonfun) and [key](@ref GLFWkeyfun) callbacks.
+
+
+@subsection news_30_scancode Platform-specific scancodes
+
+A scancode parameter has been added to the [key callback](@ref GLFWkeyfun). Keys
+that don't have a [key token](@ref keys) still get passed on with the key
+parameter set to `GLFW_KEY_UNKNOWN`.  These scancodes will vary between machines
+and are intended to be used for key bindings.
+
+
+@subsection news_30_jsname Joystick names
+
+The name of a joystick can now be retrieved using @ref glfwGetJoystickName.
+
+
+@subsection news_30_doxygen Doxygen documentation
+
+You are reading it.
+
+*/
--- 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,8 +1,10 @@
-# Getting started {#quick_guide}
+/*!

-[TOC]
+@page quick_guide Getting started

-This guide takes you through writing a small application using GLFW 3.  The
+@tableofcontents
+
+This guide takes you through writing a simple application using GLFW 3.  The
 application will create a window and OpenGL context, render a rotating triangle
 and exit when the user closes the window or presses _Escape_.  This guide will
 introduce a few of the most commonly used functions, but there are many more.
@ -12,114 +14,117 @@ 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.
+In the source files of your application where you use OpenGL or GLFW, you need
+to include the GLFW 3 header file.

-```c
+@code
 #include <GLFW/glfw3.h>
-```
+@endcode

-This header provides all the constants, types and function prototypes of the
-GLFW API.
+This defines all the constants, types and function prototypes of the GLFW API.
+It also includes the OpenGL header from your development environment and
+defines all the constants and types necessary for it to work on your platform
+without including any platform-specific headers.

-By default it also includes the OpenGL header from your development environment.
-On some platforms this header only supports older versions of OpenGL.  The most
-extreme case is Windows, where it typically only supports OpenGL 1.2.
+In other words:

-Most programs will instead use an
-[extension loader library](@ref context_glext_auto) and include its header.
-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.
+- Do _not_ include the OpenGL header yourself, as GLFW does this for you in
+  a platform-independent way
+- Do _not_ include `windows.h` or other platform-specific headers unless
+  you plan on using those APIs yourself
+- If you _do_ need to include such headers, include them _before_ the GLFW
+  header and it will detect this

-```c
-#include <glad/gl.h>
+On some platforms supported by GLFW the OpenGL header and link library only
+expose older versions of OpenGL.  The most extreme case is Windows, which only
+exposes OpenGL 1.2.  The easiest way to work around this is to use an
+[extension loader library](@ref context_glext_auto).
+
+If you are using such a library then you should include its header _before_ the
+GLFW header.  This lets it replace the OpenGL header included by GLFW without
+conflicts.  This example uses
+[glad](https://github.com/Dav1dde/glad), but the same rule applies to all such
+libraries.
+
+@code
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
-```
-
-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
-#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.
+Note that `GLFW_TRUE` and `GLFW_FALSE` are and will always be just 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
-C++ static methods) that are called by GLFW with arguments describing the event.
+a GLFW window being moved, or an error occurring.  Callbacks are simply
+C functions (or C++ static methods) that are called by GLFW with arguments
+describing the event.

 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.
+the signature below.  This simple error callback just prints the error
+description to `stderr`.

-```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
@ -132,38 +137,37 @@ require a minimum OpenGL version by setting the `GLFW_CONTEXT_VERSION_MAJOR` and
 `GLFW_CONTEXT_VERSION_MINOR` hints _before_ creation.  If the required minimum
 version is not supported on the machine, context (and window) creation fails.

-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
-glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+@code
+glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
+glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
 GLFWwindow* window = glfwCreateWindow(640, 480, "My Title", NULL, NULL);
 if (!window)
 {
    // Window or context creation failed
 }
-```
+@endcode
+
+The window handle is passed to all window related functions and is provided to
+along to all window related callbacks, so they can tell which window received
+the event.

 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.
@ -172,14 +176,14 @@ If you are using an [extension loader library](@ref context_glext_auto) to
 access modern OpenGL then this is when to initialize it, as the loader needs
 a current context to load from.  This example uses
 [glad](https://github.com/Dav1dde/glad), but the same rule applies to all such
-libraries.
+libraries. 

-```c
-gladLoadGL(glfwGetProcAddress);
-```
+@code
+gladLoadGLLoader((GLADloadproc) 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 +193,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,70 +209,66 @@ 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
+tutorial, a multi-colored 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.

-The details of how to render with OpenGL is outside the scope of this tutorial,
-but there are many excellent resources for learning modern OpenGL.  Here are
-a few of them:
-
- - [Anton's OpenGL 4 Tutorials](https://antongerdelan.net/opengl/)
- - [Learn OpenGL](https://learnopengl.com/)
- - [Open.GL](https://open.gl/)
-
-These all happen to use GLFW, but OpenGL itself works the same whatever API you
-use to create the window and context.
+Actual rendering with OpenGL is outside the scope of this tutorial, but there
+are [many](https://open.gl/) [excellent](http://learnopengl.com/)
+[tutorial](http://openglbook.com/) [sites](http://ogldev.atspace.co.uk/) that
+teach modern OpenGL.  Some of them use GLFW to create the context and window
+while others use GLUT or SDL, but remember that OpenGL itself always works the
+same.


-### 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 +277,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 +294,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
@ -311,11 +311,11 @@ done each frame after buffer swapping.

 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.
+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,24 +325,22 @@ 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.
+keyboard input, it's possible to create a simple program.

 This program creates a 640 by 480 windowed mode window and starts a loop that
 clears the screen, renders a triangle and processes events until the user either
 presses _Escape_ or closes the window.

-@snippet triangle-opengl.c code
+@snippet simple.c code

-The program above can be found in the [source package][download] 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
+The program above can be found in the
+[source package](http://www.glfw.org/download.html) as `examples/simple.c`
+and is compiled along with all other examples when you build GLFW.  If you
+built GLFW from the source package then already have this as `simple.exe` on
+Windows, `simple` on Linux or `simple.app` on OS X.

 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
@ -363,3 +361,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/spaces.svg
+++ b/docs/spaces.svg
@ -13,7 +13,7 @@
   height="327.98221"
   id="svg2"
   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="0.48.4 r9939"
   sodipodi:docname="spaces.svg">
  <defs
     id="defs4">
@ -38,11 +38,11 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.8110012"
-     inkscape:cx="320.68941"
-     inkscape:cy="159.80509"
+     inkscape:zoom="2.5611424"
+     inkscape:cx="344.24359"
+     inkscape:cy="163.9911"
     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="svg2"
     showgrid="false"
     inkscape:window-width="1920"
     inkscape:window-height="1021"
@ -475,18 +475,18 @@
       inkscape:export-ydpi="109.89113" />
    <text
       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
       x="21.213203"
       y="340.20465"
       id="text3803"
+       sodipodi:linespacing="125%"
       inkscape:export-filename="/home/elmindreda/projects/glfw/glfw/docs/spaces.png"
       inkscape:export-xdpi="109.89113"
       inkscape:export-ydpi="109.89113"><tspan
         sodipodi:role="line"
         id="tspan3805"
         x="21.213203"
-         y="340.20465"
-         style="font-size:12px;line-height:1.25;font-family:sans-serif"> </tspan></text>
+         y="340.20465" /></text>
    <g
       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
       id="text3807">
@ -647,6 +647,74 @@
         style="font-size:10px"
         id="path3239" />
    </g>
+    <g
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text3826">
+      <path
+         d="m 172.22728,456.1171 0,1.04004 c -0.33204,-0.30924 -0.68686,-0.54036 -1.06445,-0.69336 -0.37436,-0.15299 -0.77312,-0.22949 -1.19629,-0.2295 -0.83334,10e-6 -1.47136,0.25554 -1.91407,0.76661 -0.44271,0.50781 -0.66406,1.24349 -0.66406,2.20703 0,0.96029 0.22135,1.69596 0.66406,2.20703 0.44271,0.50781 1.08073,0.76172 1.91407,0.76172 0.42317,0 0.82193,-0.0765 1.19629,-0.2295 0.37759,-0.15299 0.73241,-0.38411 1.06445,-0.69336 l 0,1.03028 c -0.34506,0.23437 -0.71127,0.41015 -1.09863,0.52734 -0.38412,0.11719 -0.79102,0.17578 -1.22071,0.17578 -1.10351,0 -1.97265,-0.33691 -2.60742,-1.01074 -0.63476,-0.67708 -0.95215,-1.59993 -0.95215,-2.76855 0,-1.17187 0.31739,-2.09472 0.95215,-2.76856 0.63477,-0.67707 1.50391,-1.01562 2.60742,-1.01562 0.4362,0 0.84635,0.0586 1.23047,0.17578 0.38737,0.11394 0.75032,0.28646 1.08887,0.51758"
+         style="font-size:10px"
+         id="path3108" />
+      <path
+         d="m 173.72142,455.24796 0.89844,0 0,7.59765 -0.89844,0 0,-7.59765"
+         style="font-size:10px"
+         id="path3110" />
+      <path
+         d="m 176.49486,457.37686 0.89844,0 0,5.46875 -0.89844,0 0,-5.46875 m 0,-2.1289 0.89844,0 0,1.13769 -0.89844,0 0,-1.13769"
+         style="font-size:10px"
+         id="path3112" />
+      <path
+         d="m 183.94603,459.88663 0,0.43945 -4.13086,0 c 0.0391,0.61849 0.22461,1.0905 0.55664,1.41602 0.33528,0.32226 0.80078,0.4834 1.39649,0.48339 0.34504,1e-5 0.6787,-0.0423 1.00097,-0.12695 0.32552,-0.0846 0.64778,-0.21159 0.9668,-0.38086 l 0,0.84961 c -0.32227,0.13672 -0.65268,0.24089 -0.99121,0.3125 -0.33855,0.0716 -0.68197,0.10742 -1.03028,0.10742 -0.87239,0 -1.56413,-0.2539 -2.07519,-0.76172 -0.50781,-0.50781 -0.76172,-1.19466 -0.76172,-2.06054 0,-0.89518 0.24088,-1.60482 0.72266,-2.12891 0.48502,-0.52734 1.13769,-0.79101 1.958,-0.79101 0.73568,0 1.31673,0.23763 1.74317,0.71289 0.42968,0.47201 0.64452,1.11491 0.64453,1.92871 m -0.89844,-0.26367 c -0.007,-0.49154 -0.14486,-0.88379 -0.41504,-1.17676 -0.26693,-0.29297 -0.62175,-0.43945 -1.06445,-0.43946 -0.5013,1e-5 -0.90332,0.14161 -1.20605,0.42481 -0.29949,0.28321 -0.47201,0.68197 -0.51758,1.19629 l 3.20312,-0.005"
+         style="font-size:10px"
+         id="path3114" />
+      <path
+         d="m 189.96654,459.54483 0,3.30078 -0.89844,0 0,-3.27148 c 0,-0.51758 -0.10092,-0.90495 -0.30273,-1.16211 -0.20183,-0.25716 -0.50457,-0.38574 -0.90821,-0.38574 -0.48503,0 -0.86751,0.15462 -1.14746,0.46386 -0.27995,0.30925 -0.41992,0.7308 -0.41992,1.26465 l 0,3.09082 -0.90332,0 0,-5.46875 0.90332,0 0,0.84961 c 0.21484,-0.32877 0.46712,-0.57454 0.75684,-0.7373 0.29296,-0.16276 0.62988,-0.24414 1.01074,-0.24414 0.62825,0 1.10351,0.19531 1.42578,0.58593 0.32226,0.38738 0.48339,0.95867 0.4834,1.71387"
+         style="font-size:10px"
+         id="path3116" />
+      <path
+         d="m 192.65697,455.82413 0,1.55273 1.85058,0 0,0.69824 -1.85058,0 0,2.96875 c 0,0.44597 0.0602,0.73243 0.18066,0.85938 0.1237,0.12695 0.37272,0.19043 0.74707,0.19043 l 0.92285,0 0,0.75195 -0.92285,0 c -0.69336,0 -1.17188,-0.12858 -1.43555,-0.38574 -0.26367,-0.26042 -0.3955,-0.73242 -0.3955,-1.41602 l 0,-2.96875 -0.65918,0 0,-0.69824 0.65918,0 0,-1.55273 0.90332,0"
+         style="font-size:10px"
+         id="path3118" />
+      <path
+         d="m 201.36302,460.09659 c -0.72591,0 -1.22884,0.083 -1.50879,0.24902 -0.27995,0.16602 -0.41992,0.44922 -0.41992,0.84961 0,0.31901 0.10417,0.57292 0.3125,0.76172 0.21159,0.18555 0.49805,0.27832 0.85938,0.27832 0.49804,0 0.8968,-0.17578 1.19628,-0.52734 0.30274,-0.35482 0.4541,-0.8252 0.45411,-1.41114 l 0,-0.20019 -0.89356,0 m 1.79199,-0.3711 0,3.12012 -0.89843,0 0,-0.83008 c -0.20509,0.33204 -0.46062,0.5778 -0.76661,0.73731 -0.30599,0.15625 -0.68034,0.23437 -1.12304,0.23437 -0.5599,0 -1.00586,-0.15625 -1.33789,-0.46875 -0.32878,-0.31575 -0.49317,-0.7373 -0.49317,-1.26465 0,-0.61523 0.20508,-1.07909 0.61524,-1.3916 0.41341,-0.31249 1.02864,-0.46874 1.8457,-0.46875 l 1.25977,0 0,-0.0879 c -1e-5,-0.4134 -0.13673,-0.73242 -0.41016,-0.95703 -0.27019,-0.22786 -0.65104,-0.34179 -1.14258,-0.3418 -0.3125,1e-5 -0.61686,0.0374 -0.91308,0.11231 -0.29623,0.0749 -0.58106,0.18718 -0.8545,0.33691 l 0,-0.83007 c 0.32878,-0.12695 0.64779,-0.22135 0.95704,-0.28321 0.30924,-0.0651 0.61034,-0.0976 0.90332,-0.0976 0.79101,0 1.38183,0.20508 1.77246,0.61523 0.39062,0.41016 0.58593,1.03191 0.58593,1.86523"
+         style="font-size:10px"
+         id="path3120" />
+      <path
+         d="m 208.17943,458.21671 c -0.10092,-0.0586 -0.21159,-0.10091 -0.33203,-0.12696 -0.11719,-0.0293 -0.2474,-0.0439 -0.39063,-0.0439 -0.50781,0 -0.89844,0.16602 -1.17187,0.49804 -0.27019,0.32878 -0.40528,0.80242 -0.40528,1.4209 l 0,2.88086 -0.90332,0 0,-5.46875 0.90332,0 0,0.84961 c 0.1888,-0.33203 0.43457,-0.57779 0.73731,-0.7373 0.30273,-0.16276 0.67057,-0.24414 1.10351,-0.24414 0.0618,0 0.13021,0.005 0.20508,0.0146 0.0749,0.007 0.15788,0.0179 0.24903,0.0342 l 0.005,0.92286"
+         style="font-size:10px"
+         id="path3122" />
+      <path
+         d="m 213.59447,459.88663 0,0.43945 -4.13086,0 c 0.0391,0.61849 0.22461,1.0905 0.55664,1.41602 0.33528,0.32226 0.80078,0.4834 1.39648,0.48339 0.34505,1e-5 0.67871,-0.0423 1.00098,-0.12695 0.32552,-0.0846 0.64778,-0.21159 0.9668,-0.38086 l 0,0.84961 c -0.32227,0.13672 -0.65268,0.24089 -0.99121,0.3125 -0.33855,0.0716 -0.68197,0.10742 -1.03028,0.10742 -0.8724,0 -1.56413,-0.2539 -2.07519,-0.76172 -0.50782,-0.50781 -0.76172,-1.19466 -0.76172,-2.06054 0,-0.89518 0.24088,-1.60482 0.72265,-2.12891 0.48503,-0.52734 1.1377,-0.79101 1.95801,-0.79101 0.73567,0 1.31673,0.23763 1.74317,0.71289 0.42968,0.47201 0.64452,1.11491 0.64453,1.92871 m -0.89844,-0.26367 c -0.007,-0.49154 -0.14486,-0.88379 -0.41504,-1.17676 -0.26693,-0.29297 -0.62175,-0.43945 -1.06445,-0.43946 -0.50131,1e-5 -0.90333,0.14161 -1.20606,0.42481 -0.29948,0.28321 -0.472,0.68197 -0.51758,1.19629 l 3.20313,-0.005"
+         style="font-size:10px"
+         id="path3124" />
+      <path
+         d="m 217.55443,460.09659 c -0.72592,0 -1.22885,0.083 -1.50879,0.24902 -0.27995,0.16602 -0.41992,0.44922 -0.41992,0.84961 0,0.31901 0.10416,0.57292 0.3125,0.76172 0.21158,0.18555 0.49804,0.27832 0.85937,0.27832 0.49805,0 0.89681,-0.17578 1.19629,-0.52734 0.30273,-0.35482 0.4541,-0.8252 0.4541,-1.41114 l 0,-0.20019 -0.89355,0 m 1.79199,-0.3711 0,3.12012 -0.89844,0 0,-0.83008 c -0.20508,0.33204 -0.46061,0.5778 -0.7666,0.73731 -0.30599,0.15625 -0.68034,0.23437 -1.12305,0.23437 -0.55989,0 -1.00586,-0.15625 -1.33789,-0.46875 -0.32877,-0.31575 -0.49316,-0.7373 -0.49316,-1.26465 0,-0.61523 0.20508,-1.07909 0.61523,-1.3916 0.41341,-0.31249 1.02865,-0.46874 1.84571,-0.46875 l 1.25976,0 0,-0.0879 c 0,-0.4134 -0.13672,-0.73242 -0.41015,-0.95703 -0.27019,-0.22786 -0.65105,-0.34179 -1.14258,-0.3418 -0.3125,1e-5 -0.61687,0.0374 -0.91309,0.11231 -0.29622,0.0749 -0.58105,0.18718 -0.85449,0.33691 l 0,-0.83007 c 0.32877,-0.12695 0.64779,-0.22135 0.95703,-0.28321 0.30924,-0.0651 0.61035,-0.0976 0.90332,-0.0976 0.79101,0 1.38183,0.20508 1.77246,0.61523 0.39062,0.41016 0.58594,1.03191 0.58594,1.86523"
+         style="font-size:10px"
+         id="path3126" />
+      <path
+         d="m 226.50462,458.00674 c -0.48177,1e-5 -0.86263,0.18881 -1.14257,0.56641 -0.27995,0.37435 -0.41993,0.88868 -0.41993,1.54297 0,0.6543 0.13835,1.17025 0.41504,1.54785 0.27995,0.37435 0.66243,0.56153 1.14746,0.56152 0.47852,1e-5 0.85775,-0.1888 1.1377,-0.5664 0.27994,-0.3776 0.41992,-0.89193 0.41992,-1.54297 0,-0.64778 -0.13998,-1.16048 -0.41992,-1.53809 -0.27995,-0.38085 -0.65918,-0.57128 -1.1377,-0.57129 m 0,-0.76171 c 0.78125,0 1.39486,0.25391 1.84082,0.76171 0.44596,0.50782 0.66894,1.21095 0.66895,2.10938 -1e-5,0.89518 -0.22299,1.59831 -0.66895,2.10937 -0.44596,0.50782 -1.05957,0.76172 -1.84082,0.76172 -0.7845,0 -1.39974,-0.2539 -1.8457,-0.76172 -0.44271,-0.51106 -0.66406,-1.21419 -0.66406,-2.10937 0,-0.89843 0.22135,-1.60156 0.66406,-2.10938 0.44596,-0.5078 1.0612,-0.76171 1.8457,-0.76171"
+         style="font-size:10px"
+         id="path3128" />
+      <path
+         d="m 233.66771,458.21671 c -0.10092,-0.0586 -0.21159,-0.10091 -0.33203,-0.12696 -0.11719,-0.0293 -0.2474,-0.0439 -0.39063,-0.0439 -0.50781,0 -0.89844,0.16602 -1.17187,0.49804 -0.27019,0.32878 -0.40528,0.80242 -0.40528,1.4209 l 0,2.88086 -0.90332,0 0,-5.46875 0.90332,0 0,0.84961 c 0.1888,-0.33203 0.43457,-0.57779 0.73731,-0.7373 0.30273,-0.16276 0.67057,-0.24414 1.10351,-0.24414 0.0618,0 0.13021,0.005 0.20508,0.0146 0.0749,0.007 0.15788,0.0179 0.24903,0.0342 l 0.005,0.92286"
+         style="font-size:10px"
+         id="path3130" />
+      <path
+         d="m 234.61986,457.37686 0.89844,0 0,5.46875 -0.89844,0 0,-5.46875 m 0,-2.1289 0.89844,0 0,1.13769 -0.89844,0 0,-1.13769"
+         style="font-size:10px"
+         id="path3132" />
+      <path
+         d="m 240.99193,460.04776 c -1e-5,-0.65104 -0.1351,-1.15559 -0.40528,-1.51367 -0.26693,-0.35807 -0.6429,-0.53711 -1.12793,-0.53711 -0.48177,0 -0.85774,0.17904 -1.12792,0.53711 -0.26693,0.35808 -0.4004,0.86263 -0.4004,1.51367 0,0.64779 0.13347,1.15072 0.4004,1.50879 0.27018,0.35807 0.64615,0.53711 1.12792,0.53711 0.48503,0 0.861,-0.17904 1.12793,-0.53711 0.27018,-0.35807 0.40527,-0.861 0.40528,-1.50879 m 0.89844,2.11914 c -1e-5,0.93099 -0.20672,1.62272 -0.62012,2.0752 -0.41342,0.45572 -1.04655,0.68359 -1.89942,0.68359 -0.31575,0 -0.6136,-0.0244 -0.89355,-0.0732 -0.27995,-0.0456 -0.55176,-0.11719 -0.81543,-0.21485 l 0,-0.87402 c 0.26367,0.14323 0.52409,0.24902 0.78125,0.31738 0.25716,0.0684 0.5192,0.10254 0.78613,0.10254 0.58919,0 1.03027,-0.15462 1.32324,-0.46386 0.29297,-0.306 0.43945,-0.76986 0.43946,-1.39161 l 0,-0.44433 c -0.18555,0.32226 -0.42318,0.56315 -0.71289,0.72265 -0.28972,0.15951 -0.6364,0.23926 -1.04004,0.23926 -0.67058,0 -1.21094,-0.25553 -1.6211,-0.7666 -0.41015,-0.51107 -0.61523,-1.18815 -0.61523,-2.03125 0,-0.84635 0.20508,-1.52506 0.61523,-2.03613 0.41016,-0.51107 0.95052,-0.7666 1.6211,-0.7666 0.40364,0 0.75032,0.0797 1.04004,0.23925 0.28971,0.15951 0.52734,0.4004 0.71289,0.72266 l 0,-0.83008 0.89844,0 0,4.79004"
+         style="font-size:10px"
+         id="path3134" />
+      <path
+         d="m 243.74095,457.37686 0.89844,0 0,5.46875 -0.89844,0 0,-5.46875 m 0,-2.1289 0.89844,0 0,1.13769 -0.89844,0 0,-1.13769"
+         style="font-size:10px"
+         id="path3136" />
+      <path
+         d="m 251.06029,459.54483 0,3.30078 -0.89844,0 0,-3.27148 c 0,-0.51758 -0.10092,-0.90495 -0.30273,-1.16211 -0.20183,-0.25716 -0.50457,-0.38574 -0.90821,-0.38574 -0.48503,0 -0.86751,0.15462 -1.14746,0.46386 -0.27995,0.30925 -0.41992,0.7308 -0.41992,1.26465 l 0,3.09082 -0.90332,0 0,-5.46875 0.90332,0 0,0.84961 c 0.21484,-0.32877 0.46712,-0.57454 0.75684,-0.7373 0.29296,-0.16276 0.62988,-0.24414 1.01074,-0.24414 0.62825,0 1.10351,0.19531 1.42578,0.58593 0.32226,0.38738 0.48339,0.95867 0.4834,1.71387"
+         style="font-size:10px"
+         id="path3138" />
+    </g>
    <g
       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
       id="text3017">
@ -800,78 +868,5 @@
         style="font-size:5px"
         id="path3161" />
    </g>
-    <g
-       aria-label="Content area origin"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       id="text4089">
-      <path
-         d="m 172.21587,456.09125 v 1.04004 q -0.49805,-0.46387 -1.06446,-0.69336 -0.56152,-0.22949 -1.19629,-0.22949 -1.25,0 -1.91406,0.7666 -0.66406,0.76172 -0.66406,2.20703 0,1.44043 0.66406,2.20703 0.66406,0.76172 1.91406,0.76172 0.63477,0 1.19629,-0.22949 0.56641,-0.2295 1.06446,-0.69336 v 1.03027 q -0.51758,0.35156 -1.09864,0.52734 -0.57617,0.17578 -1.2207,0.17578 -1.65527,0 -2.60742,-1.01074 -0.95215,-1.01562 -0.95215,-2.76855 0,-1.75781 0.95215,-2.76856 0.95215,-1.01562 2.60742,-1.01562 0.6543,0 1.23047,0.17578 0.58105,0.1709 1.08887,0.51758 z"
-         style="font-size:10px"
-         id="path4091" />
-      <path
-         d="m 175.82915,457.9809 q -0.72266,0 -1.14258,0.5664 -0.41992,0.56153 -0.41992,1.54297 0,0.98145 0.41504,1.54785 0.41992,0.56153 1.14746,0.56153 0.71777,0 1.13769,-0.56641 0.41992,-0.56641 0.41992,-1.54297 0,-0.97168 -0.41992,-1.53808 -0.41992,-0.57129 -1.13769,-0.57129 z m 0,-0.76172 q 1.17187,0 1.84082,0.76172 0.66894,0.76171 0.66894,2.10937 0,1.34277 -0.66894,2.10938 -0.66895,0.76171 -1.84082,0.76171 -1.17676,0 -1.84571,-0.76171 -0.66406,-0.76661 -0.66406,-2.10938 0,-1.34766 0.66406,-2.10937 0.66895,-0.76172 1.84571,-0.76172 z"
-         style="font-size:10px"
-         id="path4093" />
-      <path
-         d="m 184.36919,459.51898 v 3.30078 h -0.89844 v -3.27148 q 0,-0.77637 -0.30274,-1.16211 -0.30273,-0.38574 -0.9082,-0.38574 -0.72754,0 -1.14746,0.46386 -0.41992,0.46387 -0.41992,1.26465 v 3.09082 h -0.90332 v -5.46875 h 0.90332 v 0.84961 q 0.32226,-0.49316 0.75683,-0.7373 0.43946,-0.24414 1.01075,-0.24414 0.94238,0 1.42578,0.58593 0.4834,0.58106 0.4834,1.71387 z"
-         style="font-size:10px"
-         id="path4095" />
-      <path
-         d="m 187.05962,455.79828 v 1.55273 h 1.85058 v 0.69825 h -1.85058 v 2.96875 q 0,0.66894 0.18066,0.85937 0.18555,0.19043 0.74707,0.19043 h 0.92285 v 0.75195 h -0.92285 q -1.04004,0 -1.43555,-0.38574 -0.3955,-0.39062 -0.3955,-1.41601 v -2.96875 h -0.65918 v -0.69825 h 0.65918 v -1.55273 z"
-         style="font-size:10px"
-         id="path4097" />
-      <path
-         d="m 194.77446,459.86078 v 0.43945 h -4.13086 q 0.0586,0.92774 0.55664,1.41602 0.50293,0.4834 1.39649,0.4834 0.51757,0 1.00097,-0.12696 0.48828,-0.12695 0.9668,-0.38086 v 0.84961 q -0.4834,0.20508 -0.99121,0.3125 -0.50781,0.10742 -1.03028,0.10742 -1.30859,0 -2.07519,-0.76171 -0.76172,-0.76172 -0.76172,-2.06055 0,-1.34277 0.72266,-2.12891 0.72754,-0.79101 1.958,-0.79101 1.10352,0 1.74317,0.71289 0.64453,0.70801 0.64453,1.92871 z m -0.89844,-0.26367 q -0.01,-0.73731 -0.41504,-1.17676 -0.40039,-0.43945 -1.06445,-0.43945 -0.75195,0 -1.20605,0.4248 -0.44922,0.42481 -0.51758,1.19629 z"
-         style="font-size:10px"
-         id="path4099" />
-      <path
-         d="m 200.79497,459.51898 v 3.30078 h -0.89844 v -3.27148 q 0,-0.77637 -0.30273,-1.16211 -0.30274,-0.38574 -0.90821,-0.38574 -0.72754,0 -1.14746,0.46386 -0.41992,0.46387 -0.41992,1.26465 v 3.09082 h -0.90332 v -5.46875 h 0.90332 v 0.84961 q 0.32227,-0.49316 0.75684,-0.7373 0.43945,-0.24414 1.01074,-0.24414 0.94238,0 1.42578,0.58593 0.4834,0.58106 0.4834,1.71387 z"
-         style="font-size:10px"
-         id="path4101" />
-      <path
-         d="m 203.4854,455.79828 v 1.55273 h 1.85058 v 0.69825 h -1.85058 v 2.96875 q 0,0.66894 0.18066,0.85937 0.18555,0.19043 0.74707,0.19043 h 0.92285 v 0.75195 h -0.92285 q -1.04004,0 -1.43555,-0.38574 -0.3955,-0.39062 -0.3955,-1.41601 v -2.96875 h -0.65918 v -0.69825 h 0.65918 v -1.55273 z"
-         style="font-size:10px"
-         id="path4103" />
-      <path
-         d="m 212.19145,460.07074 q -1.08887,0 -1.50879,0.24902 -0.41992,0.24903 -0.41992,0.84961 0,0.47852 0.3125,0.76172 0.31738,0.27832 0.85938,0.27832 0.74707,0 1.19629,-0.52734 0.4541,-0.53223 0.4541,-1.41113 v -0.2002 z m 1.79199,-0.37109 v 3.12011 h -0.89843 v -0.83007 q -0.30762,0.49804 -0.7666,0.7373 -0.45899,0.23437 -1.12305,0.23437 -0.83985,0 -1.33789,-0.46875 -0.49317,-0.47363 -0.49317,-1.26464 0,-0.92286 0.61524,-1.39161 0.62012,-0.46875 1.8457,-0.46875 h 1.25977 v -0.0879 q 0,-0.62011 -0.41016,-0.95703 -0.40527,-0.34179 -1.14258,-0.34179 -0.46875,0 -0.91308,0.1123 -0.44434,0.11231 -0.8545,0.33691 v -0.83007 q 0.49317,-0.19043 0.95704,-0.28321 0.46386,-0.0976 0.90332,-0.0976 1.18652,0 1.77246,0.61523 0.58593,0.61524 0.58593,1.86524 z"
-         style="font-size:10px"
-         id="path4105" />
-      <path
-         d="m 219.00786,458.19086 q -0.15137,-0.0879 -0.33203,-0.12696 -0.17578,-0.0439 -0.39063,-0.0439 -0.76172,0 -1.17187,0.49805 -0.40528,0.49316 -0.40528,1.42089 v 2.88086 h -0.90332 v -5.46875 h 0.90332 v 0.84961 q 0.28321,-0.49804 0.73731,-0.7373 0.4541,-0.24414 1.10351,-0.24414 0.0928,0 0.20508,0.0147 0.11231,0.01 0.24903,0.0342 z"
-         style="font-size:10px"
-         id="path4107" />
-      <path
-         d="m 224.4229,459.86078 v 0.43945 h -4.13086 q 0.0586,0.92774 0.55664,1.41602 0.50293,0.4834 1.39648,0.4834 0.51758,0 1.00098,-0.12696 0.48828,-0.12695 0.9668,-0.38086 v 0.84961 q -0.4834,0.20508 -0.99121,0.3125 -0.50782,0.10742 -1.03028,0.10742 -1.30859,0 -2.07519,-0.76171 -0.76172,-0.76172 -0.76172,-2.06055 0,-1.34277 0.72265,-2.12891 0.72754,-0.79101 1.95801,-0.79101 1.10352,0 1.74317,0.71289 0.64453,0.70801 0.64453,1.92871 z m -0.89844,-0.26367 q -0.01,-0.73731 -0.41504,-1.17676 -0.40039,-0.43945 -1.06445,-0.43945 -0.75196,0 -1.20606,0.4248 -0.44922,0.42481 -0.51758,1.19629 z"
-         style="font-size:10px"
-         id="path4109" />
-      <path
-         d="m 228.38286,460.07074 q -1.08887,0 -1.50879,0.24902 -0.41992,0.24903 -0.41992,0.84961 0,0.47852 0.3125,0.76172 0.31738,0.27832 0.85937,0.27832 0.74707,0 1.19629,-0.52734 0.4541,-0.53223 0.4541,-1.41113 v -0.2002 z m 1.79199,-0.37109 v 3.12011 h -0.89844 v -0.83007 q -0.30761,0.49804 -0.7666,0.7373 -0.45898,0.23437 -1.12305,0.23437 -0.83984,0 -1.33789,-0.46875 -0.49316,-0.47363 -0.49316,-1.26464 0,-0.92286 0.61523,-1.39161 0.62012,-0.46875 1.84571,-0.46875 h 1.25976 v -0.0879 q 0,-0.62011 -0.41015,-0.95703 -0.40528,-0.34179 -1.14258,-0.34179 -0.46875,0 -0.91309,0.1123 -0.44433,0.11231 -0.85449,0.33691 v -0.83007 q 0.49316,-0.19043 0.95703,-0.28321 0.46387,-0.0976 0.90332,-0.0976 1.18653,0 1.77246,0.61523 0.58594,0.61524 0.58594,1.86524 z"
-         style="font-size:10px"
-         id="path4111" />
-      <path
-         d="m 237.33305,457.9809 q -0.72265,0 -1.14257,0.5664 -0.41993,0.56153 -0.41993,1.54297 0,0.98145 0.41504,1.54785 0.41992,0.56153 1.14746,0.56153 0.71778,0 1.1377,-0.56641 0.41992,-0.56641 0.41992,-1.54297 0,-0.97168 -0.41992,-1.53808 -0.41992,-0.57129 -1.1377,-0.57129 z m 0,-0.76172 q 1.17188,0 1.84082,0.76172 0.66895,0.76171 0.66895,2.10937 0,1.34277 -0.66895,2.10938 -0.66894,0.76171 -1.84082,0.76171 -1.17675,0 -1.8457,-0.76171 -0.66406,-0.76661 -0.66406,-2.10938 0,-1.34766 0.66406,-2.10937 0.66895,-0.76172 1.8457,-0.76172 z"
-         style="font-size:10px"
-         id="path4113" />
-      <path
-         d="m 244.49614,458.19086 q -0.15137,-0.0879 -0.33203,-0.12696 -0.17578,-0.0439 -0.39063,-0.0439 -0.76172,0 -1.17187,0.49805 -0.40528,0.49316 -0.40528,1.42089 v 2.88086 h -0.90332 v -5.46875 h 0.90332 v 0.84961 q 0.28321,-0.49804 0.73731,-0.7373 0.4541,-0.24414 1.10352,-0.24414 0.0928,0 0.20507,0.0147 0.11231,0.01 0.24903,0.0342 z"
-         style="font-size:10px"
-         id="path4115" />
-      <path
-         d="m 245.44829,457.35101 h 0.89844 v 5.46875 h -0.89844 z m 0,-2.1289 h 0.89844 v 1.13769 h -0.89844 z"
-         style="font-size:10px"
-         id="path4117" />
-      <path
-         d="m 251.82036,460.02191 q 0,-0.97656 -0.40528,-1.51367 -0.40039,-0.53711 -1.12792,-0.53711 -0.72266,0 -1.12793,0.53711 -0.4004,0.53711 -0.4004,1.51367 0,0.97168 0.4004,1.50879 0.40527,0.53711 1.12793,0.53711 0.72753,0 1.12792,-0.53711 0.40528,-0.53711 0.40528,-1.50879 z m 0.89844,2.11914 q 0,1.39649 -0.62012,2.0752 -0.62012,0.68359 -1.89942,0.68359 -0.47363,0 -0.89355,-0.0732 -0.41992,-0.0684 -0.81543,-0.21484 v -0.87403 q 0.39551,0.21485 0.78125,0.31738 0.38574,0.10254 0.78613,0.10254 0.88379,0 1.32325,-0.46386 0.43945,-0.45899 0.43945,-1.3916 v -0.44434 q -0.27832,0.4834 -0.71289,0.72266 -0.43457,0.23925 -1.04004,0.23925 -1.00586,0 -1.6211,-0.7666 -0.61523,-0.7666 -0.61523,-2.03125 0,-1.26953 0.61523,-2.03613 0.61524,-0.7666 1.6211,-0.7666 0.60547,0 1.04004,0.23926 0.43457,0.23925 0.71289,0.72265 v -0.83008 h 0.89844 z"
-         style="font-size:10px"
-         id="path4119" />
-      <path
-         d="m 254.56938,457.35101 h 0.89844 v 5.46875 h -0.89844 z m 0,-2.1289 h 0.89844 v 1.13769 h -0.89844 z"
-         style="font-size:10px"
-         id="path4121" />
-      <path
-         d="m 261.88872,459.51898 v 3.30078 h -0.89844 v -3.27148 q 0,-0.77637 -0.30273,-1.16211 -0.30274,-0.38574 -0.90821,-0.38574 -0.72754,0 -1.14746,0.46386 -0.41992,0.46387 -0.41992,1.26465 v 3.09082 h -0.90332 v -5.46875 h 0.90332 v 0.84961 q 0.32227,-0.49316 0.75684,-0.7373 0.43945,-0.24414 1.01074,-0.24414 0.94238,0 1.42578,0.58593 0.4834,0.58106 0.4834,1.71387 z"
-         style="font-size:10px"
-         id="path4123" />
-    </g>
  </g>
 </svg>
--- a/docs/vulkan.dox
+++ b/docs/vulkan.dox
@ -1,24 +1,26 @@
-# 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
+This guide is intended to fill the gaps between the [Vulkan
+documentation](https://www.khronos.org/vulkan/) and the rest of the GLFW
 documentation and is not a replacement for either.  It assumes some familiarity
 with Vulkan concepts like loaders, devices, queues and surfaces and leaves it to
 the Vulkan documentation to explain the details of Vulkan functions.

-To develop for Vulkan you should download the [LunarG Vulkan
-SDK](https://vulkan.lunarg.com/) for your platform.  Apart from headers and link
-libraries, they also provide the validation layers necessary for development.
+To develop for Vulkan you should install an SDK for your platform, for example
+the [LunarG Vulkan SDK](https://vulkan.lunarg.com/).  Apart from the headers and
+libraries, it also provides the validation layers necessary for development.

-The [Vulkan Tutorial](https://vulkan-tutorial.com/) has more information on how
-to use GLFW and Vulkan.  The [Khronos Vulkan
-Samples](https://github.com/KhronosGroup/Vulkan-Samples) also use GLFW, although
-with a small framework in between.
+The GLFW library does not need the Vulkan SDK to enable support for Vulkan.
+However, any Vulkan-specific test and example programs are built only if the
+CMake files find a Vulkan SDK.

-For details on a specific Vulkan support function, see the @ref vulkan.  There
-are also guides for the other areas of the GLFW API.
+For details on a specific function, see the
+[reference documentation](@ref vulkan).  There are also guides for the other
+areas of the GLFW API.

 - @ref intro_guide
 - @ref window_guide
@ -27,103 +29,73 @@ are also guides for the other areas of the GLFW API.
 - @ref input_guide


-## Finding the Vulkan loader {#vulkan_loader}
+@section vulkan_include Including the Vulkan and GLFW header files

-GLFW itself does not ever need to be linked against the Vulkan loader.
+To include the Vulkan header, define [GLFW_INCLUDE_VULKAN](@ref build_macros)
+before including the GLFW header.

-By default, GLFW will load the Vulkan loader dynamically at runtime via its standard name:
-`vulkan-1.dll` on Windows, `libvulkan.so.1` on Linux and other Unix-like systems and
-`libvulkan.1.dylib` on macOS.
-
-@macos GLFW will also look up and search the `Frameworks` subdirectory of your
-application bundle.
-
-If your code is using a Vulkan loader with a different name or in a non-standard location
-you will need to direct GLFW to it.  Pass your version of `vkGetInstanceProcAddr` to @ref
-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
-glfwInitVulkanLoader(vkGetInstanceProcAddr);
-```
-
-@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}
-
-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.
+If you want to include the Vulkan header from a custom location or use your own
+custom Vulkan header then you need to include them 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.
-
- - @ref glfwInitVulkanLoader
- - @ref glfwGetInstanceProcAddress
- - @ref glfwGetPhysicalDevicePresentationSupport
- - @ref glfwCreateWindowSurface
+Unless a Vulkan header is included, either by the GLFW header or above it, any
+GLFW functions that take or return Vulkan types will not be declared.

 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
 Khronos extension functions, allowing them to be called directly.

 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
+against it, you can check for the availability of a loader 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.
+This function returns `GLFW_TRUE` if the Vulkan loader was found.  This check is
+performed by @ref glfwInit.

-If one or both were not found, calling any other Vulkan related GLFW function
-will generate a @ref GLFW_API_UNAVAILABLE error.
+If no loader was 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 +107,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
+Device-specific functions may execute a little bit 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 +126,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
@ -168,83 +140,73 @@ If it fails it will return `NULL` and GLFW will not be able to create Vulkan
 window surfaces.  You can still use Vulkan for off-screen rendering and compute
 work.

-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.
+The returned array will always contain `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
 array, as it is an error to specify an extension more than once in the
-`VkInstanceCreateInfo` struct.
-
-@macos MoltenVK is (as of July 2022) not yet a fully conformant implementation
-of Vulkan.  As of Vulkan SDK 1.3.216.0, this means you must also enable the
-`VK_KHR_portability_enumeration` instance extension and set the
-`VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR` bit in the instance creation
-info flags for MoltenVK to show up in the list of physical devices.  For more
-information, see the Vulkan and MoltenVK documentation.
+`VkInstanceCreateInfo` struct. 


-## 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
+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.
+[GLFW_CLIENT_API](@ref window_hints_ctx) 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
 }
-```
-
-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
-created.
+@endcode

 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/docs/window.md
+++ b/docs/window.md
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -1,63 +1,51 @@

 link_libraries(glfw)

-include_directories("${GLFW_SOURCE_DIR}/deps")
+include_directories(${glfw_INCLUDE_DIRS})

-if (MATH_LIBRARY)
+if (BUILD_SHARED_LIBS)
    link_libraries("${MATH_LIBRARY}")
 endif()

-# Workaround for the MS CRT deprecating parts of the standard library
-if (MSVC OR CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
+if (MSVC)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()

+include_directories("${GLFW_SOURCE_DIR}/deps")
+
 if (WIN32)
    set(ICON glfw.rc)
 elseif (APPLE)
    set(ICON glfw.icns)
+    set_source_files_properties(glfw.icns PROPERTIES
+        MAXOSX_PACKAGE_LOCATION "Resources")
 endif()

-set(GLAD_GL "${GLFW_SOURCE_DIR}/deps/glad/gl.h")
-set(GLAD_GLES2 "${GLFW_SOURCE_DIR}/deps/glad/gles2.h")
+set(GLAD "${GLFW_SOURCE_DIR}/deps/glad/glad.h"
+         "${GLFW_SOURCE_DIR}/deps/glad.c")
 set(GETOPT "${GLFW_SOURCE_DIR}/deps/getopt.h"
           "${GLFW_SOURCE_DIR}/deps/getopt.c")
 set(TINYCTHREAD "${GLFW_SOURCE_DIR}/deps/tinycthread.h"
                "${GLFW_SOURCE_DIR}/deps/tinycthread.c")

-add_executable(boing WIN32 MACOSX_BUNDLE boing.c ${ICON} ${GLAD_GL})
-add_executable(gears WIN32 MACOSX_BUNDLE gears.c ${ICON} ${GLAD_GL})
-add_executable(heightmap WIN32 MACOSX_BUNDLE heightmap.c ${ICON} ${GLAD_GL})
-add_executable(offscreen offscreen.c ${ICON} ${GLAD_GL})
-add_executable(particles WIN32 MACOSX_BUNDLE particles.c ${ICON} ${TINYCTHREAD} ${GETOPT} ${GLAD_GL})
-add_executable(sharing WIN32 MACOSX_BUNDLE sharing.c ${ICON} ${GLAD_GL})
-add_executable(splitview WIN32 MACOSX_BUNDLE splitview.c ${ICON} ${GLAD_GL})
-add_executable(triangle-opengl WIN32 MACOSX_BUNDLE triangle-opengl.c ${ICON} ${GLAD_GL})
-add_executable(triangle-opengles WIN32 MACOSX_BUNDLE triangle-opengles.c ${ICON} ${GLAD_GLES2})
-add_executable(wave WIN32 MACOSX_BUNDLE wave.c ${ICON} ${GLAD_GL})
-add_executable(windows WIN32 MACOSX_BUNDLE windows.c ${ICON} ${GLAD_GL})
+add_executable(boing WIN32 MACOSX_BUNDLE boing.c ${ICON} ${GLAD})
+add_executable(gears WIN32 MACOSX_BUNDLE gears.c ${ICON} ${GLAD})
+add_executable(heightmap WIN32 MACOSX_BUNDLE heightmap.c ${ICON} ${GLAD})
+add_executable(particles WIN32 MACOSX_BUNDLE particles.c ${ICON} ${TINYCTHREAD} ${GETOPT} ${GLAD})
+add_executable(simple WIN32 MACOSX_BUNDLE simple.c ${ICON} ${GLAD})
+add_executable(splitview WIN32 MACOSX_BUNDLE splitview.c ${ICON} ${GLAD})
+add_executable(wave WIN32 MACOSX_BUNDLE wave.c ${ICON} ${GLAD})

-target_link_libraries(particles Threads::Threads)
-if (RT_LIBRARY)
-    target_link_libraries(particles "${RT_LIBRARY}")
-endif()
+target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")

-set(GUI_ONLY_BINARIES boing gears heightmap particles sharing splitview
-    triangle-opengl triangle-opengles wave windows)
-set(CONSOLE_BINARIES offscreen)
+set(WINDOWS_BINARIES boing gears heightmap particles simple splitview wave)

-set_target_properties(${GUI_ONLY_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
-                      C_STANDARD 99
-                      FOLDER "GLFW3/Examples")
+set_target_properties(${WINDOWS_BINARIES} PROPERTIES FOLDER "GLFW3/Examples")

 if (MSVC)
-    # Tell MSVC to use main instead of WinMain
-    set_target_properties(${GUI_ONLY_BINARIES} PROPERTIES
+    # Tell MSVC to use main instead of WinMain for Windows subsystem executables
+    set_target_properties(${WINDOWS_BINARIES} PROPERTIES
                          LINK_FLAGS "/ENTRY:mainCRTStartup")
-elseif (CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
-    # Tell Clang using MS CRT to use main instead of WinMain
-    set_target_properties(${GUI_ONLY_BINARIES} PROPERTIES
-                          LINK_FLAGS "-Wl,/entry:mainCRTStartup")
 endif()

 if (APPLE)
@ -65,19 +53,15 @@ if (APPLE)
    set_target_properties(gears PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Gears")
    set_target_properties(heightmap PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Heightmap")
    set_target_properties(particles PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Particles")
-    set_target_properties(sharing PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Sharing")
-    set_target_properties(triangle-opengl PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenGL Triangle")
-    set_target_properties(triangle-opengles PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenGL ES Triangle")
+    set_target_properties(simple PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Simple")
    set_target_properties(splitview PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "SplitView")
    set_target_properties(wave PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Wave")
-    set_target_properties(windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Windows")

-    set_source_files_properties(glfw.icns PROPERTIES
-                                MACOSX_PACKAGE_LOCATION "Resources")
-    set_target_properties(${GUI_ONLY_BINARIES} PROPERTIES
+    set_target_properties(${WINDOWS_BINARIES} PROPERTIES
+                          RESOURCE glfw.icns
                          MACOSX_BUNDLE_SHORT_VERSION_STRING ${GLFW_VERSION}
-                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION}
+                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL}
                          MACOSX_BUNDLE_ICON_FILE glfw.icns
-                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/Info.plist.in")
+                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
 endif()

--- a/examples/boing.c
+++ b/examples/boing.c
@ -36,9 +36,7 @@
 #include <stdlib.h>
 #include <math.h>

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 #include <linmath.h>
@ -167,7 +165,7 @@ void CrossProduct( vertex_t a, vertex_t b, vertex_t c, vertex_t *n )
   v2 = c.y - a.y;
   v3 = c.z - a.z;

-   n->x = u2 * v3 - v2 * u3;
+   n->x = u2 * v3 - v2 * v3;
   n->y = u3 * v1 - v3 * u1;
   n->z = u1 * v2 - v1 * u2;
 }
@ -304,7 +302,7 @@ void cursor_position_callback( GLFWwindow* window, double x, double y )
 * The Boing ball is sphere in which each facet is a rectangle.
 * Facet colors alternate between red and white.
 * The ball is built by stacking latitudinal circles.  Each circle is composed
- * of a widely-separated set of points, so that each facet is noticeably large.
+ * of a widely-separated set of points, so that each facet is noticably large.
 *****************************************************************************/
 void DrawBoingBall( void )
 {
@ -448,7 +446,7 @@ void DrawBoingBallBand( GLfloat long_lo,
   static int colorToggle = 0;

  /*
-   * Iterate through the points of a latitude circle.
+   * Iterate thru the points of a latitude circle.
   * A latitude circle is a 2D set of X,Z points.
   */
   for ( lat_deg = 0;
@ -644,7 +642,7 @@ int main( void )
   glfwSetCursorPosCallback(window, cursor_position_callback);

   glfwMakeContextCurrent(window);
-   gladLoadGL(glfwGetProcAddress);
+   gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
   glfwSwapInterval( 1 );

   glfwGetFramebufferSize(window, &width, &height);
--- a/examples/gears.c
+++ b/examples/gears.c
@ -15,7 +15,7 @@
 *   - Slightly modified camera that should work better for stereo viewing
 *
 *
- * Camilla Löwy:
+ * Camilla Berglund:
 *   - Removed FPS counter (this is not a benchmark)
 *   - Added a few comments
 *   - Enabled vsync
@ -31,9 +31,7 @@
 #include <stdio.h>
 #include <string.h>

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 /**
@ -174,7 +172,6 @@ static GLfloat angle = 0.f;
 /* OpenGL draw function & timing */
 static void draw(void)
 {
-  glClearColor(0.0, 0.0, 0.0, 0.0);
  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

  glPushMatrix();
@ -314,7 +311,6 @@ int main(int argc, char *argv[])
    }

    glfwWindowHint(GLFW_DEPTH_BITS, 16);
-    glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);

    window = glfwCreateWindow( 300, 300, "Gears", NULL, NULL );
    if (!window)
@ -329,7 +325,7 @@ int main(int argc, char *argv[])
    glfwSetKeyCallback(window, key);

    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
    glfwSwapInterval( 1 );

    glfwGetFramebufferSize(window, &width, &height);
--- a/examples/glfw.rc
+++ b/examples/glfw.rc
@ -1,3 +1,3 @@
-
-GLFW_ICON               ICON            "glfw.ico"
-
+
+GLFW_ICON               ICON            "glfw.ico"
+
--- a/examples/heightmap.c
+++ b/examples/heightmap.c
@ -29,9 +29,7 @@
 #include <assert.h>
 #include <stddef.h>

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 /* Map height updates */
@ -293,12 +291,12 @@ static void generate_heightmap__circle(float* center_x, float* center_y,
 {
    float sign;
    /* random value for element in between [0-1.0] */
-    *center_x = (MAP_SIZE * rand()) / (float) RAND_MAX;
-    *center_y = (MAP_SIZE * rand()) / (float) RAND_MAX;
-    *size = (MAX_CIRCLE_SIZE * rand()) / (float) RAND_MAX;
-    sign = (1.0f * rand()) / (float) RAND_MAX;
+    *center_x = (MAP_SIZE * rand()) / (1.0f * RAND_MAX);
+    *center_y = (MAP_SIZE * rand()) / (1.0f * RAND_MAX);
+    *size = (MAX_CIRCLE_SIZE * rand()) / (1.0f * RAND_MAX);
+    sign = (1.0f * rand()) / (1.0f * RAND_MAX);
    sign = (sign < DISPLACEMENT_SIGN_LIMIT) ? -1.0f : 1.0f;
-    *displacement = (sign * (MAX_DISPLACEMENT * rand())) / (float) RAND_MAX;
+    *displacement = (sign * (MAX_DISPLACEMENT * rand())) / (1.0f * RAND_MAX);
 }

 /* Run the specified number of iterations of the generation process for the
@ -434,7 +432,7 @@ int main(int argc, char** argv)
    glfwSetKeyCallback(window, key_callback);

    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);

    /* Prepare opengl resources for rendering */
    shader_program = make_shader_program(vertex_shader_text, fragment_shader_text);
--- a/examples/particles.c
+++ b/examples/particles.c
@ -1,7 +1,7 @@
 //========================================================================
 // A simple particle engine with threaded physics
 // Copyright (c) Marcus Geelnard
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
+// Copyright (c) Camilla Berglund <elmindreda@glfw.org>
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@ -39,9 +39,7 @@
 #include <getopt.h>
 #include <linmath.h>

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 // Define tokens for GL_EXT_separate_specular_color if not already defined
@ -445,7 +443,7 @@ static void draw_particles(GLFWwindow* window, double t, float dt)
    }

    // Set up vertex arrays. We use interleaved arrays, which is easier to
-    // handle (in most situations) and it gives a linear memory access
+    // handle (in most situations) and it gives a linear memeory access
    // access pattern (which may give better performance in some
    // situations). GL_T2F_C4UB_V3F means: 2 floats for texture coords,
    // 4 ubytes for color and 3 floats for vertex coord (in that order).
@ -459,9 +457,7 @@ static void draw_particles(GLFWwindow* window, double t, float dt)
    {
        struct timespec ts;
        clock_gettime(CLOCK_REALTIME, &ts);
-        ts.tv_nsec += 100 * 1000 * 1000;
-        ts.tv_sec += ts.tv_nsec / (1000 * 1000 * 1000);
-        ts.tv_nsec %= 1000 * 1000 * 1000;
+        ts.tv_nsec += 100000000;
        cnd_timedwait(&thread_sync.p_done, &thread_sync.particles_lock, &ts);
    }

@ -655,7 +651,7 @@ static void draw_fountain(void)


 //========================================================================
-// Recursive function for building variable tessellated floor
+// Recursive function for building variable tesselated floor
 //========================================================================

 static void tessellate_floor(float x1, float y1, float x2, float y2, int depth)
@ -722,7 +718,7 @@ static void draw_floor(void)
        glMaterialfv(GL_FRONT, GL_SPECULAR, floor_specular);
        glMaterialf(GL_FRONT, GL_SHININESS, floor_shininess);

-        // Draw floor as a bunch of triangle strips (high tessellation
+        // Draw floor as a bunch of triangle strips (high tesselation
        // improves lighting)
        glNormal3f(0.f, 0.f, 1.f);
        glBegin(GL_QUADS);
@ -912,9 +908,7 @@ static int physics_thread_main(void* arg)
        {
            struct timespec ts;
            clock_gettime(CLOCK_REALTIME, &ts);
-            ts.tv_nsec += 100 * 1000 * 1000;
-            ts.tv_sec += ts.tv_nsec / (1000 * 1000 * 1000);
-            ts.tv_nsec %= 1000 * 1000 * 1000;
+            ts.tv_nsec += 100000000;
            cnd_timedwait(&thread_sync.d_done, &thread_sync.particles_lock, &ts);
        }

@ -996,7 +990,7 @@ int main(int argc, char** argv)
        glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);

    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
    glfwSwapInterval(1);

    glfwSetFramebufferSizeCallback(window, resize_callback);
--- a/examples/sharing.c
+++ b/examples/sharing.c
@ -1,234 +0,0 @@
-//========================================================================
-// Context sharing example
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-
-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "linmath.h"
-
-static const char* vertex_shader_text =
-"#version 110\n"
-"uniform mat4 MVP;\n"
-"attribute vec2 vPos;\n"
-"varying vec2 texcoord;\n"
-"void main()\n"
-"{\n"
-"    gl_Position = MVP * vec4(vPos, 0.0, 1.0);\n"
-"    texcoord = vPos;\n"
-"}\n";
-
-static const char* fragment_shader_text =
-"#version 110\n"
-"uniform sampler2D texture;\n"
-"uniform vec3 color;\n"
-"varying vec2 texcoord;\n"
-"void main()\n"
-"{\n"
-"    gl_FragColor = vec4(color * texture2D(texture, texcoord).rgb, 1.0);\n"
-"}\n";
-
-static const vec2 vertices[4] =
-{
-    { 0.f, 0.f },
-    { 1.f, 0.f },
-    { 1.f, 1.f },
-    { 0.f, 1.f }
-};
-
-static void error_callback(int error, const char* description)
-{
-    fprintf(stderr, "Error: %s\n", description);
-}
-
-static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
-{
-    if (action == GLFW_PRESS && key == GLFW_KEY_ESCAPE)
-        glfwSetWindowShouldClose(window, GLFW_TRUE);
-}
-
-int main(int argc, char** argv)
-{
-    GLFWwindow* windows[2];
-    GLuint texture, program, vertex_buffer;
-    GLint mvp_location, vpos_location, color_location, texture_location;
-
-    glfwSetErrorCallback(error_callback);
-
-    if (!glfwInit())
-        exit(EXIT_FAILURE);
-
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-
-    windows[0] = glfwCreateWindow(400, 400, "First", NULL, NULL);
-    if (!windows[0])
-    {
-        glfwTerminate();
-        exit(EXIT_FAILURE);
-    }
-
-    glfwSetKeyCallback(windows[0], key_callback);
-
-    glfwMakeContextCurrent(windows[0]);
-
-    // Only enable vsync for the first of the windows to be swapped to
-    // avoid waiting out the interval for each window
-    glfwSwapInterval(1);
-
-    // The contexts are created with the same APIs so the function
-    // pointers should be re-usable between them
-    gladLoadGL(glfwGetProcAddress);
-
-    // Create the OpenGL objects inside the first context, created above
-    // All objects will be shared with the second context, created below
-    {
-        int x, y;
-        char pixels[16 * 16];
-        GLuint vertex_shader, fragment_shader;
-
-        glGenTextures(1, &texture);
-        glBindTexture(GL_TEXTURE_2D, texture);
-
-        srand((unsigned int) glfwGetTimerValue());
-
-        for (y = 0;  y < 16;  y++)
-        {
-            for (x = 0;  x < 16;  x++)
-                pixels[y * 16 + x] = rand() % 256;
-        }
-
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 16, 16, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, pixels);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-        vertex_shader = glCreateShader(GL_VERTEX_SHADER);
-        glShaderSource(vertex_shader, 1, &vertex_shader_text, NULL);
-        glCompileShader(vertex_shader);
-
-        fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
-        glShaderSource(fragment_shader, 1, &fragment_shader_text, NULL);
-        glCompileShader(fragment_shader);
-
-        program = glCreateProgram();
-        glAttachShader(program, vertex_shader);
-        glAttachShader(program, fragment_shader);
-        glLinkProgram(program);
-
-        mvp_location = glGetUniformLocation(program, "MVP");
-        color_location = glGetUniformLocation(program, "color");
-        texture_location = glGetUniformLocation(program, "texture");
-        vpos_location = glGetAttribLocation(program, "vPos");
-
-        glGenBuffers(1, &vertex_buffer);
-        glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
-        glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-    }
-
-    glUseProgram(program);
-    glUniform1i(texture_location, 0);
-
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, texture);
-
-    glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
-    glEnableVertexAttribArray(vpos_location);
-    glVertexAttribPointer(vpos_location, 2, GL_FLOAT, GL_FALSE,
-                          sizeof(vertices[0]), (void*) 0);
-
-    windows[1] = glfwCreateWindow(400, 400, "Second", NULL, windows[0]);
-    if (!windows[1])
-    {
-        glfwTerminate();
-        exit(EXIT_FAILURE);
-    }
-
-    // Place the second window to the right of the first
-    {
-        int xpos, ypos, left, right, width;
-
-        glfwGetWindowSize(windows[0], &width, NULL);
-        glfwGetWindowFrameSize(windows[0], &left, NULL, &right, NULL);
-        glfwGetWindowPos(windows[0], &xpos, &ypos);
-
-        glfwSetWindowPos(windows[1], xpos + width + left + right, ypos);
-    }
-
-    glfwSetKeyCallback(windows[1], key_callback);
-
-    glfwMakeContextCurrent(windows[1]);
-
-    // While objects are shared, the global context state is not and will
-    // need to be set up for each context
-
-    glUseProgram(program);
-
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, texture);
-
-    glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
-    glEnableVertexAttribArray(vpos_location);
-    glVertexAttribPointer(vpos_location, 2, GL_FLOAT, GL_FALSE,
-                          sizeof(vertices[0]), (void*) 0);
-
-    while (!glfwWindowShouldClose(windows[0]) &&
-           !glfwWindowShouldClose(windows[1]))
-    {
-        int i;
-        const vec3 colors[2] =
-        {
-            { 0.8f, 0.4f, 1.f },
-            { 0.3f, 0.4f, 1.f }
-        };
-
-        for (i = 0;  i < 2;  i++)
-        {
-            int width, height;
-            mat4x4 mvp;
-
-            glfwGetFramebufferSize(windows[i], &width, &height);
-            glfwMakeContextCurrent(windows[i]);
-
-            glViewport(0, 0, width, height);
-
-            mat4x4_ortho(mvp, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f);
-            glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) mvp);
-            glUniform3fv(color_location, 1, colors[i]);
-            glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-            glfwSwapBuffers(windows[i]);
-        }
-
-        glfwWaitEvents();
-    }
-
-    glfwTerminate();
-    exit(EXIT_SUCCESS);
-}
-
--- a/examples/offscreen.c
+++ b/examples/offscreen.c
@ -1,6 +1,6 @@
 //========================================================================
-// Offscreen rendering example
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
+// Simple GLFW example
+// Copyright (c) Camilla Berglund <elmindreda@glfw.org>
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@ -22,10 +22,9 @@
 //    distribution.
 //
 //========================================================================
+//! [code]

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 #include "linmath.h"
@ -33,9 +32,6 @@
 #include <stdlib.h>
 #include <stdio.h>

-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include <stb_image_write.h>
-
 static const struct
 {
    float x, y;
@ -48,7 +44,6 @@ static const struct
 };

 static const char* vertex_shader_text =
-"#version 110\n"
 "uniform mat4 MVP;\n"
 "attribute vec3 vCol;\n"
 "attribute vec2 vPos;\n"
@ -60,7 +55,6 @@ static const char* vertex_shader_text =
 "}\n";

 static const char* fragment_shader_text =
-"#version 110\n"
 "varying vec3 color;\n"
 "void main()\n"
 "{\n"
@ -72,26 +66,25 @@ static void error_callback(int error, const char* description)
    fprintf(stderr, "Error: %s\n", description);
 }

+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);
+}
+
 int main(void)
 {
    GLFWwindow* window;
    GLuint vertex_buffer, vertex_shader, fragment_shader, program;
    GLint mvp_location, vpos_location, vcol_location;
-    float ratio;
-    int width, height;
-    mat4x4 mvp;
-    char* buffer;

    glfwSetErrorCallback(error_callback);

-    glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE);
-
    if (!glfwInit())
        exit(EXIT_FAILURE);

    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-    glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);

    window = glfwCreateWindow(640, 480, "Simple example", NULL, NULL);
    if (!window)
@ -100,8 +93,11 @@ int main(void)
        exit(EXIT_FAILURE);
    }

+    glfwSetKeyCallback(window, key_callback);
+
    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
+    glfwSwapInterval(1);

    // NOTE: OpenGL error checks have been omitted for brevity

@ -128,34 +124,35 @@ int main(void)

    glEnableVertexAttribArray(vpos_location);
    glVertexAttribPointer(vpos_location, 2, GL_FLOAT, GL_FALSE,
-                          sizeof(vertices[0]), (void*) 0);
+                          sizeof(float) * 5, (void*) 0);
    glEnableVertexAttribArray(vcol_location);
    glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE,
-                          sizeof(vertices[0]), (void*) (sizeof(float) * 2));
+                          sizeof(float) * 5, (void*) (sizeof(float) * 2));

-    glfwGetFramebufferSize(window, &width, &height);
-    ratio = width / (float) height;
+    while (!glfwWindowShouldClose(window))
+    {
+        float ratio;
+        int width, height;
+        mat4x4 m, p, mvp;

-    glViewport(0, 0, width, height);
-    glClear(GL_COLOR_BUFFER_BIT);
+        glfwGetFramebufferSize(window, &width, &height);
+        ratio = width / (float) height;

-    mat4x4_ortho(mvp, -ratio, ratio, -1.f, 1.f, 1.f, -1.f);
+        glViewport(0, 0, width, height);
+        glClear(GL_COLOR_BUFFER_BIT);

-    glUseProgram(program);
-    glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) mvp);
-    glDrawArrays(GL_TRIANGLES, 0, 3);
-    glFinish();
+        mat4x4_identity(m);
+        mat4x4_rotate_Z(m, m, (float) glfwGetTime());
+        mat4x4_ortho(p, -ratio, ratio, -1.f, 1.f, 1.f, -1.f);
+        mat4x4_mul(mvp, p, m);

-    buffer = calloc(4, width * height);
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+        glUseProgram(program);
+        glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) mvp);
+        glDrawArrays(GL_TRIANGLES, 0, 3);

-    // Write image Y-flipped because OpenGL
-    stbi_write_png("offscreen.png",
-                   width, height, 4,
-                   buffer + (width * 4 * (height - 1)),
-                   -width * 4);
-
-    free(buffer);
+        glfwSwapBuffers(window);
+        glfwPollEvents();
+    }

    glfwDestroyWindow(window);

@ -163,3 +160,4 @@ int main(void)
    exit(EXIT_SUCCESS);
 }

+//! [code]
--- a/examples/splitview.c
+++ b/examples/splitview.c
@ -2,17 +2,15 @@
 // This is an example program for the GLFW library
 //
 // The program uses a "split window" view, rendering four views of the
-// same scene in one window (e.g. useful for 3D modelling software). This
-// demo uses scissors to separate the four different rendering areas from
+// same scene in one window (e.g. uesful for 3D modelling software). This
+// demo uses scissors to separete the four different rendering areas from
 // each other.
 //
 // (If the code seems a little bit strange here and there, it may be
 //  because I am not a friend of orthogonal projections)
 //========================================================================

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 #if defined(_MSC_VER)
@ -515,7 +513,7 @@ int main(void)

    // Enable vsync
    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
    glfwSwapInterval(1);

    if (GLAD_GL_ARB_multisample || GLAD_GL_VERSION_1_3)
--- a/examples/triangle-opengl.c
+++ b/examples/triangle-opengl.c
@ -1,171 +0,0 @@
-//========================================================================
-// OpenGL triangle example
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-//! [code]
-
-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-#include "linmath.h"
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-
-typedef struct Vertex
-{
-    vec2 pos;
-    vec3 col;
-} Vertex;
-
-static const Vertex vertices[3] =
-{
-    { { -0.6f, -0.4f }, { 1.f, 0.f, 0.f } },
-    { {  0.6f, -0.4f }, { 0.f, 1.f, 0.f } },
-    { {   0.f,  0.6f }, { 0.f, 0.f, 1.f } }
-};
-
-static const char* vertex_shader_text =
-"#version 330\n"
-"uniform mat4 MVP;\n"
-"in vec3 vCol;\n"
-"in vec2 vPos;\n"
-"out vec3 color;\n"
-"void main()\n"
-"{\n"
-"    gl_Position = MVP * vec4(vPos, 0.0, 1.0);\n"
-"    color = vCol;\n"
-"}\n";
-
-static const char* fragment_shader_text =
-"#version 330\n"
-"in vec3 color;\n"
-"out vec4 fragment;\n"
-"void main()\n"
-"{\n"
-"    fragment = vec4(color, 1.0);\n"
-"}\n";
-
-static void error_callback(int error, const char* description)
-{
-    fprintf(stderr, "Error: %s\n", description);
-}
-
-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);
-}
-
-int main(void)
-{
-    glfwSetErrorCallback(error_callback);
-
-    if (!glfwInit())
-        exit(EXIT_FAILURE);
-
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-
-    GLFWwindow* window = glfwCreateWindow(640, 480, "OpenGL Triangle", NULL, NULL);
-    if (!window)
-    {
-        glfwTerminate();
-        exit(EXIT_FAILURE);
-    }
-
-    glfwSetKeyCallback(window, key_callback);
-
-    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
-    glfwSwapInterval(1);
-
-    // NOTE: OpenGL error checks have been omitted for brevity
-
-    GLuint vertex_buffer;
-    glGenBuffers(1, &vertex_buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-
-    const GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vertex_shader, 1, &vertex_shader_text, NULL);
-    glCompileShader(vertex_shader);
-
-    const GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(fragment_shader, 1, &fragment_shader_text, NULL);
-    glCompileShader(fragment_shader);
-
-    const GLuint program = glCreateProgram();
-    glAttachShader(program, vertex_shader);
-    glAttachShader(program, fragment_shader);
-    glLinkProgram(program);
-
-    const GLint mvp_location = glGetUniformLocation(program, "MVP");
-    const GLint vpos_location = glGetAttribLocation(program, "vPos");
-    const GLint vcol_location = glGetAttribLocation(program, "vCol");
-
-    GLuint vertex_array;
-    glGenVertexArrays(1, &vertex_array);
-    glBindVertexArray(vertex_array);
-    glEnableVertexAttribArray(vpos_location);
-    glVertexAttribPointer(vpos_location, 2, GL_FLOAT, GL_FALSE,
-                          sizeof(Vertex), (void*) offsetof(Vertex, pos));
-    glEnableVertexAttribArray(vcol_location);
-    glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE,
-                          sizeof(Vertex), (void*) offsetof(Vertex, col));
-
-    while (!glfwWindowShouldClose(window))
-    {
-        int width, height;
-        glfwGetFramebufferSize(window, &width, &height);
-        const float ratio = width / (float) height;
-
-        glViewport(0, 0, width, height);
-        glClear(GL_COLOR_BUFFER_BIT);
-
-        mat4x4 m, p, mvp;
-        mat4x4_identity(m);
-        mat4x4_rotate_Z(m, m, (float) glfwGetTime());
-        mat4x4_ortho(p, -ratio, ratio, -1.f, 1.f, 1.f, -1.f);
-        mat4x4_mul(mvp, p, m);
-
-        glUseProgram(program);
-        glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) &mvp);
-        glBindVertexArray(vertex_array);
-        glDrawArrays(GL_TRIANGLES, 0, 3);
-
-        glfwSwapBuffers(window);
-        glfwPollEvents();
-    }
-
-    glfwDestroyWindow(window);
-
-    glfwTerminate();
-    exit(EXIT_SUCCESS);
-}
-
-//! [code]
--- a/examples/triangle-opengles.c
+++ b/examples/triangle-opengles.c
@ -1,170 +0,0 @@
-//========================================================================
-// OpenGL ES 2.0 triangle example
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-
-#define GLAD_GLES2_IMPLEMENTATION
-#include <glad/gles2.h>
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-#include "linmath.h"
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-
-typedef struct Vertex
-{
-    vec2 pos;
-    vec3 col;
-} Vertex;
-
-static const Vertex vertices[3] =
-{
-    { { -0.6f, -0.4f }, { 1.f, 0.f, 0.f } },
-    { {  0.6f, -0.4f }, { 0.f, 1.f, 0.f } },
-    { {   0.f,  0.6f }, { 0.f, 0.f, 1.f } }
-};
-
-static const char* vertex_shader_text =
-"#version 100\n"
-"precision mediump float;\n"
-"uniform mat4 MVP;\n"
-"attribute vec3 vCol;\n"
-"attribute vec2 vPos;\n"
-"varying vec3 color;\n"
-"void main()\n"
-"{\n"
-"    gl_Position = MVP * vec4(vPos, 0.0, 1.0);\n"
-"    color = vCol;\n"
-"}\n";
-
-static const char* fragment_shader_text =
-"#version 100\n"
-"precision mediump float;\n"
-"varying vec3 color;\n"
-"void main()\n"
-"{\n"
-"    gl_FragColor = vec4(color, 1.0);\n"
-"}\n";
-
-static void error_callback(int error, const char* description)
-{
-    fprintf(stderr, "GLFW Error: %s\n", description);
-}
-
-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);
-}
-
-int main(void)
-{
-    glfwSetErrorCallback(error_callback);
-
-    if (!glfwInit())
-        exit(EXIT_FAILURE);
-
-    glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-    glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
-
-    GLFWwindow* window = glfwCreateWindow(640, 480, "OpenGL ES 2.0 Triangle (EGL)", NULL, NULL);
-    if (!window)
-    {
-        glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
-        window = glfwCreateWindow(640, 480, "OpenGL ES 2.0 Triangle", NULL, NULL);
-        if (!window)
-        {
-            glfwTerminate();
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    glfwSetKeyCallback(window, key_callback);
-
-    glfwMakeContextCurrent(window);
-    gladLoadGLES2(glfwGetProcAddress);
-    glfwSwapInterval(1);
-
-    GLuint vertex_buffer;
-    glGenBuffers(1, &vertex_buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-
-    const GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vertex_shader, 1, &vertex_shader_text, NULL);
-    glCompileShader(vertex_shader);
-
-    const GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(fragment_shader, 1, &fragment_shader_text, NULL);
-    glCompileShader(fragment_shader);
-
-    const GLuint program = glCreateProgram();
-    glAttachShader(program, vertex_shader);
-    glAttachShader(program, fragment_shader);
-    glLinkProgram(program);
-
-    const GLint mvp_location = glGetUniformLocation(program, "MVP");
-    const GLint vpos_location = glGetAttribLocation(program, "vPos");
-    const GLint vcol_location = glGetAttribLocation(program, "vCol");
-
-    glEnableVertexAttribArray(vpos_location);
-    glEnableVertexAttribArray(vcol_location);
-    glVertexAttribPointer(vpos_location, 2, GL_FLOAT, GL_FALSE,
-                          sizeof(Vertex), (void*) offsetof(Vertex, pos));
-    glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE,
-                          sizeof(Vertex), (void*) offsetof(Vertex, col));
-
-    while (!glfwWindowShouldClose(window))
-    {
-        int width, height;
-        glfwGetFramebufferSize(window, &width, &height);
-        const float ratio = width / (float) height;
-
-        glViewport(0, 0, width, height);
-        glClear(GL_COLOR_BUFFER_BIT);
-
-        mat4x4 m, p, mvp;
-        mat4x4_identity(m);
-        mat4x4_rotate_Z(m, m, (float) glfwGetTime());
-        mat4x4_ortho(p, -ratio, ratio, -1.f, 1.f, 1.f, -1.f);
-        mat4x4_mul(mvp, p, m);
-
-        glUseProgram(program);
-        glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) &mvp);
-        glDrawArrays(GL_TRIANGLES, 0, 3);
-
-        glfwSwapBuffers(window);
-        glfwPollEvents();
-    }
-
-    glfwDestroyWindow(window);
-
-    glfwTerminate();
-    exit(EXIT_SUCCESS);
-}
-
--- a/examples/wave.c
+++ b/examples/wave.c
@ -5,7 +5,7 @@
 * Modified for GLFW by Sylvain Hellegouarch - sh@programmationworld.com
 * Modified for variable frame rate by Marcus Geelnard
 * 2003-Jan-31: Minor cleanups and speedups / MG
- * 2010-10-24: Formatting and cleanup - Camilla Löwy
+ * 2010-10-24: Formatting and cleanup - Camilla Berglund
 *****************************************************************************/

 #if defined(_MSC_VER)
@ -17,9 +17,7 @@
 #include <stdlib.h>
 #include <math.h>

-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>

 #include <linmath.h>
@ -414,7 +412,7 @@ int main(int argc, char* argv[])
    glfwSetScrollCallback(window, scroll_callback);

    glfwMakeContextCurrent(window);
-    gladLoadGL(glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
    glfwSwapInterval(1);

    glfwGetFramebufferSize(window, &width, &height);
@ -457,7 +455,6 @@ int main(int argc, char* argv[])
        glfwPollEvents();
    }

-    glfwTerminate();
    exit(EXIT_SUCCESS);
 }

--- a/examples/windows.c
+++ b/examples/windows.c
@ -1,106 +0,0 @@
-//========================================================================
-// Simple multi-window example
-// Copyright (c) Camilla Löwy <elmindreda@glfw.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-
-#define GLAD_GL_IMPLEMENTATION
-#include <glad/gl.h>
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char** argv)
-{
-    int xpos, ypos, height;
-    const char* description;
-    GLFWwindow* windows[4];
-
-    if (!glfwInit())
-    {
-        glfwGetError(&description);
-        printf("Error: %s\n", description);
-        exit(EXIT_FAILURE);
-    }
-
-    glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
-
-    glfwGetMonitorWorkarea(glfwGetPrimaryMonitor(), &xpos, &ypos, NULL, &height);
-
-    for (int i = 0;  i < 4;  i++)
-    {
-        const int size = height / 5;
-        const struct
-        {
-            float r, g, b;
-        } colors[] =
-        {
-            { 0.95f, 0.32f, 0.11f },
-            { 0.50f, 0.80f, 0.16f },
-            {   0.f, 0.68f, 0.94f },
-            { 0.98f, 0.74f, 0.04f }
-        };
-
-        if (i > 0)
-            glfwWindowHint(GLFW_FOCUS_ON_SHOW, GLFW_FALSE);
-
-        glfwWindowHint(GLFW_POSITION_X, xpos + size * (1 + (i & 1)));
-        glfwWindowHint(GLFW_POSITION_Y, ypos + size * (1 + (i >> 1)));
-
-        windows[i] = glfwCreateWindow(size, size, "Multi-Window Example", NULL, NULL);
-        if (!windows[i])
-        {
-            glfwGetError(&description);
-            printf("Error: %s\n", description);
-            glfwTerminate();
-            exit(EXIT_FAILURE);
-        }
-
-        glfwSetInputMode(windows[i], GLFW_STICKY_KEYS, GLFW_TRUE);
-
-        glfwMakeContextCurrent(windows[i]);
-        gladLoadGL(glfwGetProcAddress);
-        glClearColor(colors[i].r, colors[i].g, colors[i].b, 1.f);
-    }
-
-    for (;;)
-    {
-        for (int i = 0;  i < 4;  i++)
-        {
-            glfwMakeContextCurrent(windows[i]);
-            glClear(GL_COLOR_BUFFER_BIT);
-            glfwSwapBuffers(windows[i]);
-
-            if (glfwWindowShouldClose(windows[i]) ||
-                glfwGetKey(windows[i], GLFW_KEY_ESCAPE))
-            {
-                glfwTerminate();
-                exit(EXIT_SUCCESS);
-            }
-        }
-
-        glfwWaitEvents();
-    }
-}
-
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
--- a/include/GLFW/glfw3native.h
+++ b/include/GLFW/glfw3native.h
@ -1,9 +1,9 @@
 /*************************************************************************
- * GLFW 3.5 - www.glfw.org
+ * GLFW 3.2 - www.glfw.org
 * A library for OpenGL, window and input
 *------------------------------------------------------------------------
 * Copyright (c) 2002-2006 Marcus Geelnard
- * Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
+ * Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>
 *
 * This software is provided 'as-is', without any express or implied
 * warranty. In no event will the authors be held liable for any damages
@ -45,13 +45,12 @@ extern "C" {
 *  more information.
 */
 /*! @defgroup native Native access
- *  @brief Functions related to accessing native handles.
 *
 *  **By using the native access functions you assert that you know what you're
 *  doing and how to fix problems caused by using them.  If you don't, you
 *  shouldn't be using them.**
 *
- *  Before the inclusion of @ref glfw3native.h, you may define zero or more
+ *  Before the inclusion of @ref glfw3native.h, you may define exactly one
 *  window system API macro and zero or more context creation API macros.
 *
 *  The chosen backends must match those the library was compiled for.  Failure
@ -62,28 +61,18 @@ extern "C" {
 *  * `GLFW_EXPOSE_NATIVE_COCOA`
 *  * `GLFW_EXPOSE_NATIVE_X11`
 *  * `GLFW_EXPOSE_NATIVE_WAYLAND`
+ *  * `GLFW_EXPOSE_NATIVE_MIR`
 *
 *  The available context API macros are:
 *  * `GLFW_EXPOSE_NATIVE_WGL`
 *  * `GLFW_EXPOSE_NATIVE_NSGL`
 *  * `GLFW_EXPOSE_NATIVE_GLX`
 *  * `GLFW_EXPOSE_NATIVE_EGL`
- *  * `GLFW_EXPOSE_NATIVE_OSMESA`
 *
 *  These macros select which of the native access functions that are declared
 *  and which platform-specific headers to include.  It is then up your (by
 *  definition platform-specific) code to handle which of these should be
 *  defined.
- *
- *  If you do not want the platform-specific headers to be included, define
- *  `GLFW_NATIVE_INCLUDE_NONE` before including the @ref glfw3native.h header.
- *
- *  @code
- *  #define GLFW_EXPOSE_NATIVE_WIN32
- *  #define GLFW_EXPOSE_NATIVE_WGL
- *  #define GLFW_NATIVE_INCLUDE_NONE
- *  #include <GLFW/glfw3native.h>
- *  @endcode
 */


@ -91,71 +80,40 @@ extern "C" {
 * System headers and types
 *************************************************************************/

-#if !defined(GLFW_NATIVE_INCLUDE_NONE)
+#if defined(GLFW_EXPOSE_NATIVE_WIN32)
+ // This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
+ // example to allow applications to correctly declare a GL_ARB_debug_output
+ // callback) but windows.h assumes no one will define APIENTRY before it does
+ #undef APIENTRY
+ #include <windows.h>
+#elif defined(GLFW_EXPOSE_NATIVE_COCOA)
+ #include <ApplicationServices/ApplicationServices.h>
+ #if defined(__OBJC__)
+  #import <Cocoa/Cocoa.h>
+ #else
+  typedef void* id;
+ #endif
+#elif defined(GLFW_EXPOSE_NATIVE_X11)
+ #include <X11/Xlib.h>
+ #include <X11/extensions/Xrandr.h>
+#elif defined(GLFW_EXPOSE_NATIVE_WAYLAND)
+ #include <wayland-client.h>
+#elif defined(GLFW_EXPOSE_NATIVE_MIR)
+ #include <mir_toolkit/mir_client_library.h>
+#endif

- #if defined(GLFW_EXPOSE_NATIVE_WIN32) || defined(GLFW_EXPOSE_NATIVE_WGL)
-  /* This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
-   * example to allow applications to correctly declare a GL_KHR_debug callback)
-   * but windows.h assumes no one will define APIENTRY before it does
-   */
-  #if defined(GLFW_APIENTRY_DEFINED)
-   #undef APIENTRY
-   #undef GLFW_APIENTRY_DEFINED
-  #endif
-  #include <windows.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_COCOA) || defined(GLFW_EXPOSE_NATIVE_NSGL)
-  #if defined(__OBJC__)
-   #import <Cocoa/Cocoa.h>
-  #else
-   #include <ApplicationServices/ApplicationServices.h>
-   #include <objc/objc.h>
-  #endif
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_X11) || defined(GLFW_EXPOSE_NATIVE_GLX)
-  #include <X11/Xlib.h>
-  #include <X11/extensions/Xrandr.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_WAYLAND)
-  #include <wayland-client.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_WGL)
-  /* WGL is declared by windows.h */
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_NSGL)
-  /* NSGL is declared by Cocoa.h */
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_GLX)
-  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
-   * default it also acts as an OpenGL header
-   * However, glx.h will include gl.h, which will define it unconditionally
-   */
-  #if defined(GLFW_GLAPIENTRY_DEFINED)
-   #undef GLAPIENTRY
-   #undef GLFW_GLAPIENTRY_DEFINED
-  #endif
-  #include <GL/glx.h>
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_EGL)
-  #include <EGL/egl.h>
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_OSMESA)
-  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
-   * default it also acts as an OpenGL header
-   * However, osmesa.h will include gl.h, which will define it unconditionally
-   */
-  #if defined(GLFW_GLAPIENTRY_DEFINED)
-   #undef GLAPIENTRY
-   #undef GLFW_GLAPIENTRY_DEFINED
-  #endif
-  #include <GL/osmesa.h>
- #endif
-
-#endif /*GLFW_NATIVE_INCLUDE_NONE*/
+#if defined(GLFW_EXPOSE_NATIVE_WGL)
+ /* WGL is declared by windows.h */
+#endif
+#if defined(GLFW_EXPOSE_NATIVE_NSGL)
+ /* NSGL is declared by Cocoa.h */
+#endif
+#if defined(GLFW_EXPOSE_NATIVE_GLX)
+ #include <GL/glx.h>
+#endif
+#if defined(GLFW_EXPOSE_NATIVE_EGL)
+ #include <EGL/egl.h>
+#endif


 /*************************************************************************
@ -169,9 +127,6 @@ extern "C" {
 *  of the specified monitor, or `NULL` 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.
 *
@ -187,9 +142,6 @@ GLFWAPI const char* glfwGetWin32Adapter(GLFWmonitor* monitor);
 *  `\\.\DISPLAY1\Monitor0`) of the specified monitor, or `NULL` 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.
 *
@ -204,17 +156,6 @@ GLFWAPI const char* glfwGetWin32Monitor(GLFWmonitor* monitor);
 *  @return The `HWND` of the specified window, or `NULL` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @remark The `HDC` associated with the window can be queried with the
- *  [GetDC](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getdc)
- *  function.
- *  @code
- *  HDC dc = GetDC(glfwGetWin32Window(window));
- *  @endcode
- *  This DC is private and does not need to be released.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -231,17 +172,6 @@ GLFWAPI HWND glfwGetWin32Window(GLFWwindow* window);
 *  @return The `HGLRC` of the specified window, or `NULL` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_NO_WINDOW_CONTEXT.
- *
- *  @remark The `HDC` associated with the window can be queried with the
- *  [GetDC](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getdc)
- *  function.
- *  @code
- *  HDC dc = GetDC(glfwGetWin32Window(window));
- *  @endcode
- *  This DC is private and does not need to be released.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -258,9 +188,6 @@ GLFWAPI HGLRC glfwGetWGLContext(GLFWwindow* window);
 *  @return The `CGDirectDisplayID` of the specified monitor, or
 *  `kCGNullDirectDisplay` 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.
 *
@ -275,9 +202,6 @@ GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor);
 *  @return The `NSWindow` 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.
 *
@ -286,23 +210,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)
@ -311,9 +218,6 @@ GLFWAPI id glfwGetCocoaView(GLFWwindow* window);
 *  @return The `NSOpenGLContext` of the specified window, or `nil` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_NO_WINDOW_CONTEXT.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -330,9 +234,6 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* window);
 *  @return The `Display` used by GLFW, or `NULL` 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.
 *
@ -347,9 +248,6 @@ GLFWAPI Display* glfwGetX11Display(void);
 *  @return The `RRCrtc` of the specified monitor, or `None` 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.
 *
@ -364,9 +262,6 @@ GLFWAPI RRCrtc glfwGetX11Adapter(GLFWmonitor* monitor);
 *  @return The `RROutput` of the specified monitor, or `None` 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.
 *
@ -381,9 +276,6 @@ GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* monitor);
 *  @return The `Window` of the specified window, or `None` 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.
 *
@ -392,56 +284,6 @@ GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* monitor);
 *  @ingroup native
 */
 GLFWAPI Window glfwGetX11Window(GLFWwindow* window);
-
-/*! @brief Sets the current primary selection to the specified string.
- *
- *  @param[in] string A UTF-8 encoded string.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The specified string is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa glfwGetX11SelectionString
- *  @sa glfwSetClipboardString
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI void glfwSetX11SelectionString(const char* string);
-
-/*! @brief Returns the contents of the current primary selection as a string.
- *
- *  If the selection is empty or if its contents cannot be converted, `NULL`
- *  is returned and a @ref GLFW_FORMAT_UNAVAILABLE error is generated.
- *
- *  @return The contents of the selection as a UTF-8 encoded string, or `NULL`
- *  if an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @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
- *  glfwGetX11SelectionString or @ref glfwSetX11SelectionString, or until the
- *  library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa glfwSetX11SelectionString
- *  @sa glfwGetClipboardString
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI const char* glfwGetX11SelectionString(void);
 #endif

 #if defined(GLFW_EXPOSE_NATIVE_GLX)
@ -450,9 +292,6 @@ GLFWAPI const char* glfwGetX11SelectionString(void);
 *  @return The `GLXContext` of the specified window, or `NULL` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -467,9 +306,6 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* window);
 *  @return The `GLXWindow` of the specified window, or `None` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -486,9 +322,6 @@ GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* window);
 *  @return The `struct wl_display*` used by GLFW, or `NULL` 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.
 *
@ -503,9 +336,6 @@ GLFWAPI struct wl_display* glfwGetWaylandDisplay(void);
 *  @return The `struct wl_output*` of the specified monitor, or `NULL` 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.
 *
@ -520,9 +350,6 @@ GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* monitor);
 *  @return The main `struct wl_surface*` of the specified window, or `NULL` 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.
 *
@ -533,17 +360,56 @@ GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* monitor);
 GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* window);
 #endif

+#if defined(GLFW_EXPOSE_NATIVE_MIR)
+/*! @brief Returns the `MirConnection*` used by GLFW.
+ *
+ *  @return The `MirConnection*` used by GLFW, or `NULL` if an
+ *  [error](@ref error_handling) occurred.
+ *
+ *  @thread_safety This function may be called from any thread.  Access is not
+ *  synchronized.
+ *
+ *  @since Added in version 3.2.
+ *
+ *  @ingroup native
+ */
+GLFWAPI MirConnection* glfwGetMirDisplay(void);
+
+/*! @brief Returns the Mir output ID of the specified monitor.
+ *
+ *  @return The Mir output ID of the specified monitor, or zero if an
+ *  [error](@ref error_handling) occurred.
+ *
+ *  @thread_safety This function may be called from any thread.  Access is not
+ *  synchronized.
+ *
+ *  @since Added in version 3.2.
+ *
+ *  @ingroup native
+ */
+GLFWAPI int glfwGetMirMonitor(GLFWmonitor* monitor);
+
+/*! @brief Returns the `MirSurface*` of the specified window.
+ *
+ *  @return The `MirSurface*` of the specified window, or `NULL` if an
+ *  [error](@ref error_handling) occurred.
+ *
+ *  @thread_safety This function may be called from any thread.  Access is not
+ *  synchronized.
+ *
+ *  @since Added in version 3.2.
+ *
+ *  @ingroup native
+ */
+GLFWAPI MirSurface* glfwGetMirWindow(GLFWwindow* window);
+#endif
+
 #if defined(GLFW_EXPOSE_NATIVE_EGL)
 /*! @brief Returns the `EGLDisplay` used by GLFW.
 *
 *  @return The `EGLDisplay` used by GLFW, or `EGL_NO_DISPLAY` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark Because EGL is initialized on demand, this function will return
- *  `EGL_NO_DISPLAY` until the first context has been created via EGL.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -558,9 +424,6 @@ GLFWAPI EGLDisplay glfwGetEGLDisplay(void);
 *  @return The `EGLContext` of the specified window, or `EGL_NO_CONTEXT` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -575,9 +438,6 @@ GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window);
 *  @return The `EGLSurface` of the specified window, or `EGL_NO_SURFACE` if an
 *  [error](@ref error_handling) occurred.
 *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
 *  @thread_safety This function may be called from any thread.  Access is not
 *  synchronized.
 *
@ -588,73 +448,6 @@ GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window);
 GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* window);
 #endif

-#if defined(GLFW_EXPOSE_NATIVE_OSMESA)
-/*! @brief Retrieves the color buffer associated with the specified window.
- *
- *  @param[in] window The window whose color buffer to retrieve.
- *  @param[out] width Where to store the width of the color buffer, or `NULL`.
- *  @param[out] height Where to store the height of the color buffer, or `NULL`.
- *  @param[out] format Where to store the OSMesa pixel format of the color
- *  buffer, or `NULL`.
- *  @param[out] buffer Where to store the address of the color buffer, or
- *  `NULL`.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetOSMesaColorBuffer(GLFWwindow* window, int* width, int* height, int* format, void** buffer);
-
-/*! @brief Retrieves the depth buffer associated with the specified window.
- *
- *  @param[in] window The window whose depth buffer to retrieve.
- *  @param[out] width Where to store the width of the depth buffer, or `NULL`.
- *  @param[out] height Where to store the height of the depth buffer, or `NULL`.
- *  @param[out] bytesPerValue Where to store the number of bytes per depth
- *  buffer element, or `NULL`.
- *  @param[out] buffer Where to store the address of the depth buffer, or
- *  `NULL`.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetOSMesaDepthBuffer(GLFWwindow* window, int* width, int* height, int* bytesPerValue, void** buffer);
-
-/*! @brief Returns the `OSMesaContext` of the specified window.
- *
- *  @return The `OSMesaContext` of the specified window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* window);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
--- a/Show More
+++ b/Show More