WIP: Wayland: Add a tablet skeleton

This doesn’t let the user get any event or anything yet, but it will be required for that purpose later.
Add credit
2026-09-24 09:38:58 +00:00 · 2020-10-08 22:27:21 +02:00 · 2020-10-05 23:25:32 +02:00 · 2020-10-05 23:24:12 +02:00 · 2020-10-05 23:24:12 +02:00 · 2020-10-05 23:24:12 +02:00
133 changed files with 8709 additions and 5456 deletions
@@ -1,20 +1,57 @@
 image:
    - Visual Studio 2015
    - Visual Studio 2019
 branches:
    only:
        - ci
        - master
        - 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 10 2010
          BUILD_SHARED_LIBS: ON
          CFLAGS: /WX
        - GENERATOR: Visual Studio 10 2010
          BUILD_SHARED_LIBS: OFF
          CFLAGS: /WX
        - GENERATOR: Visual Studio 16 2019
          BUILD_SHARED_LIBS: ON
          CFLAGS: /WX
        - GENERATOR: Visual Studio 16 2019
          BUILD_SHARED_LIBS: OFF
          CFLAGS: /WX
    matrix:
        - BUILD_SHARED_LIBS: ON
        - BUILD_SHARED_LIBS: OFF
 matrix:
    fast_finish: true
    exclude:
        - image: Visual Studio 2015
          GENERATOR: Visual Studio 16 2019
        - image: Visual Studio 2019
          GENERATOR: Visual Studio 10 2010
        - image: Visual Studio 2019
          GENERATOR: MinGW Makefiles
 for:
 -
    matrix:
        except:
            - GENERATOR: Visual Studio 10 2010
    build_script:
-    - mkdir build
+        - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin%
-    - cd build
+        - cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
-    - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% ..
+        - cmake --build build
-    - cmake --build .
+-
    matrix:
        only:
            - GENERATOR: Visual Studio 10 2010
    build_script:
        - cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
        - cmake --build build --target glfw
 notifications:
    - provider: Email
      to:
@@ -1,26 +1,45 @@
-# External junk
+# The canonical out-of-tree build subdirectory
-.DS_Store
+build
 # Visual Studio clutter
 _ReSharper*
 *.opensdf
 *.sdf
 *.suo
 *.dir
 *.vcxproj*
 *.sln
-.vs/
+.vs
 CMakeSettings.json
 Win32
 x64
 Debug
 Release
 MinSizeRel
 RelWithDebInfo
-*.xcodeproj
+*.opensdf
-# CMake files
+# Xcode clutter
 GLFW.build
 GLFW.xcodeproj
 # macOS clutter
 .DS_Store
 # Makefile generator clutter
 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
@@ -33,19 +52,15 @@ 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.3
+src/libglfw.so.3.4
 src/libglfw.dylib
 src/libglfw.dylib
 src/libglfw.3.dylib
-src/libglfw.3.3.dylib
+src/libglfw.3.4.dylib
 src/libglfw3.a
 src/glfw3.lib
 src/glfw3.dll
@@ -60,7 +75,7 @@ examples/offscreen
 examples/particles
 examples/splitview
 examples/sharing
-examples/simple
+examples/triangle-opengl
 examples/wave
 tests/*.app
 tests/*.exe
@@ -80,6 +95,7 @@ tests/tearing
 tests/threads
 tests/timeout
 tests/title
-tests/vulkan
+tests/triangle-vulkan
 tests/window
 tests/windows
@@ -0,0 +1,10 @@
 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>
@@ -4,31 +4,44 @@ branches:
    only:
        - ci
        - master
-sudo: false
+        - 3.3-stable
-dist: trusty
+matrix:
    include:
        - os: linux
          dist: xenial
          name: "X11 shared library"
          addons:
              apt:
                  packages:
            - cmake
                      - libxrandr-dev
                      - libxinerama-dev
                      - libxcursor-dev
                      - libxi-dev
-matrix:
+                      - libxext-dev
    include:
        - os: linux
          env:
              - BUILD_SHARED_LIBS=ON
              - CFLAGS=-Werror
        - os: linux
          dist: xenial
          name: "X11 static library"
          addons:
              apt:
                  packages:
                      - libxrandr-dev
                      - libxinerama-dev
                      - libxcursor-dev
                      - libxi-dev
                      - libxext-dev
          env:
              - BUILD_SHARED_LIBS=OFF
              - CFLAGS=-Werror
        - os: linux
-          sudo: required
+          dist: focal
          name: "Wayland shared library"
          addons:
              apt:
                  packages:
                      - wayland-protocols
                      - libwayland-dev
                      - libxkbcommon-dev
                      - libegl1-mesa-dev
@@ -37,10 +50,12 @@ matrix:
              - BUILD_SHARED_LIBS=ON
              - CFLAGS=-Werror
        - os: linux
-          sudo: required
+          dist: focal
          name: "Wayland static library"
          addons:
              apt:
                  packages:
                      - wayland-protocols
                      - libwayland-dev
                      - libxkbcommon-dev
                      - libegl1-mesa-dev
@@ -48,27 +63,48 @@ matrix:
              - USE_WAYLAND=ON
              - BUILD_SHARED_LIBS=OFF
              - CFLAGS=-Werror
        - os: linux
          dist: bionic
          name: "Null shared library"
          addons:
              apt:
                  packages:
                      - libosmesa6-dev
          env:
              - BUILD_SHARED_LIBS=ON
              - USE_OSMESA=ON
              - CFLAGS=-Werror
        - os: linux
          dist: bionic
          name: "Null static library"
          addons:
              apt:
                  packages:
                      - libosmesa6-dev
          env:
              - BUILD_SHARED_LIBS=OFF
              - USE_OSMESA=ON
              - CFLAGS=-Werror
        - os: osx
          name: "Cocoa shared library"
          env:
              - BUILD_SHARED_LIBS=ON
              - CFLAGS=-Werror
              - MACOSX_DEPLOYMENT_TARGET=10.8
        - os: osx
          name: "Cocoa static library"
          env:
              - BUILD_SHARED_LIBS=OFF
              - CFLAGS=-Werror
              - MACOSX_DEPLOYMENT_TARGET=10.8
 script:
-    - if grep -Inr '\s$' src include docs tests examples CMake *.md .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi
+    - if grep -Inr '\s$' src include docs tests examples CMake *.md .gitattributes .gitignore; then
          echo Trailing whitespace found, aborting;
          exit 1;
      fi
    - mkdir build
    - cd build
-    - if test -n "${USE_WAYLAND}";
+    - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} -DGLFW_USE_OSMESA=${USE_OSMESA} ..
          then wget https://mirrors.kernel.org/ubuntu/pool/universe/e/extra-cmake-modules/extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb;
          sudo dpkg -i extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb;
          git clone git://anongit.freedesktop.org/wayland/wayland-protocols;
          pushd wayland-protocols;
          git checkout 1.15 && ./autogen.sh --prefix=/usr && make && sudo make install;
          popd;
      fi
    - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} ..
    - cmake --build .
 notifications:
    email:
@@ -1,9 +1,9 @@
-if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+if (NOT EXISTS "@GLFW_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+    message(FATAL_ERROR "Cannot find install manifest: \"@GLFW_BINARY_DIR@/install_manifest.txt\"")
 endif()
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+file(READ "@GLFW_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")
 foreach (file ${files})
@@ -5,7 +5,7 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 Name: GLFW
 Description: A multi-platform library for OpenGL, window and input
-Version: @GLFW_VERSION_FULL@
+Version: @GLFW_VERSION@
 URL: https://www.glfw.org/
 Requires.private: @GLFW_PKG_DEPS@
 Libs: -L${libdir} -l@GLFW_LIB_NAME@
@@ -0,0 +1,3 @@
 include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
@@ -1,26 +0,0 @@
 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})
@@ -1,34 +0,0 @@
 # - 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)
@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1...3.17 FATAL_ERROR)
-project(GLFW C)
+project(GLFW VERSION 3.4.0 LANGUAGES C)
 set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
@@ -8,43 +8,38 @@ if (POLICY CMP0054)
    cmake_policy(SET CMP0054 NEW)
 endif()
-set(GLFW_VERSION_MAJOR "3")
+if (POLICY CMP0069)
-set(GLFW_VERSION_MINOR "3")
+    cmake_policy(SET CMP0069 NEW)
-set(GLFW_VERSION_PATCH "0")
+endif()
-set(GLFW_VERSION_EXTRA "")
+
-set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
+if (POLICY CMP0077)
-set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
+    cmake_policy(SET CMP0077 NEW)
 endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
    set(GLFW_STANDALONE TRUE)
 endif()
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON)
+option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ${GLFW_STANDALONE})
-option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON)
+option(GLFW_BUILD_TESTS "Build the GLFW test programs" ${GLFW_STANDALONE})
 option(GLFW_BUILD_DOCS "Build the GLFW documentation" ON)
 option(GLFW_INSTALL "Generate installation target" ON)
 option(GLFW_VULKAN_STATIC "Assume the Vulkan loader is linked with the application" OFF)
 include(GNUInstallDirs)
 include(CMakeDependentOption)
-if (UNIX)
+cmake_dependent_option(GLFW_USE_OSMESA "Use OSMesa for offscreen context creation" OFF
-    option(GLFW_USE_OSMESA "Use OSMesa for offscreen context creation" OFF)
+                       "UNIX" OFF)
-endif()
+cmake_dependent_option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF
-
+                       "WIN32" OFF)
-if (WIN32)
+cmake_dependent_option(GLFW_USE_WAYLAND "Use Wayland for window creation" OFF
-    option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF)
+                       "UNIX;NOT APPLE" OFF)
-endif()
+cmake_dependent_option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" ON
-
+                       "MSVC" OFF)
 if (UNIX AND NOT APPLE)
    option(GLFW_USE_WAYLAND "Use Wayland for window creation" OFF)
 endif()
 if (MSVC)
    option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" ON)
 endif()
 if (BUILD_SHARED_LIBS)
    set(_GLFW_BUILD_DLL 1)
 endif()
 if (BUILD_SHARED_LIBS AND UNIX)
    # On Unix-like systems, shared libraries can use the soname system.
@@ -75,17 +70,6 @@ endif()
 # Set compiler specific flags
 #--------------------------------------------------------------------
 if (MSVC)
    if (MSVC90)
        # Workaround for VS 2008 not shipping with the DirectX 9 SDK
        include(CheckIncludeFile)
        check_include_file(dinput.h DINPUT_H_FOUND)
        if (NOT DINPUT_H_FOUND)
            message(FATAL_ERROR "DirectX 9 SDK not found")
        endif()
        # Workaround for VS 2008 not shipping with stdint.h
        list(APPEND glfw_INCLUDE_DIRS "${GLFW_SOURCE_DIR}/deps/vs2008")
    endif()
    if (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
        foreach (flag CMAKE_C_FLAGS
                      CMAKE_C_FLAGS_DEBUG
@@ -104,41 +88,6 @@ if (MSVC)
    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
 #--------------------------------------------------------------------
@@ -204,56 +153,56 @@ 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)
+    if (NOT X11_Xrandr_INCLUDE_PATH)
-        message(FATAL_ERROR "The RandR headers were not found")
+        message(FATAL_ERROR "RandR headers not found; install libxrandr development package")
    endif()
    # Check for Xinerama (legacy multi-monitor support)
-    if (NOT X11_Xinerama_FOUND)
+    if (NOT X11_Xinerama_INCLUDE_PATH)
-        message(FATAL_ERROR "The Xinerama headers were not found")
+        message(FATAL_ERROR "Xinerama headers not found; install libxinerama development package")
    endif()
    # Check for Xkb (X keyboard extension)
-    if (NOT X11_Xkb_FOUND)
+    if (NOT X11_Xkb_INCLUDE_PATH)
-        message(FATAL_ERROR "The X keyboard extension headers were not found")
+        message(FATAL_ERROR "XKB headers not found; install X11 development package")
    endif()
    # Check for Xcursor (cursor creation from RGBA images)
-    if (NOT X11_Xcursor_FOUND)
+    if (NOT X11_Xcursor_INCLUDE_PATH)
-        message(FATAL_ERROR "The Xcursor headers were not found")
+        message(FATAL_ERROR "Xcursor headers not found; install libxcursor development package")
    endif()
-    list(APPEND glfw_INCLUDE_DIRS "${X11_Xrandr_INCLUDE_PATH}"
+    # Check for XInput (modern HID input)
-                                  "${X11_Xinerama_INCLUDE_PATH}"
+    if (NOT X11_Xi_INCLUDE_PATH)
-                                  "${X11_Xkb_INCLUDE_PATH}"
+        message(FATAL_ERROR "XInput headers not found; install libxi development package")
-                                  "${X11_Xcursor_INCLUDE_PATH}")
+    endif()
    # Check for X Shape (custom window input shape)
    if (NOT X11_Xshape_INCLUDE_PATH)
        message(FATAL_ERROR "X Shape headers not found; install libxext development package")
    endif()
 endif()
 #--------------------------------------------------------------------
 # Use Wayland for window creation
 #--------------------------------------------------------------------
 if (_GLFW_WAYLAND)
    find_package(ECM REQUIRED NO_MODULE)
    list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}")
-    find_package(Wayland REQUIRED Client Cursor Egl)
+    include(FindPkgConfig)
-    find_package(WaylandScanner REQUIRED)
+    pkg_check_modules(Wayland REQUIRED
-    find_package(WaylandProtocols 1.15 REQUIRED)
+        wayland-client>=0.2.7
        wayland-cursor>=0.2.7
        wayland-egl>=0.2.7
        xkbcommon)
-    list(APPEND glfw_PKG_DEPS "wayland-egl")
+    list(APPEND glfw_PKG_DEPS "wayland-client")
    list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}")
-    list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
+    list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}")
    find_package(XKBCommon REQUIRED)
    list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}")
    include(CheckIncludeFiles)
    include(CheckFunctionExists)
@@ -269,14 +218,6 @@ if (_GLFW_WAYLAND)
    endif()
 endif()
 #--------------------------------------------------------------------
 # Use OSMesa for offscreen context creation
 #--------------------------------------------------------------------
 if (_GLFW_OSMESA)
    find_package(OSMesa REQUIRED)
    list(APPEND glfw_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 endif()
 #--------------------------------------------------------------------
 # Use Cocoa for window creation and NSOpenGL for context creation
 #--------------------------------------------------------------------
@@ -285,11 +226,10 @@ if (_GLFW_COCOA)
    list(APPEND glfw_LIBRARIES
        "-framework Cocoa"
        "-framework IOKit"
-        "-framework CoreFoundation"
+        "-framework CoreFoundation")
        "-framework CoreVideo")
    set(glfw_PKG_DEPS "")
-    set(glfw_PKG_LIBS "-framework Cocoa -framework IOKit -framework CoreFoundation -framework CoreVideo")
+    set(glfw_PKG_LIBS "-framework Cocoa -framework IOKit -framework CoreFoundation")
 endif()
 #--------------------------------------------------------------------
@@ -316,18 +256,16 @@ include(CMakePackageConfigHelpers)
 set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
-configure_package_config_file(src/glfw3Config.cmake.in
+configure_package_config_file(CMake/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_FULL}
+                                 VERSION ${GLFW_VERSION}
                                 COMPATIBILITY SameMajorVersion)
-configure_file(src/glfw_config.h.in src/glfw_config.h @ONLY)
+configure_file(CMake/glfw3.pc.in src/glfw3.pc @ONLY)
 configure_file(src/glfw3.pc.in src/glfw3.pc @ONLY)
 #--------------------------------------------------------------------
 # Add subdirectories
@@ -364,9 +302,14 @@ if (GLFW_INSTALL)
    install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
    if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
        install(DIRECTORY "${GLFW_BINARY_DIR}/docs/html"
                DESTINATION "${CMAKE_INSTALL_DOCDIR}")
    endif()
    # Only generate this target if no higher-level project already has
    if (NOT TARGET uninstall)
-        configure_file(cmake_uninstall.cmake.in
+        configure_file(CMake/cmake_uninstall.cmake.in
                       cmake_uninstall.cmake IMMEDIATE @ONLY)
        add_custom_target(uninstall
@@ -1,5 +1,6 @@
 Copyright (c) 2002-2006 Marcus Geelnard
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
+
 Copyright (c) 2006-2019 Camilla Löwy
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -11,7 +11,7 @@ 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 X11 and Wayland is supported.
+Linux both X11 and Wayland are supported.
 GLFW is licensed under the [zlib/libpng
 license](http://www.glfw.org/license.html).
@@ -85,10 +85,8 @@ in the documentation for more information.
 ## Dependencies
-GLFW itself depends only on the headers and libraries for your window system.
+GLFW itself needs only CMake 3.1 or later and the headers and libraries for your
-
+OS and window system.
 The (experimental) Wayland backend also depends on the `extra-cmake-modules`
 package, which is used to generated Wayland protocol headers.
 The examples and test programs depend on a number of tiny libraries.  These are
 located in the `deps/` directory.
@@ -118,188 +116,105 @@ information on what to include when reporting a bug.
 ## Changelog
- Added `glfwGetError` function for querying the last error code and its
+ - Added `GLFW_RESIZE_NWSE_CURSOR`, `GLFW_RESIZE_NESW_CURSOR`,
-  description (#970)
+   `GLFW_RESIZE_ALL_CURSOR` and `GLFW_NOT_ALLOWED_CURSOR` cursor shapes (#427)
- Added `glfwUpdateGamepadMappings` function for importing gamepad mappings in
+ - Added `GLFW_RESIZE_EW_CURSOR` alias for `GLFW_HRESIZE_CURSOR` (#427)
-  SDL\_GameControllerDB format (#900)
+ - Added `GLFW_RESIZE_NS_CURSOR` alias for `GLFW_VRESIZE_CURSOR` (#427)
- Added `glfwJoystickIsGamepad` function for querying whether a joystick has
+ - Added `GLFW_POINTING_HAND_CURSOR` alias for `GLFW_HAND_CURSOR` (#427)
-  a gamepad mapping (#900)
+ - Added `GLFW_MOUSE_PASSTHROUGH` window hint for letting mouse input pass
- Added `glfwGetJoystickGUID` function for querying the SDL compatible GUID of
+   through the window (#1236,#1568)
-  a joystick (#900)
+ - Added `GLFW_FEATURE_UNAVAILABLE` error for platform limitations (#1692)
- Added `glfwGetGamepadName` function for querying the name provided by the
+ - Added `GLFW_FEATURE_UNIMPLEMENTED` error for incomplete backends (#1692)
-  gamepad mapping (#900)
+ - Added `GLFW_ANGLE_PLATFORM_TYPE` init hint and `GLFW_ANGLE_PLATFORM_TYPE_*`
- Added `glfwGetGamepadState` function, `GLFW_GAMEPAD_*` and `GLFWgamepadstate`
+   values to select ANGLE backend (#1380)
-  for retrieving gamepad input state (#900)
+ - Made joystick subsystem initialize at first use (#1284,#1646)
- Added `glfwGetWindowContentScale`, `glfwGetMonitorContentScale` and
+ - Updated the minimum required CMake version to 3.1
-  `glfwSetWindowContentScaleCallback` for DPI-aware rendering
+ - Disabled tests and examples by default when built as a CMake subdirectory
-  (#235,#439,#677,#845,#898)
+ - Bugfix: The CMake config-file package used an absolute path and was not
- Added `glfwRequestWindowAttention` function for requesting attention from the
+   relocatable (#1470)
-  user (#732,#988)
+ - Bugfix: Video modes with a duplicate screen area were discarded (#1555,#1556)
- Added `glfwGetMonitorWorkarea` function for retrieving the monitor work area
+ - Bugfix: Compiling with -Wextra-semi caused warnings (#1440)
-  (#920,#989,#1322)
+ - Bugfix: Built-in mappings failed because some OEMs re-used VID/PID (#1583)
- Added `glfwGetKeyScancode` function that allows retrieving platform dependent
+ - Bugfix: Some extension loader headers did not prevent default OpenGL header
-  scancodes for keys (#830)
+   inclusion (#1695)
- Added `glfwSetWindowMaximizeCallback` and `GLFWwindowmaximizefun` for
+ - [Win32] Added the `GLFW_WIN32_KEYBOARD_MENU` window hint for enabling access
-  receiving window maximization events (#778)
+           to the window menu
- Added `glfwSetWindowAttrib` function for changing window attributes (#537)
+ - [Win32] Added a version info resource to the GLFW DLL
- Added `glfwGetJoystickHats` function for querying joystick hats
+ - [Win32] Disabled framebuffer transparency on Windows 7 when DWM windows are
-  (#889,#906,#934)
+   opaque (#1512)
- Added `glfwInitHint` for setting initialization hints
+ - [Win32] Bugfix: `GLFW_INCLUDE_VULKAN` plus `VK_USE_PLATFORM_WIN32_KHR` caused
- Added `glfwWindowHintString` for setting string type window hints (#893,#1139)
+   symbol redefinition (#1524)
- Added `glfwGetWindowOpacity` and `glfwSetWindowOpacity` for controlling whole
+ - [Win32] Bugfix: The cursor position event was emitted before its cursor enter
-  window transparency (#1089)
+   event (#1490)
- Added `glfwSetMonitorUserPointer` and `glfwGetMonitorUserPointer` for
+ - [Win32] Bugfix: The window hint `GLFW_MAXIMIZED` did not move or resize the
-  per-monitor user pointers
+   window (#1499)
- Added `glfwSetJoystickUserPointer` and `glfwGetJoystickUserPointer` for
+ - [Win32] Bugfix: Disabled cursor mode interfered with some non-client actions
-  per-joystick user pointers
+ - [Win32] Bugfix: Super key was not released after Win+V hotkey (#1622)
- Added `glfwGetX11SelectionString` and `glfwSetX11SelectionString`
+ - [Win32] Bugfix: `glfwGetKeyName` could access out of bounds and return an
-  functions for accessing X11 primary selection (#894,#1056)
+   invalid pointer
- Added `glfwRawMouseMotionSupported` function for querying raw motion support
+ - [Win32] Bugfix: Some synthetic key events were reported as `GLFW_KEY_UNKNOWN`
-  (#125,#1400,#1401)
+   (#1623)
- Added headless [OSMesa](http://mesa3d.org/osmesa.html) backend (#850)
+ - [Win32] Bugfix: Non-BMP Unicode codepoint input was reported as UTF-16
- Added definition of `GLAPIENTRY` to public header
+ - [Win32] Bugfix: Monitor functions could return invalid values after
- Added `GLFW_TRANSPARENT_FRAMEBUFFER` window hint and attribute for controlling
+   configuration change (#1761)
-  per-pixel framebuffer transparency (#197,#663,#715,#723,#1078)
+ - [Win32] Bugfix: Initialization would segfault on Windows 8 (not 8.1) (#1775)
- Added `GLFW_HOVERED` window attribute for polling cursor hover state (#1166)
+ - [Cocoa] Added support for `VK_EXT_metal_surface` (#1619)
- Added `GLFW_CENTER_CURSOR` window hint for controlling cursor centering
+ - [Cocoa] Added locating the Vulkan loader at runtime in an application bundle
-  (#749,#842)
+ - [Cocoa] Moved main menu creation to GLFW initialization time (#1649)
- Added `GLFW_FOCUS_ON_SHOW` window hint and attribute to control input focus
+ - [Cocoa] Changed `EGLNativeWindowType` from `NSView` to `CALayer` (#1169)
-  on calling show window (#1189)
+ - [Cocoa] Removed dependency on the CoreVideo framework
- Added `GLFW_SCALE_TO_MONITOR` window hint for automatic window resizing
+ - [Cocoa] Bugfix: `glfwSetWindowSize` used a bottom-left anchor point (#1553)
-  (#676,#1115)
+ - [Cocoa] Bugfix: Window remained on screen after destruction until event poll
- Added `GLFW_JOYSTICK_HAT_BUTTONS` init hint (#889)
+   (#1412)
- Added `GLFW_LOCK_KEY_MODS` input mode and `GLFW_MOD_*_LOCK` mod bits (#946)
+ - [Cocoa] Bugfix: Event processing before window creation would assert (#1543)
- Added `GLFW_RAW_MOUSE_MOTION` input mode for selecting raw motion input
+ - [Cocoa] Bugfix: Undecorated windows could not be iconified on recent macOS
-  (#125,#1400,#1401)
+ - [Cocoa] Bugfix: Touching event queue from secondary thread before main thread
- Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint
+   would abort (#1649)
- Added macOS specific `GLFW_COCOA_FRAME_NAME` window hint (#195)
+ - [Cocoa] Bugfix: Non-BMP Unicode codepoint input was reported as UTF-16
- Added macOS specific `GLFW_COCOA_GRAPHICS_SWITCHING` window hint (#377,#935)
+   (#1635)
- Added macOS specific `GLFW_COCOA_CHDIR_RESOURCES` init hint
+ - [Cocoa] Bugfix: Failing to retrieve the refresh rate of built-in displays
- Added macOS specific `GLFW_COCOA_MENUBAR` init hint
+   could leak memory
- Added X11 specific `GLFW_X11_CLASS_NAME` and `GLFW_X11_INSTANCE_NAME` window
+ - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
-  hints (#893,#1139)
+ - [X11] Bugfix: Key names were not updated when the keyboard layout changed
- Added `GLFW_INCLUDE_ES32` for including the OpenGL ES 3.2 header
+   (#1462,#1528)
- Added `GLFW_OSMESA_CONTEXT_API` for creating OpenGL contexts with
+ - [X11] Bugfix: Decorations could not be enabled after window creation (#1566)
-  [OSMesa](https://www.mesa3d.org/osmesa.html) (#281)
+ - [X11] Bugfix: Content scale fallback value could be inconsistent (#1578)
- Added `GenerateMappings.cmake` script for updating gamepad mappings
+ - [X11] Bugfix: `glfwMaximizeWindow` had no effect on hidden windows
- Made `glfwCreateWindowSurface` emit an error when the window has a context
+ - [X11] Bugfix: Clearing `GLFW_FLOATING` on a hidden window caused invalid read
-  (#1194,#1205)
+ - [X11] Bugfix: Changing `GLFW_FLOATING` on a hidden window could silently fail
- Deprecated window parameter of clipboard string functions
+ - [X11] Bugfix: Disabled cursor mode was interrupted by indicator windows
- Deprecated charmods callback
+ - [X11] Bugfix: Monitor physical dimensions could be reported as zero mm
- Removed `GLFW_USE_RETINA` compile-time option
+ - [X11] Bugfix: Window position events were not emitted during resizing (#1613)
- Removed `GLFW_USE_CHDIR` compile-time option
+ - [X11] Bugfix: `glfwFocusWindow` could terminate on older WMs or without a WM
- Removed `GLFW_USE_MENUBAR` compile-time option
+ - [X11] Bugfix: Querying a disconnected monitor could segfault (#1602)
- Removed requirement of at least one window for `glfwWaitEvents` and
+ - [X11] Bugfix: IME input of CJK was broken for "C" locale (#1587,#1636)
-  `glfwPostEmptyEvent` (#1317)
+ - [X11] Bugfix: Termination would segfault if the IM had been destroyed
- Removed all dependencies on the Vulkan SDK
+ - [X11] Bugfix: Any IM started after initialization would not be detected
- Bugfix: Calling `glfwMaximizeWindow` on a full screen window was not ignored
+ - [X11] Bugfix: Xlib errors caused by other parts of the application could be
- Bugfix: `GLFW_INCLUDE_VULKAN` could not be combined with the corresponding
+   reported as GLFW errors
-          OpenGL and OpenGL ES header macros
+ - [X11] Bugfix: A handle race condition could cause a `BadWindow` error (#1633)
- Bugfix: `glfwGetInstanceProcAddress` returned `NULL` for
+ - [X11] Bugfix: XKB path used keysyms instead of physical locations for
-          `vkGetInstanceProcAddr` when `_GLFW_VULKAN_STATIC` was enabled
+   non-printable keys (#1598)
- Bugfix: Invalid library paths were used in test and example CMake files (#930)
+ - [X11] Bugfix: Function keys were mapped to `GLFW_KEY_UNKNOWN` for some layout
- Bugfix: The scancode for synthetic key release events was always zero
+   combinaitons (#1598)
- Bugfix: The generated Doxyfile did not handle paths with spaces (#1081)
+ - [X11] Bugfix: Keys pressed simultaneously with others were not always
- Bugfix: The gamma ramp generated by `glfwSetGamma` did not use the monitor
+   reported (#1112,#1415,#1472,#1616)
-          ramp size (#1387,#1388)
+ - [Wayland] Removed support for `wl_shell` (#1443)
- [Win32] Added system error strings to relevant GLFW error descriptions (#733)
+ - [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432)
- [Win32] Removed XInput circular deadzone from joystick axis data (#1045)
+ - [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled
- [Win32] Bugfix: Undecorated windows could not be iconified by the user (#861)
+ - [Wayland] Bugfix: Repeated keys could be reported with `NULL` window (#1704)
- [Win32] Bugfix: Deadzone logic could underflow with some controllers (#910)
+ - [Wayland] Bugfix: Retrieving partial framebuffer size would segfault
- [Win32] Bugfix: `glfwVulkanSupported` emitted an error on systems with
+ - [Wayland] Bugfix: Scrolling offsets were inverted compared to other platforms
-                  a loader but no ICD (#916)
+   (#1463)
- [Win32] Bugfix: Non-iconified full sreeen windows did not prevent screen
+ - [POSIX] Bugfix: `CLOCK_MONOTONIC` was not correctly tested for or enabled
-                  blanking or password enabled screensavers (#851)
+ - [NSGL] Removed enforcement of forward-compatible flag for core contexts
- [Win32] Bugfix: Mouse capture logic lost secondary release messages (#954)
+ - [NSGL] Bugfix: `GLFW_COCOA_RETINA_FRAMEBUFFER` had no effect on newer
- [Win32] Bugfix: Monitors with no display devices were not enumerated (#960)
+   macOS versions (#1442)
- [Win32] Bugfix: Monitor events were not emitted (#784)
+ - [NSGL] Bugfix: Workaround for swap interval on 10.14 broke on 10.12 (#1483)
- [Win32] Bugfix: The DLL was installed to the wrong directory on Cygwin (#1035)
+ - [EGL] Added platform selection via the `EGL_EXT_platform_base` extension
- [Win32] Bugfix: Normalization of axis data via XInput was incorrect (#1045)
+   (#442)
- [Win32] Bugfix: `glfw3native.h` would undefine a foreign `APIENTRY` (#1062)
+ - [EGL] Added ANGLE backend selection via `EGL_ANGLE_platform_angle` extension
- [Win32] Bugfix: Disabled cursor mode prevented use of caption buttons
+   (#1380)
                  (#650,#1071)
 - [Win32] Bugfix: Returned key names did not match other platforms (#943)
 - [Win32] Bugfix: Undecorated windows did not maximize to workarea (#899)
 - [Win32] Bugfix: Window was resized twice when entering full screen (#1085)
 - [Win32] Bugfix: The HID device notification was not unregistered (#1170)
 - [Win32] Bugfix: `glfwCreateWindow` activated window even with `GLFW_FOCUSED`
                  hint set to false (#1179,#1180)
 - [Win32] Bugfix: The keypad equals key was reported as `GLFW_KEY_UNKNOWN`
                  (#1315,#1316)
 - [Win32] Bugfix: A title bar would be drawn over undecorated windows in some
                  circumstances (#1383)
 - [Win32] Bugfix: Standard cursors were not per-monitor DPI aware (#1431)
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
 - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X
 - [X11] Bugfix: Dynamic X11 library loading did not use full sonames (#941)
 - [X11] Bugfix: Window creation on 64-bit would read past top of stack (#951)
 - [X11] Bugfix: XDND support had multiple non-conformance issues (#968)
 - [X11] Bugfix: The RandR monitor path was disabled despite working RandR (#972)
 - [X11] Bugfix: IM-duplicated key events would leak at low polling rates (#747)
 - [X11] Bugfix: Gamma ramp setting via RandR did not validate ramp size
 - [X11] Bugfix: Key name string encoding depended on current locale (#981,#983)
 - [X11] Bugfix: Incremental reading of selections was not supported (#275)
 - [X11] Bugfix: Selection I/O reported but did not support `COMPOUND_TEXT`
 - [X11] Bugfix: Latin-1 text read from selections was not converted to UTF-8
 - [X11] Bugfix: NVidia EGL would segfault if unloaded before closing the display
 - [X11] Bugfix: Checking window maximized attrib could crash some WMs (#1356)
 - [X11] Bugfix: Update cursor position on enter event (#1366)
 - [X11] Bugfix: `glfwSetWindowMonitor` did not update hints when resizing
                non-user-resizable windows
 - [X11] Bugfix: `glfwSetWindowMonitor` did not flush output buffer in some cases
 - [X11] Bugfix: `glfwSetWindowMonitor` did not update the EWMH state of hidden
                windows (#1358)
 - [Linux] Added workaround for missing `SYN_DROPPED` in pre-2.6.39 kernel
          headers (#1196)
 - [Linux] Moved to evdev for joystick input (#906,#1005)
 - [Linux] Bugfix: Event processing did not detect joystick disconnection (#932)
 - [Linux] Bugfix: The joystick device path could be truncated (#1025)
 - [Linux] Bugfix: `glfwInit` would fail if inotify creation failed (#833)
 - [Linux] Bugfix: `strdup` was used without any required feature macro (#1055)
 - [Cocoa] Added support for Vulkan window surface creation via
          [MoltenVK](https://moltengl.com/moltenvk/) (#870)
 - [Cocoa] Added support for loading a `MainMenu.nib` when available
 - [Cocoa] Disabled automatic window tabbing for created windows (#1250)
 - [Cocoa] Bugfix: Disabling window aspect ratio would assert (#852)
 - [Cocoa] Bugfix: Window creation failed to set first responder (#876,#883)
 - [Cocoa] Bugfix: Removed use of deprecated `CGDisplayIOServicePort` function
                  (#165,#192,#508,#511)
 - [Cocoa] Bugfix: Disabled use of deprecated `CGDisplayModeCopyPixelEncoding`
                  function on macOS 10.12+
 - [Cocoa] Bugfix: Running in AppSandbox would emit warnings (#816,#882)
 - [Cocoa] Bugfix: Windows created after the first were not cascaded (#195)
 - [Cocoa] Bugfix: Leaving video mode with `glfwSetWindowMonitor` would set
                  incorrect position and size (#748)
 - [Cocoa] Bugfix: Iconified full screen windows could not be restored (#848)
 - [Cocoa] Bugfix: Value range was ignored for joystick hats and buttons (#888)
 - [Cocoa] Bugfix: Full screen framebuffer was incorrectly sized for some video
                  modes (#682)
 - [Cocoa] Bugfix: A string object for IME was updated non-idiomatically (#1050)
 - [Cocoa] Bugfix: A hidden or disabled cursor would become visible when a user
                  notification was shown (#971,#1028)
 - [Cocoa] Bugfix: Some characters did not repeat due to Press and Hold (#1010)
 - [Cocoa] Bugfix: Window title was lost when full screen or undecorated (#1082)
 - [Cocoa] Bugfix: Window was resized twice when entering full screen (#1085)
 - [Cocoa] Bugfix: Duplicate size events were not filtered (#1085)
 - [Cocoa] Bugfix: Event polling did not initialize AppKit if necessary (#1218)
 - [Cocoa] Bugfix: OpenGL rendering was not visible before resize on early macOS
                  10.14 (#1334,#1346)
 - [Cocoa] Bugfix: Caps Lock did not generate any key events (#1368,#1373)
 - [Cocoa] Bugfix: Some buttons for some joysticks were ignored (#1385)
 - [Cocoa] Bugfix: Analog joystick buttons were not translated correctly (#1385)
 - [Cocoa] Bugfix: OpenGL swap interval was ignored for occluded windows (#680)
 - [Cocoa] Bugfix: OpenGL swap interval was ignored on early macOS 10.14
                  (#1337,#1417,#1435)
 - [Cocoa] Bugfix: The y-coordinate was incorrect for `glfwGetCursorPos` and
                  `glfwSetCursorPos` (#1461)
 - [WGL] Added support for `WGL_EXT_colorspace` for OpenGL ES contexts
 - [WGL] Added support for `WGL_ARB_create_context_no_error`
 - [GLX] Added support for `GLX_ARB_create_context_no_error`
 - [GLX] Bugfix: Context creation could segfault if no GLXFBConfigs were
                available (#1040)
 - [EGL] Added support for `EGL_KHR_get_all_proc_addresses` (#871)
 - [EGL] Added support for `EGL_KHR_context_flush_control`
 - [EGL] Bugfix: The test for `EGL_RGB_BUFFER` was invalid
 ## Contact
@@ -308,7 +223,7 @@ On [glfw.org](http://www.glfw.org/) you can find the latest version of GLFW, as
 well as news, documentation and other information about the project.
 If you have questions related to the use of GLFW, we have a
-[forum](http://discourse.glfw.org/), and the `#glfw` IRC channel on
+[forum](https://discourse.glfw.org/), and the `#glfw` IRC channel on
 [Freenode](http://freenode.net/).
 If you have a bug to report, a patch to submit or a feature you'd like to
@@ -338,7 +253,9 @@ skills.
 - blanco
 - Kyle Brenneman
 - Rok Breulj
 - Kai Burjack
 - Martin Capitanio
 - Nicolas Caramelli
 - David Carlier
 - Arturo Castro
 - Chi-kwan Chan
@@ -370,6 +287,8 @@ skills.
 - Mário Freitas
 - GeO4d
 - Marcus Geelnard
 - Charles Giessen
 - Ryan C. Gordon
 - Stephen Gowen
 - Kovid Goyal
 - Eloi Marín Gratacós
@@ -381,6 +300,7 @@ skills.
 - Lucas Hinderberger
 - Paul Holden
 - Warren Hu
 - Charles Huber
 - IntellectualKitty
 - Aaron Jacobs
 - Erik S. V. Jansson
@@ -389,17 +309,24 @@ skills.
 - Cem Karan
 - Osman Keskin
 - Josh Kilmer
 - Byunghoon Kim
 - Cameron King
 - Peter Knut
 - Christoph Kubisch
 - Yuri Kunde Schlesner
 - Rokas Kupstys
 - Konstantin Käfer
 - Eric Larson
 - Francis Lecavalier
 - Robin Leffmann
 - Glenn Lewis
 - Shane Liesegang
 - Anders Lindqvist
 - Leon Linhart
 - Eyal Lotem
 - Aaron Loucks
 - Luflosi
 - lukect
 - Tristam MacDonald
 - Hans Mackowiak
 - Дмитри Малышев
@@ -412,6 +339,7 @@ skills.
 - Jonathan Mercier
 - Marcel Metz
 - Liam Middlebrook
 - Ave Milia
 - Jonathan Miller
 - Kenneth Miller
 - Bruce Mitchener
@@ -426,6 +354,7 @@ skills.
 - ndogxj
 - Kristian Nielsen
 - Kamil Nowakowski
 - onox
 - Denis Ovod
 - Ozzy
 - Andri Pálsson
@@ -433,21 +362,28 @@ skills.
 - Braden Pellett
 - Christopher Pelloux
 - Arturo J. Pérez
 - Vladimir Perminov
 - Anthony Pesch
 - Orson Peters
 - Emmanuel Gil Peyrot
 - Cyril Pichard
 - Keith Pitt
 - Stanislav Podgorskiy
 - Konstantin Podsvirov
 - Nathan Poirier
 - Alexandre Pretyman
 - Pablo Prietz
 - przemekmirek
 - pthom
 - Guillaume Racicot
 - Philip Rideout
 - Eddie Ringle
 - Max Risuhin
 - Jorge Rodriguez
 - Luca Rood
 - Ed Ropple
 - Aleksey Rybalkin
 - Mikko Rytkönen
 - Riku Salminen
 - Brandon Schaefer
 - Sebastian Schuberth
@@ -455,6 +391,7 @@ skills.
 - Matt Sealey
 - Steve Sexton
 - Arkady Shapkin
 - Ali Sherief
 - Yoshiki Shibukawa
 - Dmitri Shuralyov
 - Daniel Skorupski
@@ -471,6 +408,7 @@ skills.
 - Paul Sultana
 - Nathan Sweet
 - TTK-Bandit
 - Jared Tiala
 - Sergey Tikhomirov
 - Arthur Tombs
 - Ioannis Tsakpinis
@@ -487,10 +425,14 @@ skills.
 - Torsten Walluhn
 - Patrick Walton
 - Xo Wang
 - Waris
 - Jay Weisskopf
 - Frank Wille
 - Tatsuya Yatagawa
 - Ryogo Yoshimura
 - Lukas Zanner
 - Andrey Zholos
 - Aihui Zhu
 - Santi Zupancic
 - Jonas Ådahl
 - Lasse Öörni
@@ -3,31 +3,40 @@
 #include <math.h>
-#ifdef _MSC_VER
+/* 2020-03-02 Camilla Löwy <elmindreda@elmindreda.org>
-#define inline __inline
+ * - Added inclusion of string.h for memcpy
 * - Replaced tan and acos with tanf and acosf
 * - Replaced double constants with float equivalents
 */
 #include <string.h>
 #ifdef LINMATH_NO_INLINE
 #define LINMATH_H_FUNC static
 #else
 #define LINMATH_H_FUNC static inline
 #endif
 #define LINMATH_H_DEFINE_VEC(n) \
 typedef float vec##n[n]; \
-static inline void vec##n##_add(vec##n r, vec##n const a, vec##n const b) \
+LINMATH_H_FUNC 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]; \
 } \
-static inline void vec##n##_sub(vec##n r, vec##n const a, vec##n const b) \
+LINMATH_H_FUNC 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]; \
 } \
-static inline void vec##n##_scale(vec##n r, vec##n const v, float const s) \
+LINMATH_H_FUNC 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; \
 } \
-static inline float vec##n##_mul_inner(vec##n const a, vec##n const b) \
+LINMATH_H_FUNC float vec##n##_mul_inner(vec##n const a, vec##n const b) \
 { \
 	float p = 0.; \
 	int i; \
@@ -35,28 +44,40 @@ static inline float vec##n##_mul_inner(vec##n const a, vec##n const b) \
 		p += b[i]*a[i]; \
 	return p; \
 } \
-static inline float vec##n##_len(vec##n const v) \
+LINMATH_H_FUNC float vec##n##_len(vec##n const v) \
 { \
-	return (float) sqrt(vec##n##_mul_inner(v,v)); \
+	return sqrtf(vec##n##_mul_inner(v,v)); \
 } \
-static inline void vec##n##_norm(vec##n r, vec##n const v) \
+LINMATH_H_FUNC 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_DEFINE_VEC(2)
 LINMATH_H_DEFINE_VEC(3)
 LINMATH_H_DEFINE_VEC(4)
-static inline void vec3_mul_cross(vec3 r, vec3 const a, vec3 const b)
+LINMATH_H_FUNC 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];
 }
-static inline void vec3_reflect(vec3 r, vec3 const v, vec3 const n)
+LINMATH_H_FUNC void vec3_reflect(vec3 r, vec3 const v, vec3 const n)
 {
 	float p  = 2.f*vec3_mul_inner(v, n);
 	int i;
@@ -64,7 +85,7 @@ static inline void vec3_reflect(vec3 r, vec3 const v, vec3 const n)
 		r[i] = v[i] - p*n[i];
 }
-static inline void vec4_mul_cross(vec4 r, vec4 a, vec4 b)
+LINMATH_H_FUNC 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];
@@ -72,7 +93,7 @@ static inline void vec4_mul_cross(vec4 r, vec4 a, vec4 b)
 	r[3] = 1.f;
 }
-static inline void vec4_reflect(vec4 r, vec4 v, vec4 n)
+LINMATH_H_FUNC void vec4_reflect(vec4 r, vec4 v, vec4 n)
 {
 	float p  = 2.f*vec4_mul_inner(v, n);
 	int i;
@@ -81,58 +102,58 @@ static inline void vec4_reflect(vec4 r, vec4 v, vec4 n)
 }
 typedef vec4 mat4x4[4];
-static inline void mat4x4_identity(mat4x4 M)
+LINMATH_H_FUNC 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;
 }
-static inline void mat4x4_dup(mat4x4 M, mat4x4 N)
+LINMATH_H_FUNC void mat4x4_dup(mat4x4 M, mat4x4 N)
 {
 	int i, j;
 	for(i=0; i<4; ++i)
 		for(j=0; j<4; ++j)
 			M[i][j] = N[i][j];
 }
-static inline void mat4x4_row(vec4 r, mat4x4 M, int i)
+LINMATH_H_FUNC void mat4x4_row(vec4 r, mat4x4 M, int i)
 {
 	int k;
 	for(k=0; k<4; ++k)
 		r[k] = M[k][i];
 }
-static inline void mat4x4_col(vec4 r, mat4x4 M, int i)
+LINMATH_H_FUNC void mat4x4_col(vec4 r, mat4x4 M, int i)
 {
 	int k;
 	for(k=0; k<4; ++k)
 		r[k] = M[i][k];
 }
-static inline void mat4x4_transpose(mat4x4 M, mat4x4 N)
+LINMATH_H_FUNC void mat4x4_transpose(mat4x4 M, mat4x4 N)
 {
 	int i, j;
 	for(j=0; j<4; ++j)
 		for(i=0; i<4; ++i)
 			M[i][j] = N[j][i];
 }
-static inline void mat4x4_add(mat4x4 M, mat4x4 a, mat4x4 b)
+LINMATH_H_FUNC 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]);
 }
-static inline void mat4x4_sub(mat4x4 M, mat4x4 a, mat4x4 b)
+LINMATH_H_FUNC 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]);
 }
-static inline void mat4x4_scale(mat4x4 M, mat4x4 a, float k)
+LINMATH_H_FUNC void mat4x4_scale(mat4x4 M, mat4x4 a, float k)
 {
 	int i;
 	for(i=0; i<4; ++i)
 		vec4_scale(M[i], a[i], k);
 }
-static inline void mat4x4_scale_aniso(mat4x4 M, mat4x4 a, float x, float y, float z)
+LINMATH_H_FUNC void mat4x4_scale_aniso(mat4x4 M, mat4x4 a, float x, float y, float z)
 {
 	int i;
 	vec4_scale(M[0], a[0], x);
@@ -142,7 +163,7 @@ static inline void mat4x4_scale_aniso(mat4x4 M, mat4x4 a, float x, float y, floa
 		M[3][i] = a[3][i];
 	}
 }
-static inline void mat4x4_mul(mat4x4 M, mat4x4 a, mat4x4 b)
+LINMATH_H_FUNC void mat4x4_mul(mat4x4 M, mat4x4 a, mat4x4 b)
 {
 	mat4x4 temp;
 	int k, r, c;
@@ -153,7 +174,7 @@ static inline void mat4x4_mul(mat4x4 M, mat4x4 a, mat4x4 b)
 	}
 	mat4x4_dup(M, temp);
 }
-static inline void mat4x4_mul_vec4(vec4 r, mat4x4 M, vec4 v)
+LINMATH_H_FUNC void mat4x4_mul_vec4(vec4 r, mat4x4 M, vec4 v)
 {
 	int i, j;
 	for(j=0; j<4; ++j) {
@@ -162,14 +183,14 @@ static inline void mat4x4_mul_vec4(vec4 r, mat4x4 M, vec4 v)
 			r[j] += M[i][j] * v[i];
 	}
 }
-static inline void mat4x4_translate(mat4x4 T, float x, float y, float z)
+LINMATH_H_FUNC 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;
 }
-static inline void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z)
+LINMATH_H_FUNC void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z)
 {
 	vec4 t = {x, y, z, 0};
 	vec4 r;
@@ -179,33 +200,32 @@ static inline void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z
 		M[3][i] += vec4_mul_inner(r, t);
 	}
 }
-static inline void mat4x4_from_vec3_mul_outer(mat4x4 M, vec3 a, vec3 b)
+LINMATH_H_FUNC 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;
 }
-static inline void mat4x4_rotate(mat4x4 R, mat4x4 M, float x, float y, float z, float angle)
+LINMATH_H_FUNC void mat4x4_rotate(mat4x4 R, mat4x4 M, float x, float y, float z, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
 	vec3 u = {x, y, z};
 	if(vec3_len(u) > 1e-4) {
 		mat4x4 T, C, S = {{0}};
 		vec3_norm(u, u);
 		mat4x4 T;
 		mat4x4_from_vec3_mul_outer(T, u, u);
-		S[1][2] =  u[0];
+		mat4x4 S = {
-		S[2][1] = -u[0];
+			{    0,  u[2], -u[1], 0},
-		S[2][0] =  u[1];
+			{-u[2],     0,  u[0], 0},
-		S[0][2] = -u[1];
+			{ u[1], -u[0],     0, 0},
-		S[0][1] =  u[2];
+			{    0,     0,     0, 0}
-		S[1][0] = -u[2];
+		};
 		mat4x4_scale(S, S, s);
 		mat4x4 C;
 		mat4x4_identity(C);
 		mat4x4_sub(C, C, T);
@@ -220,7 +240,7 @@ static inline void mat4x4_rotate(mat4x4 R, mat4x4 M, float x, float y, float z,
 		mat4x4_dup(R, M);
 	}
 }
-static inline void mat4x4_rotate_X(mat4x4 Q, mat4x4 M, float angle)
+LINMATH_H_FUNC void mat4x4_rotate_X(mat4x4 Q, mat4x4 M, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
@@ -232,19 +252,19 @@ static inline void mat4x4_rotate_X(mat4x4 Q, mat4x4 M, float angle)
 	};
 	mat4x4_mul(Q, M, R);
 }
-static inline void mat4x4_rotate_Y(mat4x4 Q, mat4x4 M, float angle)
+LINMATH_H_FUNC 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);
 }
-static inline void mat4x4_rotate_Z(mat4x4 Q, mat4x4 M, float angle)
+LINMATH_H_FUNC void mat4x4_rotate_Z(mat4x4 Q, mat4x4 M, float angle)
 {
 	float s = sinf(angle);
 	float c = cosf(angle);
@@ -256,9 +276,8 @@ static inline void mat4x4_rotate_Z(mat4x4 Q, mat4x4 M, float angle)
 	};
 	mat4x4_mul(Q, M, R);
 }
-static inline void mat4x4_invert(mat4x4 T, mat4x4 M)
+LINMATH_H_FUNC void mat4x4_invert(mat4x4 T, mat4x4 M)
 {
 	float idet;
 	float s[6];
 	float c[6];
 	s[0] = M[0][0]*M[1][1] - M[1][0]*M[0][1];
@@ -276,7 +295,7 @@ static inline void mat4x4_invert(mat4x4 T, mat4x4 M)
 	c[5] = M[2][2]*M[3][3] - M[3][2]*M[2][3];
 	/* Assumes it is invertible */
-	idet = 1.0f/( s[0]*c[5]-s[1]*c[4]+s[2]*c[3]+s[3]*c[2]-s[4]*c[1]+s[5]*c[0] );
+	float idet = 1.0f/( s[0]*c[5]-s[1]*c[4]+s[2]*c[3]+s[3]*c[2]-s[4]*c[1]+s[5]*c[0] );
 	T[0][0] = ( M[1][1] * c[5] - M[1][2] * c[4] + M[1][3] * c[3]) * idet;
 	T[0][1] = (-M[0][1] * c[5] + M[0][2] * c[4] - M[0][3] * c[3]) * idet;
@@ -298,17 +317,12 @@ static inline void mat4x4_invert(mat4x4 T, mat4x4 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;
 }
-static inline void mat4x4_orthonormalize(mat4x4 R, mat4x4 M)
+LINMATH_H_FUNC void mat4x4_orthonormalize(mat4x4 R, mat4x4 M)
 {
 	mat4x4_dup(R, M);
 	float s = 1.;
 	vec3 h;
 	mat4x4_dup(R, M);
 	vec3_norm(R[2], R[2]);
 	s = vec3_mul_inner(R[1], R[2]);
 	vec3_scale(h, R[2], s);
 	vec3_sub(R[1], R[1], h);
 	vec3_norm(R[2], R[2]);
 	s = vec3_mul_inner(R[1], R[2]);
@@ -316,13 +330,17 @@ static inline void mat4x4_orthonormalize(mat4x4 R, mat4x4 M)
 	vec3_sub(R[1], R[1], h);
 	vec3_norm(R[1], R[1]);
 	s = vec3_mul_inner(R[0], R[2]);
 	vec3_scale(h, R[2], s);
 	vec3_sub(R[0], R[0], h);
 	s = vec3_mul_inner(R[0], R[1]);
 	vec3_scale(h, R[1], s);
 	vec3_sub(R[0], R[0], h);
 	vec3_norm(R[0], R[0]);
 }
-static inline void mat4x4_frustum(mat4x4 M, float l, float r, float b, float t, float n, float f)
+LINMATH_H_FUNC 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;
@@ -338,7 +356,7 @@ static inline 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;
 }
-static inline void mat4x4_ortho(mat4x4 M, float l, float r, float b, float t, float n, float f)
+LINMATH_H_FUNC 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;
@@ -354,11 +372,11 @@ static inline void mat4x4_ortho(mat4x4 M, float l, float r, float b, float t, fl
 	M[3][2] = -(f+n)/(f-n);
 	M[3][3] = 1.f;
 }
-static inline void mat4x4_perspective(mat4x4 m, float y_fov, float aspect, float n, float f)
+LINMATH_H_FUNC 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 / (float) tan(y_fov / 2.f);
+	float const a = 1.f / tanf(y_fov / 2.f);
 	m[0][0] = a / aspect;
 	m[0][1] = 0.f;
@@ -380,7 +398,7 @@ static inline void mat4x4_perspective(mat4x4 m, float y_fov, float aspect, float
 	m[3][2] = -((2.f * f * n) / (f - n));
 	m[3][3] = 0.f;
 }
-static inline void mat4x4_look_at(mat4x4 m, vec3 eye, vec3 center, vec3 up)
+LINMATH_H_FUNC 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 */
@@ -389,15 +407,14 @@ static inline void mat4x4_look_at(mat4x4 m, vec3 eye, vec3 center, vec3 up)
 	/* TODO: The negation of of can be spared by swapping the order of
 	 *       operands in the following cross products in the right way. */
 	vec3 f;
 	vec3 s;
 	vec3 t;
 	vec3_sub(f, center, eye);	
 	vec3_norm(f, f);	
 	vec3 s;
 	vec3_mul_cross(s, f, up);
 	vec3_norm(s, s);
 	vec3 t;
 	vec3_mul_cross(t, s, f);
 	m[0][0] =  s[0];
@@ -424,24 +441,24 @@ static inline void mat4x4_look_at(mat4x4 m, vec3 eye, vec3 center, vec3 up)
 }
 typedef float quat[4];
-static inline void quat_identity(quat q)
+LINMATH_H_FUNC void quat_identity(quat q)
 {
 	q[0] = q[1] = q[2] = 0.f;
 	q[3] = 1.f;
 }
-static inline void quat_add(quat r, quat a, quat b)
+LINMATH_H_FUNC 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)
+LINMATH_H_FUNC 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)
+LINMATH_H_FUNC void quat_mul(quat r, quat p, quat q)
 {
 	vec3 w;
 	vec3_mul_cross(r, p, q);
@@ -451,13 +468,13 @@ static inline void quat_mul(quat r, quat p, quat q)
 	vec3_add(r, r, w);
 	r[3] = p[3]*q[3] - vec3_mul_inner(p, q);
 }
-static inline void quat_scale(quat r, quat v, float s)
+LINMATH_H_FUNC 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)
+LINMATH_H_FUNC float quat_inner_product(quat a, quat b)
 {
 	float p = 0.f;
 	int i;
@@ -465,42 +482,43 @@ static inline float quat_inner_product(quat a, quat b)
 		p += b[i]*a[i];
 	return p;
 }
-static inline void quat_conj(quat r, quat q)
+LINMATH_H_FUNC void quat_conj(quat r, quat q)
 {
 	int i;
 	for(i=0; i<3; ++i)
 		r[i] = -q[i];
 	r[3] = q[3];
 }
-static inline void quat_rotate(quat r, float angle, vec3 axis) {
+LINMATH_H_FUNC void quat_rotate(quat r, float angle, vec3 axis) {
 	int i;
 	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);
 }
 #define quat_norm vec4_norm
-static inline void quat_mul_vec3(vec3 r, quat q, vec3 v)
+LINMATH_H_FUNC 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 = {q[0], q[1], q[2]};
+	vec3 t;
 	vec3 q_xyz = {q[0], q[1], q[2]};
 	vec3 u = {q[0], q[1], q[2]};
-	vec3_mul_cross(t, t, v);
+	vec3_mul_cross(t, q_xyz, v);
 	vec3_scale(t, t, 2);
-	vec3_mul_cross(u, u, t);
+	vec3_mul_cross(u, q_xyz, t);
 	vec3_scale(t, t, q[3]);
 	vec3_add(r, v, t);
 	vec3_add(r, r, u);
 }
-static inline void mat4x4_from_quat(mat4x4 M, quat q)
+LINMATH_H_FUNC void mat4x4_from_quat(mat4x4 M, quat q)
 {
 	float a = q[3];
 	float b = q[0];
@@ -530,7 +548,7 @@ static inline void mat4x4_from_quat(mat4x4 M, quat q)
 	M[3][3] = 1.f;
 }
-static inline void mat4x4o_mul_quat(mat4x4 R, mat4x4 M, quat q)
+LINMATH_H_FUNC void mat4x4o_mul_quat(mat4x4 R, mat4x4 M, quat q)
 {
 /*  XXX: The way this is written only works for othogonal matrices. */
 /* TODO: Take care of non-orthogonal case. */
@@ -541,7 +559,7 @@ static inline void mat4x4o_mul_quat(mat4x4 R, mat4x4 M, quat q)
 	R[3][0] = R[3][1] = R[3][2] = 0.f;
 	R[3][3] = 1.f;
 }
-static inline void quat_from_mat4x4(quat q, mat4x4 M)
+LINMATH_H_FUNC void quat_from_mat4x4(quat q, mat4x4 M)
 {
 	float r=0.f;
 	int i;
@@ -557,7 +575,7 @@ static inline void quat_from_mat4x4(quat q, mat4x4 M)
 		p = &perm[i];
 	}
-	r = (float) sqrt(1.f + M[p[0]][p[0]] - M[p[1]][p[1]] - M[p[2]][p[2]] );
+	r = sqrtf(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;
@@ -571,4 +589,33 @@ static inline void quat_from_mat4x4(quat q, mat4x4 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 M, vec2 _a, vec2 _b, float s)
 {
 	vec2 a; memcpy(a, _a, sizeof(a));
 	vec2 b; memcpy(b, _b, sizeof(b));
 	float z_a = 0.;
 	float z_b = 0.;
 	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 = acosf(vec3_mul_inner(a_, b_)) * s;
 	mat4x4_rotate(R, M, c_[0], c_[1], c_[2], angle);
 }
 #endif
@@ -105,6 +105,8 @@
 /// NK_INCLUDE_COMMAND_USERDATA     | Defining this adds a userdata pointer into each command. Can be useful for example if you want to provide custom shaders depending on the used widget. Can be combined with the style structures.
 /// NK_BUTTON_TRIGGER_ON_RELEASE    | Different platforms require button clicks occurring either on buttons being pressed (up to down) or released (down to up). By default this library will react on buttons being pressed, but if you define this it will only trigger if a button is released.
 /// NK_ZERO_COMMAND_MEMORY          | Defining this will zero out memory for each drawing command added to a drawing queue (inside nk_command_buffer_push). Zeroing command memory is very useful for fast checking (using memcmp) if command buffers are equal and avoid drawing frames when nothing on screen has changed since previous frame.
 /// NK_UINT_DRAW_INDEX              | Defining this will set the size of vertex index elements when using NK_VERTEX_BUFFER_OUTPUT to 32bit instead of the default of 16bit
 /// NK_KEYSTATE_BASED_INPUT         | Define this if your backend uses key state for each frame rather than key press/release events
 ///
 /// !!! WARNING
 ///     The following flags will pull in the standard C library:
@@ -122,6 +124,7 @@
 ///     - NK_INCLUDE_DEFAULT_FONT
 ///     - NK_INCLUDE_STANDARD_VARARGS
 ///     - NK_INCLUDE_COMMAND_USERDATA
 ///     - NK_UINT_DRAW_INDEX
 ///
 /// ### Constants
 /// Define                          | Description
@@ -301,6 +304,7 @@ extern "C" {
 #define NK_CLAMP(i,v,x) (NK_MAX(NK_MIN(v,x), i))
 #ifdef NK_INCLUDE_STANDARD_VARARGS
  #include <stdarg.h> /* valist, va_start, va_end, ... */
  #if defined(_MSC_VER) && (_MSC_VER >= 1600) /* VS 2010 and above */
    #include <sal.h>
    #define NK_PRINTF_FORMAT_STRING _Printf_format_string_
@@ -314,7 +318,6 @@ extern "C" {
    #define NK_PRINTF_VARARG_FUNC(fmtargnumber)
    #define NK_PRINTF_VALIST_FUNC(fmtargnumber)
  #endif
  #include <stdarg.h> /* valist, va_start, va_end, ... */
 #endif
 /*
@@ -336,7 +339,7 @@ extern "C" {
 #define NK_POINTER_TYPE uintptr_t
 #else
  #ifndef NK_INT8
-    #define NK_INT8 char
+    #define NK_INT8 signed char
  #endif
  #ifndef NK_UINT8
    #define NK_UINT8 unsigned char
@@ -1084,6 +1087,12 @@ NK_API void nk_input_end(struct nk_context*);
 ///
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// // fill configuration
 /// struct your_vertex
 /// {
 ///     float pos[2]; // important to keep it to 2 floats
 ///     float uv[2];
 ///     unsigned char col[4];
 /// };
 /// struct nk_convert_config cfg = {};
 /// static const struct nk_draw_vertex_layout_element vertex_layout[] = {
 ///     {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct your_vertex, pos)},
@@ -1209,7 +1218,7 @@ NK_API const struct nk_command* nk__next(struct nk_context*, const struct nk_com
 ///
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// nk_flags nk_convert(struct nk_context *ctx, struct nk_buffer *cmds,
-//      struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*);
+///     struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter   | Description
@@ -1394,6 +1403,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
 /// nk_window_get_content_region_max    | Returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window
 /// nk_window_get_content_region_size   | Returns the size of the currently visible and non-clipped space inside the currently processed window
 /// nk_window_get_canvas                | Returns the draw command buffer. Can be used to draw custom widgets
 /// nk_window_get_scroll                | Gets the scroll offset of the current window
 /// nk_window_has_focus                 | Returns if the currently processed window is currently active
 /// nk_window_is_collapsed              | Returns if the window with given name is currently minimized/collapsed
 /// nk_window_is_closed                 | Returns if the currently processed window was closed
@@ -1407,6 +1417,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
 /// nk_window_set_position              | Updates position of the currently process window
 /// nk_window_set_size                  | Updates the size of the currently processed window
 /// nk_window_set_focus                 | Set the currently processed window as active window
 /// nk_window_set_scroll                | Sets the scroll offset of the current window
 //
 /// nk_window_close                     | Closes the window with given window name which deletes the window at the end of the frame
 /// nk_window_collapse                  | Collapses the window with given window name
@@ -1427,7 +1438,7 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*
 /// NK_WINDOW_TITLE             | Forces a header at the top at the window showing the title
 /// NK_WINDOW_SCROLL_AUTO_HIDE  | Automatically hides the window scrollbar if no user interaction: also requires delta time in `nk_context` to be set each frame
 /// NK_WINDOW_BACKGROUND        | Always keep window in the background
-/// NK_WINDOW_SCALE_LEFT        | Puts window scaler in the left-ottom corner instead right-bottom
+/// NK_WINDOW_SCALE_LEFT        | Puts window scaler in the left-bottom corner instead right-bottom
 /// NK_WINDOW_NO_INPUT          | Prevents window of scaling, moving or getting focus
 ///
 /// #### nk_collapse_states
@@ -1506,7 +1517,7 @@ NK_API void nk_end(struct nk_context *ctx);
 /// Finds and returns a window from passed name
 ///
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
-/// void nk_end(struct nk_context *ctx);
+/// struct nk_window *nk_window_find(struct nk_context *ctx, const char *name);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter   | Description
@@ -1710,6 +1721,22 @@ NK_API struct nk_vec2 nk_window_get_content_region_size(struct nk_context*);
 /// drawing canvas. Can be used to do custom drawing.
 */
 NK_API struct nk_command_buffer* nk_window_get_canvas(struct nk_context*);
 /*/// #### nk_window_get_scroll
 /// Gets the scroll offset for the current window
 /// !!! WARNING
 ///     Only call this function between calls `nk_begin_xxx` and `nk_end`
 ///
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// void nk_window_get_scroll(struct nk_context *ctx, nk_uint *offset_x, nk_uint *offset_y);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter    | Description
 /// -------------|-----------------------------------------------------------
 /// __ctx__      | Must point to an previously initialized `nk_context` struct
 /// __offset_x__ | A pointer to the x offset output (or NULL to ignore)
 /// __offset_y__ | A pointer to the y offset output (or NULL to ignore)
 */
 NK_API void nk_window_get_scroll(struct nk_context*, nk_uint *offset_x, nk_uint *offset_y);
 /*/// #### nk_window_has_focus
 /// Returns if the currently processed window is currently active
 /// !!! WARNING
@@ -1876,6 +1903,22 @@ NK_API void nk_window_set_size(struct nk_context*, const char *name, struct nk_v
 /// __name__    | Identifier of the window to set focus on
 */
 NK_API void nk_window_set_focus(struct nk_context*, const char *name);
 /*/// #### nk_window_set_scroll
 /// Sets the scroll offset for the current window
 /// !!! WARNING
 ///     Only call this function between calls `nk_begin_xxx` and `nk_end`
 ///
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// void nk_window_set_scroll(struct nk_context *ctx, nk_uint offset_x, nk_uint offset_y);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter    | Description
 /// -------------|-----------------------------------------------------------
 /// __ctx__      | Must point to an previously initialized `nk_context` struct
 /// __offset_x__ | The x offset to scroll to
 /// __offset_y__ | The y offset to scroll to
 */
 NK_API void nk_window_set_scroll(struct nk_context*, nk_uint offset_x, nk_uint offset_y);
 /*/// #### nk_window_close
 /// Closes a window and marks it for being freed at the end of the frame
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
@@ -2588,7 +2631,7 @@ NK_API struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct n
 ///     case ...:
 ///         // [...]
 ///     }
-//      nk_clear(&ctx);
+///     nk_clear(&ctx);
 /// }
 /// nk_free(&ctx);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2601,6 +2644,8 @@ NK_API struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct n
 /// nk_group_scrolled_offset_begin  | Start a new group with manual separated handling of scrollbar x- and y-offset
 /// nk_group_scrolled_begin         | Start a new group with manual scrollbar handling
 /// nk_group_scrolled_end           | Ends a group with manual scrollbar handling. Should only be called if nk_group_begin returned non-zero
 /// nk_group_get_scroll             | Gets the scroll offset for the given group
 /// nk_group_set_scroll             | Sets the scroll offset for the given group
 */
 /*/// #### nk_group_begin
 /// Starts a new widget group. Requires a previous layouting function to specify a pos/size.
@@ -2690,6 +2735,34 @@ NK_API int nk_group_scrolled_begin(struct nk_context*, struct nk_scroll *off, co
 /// __ctx__     | Must point to an previously initialized `nk_context` struct
 */
 NK_API void nk_group_scrolled_end(struct nk_context*);
 /*/// #### nk_group_get_scroll
 /// Gets the scroll position of the given group.
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// void nk_group_get_scroll(struct nk_context*, const char *id, nk_uint *x_offset, nk_uint *y_offset);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter    | Description
 /// -------------|-----------------------------------------------------------
 /// __ctx__      | Must point to an previously initialized `nk_context` struct
 /// __id__       | The id of the group to get the scroll position of
 /// __x_offset__ | A pointer to the x offset output (or NULL to ignore)
 /// __y_offset__ | A pointer to the y offset output (or NULL to ignore)
 */
 NK_API void nk_group_get_scroll(struct nk_context*, const char *id, nk_uint *x_offset, nk_uint *y_offset);
 /*/// #### nk_group_set_scroll
 /// Sets the scroll position of the given group.
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c
 /// void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_offset, nk_uint y_offset);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ///
 /// Parameter    | Description
 /// -------------|-----------------------------------------------------------
 /// __ctx__      | Must point to an previously initialized `nk_context` struct
 /// __id__       | The id of the group to scroll
 /// __x_offset__ | The x offset to scroll to
 /// __y_offset__ | The y offset to scroll to
 */
 NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_offset, nk_uint y_offset);
 /* =============================================================================
 *
 *                                  TREE
@@ -3187,7 +3260,7 @@ NK_API int nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_color_fo
 ///     case ...:
 ///         // [...]
 ///     }
-//      nk_clear(&ctx);
+///     nk_clear(&ctx);
 /// }
 /// nk_free(&ctx);
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3395,6 +3468,8 @@ NK_API void nk_plot_function(struct nk_context*, enum nk_chart_type, void *userd
 NK_API int nk_popup_begin(struct nk_context*, enum nk_popup_type, const char*, nk_flags, struct nk_rect bounds);
 NK_API void nk_popup_close(struct nk_context*);
 NK_API void nk_popup_end(struct nk_context*);
 NK_API void nk_popup_get_scroll(struct nk_context*, nk_uint *offset_x, nk_uint *offset_y);
 NK_API void nk_popup_set_scroll(struct nk_context*, nk_uint offset_x, nk_uint offset_y);
 /* =============================================================================
 *
 *                                  COMBOBOX
@@ -4588,7 +4663,11 @@ NK_API int nk_input_is_key_down(const struct nk_input*, enum nk_keys);
    In fact it is probably more powerful than needed but allows even more crazy
    things than this library provides by default.
 */
 #ifdef NK_UINT_DRAW_INDEX
 typedef nk_uint nk_draw_index;
 #else
 typedef nk_ushort nk_draw_index;
 #endif
 enum nk_draw_list_stroke {
    NK_STROKE_OPEN = nk_false,
    /* build up path has no connection back to the beginning */
@@ -5603,7 +5682,6 @@ template<typename T> struct nk_alignof{struct Big {T x; char c;}; enum {
 #endif /* NK_NUKLEAR_H_ */
 #ifdef NK_IMPLEMENTATION
 #ifndef NK_INTERNAL_H
@@ -6007,15 +6085,18 @@ nk_sin(float x)
 NK_LIB float
 nk_cos(float x)
 {
-    NK_STORAGE const float a0 = +1.00238601909309722f;
+    /* New implementation. Also generated using lolremez. */
-    NK_STORAGE const float a1 = -3.81919947353040024e-2f;
+    /* Old version significantly deviated from expected results. */
-    NK_STORAGE const float a2 = -3.94382342128062756e-1f;
+    NK_STORAGE const float a0 = 9.9995999154986614e-1f;
-    NK_STORAGE const float a3 = -1.18134036025221444e-1f;
+    NK_STORAGE const float a1 = 1.2548995793001028e-3f;
-    NK_STORAGE const float a4 = +1.07123798512170878e-1f;
+    NK_STORAGE const float a2 = -5.0648546280678015e-1f;
-    NK_STORAGE const float a5 = -1.86637164165180873e-2f;
+    NK_STORAGE const float a3 = 1.2942246466519995e-2f;
-    NK_STORAGE const float a6 = +9.90140908664079833e-4f;
+    NK_STORAGE const float a4 = 2.8668384702547972e-2f;
-    NK_STORAGE const float a7 = -5.23022132118824778e-14f;
+    NK_STORAGE const float a5 = 7.3726485210586547e-3f;
-    return a0 + x*(a1 + x*(a2 + x*(a3 + x*(a4 + x*(a5 + x*(a6 + x*a7))))));
+    NK_STORAGE const float a6 = -3.8510875386947414e-3f;
    NK_STORAGE const float a7 = 4.7196604604366623e-4f;
    NK_STORAGE const float a8 = -1.8776444013090451e-5f;
    return a0 + x*(a1 + x*(a2 + x*(a3 + x*(a4 + x*(a5 + x*(a6 + x*(a7 + x*a8)))))));
 }
 NK_LIB nk_uint
 nk_round_up_pow2(nk_uint v)
@@ -7151,23 +7232,29 @@ nk_murmur_hash(const void * key, int len, nk_hash seed)
 {
    /* 32-Bit MurmurHash3: https://code.google.com/p/smhasher/wiki/MurmurHash3*/
    #define NK_ROTL(x,r) ((x) << (r) | ((x) >> (32 - r)))
-    union {const nk_uint *i; const nk_byte *b;} conv = {0};
+
    const nk_byte *data = (const nk_byte*)key;
    const int nblocks = len/4;
    nk_uint h1 = seed;
    nk_uint k1;
    const nk_byte *data = (const nk_byte*)key;
    const nk_byte *keyptr = data;
    nk_byte *k1ptr;
    const int bsize = sizeof(k1);
    const int nblocks = len/4;
    const nk_uint c1 = 0xcc9e2d51;
    const nk_uint c2 = 0x1b873593;
    const nk_byte *tail;
    const nk_uint *blocks;
    nk_uint k1;
    int i;
    /* body */
    if (!key) return 0;
-    conv.b = (data + nblocks*4);
+    for (i = 0; i < nblocks; ++i, keyptr += bsize) {
-    blocks = (const nk_uint*)conv.i;
+        k1ptr = (nk_byte*)&k1;
-    for (i = -nblocks; i; ++i) {
+        k1ptr[0] = keyptr[0];
-        k1 = blocks[i];
+        k1ptr[1] = keyptr[1];
        k1ptr[2] = keyptr[2];
        k1ptr[3] = keyptr[3];
        k1 *= c1;
        k1 = NK_ROTL(k1,15);
        k1 *= c2;
@@ -9356,7 +9443,7 @@ nk_draw_list_alloc_vertices(struct nk_draw_list *list, nk_size count)
     * backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements`
     * instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`.
     * Sorry for the inconvenience. */
-    NK_ASSERT((sizeof(nk_draw_index) == 2 && list->vertex_count < NK_USHORT_MAX &&
+    if(sizeof(nk_draw_index)==2) NK_ASSERT((list->vertex_count < NK_USHORT_MAX &&
        "To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem"));
    return vtx;
 }
@@ -12809,6 +12896,9 @@ nk_font_bake(struct nk_font_baker *baker, void *image_memory, int width, int hei
                dst_font->ascent = ((float)unscaled_ascent * font_scale);
                dst_font->descent = ((float)unscaled_descent * font_scale);
                dst_font->glyph_offset = glyph_n;
                // Need to zero this, or it will carry over from a previous
                // bake, and cause a segfault when accessing glyphs[].
                dst_font->glyph_count = 0;
            }
            /* fill own baked font glyph array */
@@ -13903,8 +13993,12 @@ nk_input_key(struct nk_context *ctx, enum nk_keys key, int down)
    NK_ASSERT(ctx);
    if (!ctx) return;
    in = &ctx->input;
 #ifdef NK_KEYSTATE_BASED_INPUT
    if (in->keyboard.keys[key].down != down)
        in->keyboard.keys[key].clicked++;
 #else
    in->keyboard.keys[key].clicked++;
 #endif
    in->keyboard.keys[key].down = down;
 }
 NK_API void
@@ -15788,7 +15882,7 @@ nk_panel_end(struct nk_context *ctx)
        nk_fill_rect(out, empty_space, 0, style->window.background);
        /* fill right empty space */
-        empty_space.x = layout->bounds.x + layout->bounds.w - layout->border;
+        empty_space.x = layout->bounds.x + layout->bounds.w;
        empty_space.y = layout->bounds.y;
        empty_space.w = panel_padding.x + layout->border;
        empty_space.h = layout->bounds.h;
@@ -15797,11 +15891,11 @@ nk_panel_end(struct nk_context *ctx)
        nk_fill_rect(out, empty_space, 0, style->window.background);
        /* fill bottom empty space */
-        if (*layout->offset_x != 0 && !(layout->flags & NK_WINDOW_NO_SCROLLBAR)) {
+        if (layout->footer_height > 0) {
            empty_space.x = window->bounds.x;
            empty_space.y = layout->bounds.y + layout->bounds.h;
            empty_space.w = window->bounds.w;
-            empty_space.h = scrollbar_size.y;
+            empty_space.h = layout->footer_height;
            nk_fill_rect(out, empty_space, 0, style->window.background);
        }
    }
@@ -16175,8 +16269,8 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
 {
    struct nk_window *win;
    struct nk_style *style;
-    nk_hash title_hash;
+    nk_hash name_hash;
-    int title_len;
+    int name_len;
    int ret = 0;
    NK_ASSERT(ctx);
@@ -16189,12 +16283,12 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
    /* find or create window */
    style = &ctx->style;
-    title_len = (int)nk_strlen(name);
+    name_len = (int)nk_strlen(name);
-    title_hash = nk_murmur_hash(name, (int)title_len, NK_WINDOW_TITLE);
+    name_hash = nk_murmur_hash(name, (int)name_len, NK_WINDOW_TITLE);
-    win = nk_find_window(ctx, title_hash, name);
+    win = nk_find_window(ctx, name_hash, name);
    if (!win) {
        /* create new window */
-        nk_size name_length = (nk_size)nk_strlen(name);
+        nk_size name_length = (nk_size)name_len;
        win = (struct nk_window*)nk_create_window(ctx);
        NK_ASSERT(win);
        if (!win) return 0;
@@ -16206,7 +16300,7 @@ nk_begin_titled(struct nk_context *ctx, const char *name, const char *title,
        win->flags = flags;
        win->bounds = bounds;
-        win->name = title_hash;
+        win->name = name_hash;
        name_length = NK_MIN(name_length, NK_WINDOW_MAX_NAME-1);
        NK_MEMCPY(win->name_string, name, name_length);
        win->name_string[name_length] = 0;
@@ -16434,6 +16528,20 @@ nk_window_get_panel(struct nk_context *ctx)
    if (!ctx || !ctx->current) return 0;
    return ctx->current->layout;
 }
 NK_API void
 nk_window_get_scroll(struct nk_context *ctx, nk_uint *offset_x, nk_uint *offset_y)
 {
    struct nk_window *win;
    NK_ASSERT(ctx);
    NK_ASSERT(ctx->current);
    if (!ctx || !ctx->current)
        return ;
    win = ctx->current;
    if (offset_x)
      *offset_x = win->scrollbar.x;
    if (offset_y)
      *offset_y = win->scrollbar.y;
 }
 NK_API int
 nk_window_has_focus(const struct nk_context *ctx)
 {
@@ -16600,6 +16708,18 @@ nk_window_set_size(struct nk_context *ctx,
    win->bounds.h = size.y;
 }
 NK_API void
 nk_window_set_scroll(struct nk_context *ctx, nk_uint offset_x, nk_uint offset_y)
 {
    struct nk_window *win;
    NK_ASSERT(ctx);
    NK_ASSERT(ctx->current);
    if (!ctx || !ctx->current)
        return;
    win = ctx->current;
    win->scrollbar.x = offset_x;
    win->scrollbar.y = offset_y;
 }
 NK_API void
 nk_window_collapse(struct nk_context *ctx, const char *name,
                    enum nk_collapse_states c)
 {
@@ -16673,7 +16793,6 @@ nk_window_set_focus(struct nk_context *ctx, const char *name)
 /* ===============================================================
 *
 *                              POPUP
@@ -16807,7 +16926,11 @@ nk_nonblock_begin(struct nk_context *ctx,
    } else {
        /* close the popup if user pressed outside or in the header */
        int pressed, in_body, in_header;
 #ifdef NK_BUTTON_TRIGGER_ON_RELEASE
        pressed = nk_input_is_mouse_released(&ctx->input, NK_BUTTON_LEFT);
 #else
        pressed = nk_input_is_mouse_pressed(&ctx->input, NK_BUTTON_LEFT);
 #endif
        in_body = nk_input_is_mouse_hovering_rect(&ctx->input, body);
        in_header = nk_input_is_mouse_hovering_rect(&ctx->input, header);
        if (pressed && (!in_body || in_header))
@@ -16898,7 +17021,38 @@ nk_popup_end(struct nk_context *ctx)
    ctx->current = win;
    nk_push_scissor(&win->buffer, win->layout->clip);
 }
 NK_API void
 nk_popup_get_scroll(struct nk_context *ctx, nk_uint *offset_x, nk_uint *offset_y)
 {
    struct nk_window *popup;
    NK_ASSERT(ctx);
    NK_ASSERT(ctx->current);
    NK_ASSERT(ctx->current->layout);
    if (!ctx || !ctx->current || !ctx->current->layout)
        return;
    popup = ctx->current;
    if (offset_x)
      *offset_x = popup->scrollbar.x;
    if (offset_y)
      *offset_y = popup->scrollbar.y;
 }
 NK_API void
 nk_popup_set_scroll(struct nk_context *ctx, nk_uint offset_x, nk_uint offset_y)
 {
    struct nk_window *popup;
    NK_ASSERT(ctx);
    NK_ASSERT(ctx->current);
    NK_ASSERT(ctx->current->layout);
    if (!ctx || !ctx->current || !ctx->current->layout)
        return;
    popup = ctx->current;
    popup->scrollbar.x = offset_x;
    popup->scrollbar.y = offset_y;
 }
@@ -18025,22 +18179,25 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx,
    panel_space = nk_layout_row_calculate_usable_space(&ctx->style, layout->type,
                                            layout->bounds.w, layout->row.columns);
    #define NK_FRAC(x) (x - (int)x) /* will be used to remove fookin gaps */
    /* calculate the width of one item inside the current layout space */
    switch (layout->row.type) {
    case NK_LAYOUT_DYNAMIC_FIXED: {
        /* scaling fixed size widgets item width */
-        item_width = NK_MAX(1.0f,panel_space) / (float)layout->row.columns;
+        float w = NK_MAX(1.0f,panel_space) / (float)layout->row.columns;
-        item_offset = (float)layout->row.index * item_width;
+        item_offset = (float)layout->row.index * w;
        item_width = w + NK_FRAC(item_offset);
        item_spacing = (float)layout->row.index * spacing.x;
    } break;
    case NK_LAYOUT_DYNAMIC_ROW: {
        /* scaling single ratio widget width */
-        item_width = layout->row.item_width * panel_space;
+        float w = layout->row.item_width * panel_space;
        item_offset = layout->row.item_offset;
        item_width = w + NK_FRAC(item_offset);
        item_spacing = 0;
        if (modify) {
-            layout->row.item_offset += item_width + spacing.x;
+            layout->row.item_offset += w + spacing.x;
            layout->row.filled += layout->row.item_width;
            layout->row.index = 0;
        }
@@ -18051,23 +18208,24 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx,
        bounds->x -= (float)*layout->offset_x;
        bounds->y = layout->at_y + (layout->row.height * layout->row.item.y);
        bounds->y -= (float)*layout->offset_y;
-        bounds->w = layout->bounds.w  * layout->row.item.w;
+        bounds->w = layout->bounds.w  * layout->row.item.w + NK_FRAC(bounds->x);
-        bounds->h = layout->row.height * layout->row.item.h;
+        bounds->h = layout->row.height * layout->row.item.h + NK_FRAC(bounds->y);
        return;
    }
    case NK_LAYOUT_DYNAMIC: {
        /* scaling arrays of panel width ratios for every widget */
-        float ratio;
+        float ratio, w;
        NK_ASSERT(layout->row.ratio);
        ratio = (layout->row.ratio[layout->row.index] < 0) ?
            layout->row.item_width : layout->row.ratio[layout->row.index];
        w = (ratio * panel_space);
        item_spacing = (float)layout->row.index * spacing.x;
        item_width = (ratio * panel_space);
        item_offset = layout->row.item_offset;
        item_width = w + NK_FRAC(item_offset);
        if (modify) {
-            layout->row.item_offset += item_width;
+            layout->row.item_offset += w;
            layout->row.filled += ratio;
        }
    } break;
@@ -18105,13 +18263,16 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx,
    } break;
    case NK_LAYOUT_TEMPLATE: {
        /* stretchy row layout with combined dynamic/static widget width*/
        float w;
        NK_ASSERT(layout->row.index < layout->row.columns);
        NK_ASSERT(layout->row.index < NK_MAX_LAYOUT_ROW_TEMPLATE_COLUMNS);
-        item_width = layout->row.templates[layout->row.index];
+        w = layout->row.templates[layout->row.index];
        item_offset = layout->row.item_offset;
        item_width = w + NK_FRAC(item_offset);
        item_spacing = (float)layout->row.index * spacing.x;
-        if (modify) layout->row.item_offset += item_width;
+        if (modify) layout->row.item_offset += w;
    } break;
    #undef NK_FRAC
    default: NK_ASSERT(0); break;
    };
@@ -18687,7 +18848,74 @@ nk_group_end(struct nk_context *ctx)
 {
    nk_group_scrolled_end(ctx);
 }
 NK_API void
 nk_group_get_scroll(struct nk_context *ctx, const char *id, nk_uint *x_offset, nk_uint *y_offset)
 {
    int id_len;
    nk_hash id_hash;
    struct nk_window *win;
    nk_uint *x_offset_ptr;
    nk_uint *y_offset_ptr;
    NK_ASSERT(ctx);
    NK_ASSERT(id);
    NK_ASSERT(ctx->current);
    NK_ASSERT(ctx->current->layout);
    if (!ctx || !ctx->current || !ctx->current->layout || !id)
        return;
    /* find persistent group scrollbar value */
    win = ctx->current;
    id_len = (int)nk_strlen(id);
    id_hash = nk_murmur_hash(id, (int)id_len, NK_PANEL_GROUP);
    x_offset_ptr = nk_find_value(win, id_hash);
    if (!x_offset_ptr) {
        x_offset_ptr = nk_add_value(ctx, win, id_hash, 0);
        y_offset_ptr = nk_add_value(ctx, win, id_hash+1, 0);
        NK_ASSERT(x_offset_ptr);
        NK_ASSERT(y_offset_ptr);
        if (!x_offset_ptr || !y_offset_ptr) return;
        *x_offset_ptr = *y_offset_ptr = 0;
    } else y_offset_ptr = nk_find_value(win, id_hash+1);
    if (x_offset)
      *x_offset = *x_offset_ptr;
    if (y_offset)
      *y_offset = *y_offset_ptr;
 }
 NK_API void
 nk_group_set_scroll(struct nk_context *ctx, const char *id, nk_uint x_offset, nk_uint y_offset)
 {
    int id_len;
    nk_hash id_hash;
    struct nk_window *win;
    nk_uint *x_offset_ptr;
    nk_uint *y_offset_ptr;
    NK_ASSERT(ctx);
    NK_ASSERT(id);
    NK_ASSERT(ctx->current);
    NK_ASSERT(ctx->current->layout);
    if (!ctx || !ctx->current || !ctx->current->layout || !id)
        return;
    /* find persistent group scrollbar value */
    win = ctx->current;
    id_len = (int)nk_strlen(id);
    id_hash = nk_murmur_hash(id, (int)id_len, NK_PANEL_GROUP);
    x_offset_ptr = nk_find_value(win, id_hash);
    if (!x_offset_ptr) {
        x_offset_ptr = nk_add_value(ctx, win, id_hash, 0);
        y_offset_ptr = nk_add_value(ctx, win, id_hash+1, 0);
        NK_ASSERT(x_offset_ptr);
        NK_ASSERT(y_offset_ptr);
        if (!x_offset_ptr || !y_offset_ptr) return;
        *x_offset_ptr = *y_offset_ptr = 0;
    } else y_offset_ptr = nk_find_value(win, id_hash+1);
    *x_offset_ptr = x_offset;
    *y_offset_ptr = y_offset;
 }
@@ -21179,6 +21407,7 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in,
 {
    nk_flags ws = 0;
    int left_mouse_down;
    int left_mouse_clicked;
    int left_mouse_click_in_cursor;
    float scroll_delta;
@@ -21186,13 +21415,14 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in,
    if (!in) return scroll_offset;
    left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down;
    left_mouse_clicked = in->mouse.buttons[NK_BUTTON_LEFT].clicked;
    left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in,
        NK_BUTTON_LEFT, *cursor, nk_true);
    if (nk_input_is_mouse_hovering_rect(in, *scroll))
        *state = NK_WIDGET_STATE_HOVERED;
    scroll_delta = (o == NK_VERTICAL) ? in->mouse.scroll_delta.y: in->mouse.scroll_delta.x;
-    if (left_mouse_down && left_mouse_click_in_cursor) {
+    if (left_mouse_down && left_mouse_click_in_cursor && !left_mouse_clicked) {
        /* update cursor by mouse dragging */
        float pixel, delta;
        *state = NK_WIDGET_STATE_ACTIVE;
@@ -25243,95 +25473,105 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///    - [yy]: Minor version with non-breaking API and library changes
 ///    - [zz]: Bug fix version with no direct changes to API
 ///
-/// - 2018/04/01 (4.00.1) - Fixed calling `nk_convert` multiple time per single frame
+/// - 2019/09/20 (4.01.3) - Fixed a bug wherein combobox cannot be closed by clicking the header
 ///                        when NK_BUTTON_TRIGGER_ON_RELEASE is defined.
 /// - 2019/09/10 (4.01.2) - Fixed the nk_cos function, which deviated significantly.
 /// - 2019/09/08 (4.01.1) - Fixed a bug wherein re-baking of fonts caused a segmentation
 ///                        fault due to dst_font->glyph_count not being zeroed on subsequent
 ///                        bakes of the same set of fonts.
 /// - 2019/06/23 (4.01.0) - Added nk_***_get_scroll and nk_***_set_scroll for groups, windows, and popups.
 /// - 2019/06/12 (4.00.3) - Fix panel background drawing bug.
 /// - 2018/10/31 (4.00.2) - Added NK_KEYSTATE_BASED_INPUT to "fix" state based backends
 ///                        like GLFW without breaking key repeat behavior on event based.
 /// - 2018/04/01 (4.00.1) - Fixed calling `nk_convert` multiple time per single frame.
 /// - 2018/04/01 (4.00.0) - BREAKING CHANGE: nk_draw_list_clear no longer tries to
 ///                        clear provided buffers. So make sure to either free
 ///                        or clear each passed buffer after calling nk_convert.
-/// - 2018/02/23 (3.00.6) - Fixed slider dragging behavior
+/// - 2018/02/23 (3.00.6) - Fixed slider dragging behavior.
-/// - 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process
+/// - 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process.
-/// - 2018/01/31 (3.00.4) - Removed name collision with stb_truetype
+/// - 2018/01/31 (3.00.4) - Removed name collision with stb_truetype.
-/// - 2018/01/28 (3.00.3) - Fixed panel window border drawing bug
+/// - 2018/01/28 (3.00.3) - Fixed panel window border drawing bug.
-/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separed group identifier and title
+/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separed group identifier and title.
-/// - 2018/01/07 (3.00.1) - Started to change documentation style
+/// - 2018/01/07 (3.00.1) - Started to change documentation style.
 /// - 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken
 ///                        because of conversions between float and byte color representation.
 ///                        Color pickers now use floating point values to represent
 ///                        HSV values. To get back the old behavior I added some additional
 ///                        color conversion functions to cast between nk_color and
 ///                        nk_colorf.
-/// - 2017/12/23 (2.00.7) - Fixed small warning
+/// - 2017/12/23 (2.00.7) - Fixed small warning.
-/// - 2017/12/23 (2.00.7) - Fixed nk_edit_buffer behavior if activated to allow input
+/// - 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input.
-/// - 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior
+/// - 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior.
-/// - 2017/12/04 (2.00.6) - Added formated string tooltip widget
+/// - 2017/12/04 (2.00.6) - Added formated string tooltip widget.
-/// - 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag NK_WINDOW_NO_INPUT
+/// - 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`.
-/// - 2017/11/15 (2.00.4) - Fixed font merging
+/// - 2017/11/15 (2.00.4) - Fixed font merging.
-/// - 2017/11/07 (2.00.3) - Fixed window size and position modifier functions
+/// - 2017/11/07 (2.00.3) - Fixed window size and position modifier functions.
-/// - 2017/09/14 (2.00.2) - Fixed nk_edit_buffer and nk_edit_focus behavior
+/// - 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior.
-/// - 2017/09/14 (2.00.1) - Fixed window closing behavior
+/// - 2017/09/14 (2.00.1) - Fixed window closing behavior.
 /// - 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifing window position and size funtions now
 ///                        require the name of the window and must happen outside the window
 ///                        building process (between function call nk_begin and nk_end).
-/// - 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last
+/// - 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last.
-/// - 2017/08/27 (1.40.8) - Fixed `nk_item_is_any_active` for hidden windows
+/// - 2017/08/27 (1.40.8) - Fixed `nk_item_is_any_active` for hidden windows.
-/// - 2017/08/27 (1.40.7) - Fixed window background flag
+/// - 2017/08/27 (1.40.7) - Fixed window background flag.
 /// - 2017/07/07 (1.40.6) - Fixed missing clipping rect check for hovering/clicked
-///                        query for widgets
+///                        query for widgets.
 /// - 2017/07/07 (1.40.5) - Fixed drawing bug for vertex output for lines and stroked
-///                        and filled rectangles
+///                        and filled rectangles.
 /// - 2017/07/07 (1.40.4) - Fixed bug in nk_convert trying to add windows that are in
 ///                        process of being destroyed.
 /// - 2017/07/07 (1.40.3) - Fixed table internal bug caused by storing table size in
 ///                        window instead of directly in table.
-/// - 2017/06/30 (1.40.2) - Removed unneeded semicolon in C++ NK_ALIGNOF macro
+/// - 2017/06/30 (1.40.2) - Removed unneeded semicolon in C++ NK_ALIGNOF macro.
-/// - 2017/06/30 (1.40.1) - Fixed drawing lines smaller or equal zero
+/// - 2017/06/30 (1.40.1) - Fixed drawing lines smaller or equal zero.
 /// - 2017/06/08 (1.40.0) - Removed the breaking part of last commit. Auto layout now only
-///                        comes in effect if you pass in zero was row height argument
+///                        comes in effect if you pass in zero was row height argument.
 /// - 2017/06/08 (1.40.0) - BREAKING CHANGE: while not directly API breaking it will change
 ///                        how layouting works. From now there will be an internal minimum
 ///                        row height derived from font height. If you need a row smaller than
 ///                        that you can directly set it by `nk_layout_set_min_row_height` and
 ///                        reset the value back by calling `nk_layout_reset_min_row_height.
-/// - 2017/06/08 (1.39.1) - Fixed property text edit handling bug caused by past `nk_widget` fix
+/// - 2017/06/08 (1.39.1) - Fixed property text edit handling bug caused by past `nk_widget` fix.
-/// - 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a nk_layout_xxx function
+/// - 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function.
-/// - 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer
+/// - 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer.
-/// - 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped
+/// - 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped.
-/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundries
+/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundries.
-/// - 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space
+/// - 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space.
-/// - 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size
+/// - 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size.
-/// - 2017/05/06 (1.38.0) - Added platform double-click support
+/// - 2017/05/06 (1.38.0) - Added platform double-click support.
-/// - 2017/04/20 (1.37.1) - Fixed key repeat found inside glfw demo backends
+/// - 2017/04/20 (1.37.1) - Fixed key repeat found inside glfw demo backends.
-/// - 2017/04/20 (1.37.0) - Extended properties with selection and clipbard support
+/// - 2017/04/20 (1.37.0) - Extended properties with selection and clipboard support.
-/// - 2017/04/20 (1.36.2) - Fixed #405 overlapping rows with zero padding and spacing
+/// - 2017/04/20 (1.36.2) - Fixed #405 overlapping rows with zero padding and spacing.
-/// - 2017/04/09 (1.36.1) - Fixed #403 with another widget float error
+/// - 2017/04/09 (1.36.1) - Fixed #403 with another widget float error.
-/// - 2017/04/09 (1.36.0) - Added window `NK_WINDOW_NO_INPUT` and `NK_WINDOW_NOT_INTERACTIVE` flags
+/// - 2017/04/09 (1.36.0) - Added window `NK_WINDOW_NO_INPUT` and `NK_WINDOW_NOT_INTERACTIVE` flags.
-/// - 2017/04/09 (1.35.3) - Fixed buffer heap corruption
+/// - 2017/04/09 (1.35.3) - Fixed buffer heap corruption.
-/// - 2017/03/25 (1.35.2) - Fixed popup overlapping for `NK_WINDOW_BACKGROUND` windows
+/// - 2017/03/25 (1.35.2) - Fixed popup overlapping for `NK_WINDOW_BACKGROUND` windows.
-/// - 2017/03/25 (1.35.1) - Fixed windows closing behavior
+/// - 2017/03/25 (1.35.1) - Fixed windows closing behavior.
-/// - 2017/03/18 (1.35.0) - Added horizontal scroll requested in #377
+/// - 2017/03/18 (1.35.0) - Added horizontal scroll requested in #377.
-/// - 2017/03/18 (1.34.3) - Fixed long window header titles
+/// - 2017/03/18 (1.34.3) - Fixed long window header titles.
-/// - 2017/03/04 (1.34.2) - Fixed text edit filtering
+/// - 2017/03/04 (1.34.2) - Fixed text edit filtering.
-/// - 2017/03/04 (1.34.1) - Fixed group closable flag
+/// - 2017/03/04 (1.34.1) - Fixed group closable flag.
-/// - 2017/02/25 (1.34.0) - Added custom draw command for better language binding support
+/// - 2017/02/25 (1.34.0) - Added custom draw command for better language binding support.
-/// - 2017/01/24 (1.33.0) - Added programatic way of remove edit focus
+/// - 2017/01/24 (1.33.0) - Added programatic way of remove edit focus.
-/// - 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows
+/// - 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows.
-/// - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows
+/// - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows.
-/// - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing
+/// - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing.
-/// - 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner
+/// - 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner.
 /// - 2017/01/13 (1.31.0) - Added additional row layouting method to combine both
 ///                        dynamic and static widgets.
-/// - 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit
+/// - 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit.
-/// - 2016/12/31 (1.29.2)- Fixed closing window bug of minimized windows
+/// - 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows.
-/// - 2016/12/03 (1.29.1)- Fixed wrapped text with no seperator and C89 error
+/// - 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error.
-/// - 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters
+/// - 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters.
-/// - 2016/11/22 (1.28.6)- Fixed window minimized closing bug
+/// - 2016/11/22 (1.28.6) - Fixed window minimized closing bug.
-/// - 2016/11/19 (1.28.5)- Fixed abstract combo box closing behavior
+/// - 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior.
-/// - 2016/11/19 (1.28.4)- Fixed tooltip flickering
+/// - 2016/11/19 (1.28.4) - Fixed tooltip flickering.
-/// - 2016/11/19 (1.28.3)- Fixed memory leak caused by popup repeated closing
+/// - 2016/11/19 (1.28.3) - Fixed memory leak caused by popup repeated closing.
-/// - 2016/11/18 (1.28.2)- Fixed memory leak caused by popup panel allocation
+/// - 2016/11/18 (1.28.2) - Fixed memory leak caused by popup panel allocation.
-/// - 2016/11/10 (1.28.1)- Fixed some warnings and C++ error
+/// - 2016/11/10 (1.28.1) - Fixed some warnings and C++ error.
 /// - 2016/11/10 (1.28.0) - Added additional `nk_button` versions which allows to directly
 ///                        pass in a style struct to change buttons visual.
-/// - 2016/11/10 (1.27.0)- Added additional 'nk_tree' versions to support external state
+/// - 2016/11/10 (1.27.0) - Added additional `nk_tree` versions to support external state
 ///                        storage. Just like last the `nk_group` commit the main
 ///                        advantage is that you optionally can minimize nuklears runtime
 ///                        memory consumption or handle hash collisions.
@@ -25342,25 +25582,25 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///                        want the name. In addition I added `nk_list_view` which allows
 ///                        to draw big lists inside a group without actually having to
 ///                        commit the whole list to nuklear (issue #269).
-/// - 2016/10/30 (1.25.1)- Fixed clipping rectangle bug inside `nk_draw_list`
+/// - 2016/10/30 (1.25.1) - Fixed clipping rectangle bug inside `nk_draw_list`.
 /// - 2016/10/29 (1.25.0) - Pulled `nk_panel` memory management into nuklear and out of
 ///                        the hands of the user. From now on users don't have to care
 ///                        about panels unless they care about some information. If you
 ///                        still need the panel just call `nk_window_get_panel`.
 /// - 2016/10/21 (1.24.0) - Changed widget border drawing to stroked rectangle from filled
 ///                        rectangle for less overdraw and widget background transparency.
-/// - 2016/10/18 (1.23.0)- Added `nk_edit_focus` for manually edit widget focus control
+/// - 2016/10/18 (1.23.0) - Added `nk_edit_focus` for manually edit widget focus control.
-/// - 2016/09/29 (1.22.7)- Fixed deduction of basic type in non `<stdint.h>` compilation
+/// - 2016/09/29 (1.22.7) - Fixed deduction of basic type in non `<stdint.h>` compilation.
-/// - 2016/09/29 (1.22.6)- Fixed edit widget UTF-8 text cursor drawing bug
+/// - 2016/09/29 (1.22.6) - Fixed edit widget UTF-8 text cursor drawing bug.
-/// - 2016/09/28 (1.22.5)- Fixed edit widget UTF-8 text appending/inserting/removing
+/// - 2016/09/28 (1.22.5) - Fixed edit widget UTF-8 text appending/inserting/removing.
 /// - 2016/09/28 (1.22.4) - Fixed drawing bug inside edit widgets which offset all text
 ///                        text in every edit widget if one of them is scrolled.
 /// - 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong
 ///                        text length is passed. It should have been in bytes but
 ///                        was passed as glyphes.
-/// - 2016/09/20 (1.22.2)- Fixed color button size calculation
+/// - 2016/09/20 (1.22.2) - Fixed color button size calculation.
-/// - 2016/09/20 (1.22.1)- Fixed some `nk_vsnprintf` behavior bugs and removed
+/// - 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `<stdio.h>`
-///                        `<stdio.h>` again from `NK_INCLUDE_STANDARD_VARARGS`.
+///                        again from `NK_INCLUDE_STANDARD_VARARGS`.
 /// - 2016/09/18 (1.22.0) - C89 does not support vsnprintf only C99 and newer as well
 ///                        as C++11 and newer. In addition to use vsnprintf you have
 ///                        to include <stdio.h>. So just defining `NK_INCLUDE_STD_VAR_ARGS`
@@ -25368,14 +25608,14 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///                        both varargs as well as stdio is selected I try to use
 ///                        vsnprintf if not possible I will revert to vsprintf. If
 ///                        varargs but not stdio was defined I will use my own function.
-/// - 2016/09/15 (1.21.2)- Fixed panel `close` behavior for deeper panel levels
+/// - 2016/09/15 (1.21.2) - Fixed panel `close` behavior for deeper panel levels.
-/// - 2016/09/15 (1.21.1)- Fixed C++ errors and wrong argument to `nk_panel_get_xxxx`
+/// - 2016/09/15 (1.21.1) - Fixed C++ errors and wrong argument to `nk_panel_get_xxxx`.
 /// - 2016/09/13 (1.21.0) - !BREAKING! Fixed nonblocking popup behavior in menu, combo,
 ///                        and contextual which prevented closing in y-direction if
 ///                        popup did not reach max height.
 ///                        In addition the height parameter was changed into vec2
 ///                        for width and height to have more control over the popup size.
-/// - 2016/09/13 (1.20.3) - Cleaned up and extended type selection
+/// - 2016/09/13 (1.20.3) - Cleaned up and extended type selection.
 /// - 2016/09/13 (1.20.2) - Fixed slider behavior hopefully for the last time. This time
 ///                        all calculation are correct so no more hackery.
 /// - 2016/09/13 (1.20.1) - Internal change to divide window/panel flags into panel flags and types.
@@ -25398,17 +25638,17 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///                        `NK_SYMBOL_CIRCLE_OUTLINE`.
 /// - 2016/09/08 (1.16.0) - Added additional checks to select correct types if `NK_INCLUDE_FIXED_TYPES`
 ///                        is not defined by supporting the biggest compiler GCC, clang and MSVC.
-/// - 2016/09/07 (1.15.3)- Fixed `NK_INCLUDE_COMMAND_USERDATA` define to not cause an error
+/// - 2016/09/07 (1.15.3) - Fixed `NK_INCLUDE_COMMAND_USERDATA` define to not cause an error.
-/// - 2016/09/04 (1.15.2)- Fixed wrong combobox height calculation
+/// - 2016/09/04 (1.15.2) - Fixed wrong combobox height calculation.
-/// - 2016/09/03 (1.15.1)- Fixed gaps inside combo boxes in OpenGL
+/// - 2016/09/03 (1.15.1) - Fixed gaps inside combo boxes in OpenGL.
 /// - 2016/09/02 (1.15.0) - Changed nuklear to not have any default vertex layout and
 ///                        instead made it user provided. The range of types to convert
 ///                        to is quite limited at the moment, but I would be more than
 ///                        happy to accept PRs to add additional.
-/// - 2016/08/30 (1.14.2) - Removed unused variables
+/// - 2016/08/30 (1.14.2) - Removed unused variables.
-/// - 2016/08/30 (1.14.1) - Fixed C++ build errors
+/// - 2016/08/30 (1.14.1) - Fixed C++ build errors.
-/// - 2016/08/30 (1.14.0) - Removed mouse dragging from SDL demo since it does not work correctly
+/// - 2016/08/30 (1.14.0) - Removed mouse dragging from SDL demo since it does not work correctly.
-/// - 2016/08/30 (1.13.4) - Tweaked some default styling variables
+/// - 2016/08/30 (1.13.4) - Tweaked some default styling variables.
 /// - 2016/08/30 (1.13.3) - Hopefully fixed drawing bug in slider, in general I would
 ///                        refrain from using slider with a big number of steps.
 /// - 2016/08/30 (1.13.2) - Fixed close and minimize button which would fire even if the
@@ -25418,28 +25658,28 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 /// - 2016/08/30 (1.13.0) - Removed `NK_WINDOW_DYNAMIC` flag from public API since
 ///                        it is bugged and causes issues in window selection.
 /// - 2016/08/30 (1.12.0) - Removed scaler size. The size of the scaler is now
-///                        determined by the scrollbar size
+///                        determined by the scrollbar size.
-/// - 2016/08/30 (1.11.2) - Fixed some drawing bugs caused by changes from 1.11
+/// - 2016/08/30 (1.11.2) - Fixed some drawing bugs caused by changes from 1.11.0.
-/// - 2016/08/30 (1.11.1) - Fixed overlapping minimized window selection
+/// - 2016/08/30 (1.11.1) - Fixed overlapping minimized window selection.
 /// - 2016/08/30 (1.11.0) - Removed some internal complexity and overly complex code
 ///                        handling panel padding and panel border.
-/// - 2016/08/29 (1.10.0) - Added additional height parameter to `nk_combobox_xxx`
+/// - 2016/08/29 (1.10.0) - Added additional height parameter to `nk_combobox_xxx`.
-/// - 2016/08/29 (1.10.0) - Fixed drawing bug in dynamic popups
+/// - 2016/08/29 (1.10.0) - Fixed drawing bug in dynamic popups.
-/// - 2016/08/29 (1.10.0) - Added experimental mouse scrolling to popups, menus and comboboxes
+/// - 2016/08/29 (1.10.0) - Added experimental mouse scrolling to popups, menus and comboboxes.
 /// - 2016/08/26 (1.10.0) - Added window name string prepresentation to account for
-///                        hash collisions. Currently limited to NK_WINDOW_MAX_NAME
+///                        hash collisions. Currently limited to `NK_WINDOW_MAX_NAME`
 ///                        which in term can be redefined if not big enough.
-/// - 2016/08/26 (1.10.0) - Added stacks for temporary style/UI changes in code
+/// - 2016/08/26 (1.10.0) - Added stacks for temporary style/UI changes in code.
 /// - 2016/08/25 (1.10.0) - Changed `nk_input_is_key_pressed` and 'nk_input_is_key_released'
 ///                        to account for key press and release happening in one frame.
-/// - 2016/08/25 (1.10.0) - Added additional nk_edit flag to directly jump to the end on activate
+/// - 2016/08/25 (1.10.0) - Added additional nk_edit flag to directly jump to the end on activate.
-/// - 2016/08/17 (1.09.6)- Removed invalid check for value zero in nk_propertyx
+/// - 2016/08/17 (1.09.6) - Removed invalid check for value zero in `nk_propertyx`.
 /// - 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents.
 /// - 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag
 ///                        `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep
 ///                        typing after commiting.
-/// - 2016/08/15 (1.09.4)- Removed redundant code
+/// - 2016/08/15 (1.09.4) - Removed redundant code.
-/// - 2016/08/15 (1.09.4)- Fixed negative numbers in `nk_strtoi` and remove unused variable
+/// - 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable.
 /// - 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background
 ///                        window only as selected by hovering and not by clicking.
 /// - 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading
@@ -25447,7 +25687,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 /// - 2016/08/12 (1.09.1) - Added additional function to check if window is currently
 ///                        hidden and therefore not visible.
 /// - 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED`
-///                        instead of the old flag `NK_WINDOW_HIDDEN`
+///                        instead of the old flag `NK_WINDOW_HIDDEN`.
 /// - 2016/08/09 (1.09.0) - Added additional double version to nk_property and changed
 ///                        the underlying implementation to not cast to float and instead
 ///                        work directly on the given values.
@@ -25457,7 +25697,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 /// - 2016/08/09 (1.08.0) - Added additional define to overwrite library internal
 ///                        string to floating point number conversion for additional
 ///                        precision.
-/// - 2016/08/08 (1.07.2)- Fixed compiling error without define NK_INCLUDE_FIXED_TYPE
+/// - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`.
 /// - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading
 ///                        to wrong wiget width calculation which results in widgets falsly
 ///                        becomming tagged as not inside window and cannot be accessed.
@@ -25469,31 +25709,31 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///                        remain.
 /// - 2016/08/08 (1.06.0) - Added `nk_edit_string_zero_terminated` as a second option to
 ///                        `nk_edit_string` which takes, edits and outputs a '\0' terminated string.
-/// - 2016/08/08 (1.05.4)- Fixed scrollbar auto hiding behavior
+/// - 2016/08/08 (1.05.4) - Fixed scrollbar auto hiding behavior.
-/// - 2016/08/08 (1.05.3)- Fixed wrong panel padding selection in `nk_layout_widget_space`
+/// - 2016/08/08 (1.05.3) - Fixed wrong panel padding selection in `nk_layout_widget_space`.
 /// - 2016/08/07 (1.05.2) - Fixed old bug in dynamic immediate mode layout API, calculating
 ///                        wrong item spacing and panel width.
-///- 2016/08/07 (1.05.1)- Hopefully finally fixed combobox popup drawing bug
+/// - 2016/08/07 (1.05.1) - Hopefully finally fixed combobox popup drawing bug.
-///- 2016/08/07 (1.05.0) - Split varargs away from NK_INCLUDE_STANDARD_IO into own
+/// - 2016/08/07 (1.05.0) - Split varargs away from `NK_INCLUDE_STANDARD_IO` into own
-///                        define NK_INCLUDE_STANDARD_VARARGS to allow more fine
+///                        define `NK_INCLUDE_STANDARD_VARARGS` to allow more fine
 ///                        grained controlled over library includes.
-/// - 2016/08/06 (1.04.5)- Changed memset calls to NK_MEMSET
+/// - 2016/08/06 (1.04.5) - Changed memset calls to `NK_MEMSET`.
-/// - 2016/08/04 (1.04.4)- Fixed fast window scaling behavior
+/// - 2016/08/04 (1.04.4) - Fixed fast window scaling behavior.
 /// - 2016/08/04 (1.04.3) - Fixed window scaling, movement bug which appears if you
 ///                        move/scale a window and another window is behind it.
 ///                        If you are fast enough then the window behind gets activated
 ///                        and the operation is blocked. I now require activating
 ///                        by hovering only if mouse is not pressed.
-/// - 2016/08/04 (1.04.2)- Fixed changing fonts
+/// - 2016/08/04 (1.04.2) - Fixed changing fonts.
-/// - 2016/08/03 (1.04.1)- Fixed `NK_WINDOW_BACKGROUND` behavior
+/// - 2016/08/03 (1.04.1) - Fixed `NK_WINDOW_BACKGROUND` behavior.
-/// - 2016/08/03 (1.04.0) - Added color parameter to `nk_draw_image`
+/// - 2016/08/03 (1.04.0) - Added color parameter to `nk_draw_image`.
 /// - 2016/08/03 (1.04.0) - Added additional window padding style attributes for
-///                        sub windows (combo, menu, ...)
+///                        sub windows (combo, menu, ...).
-/// - 2016/08/03 (1.04.0) - Added functions to show/hide software cursor
+/// - 2016/08/03 (1.04.0) - Added functions to show/hide software cursor.
 /// - 2016/08/03 (1.04.0) - Added `NK_WINDOW_BACKGROUND` flag to force a window
-///                        to be always in the background of the screen
+///                        to be always in the background of the screen.
-/// - 2016/08/03 (1.03.2)- Removed invalid assert macro for NK_RGB color picker
+/// - 2016/08/03 (1.03.2) - Removed invalid assert macro for NK_RGB color picker.
-/// - 2016/08/01 (1.03.1)- Added helper macros into header include guard
+/// - 2016/08/01 (1.03.1) - Added helper macros into header include guard.
 /// - 2016/07/29 (1.03.0) - Moved the window/table pool into the header part to
 ///                        simplify memory management by removing the need to
 ///                        allocate the pool.
@@ -25501,16 +25741,15 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
 ///                        will hide the window scrollbar after NK_SCROLLBAR_HIDING_TIMEOUT
 ///                        seconds without window interaction. To make it work
 ///                        you have to also set a delta time inside the `nk_context`.
-/// - 2016/07/25 (1.01.1) - Fixed small panel and panel border drawing bugs
+/// - 2016/07/25 (1.01.1) - Fixed small panel and panel border drawing bugs.
-/// - 2016/07/15 (1.01.0) - Added software cursor to `nk_style` and `nk_context`
+/// - 2016/07/15 (1.01.0) - Added software cursor to `nk_style` and `nk_context`.
-/// - 2016/07/15 (1.01.0) - Added const correctness to `nk_buffer_push' data argument
+/// - 2016/07/15 (1.01.0) - Added const correctness to `nk_buffer_push' data argument.
 /// - 2016/07/15 (1.01.0) - Removed internal font baking API and simplified
 ///                        font atlas memory management by converting pointer
 ///                        arrays for fonts and font configurations to lists.
 /// - 2016/07/15 (1.00.0) - Changed button API to use context dependend button
 ///                        behavior instead of passing it for every function call.
 /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /// ## Gallery
 /// ![Figure [blue]: Feature overview with blue color styling](https://cloud.githubusercontent.com/assets/8057201/13538240/acd96876-e249-11e5-9547-5ac0b19667a0.png)
 /// ![Figure [red]: Feature overview with red color styling](https://cloud.githubusercontent.com/assets/8057201/13538243/b04acd4c-e249-11e5-8fd2-ad7744a5b446.png)
@@ -230,7 +230,7 @@ nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int m
 }
 NK_INTERN void
-nk_glfw3_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
+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));
@@ -238,7 +238,7 @@ nk_glfw3_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
 }
 NK_INTERN void
-nk_glfw3_clipbard_copy(nk_handle usr, const char *text, int len)
+nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
 {
    char *str = 0;
    (void)usr;
@@ -261,8 +261,8 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
        glfwSetMouseButtonCallback(win, nk_glfw3_mouse_button_callback);
    }
    nk_init_default(&glfw.ctx, 0);
-    glfw.ctx.clip.copy = nk_glfw3_clipbard_copy;
+    glfw.ctx.clip.copy = nk_glfw3_clipboard_copy;
-    glfw.ctx.clip.paste = nk_glfw3_clipbard_paste;
+    glfw.ctx.clip.paste = nk_glfw3_clipboard_paste;
    glfw.ctx.clip.userdata = nk_handle_ptr(0);
    nk_buffer_init_default(&glfw.ogl.cmds);
@@ -1,24 +1,27 @@
-set(glfw_DOCS_SOURCES
+# NOTE: The order of this list determines the order of items in the Guides
-    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
+#       (i.e. Pages) list in the generated documentation
-    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h"
+set(GLFW_DOXYGEN_SOURCES
-    "${GLFW_SOURCE_DIR}/docs/main.dox"
+    "include/GLFW/glfw3.h"
-    "${GLFW_SOURCE_DIR}/docs/news.dox"
+    "include/GLFW/glfw3native.h"
-    "${GLFW_SOURCE_DIR}/docs/quick.dox"
+    "docs/main.dox"
-    "${GLFW_SOURCE_DIR}/docs/moving.dox"
+    "docs/news.dox"
-    "${GLFW_SOURCE_DIR}/docs/compile.dox"
+    "docs/quick.dox"
-    "${GLFW_SOURCE_DIR}/docs/build.dox"
+    "docs/moving.dox"
-    "${GLFW_SOURCE_DIR}/docs/intro.dox"
+    "docs/compile.dox"
-    "${GLFW_SOURCE_DIR}/docs/context.dox"
+    "docs/build.dox"
-    "${GLFW_SOURCE_DIR}/docs/monitor.dox"
+    "docs/intro.dox"
-    "${GLFW_SOURCE_DIR}/docs/window.dox"
+    "docs/context.dox"
-    "${GLFW_SOURCE_DIR}/docs/input.dox"
+    "docs/monitor.dox"
-    "${GLFW_SOURCE_DIR}/docs/vulkan.dox"
+    "docs/window.dox"
-    "${GLFW_SOURCE_DIR}/docs/compat.dox"
+    "docs/input.dox"
-    "${GLFW_SOURCE_DIR}/docs/internal.dox")
+    "docs/vulkan.dox"
    "docs/compat.dox"
    "docs/internal.dox")
-foreach(arg ${glfw_DOCS_SOURCES})
+# Format the source list into a Doxyfile INPUT value that Doxygen can parse
-    set(GLFW_DOCS_SOURCES "${GLFW_DOCS_SOURCES} \\\n\"${arg}\"")
+foreach(path IN LISTS GLFW_DOXYGEN_SOURCES)
    set(GLFW_DOXYGEN_INPUT "${GLFW_DOXYGEN_INPUT} \\\n\"${GLFW_SOURCE_DIR}/${path}\"")
 endforeach()
 configure_file(Doxyfile.in Doxyfile @ONLY)
@@ -27,3 +30,5 @@ add_custom_target(docs ALL "${DOXYGEN_EXECUTABLE}"
                  WORKING_DIRECTORY "${GLFW_BINARY_DIR}/docs"
                  COMMENT "Generating HTML documentation" VERBATIM)
 set_target_properties(docs PROPERTIES FOLDER "GLFW3")
@@ -0,0 +1,10 @@
 *               @elmindreda
 src/wl_*        @linkmauve
 docs/*.css      @glfw/webdev
 docs/*.scss     @glfw/webdev
 docs/*.html     @glfw/webdev
 docs/*.xml      @glfw/webdev
@@ -20,14 +20,14 @@
 ## Asking a question
 Questions about how to use GLFW should be asked either in the [support
-section](http://discourse.glfw.org/c/support) of the forum, under the [Stack
+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 or in the IRC channel `#glfw` on
 [Freenode](http://freenode.net/).
 Questions about the design or implementation of GLFW or about future plans
-should be asked in the [dev section](http://discourse.glfw.org/c/dev) of the
+should be asked in the [dev section](https://discourse.glfw.org/c/dev) of the
 forum or in the IRC channel.  Please don't open a GitHub issue to discuss design
 questions without first checking with a maintainer.
@@ -0,0 +1,14 @@
 # Support resources
 See the [latest documentation](http://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/), and the `#glfw` IRC channel on
 [Freenode](http://freenode.net/).
 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.
@@ -25,39 +25,41 @@ GLFW.
 #include <GLFW/glfw3.h>
@endcode
-This header declares the GLFW API and by default also includes the OpenGL header
+This header defines all the constants and declares all the types and function
-from your development environment.  See below for how to control this.
+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 it can be included without needing any window system headers.
+header, so that it can be included without needing any window system headers.
-For example, under Windows you are normally required to include `windows.h`
+It does this only when needed, so if window system headers are included, the
-before the OpenGL header, which would bring in the whole Win32 API.  The GLFW
+GLFW header does not try to redefine those symbols.  The reverse is not true,
-header duplicates the small number of macros needed.
+i.e. `windows.h` cannot cope if any Win32 symbols have already been defined.
 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
+ - Use the GLFW header to include OpenGL or OpenGL ES headers portably
- - Do _not_ include `windows.h` or other platform-specific headers unless you
+ - Do not include window system headers unless you will use those APIs directly
-   plan on using those APIs directly
+ - If you do need such headers, include them before the GLFW header
 - 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
-be included _before_ the GLFW one.
+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.
@code
 #include <glad/gl.h>
 #include <GLFW/glfw3.h>
@endcode
-Alternatively the @ref GLFW_INCLUDE_NONE macro (described below) can be used to
+Both of these mechanisms depend on the extension loader header defining a known
-prevent the GLFW header from including the OpenGL header.
+macro.  If yours doesn't or you don't know which one your users will pick, the
@ref GLFW_INCLUDE_NONE macro will explicitly to prevent the GLFW header from
 including the OpenGL header.  This will also allow you to include the two
 headers in any order.
@code
 #define GLFW_INCLUDE_NONE
@@ -78,6 +80,11 @@ 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](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
@@ -100,7 +107,7 @@ __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_ES31__ makes the GLFW header include the OpenGL ES 3.2
+__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
@@ -108,7 +115,8 @@ __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.
+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
@@ -129,10 +137,6 @@ 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, OpenGL ES or Vulkan
 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.
@@ -166,16 +170,11 @@ must also explicitly link with `gdi32`. Other toolchains including MinGW-w64
 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 @ref
 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 `glu32` if it uses GLU.
@subsection build_link_cmake_source With CMake and GLFW source
@@ -186,61 +185,41 @@ build_link_cmake_package.
 With 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
+Add the root directory of the GLFW source tree to your project.  This will add
-GLFW tests, examples and documentation.  To disable these, set the corresponding
+the `glfw` target to your project.
 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.
+Once GLFW has been added, link your application against the `glfw` target.
-This adds all link-time dependencies of GLFW as it is currently configured,
+This adds the GLFW library and its link-time dependencies as it is currently
-the include directory for the GLFW header and, when applicable, the @ref
+configured, the include directory for the GLFW header and, when applicable, the
-GLFW_DLL macro.
+@ref GLFW_DLL macro.
@code{.cmake}
 target_link_libraries(myapp glfw)
@endcode
-Note that the dependencies do not include OpenGL or GLU, as GLFW loads any
+Note that the `glfw` target does not depend on OpenGL, as GLFW loads any OpenGL,
-OpenGL, OpenGL ES or Vulkan libraries it needs at runtime and does not use GLU.
+OpenGL ES or Vulkan libraries it needs at runtime.  If your application calls
-If your application calls OpenGL directly, instead of using a modern
+OpenGL directly, instead of using a modern
-[extension loader library](@ref context_glext_auto) you can find it by requiring
+[extension loader library](@ref context_glext_auto), use the OpenGL CMake
-the OpenGL package.
+package.
@code{.cmake}
 find_package(OpenGL REQUIRED)
@endcode
-If OpenGL is found, the `OPENGL_FOUND` variable is true and the
+If OpenGL is found, the `OpenGL::GL` target is added to your project, containing
-`OPENGL_INCLUDE_DIR` and `OPENGL_gl_LIBRARY` cache variables can be used.
+library and include directory paths.  Link against this like any other library.
@code{.cmake}
-target_include_directories(myapp PUBLIC ${OPENGL_INCLUDE_DIR})
+target_link_libraries(myapp OpenGL::GL)
 target_link_libraries(myapp ${OPENGL_gl_LIBRARY})
@endcode
-The OpenGL CMake package also looks for GLU.  If GLU is found, the
+For a minimal example of a program and GLFW sources built with CMake, see the
-`OPENGL_GLU_FOUND` variable is true and the `OPENGL_INCLUDE_DIR` and
+[GLFW CMake Starter](https://github.com/juliettef/GLFW-CMake-starter) on GitHub.
 `OPENGL_glu_LIBRARY` cache variables can be used.
@code{.cmake}
 target_link_libraries(myapp ${OPENGL_glu_LIBRARY})
@endcode
@note GLU has been deprecated and should not be used in new code, but some
 legacy code requires it.  See the [section on GLU](@ref moving_glu) in the
 transition guide for suggested replacements.
@subsection build_link_cmake_package With CMake and installed GLFW binaries
@@ -253,48 +232,34 @@ With 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.3 REQUIRED)
+find_package(glfw3 3.4 REQUIRED)
@endcode
 Once GLFW has been added to the project, link against it with the `glfw` target.
-This adds all link-time dependencies of GLFW as it is currently configured,
+This adds the GLFW library and its link-time dependencies, the include directory
-the include directory for the GLFW header and, when applicable, the @ref
+for the GLFW header and, when applicable, the @ref GLFW_DLL macro.
 GLFW_DLL macro.
@code{.cmake}
 target_link_libraries(myapp glfw)
@endcode
-Note that the dependencies do not include OpenGL or GLU, as GLFW loads any
+Note that the `glfw` target does not depend on OpenGL, as GLFW loads any OpenGL,
-OpenGL, OpenGL ES or Vulkan libraries it needs at runtime and does not use GLU.
+OpenGL ES or Vulkan libraries it needs at runtime.  If your application calls
-If your application calls OpenGL directly, instead of using a modern
+OpenGL directly, instead of using a modern
-[extension loader library](@ref context_glext_auto) you can find it by requiring
+[extension loader library](@ref context_glext_auto), use the OpenGL CMake
-the OpenGL package.
+package.
@code{.cmake}
 find_package(OpenGL REQUIRED)
@endcode
-If OpenGL is found, the `OPENGL_FOUND` variable is true and the
+If OpenGL is found, the `OpenGL::GL` target is added to your project, containing
-`OPENGL_INCLUDE_DIR` and `OPENGL_gl_LIBRARY` cache variables can be used.
+library and include directory paths.  Link against this like any other library.
@code{.cmake}
-target_include_directories(myapp PUBLIC ${OPENGL_INCLUDE_DIR})
+target_link_libraries(myapp OpenGL::GL)
 target_link_libraries(myapp ${OPENGL_gl_LIBRARY})
@endcode
 The OpenGL CMake package also looks for GLU.  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_link_libraries(myapp ${OPENGL_glu_LIBRARY})
@endcode
@note GLU has been deprecated and should not be used in new code, but some
 legacy code requires it.  See the [section on GLU](@ref moving_glu) in the
 transition guide for suggested replacements.
@subsection build_link_pkgconfig With makefiles and pkg-config on Unix
@@ -309,42 +274,31 @@ 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`
+cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --static --libs glfw3)
@endcode
 If you are using the shared version of the GLFW library, omit the `--static`
 flag.
@code{.sh}
-cc `pkg-config --cflags glfw3` -o myprog myprog.c `pkg-config --libs glfw3`
+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`
+env PKG_CONFIG_PATH=path/to/glfw/src cc $(pkg-config --cflags glfw3) -o myprog myprog.c $(pkg-config --libs glfw3)
@endcode
-The dependencies do not include OpenGL or GLU, as GLFW loads any OpenGL, OpenGL
+The dependencies do not include OpenGL, as GLFW loads any OpenGL, OpenGL ES or
-ES or Vulkan libraries it needs at runtime and does not use GLU.  On macOS, GLU
+Vulkan libraries it needs at runtime.  If your application calls OpenGL
-is built into the OpenGL framework, so if you need GLU you don't need to do
+directly, instead of using a modern
-anything extra.  If you need GLU and are using Linux or BSD, you should add the
+[extension loader library](@ref context_glext_auto), you should add the `gl`
-`glu` pkg-config package.
+pkg-config package.
@code{.sh}
-cc `pkg-config --cflags glfw3 glu` -o myprog myprog.c `pkg-config --libs glfw3 glu`
+cc $(pkg-config --cflags glfw3 gl) -o myprog myprog.c $(pkg-config --libs glfw3 gl)
@endcode
@note GLU has been deprecated and should not be used in new code, but some
 legacy code requires it.  See the [section on GLU](@ref moving_glu) in the
 transition guide for suggested replacements.
 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
@@ -354,8 +308,8 @@ If you are using the dynamic library version of GLFW, add it to the project
 dependencies.
 If you are using the static library version of GLFW, add it and the Cocoa,
-OpenGL, IOKit and CoreVideo frameworks to the project as dependencies.  They can
+OpenGL and IOKit frameworks to the project as dependencies.  They can all be
-all be found in `/System/Library/Frameworks`.
+found in `/System/Library/Frameworks`.
@subsection build_link_osx With command-line on macOS
@@ -369,7 +323,7 @@ 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
+cc -o myprog myprog.c -lglfw -framework Cocoa -framework OpenGL -framework IOKit
@endcode
 If you are using the static library, named `libglfw3.a`, substitute `-lglfw3`
@@ -378,9 +332,7 @@ 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
+@note Your machine may have `libGL.*.dylib` style OpenGL library, but that is
-special to do when using GLU.  Also note that even though your machine may have
+for the X Window System and will not work with the macOS native version of GLFW.
 `libGL`-style OpenGL libraries, they are for use with the X Window System and
 will _not_ work with the macOS native version of GLFW.
 */
@@ -85,6 +85,13 @@ 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.
@section compat_wayland Wayland protocols and IPC standards
@@ -104,11 +111,7 @@ has been configured in the compositor.
 GLFW uses the [xdg-shell
 protocol](https://cgit.freedesktop.org/wayland/wayland-protocols/tree/stable/xdg-shell/xdg-shell.xml)
 to provide better window management.  This protocol is part of
-wayland-protocols 1.12, and mandatory at build time.  If the running compositor
+wayland-protocols 1.12, and is mandatory for GLFW to display a window.
 does not support this protocol, the older [wl_shell
 interface](https://cgit.freedesktop.org/wayland/wayland/tree/protocol/wayland.xml#n972)
 will be used instead.  This will result in a worse integration with the
 desktop, especially on tiling compositors.
 GLFW uses the [relative pointer
 protocol](https://cgit.freedesktop.org/wayland/wayland-protocols/tree/unstable/relative-pointer/relative-pointer-unstable-v1.xml)
@@ -160,10 +163,9 @@ multisampling anti-aliasing.  Where this extension is unavailable, the
 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
+hints will only be partially supported, the `GLFW_CONTEXT_DEBUG` hint will have
-will have no effect, and setting the `GLFW_OPENGL_PROFILE` or
+no effect, and setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT`
-`GLFW_OPENGL_FORWARD_COMPAT` hints to `GLFW_TRUE` will cause @ref
+hints to `GLFW_TRUE` will cause @ref glfwCreateWindow to fail.
 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
@@ -203,10 +205,9 @@ 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
+hints will only be partially supported, the `GLFW_CONTEXT_DEBUG` hint will have
-will have no effect, and setting the `GLFW_OPENGL_PROFILE` or
+no effect, and setting the `GLFW_OPENGL_PROFILE` or `GLFW_OPENGL_FORWARD_COMPAT`
-`GLFW_OPENGL_FORWARD_COMPAT` hints to `GLFW_TRUE` will cause @ref
+hints to `GLFW_TRUE` will cause @ref glfwCreateWindow to fail.
 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
@@ -234,16 +235,15 @@ 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
+given version 3.0 or 3.1.  The `GLFW_OPENGL_PROFILE` 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.  The
-`GLFW_OPENGL_DEBUG_CONTEXT` and `GLFW_CONTEXT_NO_ERROR` hints are ignored.
+`GLFW_CONTEXT_DEBUG` and `GLFW_CONTEXT_NO_ERROR` hints are 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.
+`GLFW_CONTEXT_DEBUG` hint is ignored.
@section compat_vulkan Vulkan loader and API
@@ -266,10 +266,10 @@ 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 `VK_MVK_macos_surface` extensions to create
+GLFW uses the `VK_KHR_surface` and either the `VK_MVK_macos_surface` or
-surfaces on macOS.  If any of these extensions are not available, @ref
+`VK_EXT_metal_surface` extensions to create surfaces on macOS.  If any of these
-glfwGetRequiredInstanceExtensions will return an empty list and window surface
+extensions are not available, @ref glfwGetRequiredInstanceExtensions will
-creation will fail.
+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`
@@ -103,8 +103,7 @@ To compile GLFW for Wayland, you need to have the Wayland 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 `libwayland-dev` package, which contains all Wayland headers and pulls in
-wayland-scanner, as well as the `wayland-protocols` and `extra-cmake-modules`
+wayland-scanner, as well as the `wayland-protocols` package.
 packages.
 Once you have installed the necessary packages, move on to @ref
 compile_generate.
@@ -212,11 +211,13 @@ library or as a DLL / shared library / dynamic library.
@anchor GLFW_BUILD_EXAMPLES
 __GLFW_BUILD_EXAMPLES__ determines whether the GLFW examples are built
-along with the library.
+along with the library.  This is enabled by default unless GLFW is being built
 as a sub-project.
@anchor GLFW_BUILD_TESTS
 __GLFW_BUILD_TESTS__ determines whether the GLFW test programs are
-built along with the library.
+built along with the library.  This is enabled by default unless GLFW is being
 built as a sub-project.
@anchor GLFW_BUILD_DOCS
 __GLFW_BUILD_DOCS__ determines whether the GLFW documentation is built along
@@ -84,10 +84,6 @@ 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.
@macos The first time a window is created the menu bar is created.  This is not
 desirable for example when writing a command-line only application.  Menu bar
 creation can be disabled with the @ref GLFW_COCOA_MENUBAR init hint.
@subsection context_less Windows without contexts
@@ -0,0 +1 @@
 {"version":3,"sourceRoot":"","sources":["extra.scss"],"names":[],"mappings":"AA8EA,4GACI,gBACA,iBAGJ,yBACC,yDAGD,6HACC,sDAGD,yIACC,sDAGD,mBACI,WA9EuB,KA+EvB,iBAGJ,uBACC,MAzFoB,QA0FjB,iBAGJ,6UACC,gBAGD,mJACC,YAGD,yHACC,iBAGD,sBACC,gBAGD,4LACC,UAGD,yCACC,aAGD,kMACC,WAnHgC,QAsHjC,KACC,MA1HoB,QA6HrB,sDACC,MA/Ge,QAgHf,mBAGD,GACE,iBACA,eAGF,GACE,iBACA,gBACA,eAGF,GACE,iBACA,gBACA,eAGF,YACC,eACA,gBACA,gBACA,eACA,cAEA,aACA,mBACA,eACA,2BACA,mBACA,sBAGD,UACC,iBACA,mBACA,MA/J0B,KAgK1B,gBACA,qEAGD,YACC,qBACA,kBACA,YAGD,yBACC,WAGD,oCACC,iBACA,gBACA,cACA,MAlL0B,KAqL3B,YACC,eAGD,8CACC,qBAGD,mBACC,MA9L0B,KAiM3B,eACC,kBACA,YACA,eAGD,KACC,WAxM0B,KA2M3B,UACC,gBACA,cACA,eAGD,WACC,gBACA,cACA,eAGD,UACI,aAGJ,mBACI,iBACA,iBAGJ,WACC,gBACA,aACA,mBACA,eACA,2BACA,mBACA,sBAGD,mEACC,MA9OgC,QAiPjC,gCACC,MArPoB,QAwPrB,sCACC,MAjOoB,KAoOrB,yBACC,kBAGD,UACC,iBAGD,wBACC,gBACA,cACA,eACA,qBAGD,uDACC,gEACA,+BACA,+BACA,gBACA,MArPgB,KAwPjB,mBACC,MA5PoB,KA6PpB,aACA,kBACA,yBAGD,QACC,WACA,WAGD,WACC,iBAGD,WACC,mBAGD,WACC,cACA,eACA,qBAGD,oCACC,gEACA,kCACA,2BACA,MAlSe,QAmSf,yBACA,kBAGD,WACC,MA3QuB,QA8QxB,cACC,sBACA,2BACA,4BACA,mBAGD,cACC,sBACA,+BACA,8BACA,gBAGD,mCACC,wBACA,iBACA,sBACA,kBAGD,gIACC,MAxToB,KAyTpB,qBAGD,cACC,wBACA,iBACA,sBACA,kBAGD,iBACC,WACA,4EAGD,oCApSC,gEACA,kCACA,cACA,yBAqSD,wBAxSC,gEACA,kCACA,cACA,yBAySD,qBA5SC,gEACA,kCACA,cACA,yBA6SD,gBAhTC,gEACA,kCACA,cACA,yBAiTD,iGACC,kBACA,YACA,2BACA,aAGD,kRACC,cAGD,SACC,oBAGD,0BACC,mBACA,kBACA,YACA,YACA,cACA,2BACA,aAGD,+CACC,MA1YoB,QA6YrB,+BACC,cAGD,sBACC,cAGD,+CACC,cACA,iBAGD,mBACC,cAGD,KACC,aACA","file":"extra.css"}
@@ -1,79 +1,79 @@
 // 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:
+// You need to install the official Sass CLI tool:
-// gem install less therubyracer
+// npm install -g sass
 //
 // Run this command to regenerate extra.css after you're finished with changes:
-// lessc --compress extra.less > extra.css
+// 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%);
+$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%);
+$header-footer-background-color: hsl(0,0%,95%);
 // Page header, footer links and navigation bar background
-@header-footer-link-color: hsl(0,0%,40%);
+$header-footer-link-color: hsl(0,0%,40%);
 // Doxygen navigation bar links
-@navbar-link-color: @header-footer-background-color;
+$navbar-link-color: $header-footer-background-color;
 // Page content background color
-@content-background-color: hsl(0,0%,100%);
+$content-background-color: hsl(0,0%,100%);
 // Bold, italic, h1, h2, ... and table of contents
-@heading-color: hsl(0,0%,10%);
+$heading-color: hsl(0,0%,10%);
 // Function, enum and macro definition separator
-@def-separator-color: @header-footer-background-color;
+$def-separator-color: $header-footer-background-color;
 // Base color hue
-@base-hue: 24;
+$base-hue: 24;
 // Default color used for links
-@default-link-color: hsl(@base-hue,100%,50%);
+$default-link-color: hsl($base-hue,100%,50%);
 // Doxygen navigation bar active tab
-@tab-text-color: hsl(0,0%,100%);
+$tab-text-color: hsl(0,0%,100%);
-@tab-background-color1: @default-link-color;
+$tab-background-color1: $default-link-color;
-@tab-background-color2: lighten(spin(@tab-background-color1, 10), 10%);
+$tab-background-color2: lighten(adjust-hue($tab-background-color1, 10), 10%);
 // Table borders
-@default-border-color: @default-link-color;
+$default-border-color: $default-link-color;
 // Table header
-@table-text-color: @tab-text-color;
+$table-text-color: $tab-text-color;
-@table-background-color1: @tab-background-color1;
+$table-background-color1: $tab-background-color1;
-@table-background-color2: @tab-background-color2;
+$table-background-color2: $tab-background-color2;
 // Table of contents, data structure index and prototypes
-@toc-background-color1: hsl(0,0%,90%);
+$toc-background-color1: hsl(0,0%,90%);
-@toc-background-color2: lighten(@toc-background-color1, 5%);
+$toc-background-color2: lighten($toc-background-color1, 5%);
 // Function prototype parameters color
-@prototype-param-color: darken(@default-link-color, 25%);
+$prototype-param-color: darken($default-link-color, 25%);
 // Message box color: note, pre, post and invariant
-@box-note-color: hsl(103,80%,85%);
+$box-note-color: hsl(103,80%,85%);
 // Message box color: warning and attention
-@box-warning-color: hsl(34,80%,85%);
+$box-warning-color: hsl(34,80%,85%);
 // Message box color: deprecated and bug
-@box-bug-color: hsl(333,80%,85%);
+$box-bug-color: hsl(333,80%,85%);
 // Message box color: todo and test
-@box-todo-color: hsl(200,80%,85%);
+$box-todo-color: hsl(200,80%,85%);
 // Message box helper function
-.message-box(@base-color) {
+@mixin message-box($base-color){
-	background:linear-gradient(to bottom,lighten(@base-color, 5%) 0%,@base-color 100%);
+	background:linear-gradient(to bottom,lighten($base-color, 5%) 0%,$base-color 100%);
-	box-shadow:inset 0 0 32px darken(@base-color, 5%);
+	box-shadow:inset 0 0 32px darken($base-color, 5%);
-	color:darken(@base-color, 67%);
+	color:darken($base-color, 67%);
-	border:2px solid desaturate(darken(@base-color, 10%), 20%);
+	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 {
@@ -82,24 +82,24 @@
 }
 .sm-dox a span.sub-arrow {
-	border-color:@navbar-link-color transparent transparent transparent;
+	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;
+	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;
+	border-color:transparent transparent transparent $default-link-color;
 }
 .sm-dox ul a:hover {
-    background:@header-footer-link-color;
+	background:$header-footer-link-color;
 	text-shadow:none;
 }
 .sm-dox ul.sm-nowrap a {
-	color:@default-text-color;
+	color:$default-text-color;
 	text-shadow:none;
 }
@@ -128,15 +128,15 @@ div.headertitle,.note code,.pre code,.post code,.invariant code,.warning code,.a
 }
 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;
+	background:$header-footer-background-color;
 }
 body {
-	color:@default-text-color;
+	color:$default-text-color;
 }
 h1,h2,h2.groupheader,h3,div.toc h3,h4,h5,h6,strong,em {
-	color:@heading-color;
+	color:$heading-color;
 	border-bottom:none;
 }
@@ -159,24 +159,30 @@ h3 {
 .glfwheader {
 	font-size:16px;
-	height:64px;
+	min-height:64px;
 	max-width:920px;
 	min-width:800px;
 	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;
+	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 auto;
+	margin:0 0 0 auto;
 	float:right;
 }
@@ -188,7 +194,11 @@ h3 {
 	line-height:64px;
 	margin-left:2em;
 	display:block;
-	color:@header-footer-link-color;
+	color:$header-footer-link-color;
 }
 .glfwnavbar {
 	padding-left: 0;
 }
 #glfwhome,.glfwnavbar a,.glfwnavbar a:visited {
@@ -196,7 +206,7 @@ h3 {
 }
 #titlearea,.footer {
-	color:@header-footer-link-color;
+	color:$header-footer-link-color;
 }
 address.footer {
@@ -206,19 +216,17 @@ address.footer {
 }
 #top {
-	background:@header-footer-link-color;
+	background:$header-footer-link-color;
 }
 #main-nav {
 	max-width:960px;
 	min-width:800px;
 	margin:0 auto;
 	font-size:13px;
 }
 #main-menu {
 	max-width:920px;
 	min-width:800px;
 	margin:0 auto;
 	font-size:13px;
 }
@@ -233,21 +241,29 @@ address.footer {
 }
 #main-menu {
-	height:36px;
+	min-height:36px;
-	display:block;
+	display: flex;
-	position:relative;
+	flex-direction: row;
 	flex-wrap: wrap;
 	justify-content: flex-start;
 	align-items: center;
 	align-content: stretch;
 }
 #main-menu a,#main-menu a:visited,#main-menu a:hover,#main-menu li {
-	color:@navbar-link-color;
+	color:$navbar-link-color;
 }
 #main-menu li ul.sm-nowrap li a {
-	color:@default-text-color;
+	color:$default-text-color;
 }
 #main-menu li ul.sm-nowrap li a:hover {
-	color:@default-link-color;
+	color:$default-link-color;
 }
 #main-menu > li:last-child {
 	margin: 0 0 0 auto;
 }
 .contents {
@@ -258,22 +274,22 @@ div.contents,div.header {
 	max-width:920px;
 	margin:0 auto;
 	padding:0 32px;
-	background:@content-background-color none;
+	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%);
+	background:linear-gradient(to bottom,$table-background-color2 0%,$table-background-color1 100%);
-	box-shadow:inset 0 0 32px @table-background-color1;
+	box-shadow:inset 0 0 32px $table-background-color1;
-	text-shadow:0 -1px 1px darken(@table-background-color1, 15%);
+	text-shadow:0 -1px 1px darken($table-background-color1, 15%);
 	text-align:left;
-	color:@table-text-color;
+	color:$table-text-color;
 }
 dl.reflist dt a.el {
-	color:@default-link-color;
+	color:$default-link-color;
 	padding:.2em;
 	border-radius:4px;
-	background-color:lighten(@default-link-color, 40%);
+	background-color:lighten($default-link-color, 40%);
 }
 div.toc {
@@ -296,27 +312,27 @@ div.toc li {
 }
 div.toc,.memproto,div.qindex,div.ah {
-	background:linear-gradient(to bottom,@toc-background-color2 0%,@toc-background-color1 100%);
+	background:linear-gradient(to bottom,$toc-background-color2 0%,$toc-background-color1 100%);
-	box-shadow:inset 0 0 32px @toc-background-color1;
+	box-shadow:inset 0 0 32px $toc-background-color1;
-	text-shadow:0 1px 1px lighten(@toc-background-color2, 10%);
+	text-shadow:0 1px 1px lighten($toc-background-color2, 10%);
-	color:@heading-color;
+	color:$heading-color;
-	border:2px solid @toc-background-color1;
+	border:2px solid $toc-background-color1;
 	border-radius:4px;
 }
 .paramname {
-	color:@prototype-param-color;
+	color:$prototype-param-color;
 }
 dl.reflist dt {
-	border:2px solid @default-border-color;
+	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:2px solid $default-border-color;
 	border-bottom-right-radius:4px;
 	border-bottom-left-radius:4px;
 	border-top:none;
@@ -325,41 +341,41 @@ dl.reflist dd {
 table.doxtable,table.markdownTable {
 	border-collapse:inherit;
 	border-spacing:0;
-	border:2px solid @default-border-color;
+	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;
+	color:$default-link-color;
 	text-decoration:none;
 }
 div.directory {
 	border-collapse:inherit;
 	border-spacing:0;
-	border:2px solid @default-border-color;
+	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%);
+	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);
+	@include message-box($box-note-color);
 }
 dl.warning,dl.attention {
-	.message-box(@box-warning-color);
+	@include message-box($box-warning-color);
 }
 dl.deprecated,dl.bug {
-	.message-box(@box-bug-color);
+	@include message-box($box-bug-color);
 }
 dl.todo,dl.test {
-	.message-box(@box-todo-color);
+	@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 {
@@ -388,7 +404,7 @@ div.fragment,pre.fragment {
 }
 .lineno a,.lineno a:visited,.line,pre.fragment {
-	color:@default-text-color;
+	color:$default-text-color;
 }
 span.preprocessor,span.comment {
@@ -400,7 +416,7 @@ a.code,a.code:visited {
 }
 span.keyword,span.keywordtype,span.keywordflow {
-	color:darken(@default-text-color, 5%);
+	color:darken($default-text-color, 5%);
 	font-weight:bold;
 }
@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
 <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-->
@@ -373,12 +373,15 @@ 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);
+GLFWcursor* url_cursor = glfwCreateStandardCursor(GLFW_POINTING_HAND_CURSOR);
@endcode
 These cursor objects behave in the exact same way as those created with @ref
 glfwCreateCursor except that the system cursor theme provides the actual image.
 A few of these shapes are not available everywhere.  If a shape is unavailable,
 `NULL` is returned.  See @ref glfwCreateStandardCursor for details.
@subsubsection cursor_destruction Cursor destruction
@@ -547,10 +550,10 @@ int present = glfwJoystickPresent(GLFW_JOYSTICK_1);
 Each joystick has zero or more axes, zero or more buttons, zero or more hats,
 a human-readable name, a user pointer and an SDL compatible GUID.
-When GLFW is initialized, detected joysticks are added to the beginning of
+Detected joysticks are added to the beginning of the array.  Once a joystick is
-the array.  Once a joystick is detected, it keeps its assigned ID until it is
+detected, it keeps its assigned ID until it is disconnected or the library is
-disconnected or the library is terminated, so as joysticks are connected and
+terminated, so as joysticks are connected and disconnected, there may appear
-disconnected, there may appear gaps in the IDs.
+gaps in the IDs.
 Joystick axis, button and hat state is updated when polled and does not require
 a window to be created or events to be processed.  However, if you want joystick
@@ -645,7 +648,7 @@ const char* name = glfwGetJoystickName(GLFW_JOYSTICK_4);
@endcode
 Joystick names are not guaranteed to be unique.  Two joysticks of the same model
-and make may have the same name.  Only the [joystick token](@ref joysticks) is
+and make may have the same name.  Only the [joystick ID](@ref joysticks) is
 guaranteed to be unique, and only until that joystick is disconnected.
@@ -864,31 +867,32 @@ GLFW provides high-resolution time input, in seconds, with @ref glfwGetTime.
 double seconds = glfwGetTime();
@endcode
-It returns the number of seconds since the timer was started when the library
+It returns the number of seconds since the library was initialized with @ref
-was initialized with @ref glfwInit.  The platform-specific time sources used
+glfwInit.  The platform-specific time sources used typically have micro- or
-usually have micro- or nanosecond resolution.
+nanosecond resolution.
-You can modify the reference time with @ref glfwSetTime.
+You can modify the base time with @ref glfwSetTime.
@code
 glfwSetTime(4.0);
@endcode
-This sets the timer to the specified time, in seconds.
+This sets the time to the specified time, in seconds, and it continues to count
 from there.
-You can also access the raw timer value, measured in 1&nbsp;/&nbsp;frequency
+You can also access the raw timer used to implement the functions above,
-seconds, with @ref glfwGetTimerValue.
+with @ref glfwGetTimerValue.
@code
 uint64_t value = glfwGetTimerValue();
@endcode
-The frequency of the raw timer varies depending on what time sources are
+This value is in 1&nbsp;/&nbsp;frequency seconds.  The frequency of the raw
-available on the machine.  You can query its frequency, in Hz, with @ref
+timer varies depending on the operating system and hardware.  You can query the
-glfwGetTimerFrequency.
+frequency, in Hz, with @ref glfwGetTimerFrequency.
@code
-uint64_t freqency = glfwGetTimerFrequency();
+uint64_t frequency = glfwGetTimerFrequency();
@endcode
@@ -22,8 +22,8 @@ There are also guides for the other areas of GLFW.
 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
+enumerates monitors, initializes the timer and performs any required
-required platform-specific initialization.
+platform-specific initialization.
 Only the following functions may be called before the library has been
 successfully initialized, and only from the main thread.
@@ -62,6 +62,11 @@ 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.
@subsection init_hints Initialization hints
@@ -86,7 +91,22 @@ Setting these hints requires no platform specific headers or functions.
@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.  Set this with @ref glfwInitHint.
+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](https://chromium.googlesource.com/angle/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`.
@par
 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.
@subsubsection init_hints_osx macOS specific init hints
@@ -94,19 +114,22 @@ glfwGetJoystickHats.  Set this with @ref glfwInitHint.
@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.  Set this with @ref glfwInitHint.
+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 a basic menu bar, either from
+__GLFW_COCOA_MENUBAR__ specifies whether to create the menu bar and dock icon
-a nib or manually, when the first window is created, which is when AppKit is
+when GLFW is initialized.  This applies whether the menu bar is created from
-initialized.  Set this with @ref glfwInitHint.
+a nib or manually by GLFW.  Possible values are `GLFW_TRUE` and `GLFW_FALSE`.
 This is ignored on other platforms.
@subsubsection init_hints_values Supported and default values
 Initialization hint             | Default value                   | Supported values
------------------------------- | ------------- | ----------------
+------------------------------- | ------------------------------- | ----------------
@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`
@@ -8,7 +8,7 @@ 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_33 list new features, caveats and deprecations.
+@ref news_34 list new features, caveats and deprecations.
@ref quick_guide is a guide for users new to GLFW.  It takes you through how to
 write a small but complete program.
@@ -94,8 +94,8 @@ for a disconnected monitor and only before the monitor callback returns.
@section monitor_properties Monitor properties
 Each monitor has a current video mode, a list of supported video modes,
-a virtual position, a human-readable name, a user pointer, an estimated physical
+a virtual position, a content scale, a human-readable name, a user pointer, an
-size and a gamma ramp.
+estimated physical size and a gamma ramp.
@subsection monitor_modes Video modes
@@ -362,8 +362,8 @@ 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
+having to remember whether to check for `a` or `A`, you now check for
-`GLFW_KEY_A`.
+@ref GLFW_KEY_A.
@subsection moving_joystick Joystick function changes
@@ -5,852 +5,150 @@
@tableofcontents
-@section news_33 Release notes for version 3.3
+@section news_34 Release notes for version 3.4
-These are the release notes for version 3.3.  For a more detailed view including
+@subsection features_34 New features in version 3.4
 all fixed bugs see the [version history](https://www.glfw.org/changelog.html).
-Please review the caveats, deprecations and removals if your project was written
+@subsubsection standard_cursors_34 More standard cursors
 against an earlier version of GLFW 3.
 GLFW now provides the standard cursor shapes @ref GLFW_RESIZE_NWSE_CURSOR and
@ref GLFW_RESIZE_NESW_CURSOR for diagonal resizing, @ref GLFW_RESIZE_ALL_CURSOR
 for omni-directional resizing and @ref GLFW_NOT_ALLOWED_CURSOR for showing an
 action is not allowed.
-@subsection features_33 New features in version 3.3
+Unlike the original set, these shapes may not be available everywhere and
 creation will then fail with the new @ref GLFW_CURSOR_UNAVAILABLE error.
-@subsubsection gamepad_33 Gamepad input via SDL_GameControllerDB
+The cursors for horizontal and vertical resizing are now referred to as @ref
 GLFW_RESIZE_EW_CURSOR and @ref GLFW_RESIZE_NS_CURSOR, and the pointing hand
 cursor is now referred to as @ref GLFW_POINTING_HAND_CURSOR.  The older names
 are still available.
-GLFW can now remap game controllers to a standard Xbox-like layout using
+For more information see @ref cursor_standard.
 a built-in copy of SDL_GameControllerDB.  Call @ref glfwJoystickIsGamepad to
 check if a joystick has a mapping, @ref glfwGetGamepadState to retrieve its
 input state, @ref glfwUpdateGamepadMappings to add newer mappings and @ref
 glfwGetGamepadName and @ref glfwGetJoystickGUID for mapping related information.
 For more information see @ref gamepad.
@subsubsection mouse_passthrough_34 Mouse event passthrough
-@subsubsection moltenvk_33 Support for Vulkan on macOS via MoltenVK
+GLFW now provides the [GLFW_MOUSE_PASSTHROUGH](@ref GLFW_MOUSE_PASSTHROUGH_hint)
 window hint for making a window transparent to mouse input, lettings events pass
 to whatever window is behind it.  This can also be changed after window
 creation with the matching [window attribute](@ref GLFW_MOUSE_PASSTHROUGH_attrib).
 GLFW now supports [MoltenVK](https://moltengl.com/moltenvk/), a Vulkan
 implementation on top of the Metal API, and its `VK_MVK_macos_surface` window
 surface creation extension.  MoltenVK is included in the [macOS Vulkan
 SDK](https://vulkan.lunarg.com/).
-For more information see @ref vulkan_guide.
+@subsubsection features_34_angle_backend Support for ANGLE rendering backend selection
 GLFW now provides the
 [GLFW_ANGLE_PLATFORM_TYPE](@ref GLFW_ANGLE_PLATFORM_TYPE_hint) init hint for
 requesting a specific rendering backend when using
 [ANGLE](https://chromium.googlesource.com/angle/angle/) to create OpenGL ES
 contexts.
@subsubsection content_scale_33 Content scale queries for DPI-aware rendering
-GLFW now provides content scales for windows and monitors, i.e. the ratio
+@subsubsection features_34_win32_keymenu Support for keyboard access to Windows window menu
 between their current DPI and the platform's default DPI, with @ref
 glfwGetWindowContentScale and @ref glfwGetMonitorContentScale.
-Changes of the content scale of a window can be received with the window content
+GLFW now provides the
-scale callback, set with @ref glfwSetWindowContentScaleCallback.
+[GLFW_WIN32_KEYBOARD_MENU](@ref GLFW_WIN32_KEYBOARD_MENU_hint) window hint for
 enabling keyboard access to the window menu via the Alt+Space and
 Alt-and-then-Space shortcuts.  This may be useful for more GUI-oriented
 applications.
 The @ref GLFW_SCALE_TO_MONITOR window hint enables automatic resizing of a
 window by the content scale of the monitor it is placed, on platforms like
 Windows where this is necessary.  This takes effect both on creation and when
 the window is moved between monitors.  It is related to but different from
 [GLFW_COCOA_RETINA_FRAMEBUFFER](@ref GLFW_COCOA_RETINA_FRAMEBUFFER_hint).
-For more information see @ref window_scale.
+@subsection caveats_34 Caveats for version 3.4
@subsubsection joysticks_34 Joystick support is initialized on demand
-@subsubsection setwindowattrib_33 Support for updating window attributes
+The joystick part of GLFW is now initialized when first used, primarily to work
 around faulty Windows drivers that cause DirectInput to take up to several
 seconds to enumerate devices.
-GLFW now supports changing the [GLFW_DECORATED](@ref GLFW_DECORATED_attrib),
+This change will usually not be observable.  However, if your application waits
-[GLFW_RESIZABLE](@ref GLFW_RESIZABLE_attrib),
+for events without having first called any joystick function or created any
-[GLFW_FLOATING](@ref GLFW_FLOATING_attrib),
+visible windows, the wait may never unblock as GLFW may not yet have subscribed
-[GLFW_AUTO_ICONIFY](@ref GLFW_AUTO_ICONIFY_attrib) and
+to joystick related OS events.
 [GLFW_FOCUS_ON_SHOW](@ref GLFW_FOCUS_ON_SHOW_attrib) attributes for existing
 windows with @ref glfwSetWindowAttrib.
-For more information see @ref window_attribs.
+To work around this, call any joystick function before waiting for events, for
 example by setting a [joystick callback](@ref joystick_event).
-@subsubsection raw_motion_33 Support for raw mouse motion
+@subsubsection standalone_34 Tests and examples are disabled when built as a sub-project
-GLFW now supports raw (unscaled and unaccelerated) mouse motion in disabled
+GLFW now does not build the tests and examples when it is added as
-cursor mode with the [GLFW_RAW_MOUSE_MOTION](@ref GLFW_RAW_MOUSE_MOTION) input
+a subdirectory of another CMake project.  To enable these, set the @ref
-mode.  Raw mouse motion input is not yet implemented on macOS.  Call @ref
+GLFW_BUILD_TESTS and @ref GLFW_BUILD_EXAMPLES cache variables before adding the
-glfwRawMouseMotionSupported to check if GLFW can provide raw mouse motion on the
+GLFW subdirectory.
 current system.
-For more information see @ref raw_mouse_motion.
+@code{.cmake}
 set(GLFW_BUILD_EXAMPLES ON CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
 add_subdirectory(path/to/glfw)
@endcode
-@subsubsection joysticks_33 Joystick hats
+@subsubsection initmenu_34 macOS main menu now created at initialization
-GLFW can now return the state of hats (i.e. POVs or D-pads) of a joystick with
+GLFW now creates the main menu and completes the initialization of NSApplication
-@ref glfwGetJoystickHats.  For compatibility, hats are also exposed as buttons.
+during initialization.  Programs that do not want a main menu can disable it
-This can be disabled with the @ref GLFW_JOYSTICK_HAT_BUTTONS initialization
+with the [GLFW_COCOA_MENUBAR](@ref GLFW_COCOA_MENUBAR_hint) init hint.
 hint.
 For more information see @ref joystick_hat.
@subsubsection corevideo_34 CoreVideo dependency has been removed
-@subsubsection geterror_33 Error query
+GLFW no longer depends on the CoreVideo framework on macOS and it no longer
 needs to be specified during compilation or linking.
 GLFW now supports querying the last error code for the calling thread and its
 human-readable description with @ref glfwGetError.  This can be used instead of
 or together with the error callback.
-For more information see @ref error_handling.
+@subsubsection caveat_fbtransparency_34 Framebuffer transparency requires DWM transparency
 GLFW no longer supports framebuffer transparency enabled via @ref
 GLFW_TRANSPARENT_FRAMEBUFFER on Windows 7 if DWM transparency is off
 (the Transparency setting under Personalization > Window Color).
@subsubsection init_hints_33 Support for initialization hints
-GLFW now supports setting library initialization hints with @ref glfwInitHint.
+@subsection deprecations_34 Deprecations in version 3.4
 These must be set before initialization to take effect.  Some of these hints are
 platform specific but are safe to set on any platform.
-For more information see @ref init_hints.
+@subsection removals_34 Removals in 3.4
@subsubsection wl_shell_34 Support for the wl_shell protocol has been removed
-@subsubsection attention_33 User attention request
+Support for the wl_shell protocol has been removed and GLFW now only supports
 the XDG-Shell protocol.  If your Wayland compositor does not support XDG-Shell
 then GLFW will fail to initialize.
 GLFW now supports requesting user attention with @ref
 glfwRequestWindowAttention.  Where possible this calls attention to the
 specified window.  On platforms like macOS it calls attention to the whole
 application.
-For more information see @ref window_attention.
+@subsection symbols_34 New symbols in version 3.4
@subsubsection functions_34 New functions in version 3.4
@subsubsection types_34 New types in version 3.4
@subsubsection constants_34 New constants in version 3.4
-@subsubsection maximize_33 Window maximization callback
+ - @ref GLFW_POINTING_HAND_CURSOR
 - @ref GLFW_RESIZE_EW_CURSOR
 - @ref GLFW_RESIZE_NS_CURSOR
 - @ref GLFW_RESIZE_NWSE_CURSOR
 - @ref GLFW_RESIZE_NESW_CURSOR
 - @ref GLFW_RESIZE_ALL_CURSOR
 - @ref GLFW_MOUSE_PASSTHROUGH
 - @ref GLFW_NOT_ALLOWED_CURSOR
 - @ref GLFW_CURSOR_UNAVAILABLE
 - @ref GLFW_WIN32_KEYBOARD_MENU
 - @ref GLFW_CONTEXT_DEBUG
 - @ref GLFW_FEATURE_UNAVAILABLE
 - @ref GLFW_FEATURE_UNIMPLEMENTED
 - @ref GLFW_ANGLE_PLATFORM_TYPE
 - @ref GLFW_ANGLE_PLATFORM_TYPE_NONE
 - @ref GLFW_ANGLE_PLATFORM_TYPE_OPENGL
 - @ref GLFW_ANGLE_PLATFORM_TYPE_OPENGLES
 - @ref GLFW_ANGLE_PLATFORM_TYPE_D3D9
 - @ref GLFW_ANGLE_PLATFORM_TYPE_D3D11
 - @ref GLFW_ANGLE_PLATFORM_TYPE_VULKAN
 - @ref GLFW_ANGLE_PLATFORM_TYPE_METAL
 GLFW now supports notifying the application that the window has been maximized
@ref glfwSetWindowMaximizeCallback.  This is called both when the window was
 maximized by the user and when it was done with @ref glfwMaximizeWindow.
-For more information see @ref window_maximize.
+@section news_archive Release notes for earlier versions
-
+- [Release notes for 3.3](https://www.glfw.org/docs/3.3/news.html)
-@subsubsection workarea_33 Query for the monitor work area
+- [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)
-GLFW now supports querying the work area of a monitor, i.e. the area not
+- [Release notes for 3.0](https://www.glfw.org/docs/3.0/news.html)
 occupied by task bars or global menu bars, with @ref glfwGetMonitorWorkarea.  On
 platforms that lack this concept, the whole area of the monitor is returned.
 For more information see @ref monitor_workarea.
@subsubsection transparency_33 Transparent windows and framebuffers
 GLFW now supports the creation of windows with transparent framebuffers on
 systems with desktop compositing enabled with the @ref
 GLFW_TRANSPARENT_FRAMEBUFFER window hint and attribute.  This hint must be set
 before window creation and leaves any window decorations opaque.
 GLFW now also supports whole window transparency with @ref glfwGetWindowOpacity
 and @ref glfwSetWindowOpacity.  This value controls the opacity of the whole
 window including decorations and unlike framebuffer transparency can be changed
 at any time after window creation.
 For more information see @ref window_transparency.
@subsubsection key_scancode_33 Query for the scancode of a key
 GLFW now supports querying the platform dependent scancode of any physical key
 with @ref glfwGetKeyScancode.
 For more information see @ref input_key.
@subsubsection center_cursor_33 Cursor centering window hint
 GLFW now supports controlling whether the cursor is centered over newly created
 full screen windows with the [GLFW_CENTER_CURSOR](@ref GLFW_CENTER_CURSOR_hint)
 window hint.  It is enabled by default.
@subsubsection cursor_hover_33 Mouse cursor hover window attribute
 GLFW now supports polling whether the cursor is hovering over the window content
 area with the [GLFW_HOVERED](@ref GLFW_HOVERED_attrib) window attribute.  This
 attribute corresponds to the [cursor enter/leave](@ref cursor_enter) event.
@subsubsection focusonshow_33 Window hint and attribute for input focus on show
 GLFW now has the [GLFW_FOCUS_ON_SHOW](@ref GLFW_DECORATED_hint) window hint and
 attribute for controlling whether a window gets input focus when shown.  It is
 enabled by default.  It applies both when creating an visible window with @ref
 glfwCreateWindow and when showing it with @ref glfwShowWindow.
 This is a workaround for GLFW 3.0 lacking @ref glfwFocusWindow and will be
 corrected in the next major version.
 For more information see @ref window_hide.
@subsubsection device_userptr_33 Monitor and joystick user pointers
 GLFW now supports setting and querying user pointers for connected monitors and
 joysticks with @ref glfwSetMonitorUserPointer, @ref glfwGetMonitorUserPointer,
@ref glfwSetJoystickUserPointer and @ref glfwGetJoystickUserPointer.
 For more information see @ref monitor_userptr and @ref joystick_userptr.
@subsubsection macos_nib_33 macOS menu bar from nib file
 GLFW will now load a `MainMenu.nib` file if found in the `Contents/Resources`
 directory of the application bundle, as a way to replace the GLFW menu bar
 without recompiling GLFW.  This behavior can be disabled with the
 [GLFW_COCOA_MENUBAR](@ref GLFW_COCOA_MENUBAR_hint) initialization hint.
@subsubsection glext_33 Support for more context creation extensions
 The context hint @ref GLFW_SRGB_CAPABLE now supports OpenGL ES via
 `WGL_EXT_colorspace`, the context hint @ref GLFW_CONTEXT_NO_ERROR now supports
 `WGL_ARB_create_context_no_error` and `GLX_ARB_create_context_no_error`, the
 context hint @ref GLFW_CONTEXT_RELEASE_BEHAVIOR now supports
 `EGL_KHR_context_flush_control` and @ref glfwGetProcAddress now supports
 `EGL_KHR_get_all_proc_addresses`.
@subsubsection osmesa_33 OSMesa off-screen context creation support
 GLFW now supports creating off-screen OpenGL contexts using
 [OSMesa](https://www.mesa3d.org/osmesa.html) by setting
 [GLFW_CONTEXT_CREATION_API](@ref GLFW_CONTEXT_CREATION_API_hint) to
 `GLFW_OSMESA_CONTEXT_API`.  Native access function have been added to retrieve
 the OSMesa color and depth buffers.
 There is also a new null backend that uses OSMesa as its native context
 creation API, intended for automated testing.  This backend does not provide
 input.
@subsection caveats_33 Caveats for version 3.3
@subsubsection joystick_layout_33 Layout of joysticks have changed
 The way joystick elements are arranged have changed to match SDL2 in order to
 support SDL_GameControllerDB mappings.  The layout of joysticks may
 change again if required for compatibility with SDL2.  If you need a known and
 stable layout for game controllers, see if you can switch to @ref gamepad.
 Existing code that depends on a specific joystick layout will likely have to be
 updated.
@subsubsection wait_events_33 No window required to wait for events
 The @ref glfwWaitEvents and @ref glfwWaitEventsTimeout functions no longer need
 a window to be created to wait for events.  Before version 3.3 these functions
 would return immediately if there were no user-created windows.  On platforms
 where only windows can receive events, an internal helper window is used.
 Existing code that depends on the earlier behavior will likely have to be
 updated.
@subsubsection gamma_ramp_size_33 Gamma ramp size of 256 may be rejected
 The documentation for versions before 3.3 stated that a gamma ramp size of 256
 would always be accepted.  This was never the case on X11 and could lead to
 artifacts on macOS.  The @ref glfwSetGamma function has been updated to always
 generate a ramp of the correct size.
 Existing code that hardcodes a size of 256 should be updated to use the size of
 the current ramp of a monitor when setting a new ramp for that monitor.
@subsubsection xinput_deadzone_33 Windows XInput deadzone removed
 GLFW no longer applies any deadzone to the input state received from the XInput
 API.  This was never done for any other platform joystick API so this change
 makes the behavior more consistent but you will need to apply your own deadzone
 if desired.
@subsubsection x11_clipboard_33 X11 clipboard transfer limits
 GLFW now supports reading clipboard text via the `INCR` method, which removes
 the limit on how much text can be read with @ref glfwGetClipboardString.
 However, writing via this method is not yet supported, so you may not be able to
 write a very large string with @ref glfwSetClipboardString even if you read it
 from the clipboard earlier.
 The exact size limit for writing to the clipboard is negotiated with each
 receiving application but is at least several tens of kilobytes.  Note that only
 the read limit has changed.  Any string that could be written before still can
 be.
@subsubsection x11_linking_33 X11 extension libraries are loaded dynamically
 GLFW now loads all X11 extension libraries at initialization.  The only X11
 library you need to link against is `libX11`.  The header files for the
 extension libraries are still required for compilation.
 Existing projects and makefiles that link GLFW directly against the extension
 libraries should still build correctly but will add these libraries as load-time
 dependencies.
@subsubsection cmake_version_33 CMake 3.0 or later is required
 The minimum CMake version has been raised from 2.8.12 to 3.0.  This is only
 a requirement of the GLFW CMake files.  The GLFW source files do not depend on
 CMake.
@subsection deprecations_33 Deprecations in version 3.3
@subsubsection charmods_callback_33 Character with modifiers callback
 The character with modifiers callback set with @ref glfwSetCharModsCallback has
 been deprecated and should if possible not be used.
 Existing code should still work but further bug fixes will likely not be made.
 The callback will be removed in the next major version.
@subsubsection clipboard_window_33 Window parameter to clipboard functions
 The window parameter of the clipboard functions @ref glfwGetClipboardString and
@ref glfwSetClipboardString has been deprecated and is no longer used on any
 platform.  On platforms where the clipboard must be owned by a specific window,
 an internal helper window is used.
 Existing code should still work unless it depends on a specific window owning
 the clipboard.  New code may pass `NULL` as the window argument.  The parameter
 will be removed in a future release.
@subsection removals_33 Removals in 3.3
@subsubsection macos_options_33 macOS specific CMake options and macros
 The `GLFW_USE_RETINA`, `GLFW_USE_CHDIR` and `GLFW_USE_MENUBAR` CMake options and
 the `_GLFW_USE_RETINA`, `_GLFW_USE_CHDIR` and `_GLFW_USE_MENUBAR` compile-time
 macros have been removed.
 These options and macros are replaced by the window hint
 [GLFW_COCOA_RETINA_FRAMEBUFFER](@ref GLFW_COCOA_RETINA_FRAMEBUFFER_hint)
 and the init hints
 [GLFW_COCOA_CHDIR_RESOURCES](@ref GLFW_COCOA_CHDIR_RESOURCES_hint) and
 [GLFW_COCOA_MENUBAR](@ref GLFW_COCOA_MENUBAR_hint).
 Existing projects and makefiles that set these options or define these macros
 during compilation of GLFW will still build but it will have no effect and the
 default behaviors will be used.
@subsubsection vulkan_sdk_33 LunarG Vulkan SDK dependency
 The GLFW test programs that previously depended on the LunarG Vulkan SDK now
 instead uses a Vulkan loader generated by
 [glad2](https://github.com/Dav1dde/glad).  This means the GLFW CMake files no
 longer look for the Vulkan SDK.
 Existing CMake projects that depended on the Vulkan SDK cache variables from
 GLFW will need to call `find_package(Vulkan)` themselves.  CMake 3.7 and later
 already comes with a
 [Vulkan find module](https://cmake.org/cmake/help/latest/module/FindVulkan.html)
 similar to the one GLFW previously included.
@subsubsection lib_suffix_33 CMake option LIB_SUFFIX
 The `LIB_SUFFIX` CMake option has been removed.  GLFW now uses the
 GNUInstallDirs CMake package to handle platform specific details like the
 library directory suffix and the `LIB_SUFFIX` CMake option has been removed.
 Existing projects and makefiles that set the `LIB_SUFFIX` option will use the
 suffix chosen by the GNUInstallDirs package and the option will be ignored.
@subsubsection mir_removed_33 Mir support
 The experimental Mir support has been completely removed as the Mir project has
 implemented support for the Wayland protocol and is recommending that
 applications use that instead.
 Existing projects and makefiles that select Mir when compiling GLFW will fail.
 Use Wayland or X11 instead.
@subsection symbols_33 New symbols in version 3.3
@subsubsection functions_33 New functions in version 3.3
 - @ref glfwInitHint
 - @ref glfwGetError
 - @ref glfwGetMonitorWorkarea
 - @ref glfwGetMonitorContentScale
 - @ref glfwGetMonitorUserPointer
 - @ref glfwSetMonitorUserPointer
 - @ref glfwWindowHintString
 - @ref glfwGetWindowContentScale
 - @ref glfwGetWindowOpacity
 - @ref glfwSetWindowOpacity
 - @ref glfwRequestWindowAttention
 - @ref glfwSetWindowAttrib
 - @ref glfwSetWindowMaximizeCallback
 - @ref glfwSetWindowContentScaleCallback
 - @ref glfwRawMouseMotionSupported
 - @ref glfwGetKeyScancode
 - @ref glfwGetJoystickHats
 - @ref glfwGetJoystickGUID
 - @ref glfwGetJoystickUserPointer
 - @ref glfwSetJoystickUserPointer
 - @ref glfwJoystickIsGamepad
 - @ref glfwUpdateGamepadMappings
 - @ref glfwGetGamepadName
 - @ref glfwGetGamepadState
@subsubsection types_33 New types in version 3.3
 - @ref GLFWwindowmaximizefun
 - @ref GLFWwindowcontentscalefun
 - @ref GLFWgamepadstate
@subsubsection constants_33 New constants in version 3.3
 - @ref GLFW_NO_ERROR
 - @ref GLFW_JOYSTICK_HAT_BUTTONS
 - @ref GLFW_COCOA_CHDIR_RESOURCES
 - @ref GLFW_COCOA_MENUBAR
 - @ref GLFW_CENTER_CURSOR
 - @ref GLFW_TRANSPARENT_FRAMEBUFFER
 - @ref GLFW_HOVERED
 - @ref GLFW_FOCUS_ON_SHOW
 - @ref GLFW_SCALE_TO_MONITOR
 - @ref GLFW_COCOA_RETINA_FRAMEBUFFER
 - @ref GLFW_COCOA_FRAME_NAME
 - @ref GLFW_COCOA_GRAPHICS_SWITCHING
 - @ref GLFW_X11_CLASS_NAME
 - @ref GLFW_X11_INSTANCE_NAME
 - @ref GLFW_OSMESA_CONTEXT_API
 - @ref GLFW_HAT_CENTERED
 - @ref GLFW_HAT_UP
 - @ref GLFW_HAT_RIGHT
 - @ref GLFW_HAT_DOWN
 - @ref GLFW_HAT_LEFT
 - @ref GLFW_HAT_RIGHT_UP
 - @ref GLFW_HAT_RIGHT_DOWN
 - @ref GLFW_HAT_LEFT_UP
 - @ref GLFW_HAT_LEFT_DOWN
 - @ref GLFW_MOD_CAPS_LOCK
 - @ref GLFW_MOD_NUM_LOCK
 - @ref GLFW_LOCK_KEY_MODS
 - @ref GLFW_RAW_MOUSE_MOTION
 - @ref GLFW_GAMEPAD_BUTTON_A
 - @ref GLFW_GAMEPAD_BUTTON_B
 - @ref GLFW_GAMEPAD_BUTTON_X
 - @ref GLFW_GAMEPAD_BUTTON_Y
 - @ref GLFW_GAMEPAD_BUTTON_LEFT_BUMPER
 - @ref GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER
 - @ref GLFW_GAMEPAD_BUTTON_BACK
 - @ref GLFW_GAMEPAD_BUTTON_START
 - @ref GLFW_GAMEPAD_BUTTON_GUIDE
 - @ref GLFW_GAMEPAD_BUTTON_LEFT_THUMB
 - @ref GLFW_GAMEPAD_BUTTON_RIGHT_THUMB
 - @ref GLFW_GAMEPAD_BUTTON_DPAD_UP
 - @ref GLFW_GAMEPAD_BUTTON_DPAD_RIGHT
 - @ref GLFW_GAMEPAD_BUTTON_DPAD_DOWN
 - @ref GLFW_GAMEPAD_BUTTON_DPAD_LEFT
 - @ref GLFW_GAMEPAD_BUTTON_LAST
 - @ref GLFW_GAMEPAD_BUTTON_CROSS
 - @ref GLFW_GAMEPAD_BUTTON_CIRCLE
 - @ref GLFW_GAMEPAD_BUTTON_SQUARE
 - @ref GLFW_GAMEPAD_BUTTON_TRIANGLE
 - @ref GLFW_GAMEPAD_AXIS_LEFT_X
 - @ref GLFW_GAMEPAD_AXIS_LEFT_Y
 - @ref GLFW_GAMEPAD_AXIS_RIGHT_X
 - @ref GLFW_GAMEPAD_AXIS_RIGHT_Y
 - @ref GLFW_GAMEPAD_AXIS_LEFT_TRIGGER
 - @ref GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
 - @ref GLFW_GAMEPAD_AXIS_LAST
@section news_32 Release notes for 3.2
 These are the release notes for version 3.2.  For a more detailed view including
 all fixed bugs see the [version history](https://www.glfw.org/changelog.html).
@subsection features_32 New features in version 3.2
@subsubsection 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
@ref GLFW_INCLUDE_VULKAN.
@subsubsection 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.
@subsubsection news_32_maximize Window maxmimization support
 GLFW now supports window maximization with @ref glfwMaximizeWindow and the
@ref GLFW_MAXIMIZED window hint and attribute.
@subsubsection news_32_focus Window input focus control
 GLFW now supports giving windows input focus with @ref glfwFocusWindow.
@subsubsection news_32_sizelimits Window size limit support
 GLFW now supports setting both absolute and relative window size limits with
@ref glfwSetWindowSizeLimits and @ref glfwSetWindowAspectRatio.
@subsubsection 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.
@subsubsection news_32_waittimeout Wait for events with timeout
 GLFW now supports waiting for events for a set amount of time with @ref
 glfwWaitEventsTimeout.
@subsubsection news_32_icon Window icon support
 GLFW now supports setting the icon of windows with @ref glfwSetWindowIcon.
@subsubsection news_32_timer Raw timer access
 GLFW now supports raw timer values with @ref glfwGetTimerValue and @ref
 glfwGetTimerFrequency.
@subsubsection news_32_joystick Joystick connection callback
 GLFW now supports notifying when a joystick has been connected or disconnected
 with @ref glfwSetJoystickCallback.
@subsubsection news_32_noapi Context-less windows
 GLFW now supports creating windows without a OpenGL or OpenGL ES context by
 setting the [GLFW_CLIENT_API](@ref GLFW_CLIENT_API_hint) hint to `GLFW_NO_API`.
@subsubsection news_32_contextapi Run-time context creation API selection
 GLFW now supports selecting and querying the context creation API at run-time
 with the @ref GLFW_CONTEXT_CREATION_API hint and attribute.
@subsubsection news_32_noerror Error-free context creation
 GLFW now supports creating and querying OpenGL and OpenGL ES contexts that do
 not emit errors with the @ref GLFW_CONTEXT_NO_ERROR hint, provided the machine
 supports the `GL_KHR_no_error` extension.
@subsubsection 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 Release notes for 3.1
 These are the release notes for version 3.1.  For a more detailed view including
 all fixed bugs see the [version history](https://www.glfw.org/changelog.html).
@subsection features_31 New features in version 3.1
@subsubsection 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
@subsubsection 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
@subsubsection 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
@subsubsection news_31_framesize Window frame size query
 GLFW now supports querying the size, on each side, of the frame around the
 content area of a window, with @ref glfwGetWindowFrameSize.
@see [Window size](@ref window_size)
@subsubsection news_31_autoiconify Simultaneous multi-monitor rendering
 GLFW now supports disabling auto-iconification of full screen windows with
 the [GLFW_AUTO_ICONIFY](@ref GLFW_AUTO_ICONIFY_hint) window hint.  This is
 intended for people building multi-monitor installations, where you need windows
 to stay in full screen despite losing input focus.
@subsubsection news_31_floating Floating windows
 GLFW now supports floating windows, also called topmost or always on top, for
 easier debugging with the @ref GLFW_FLOATING window hint and attribute.
@subsubsection 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 GLFW_FOCUSED_hint) window hint.
@subsubsection 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.
@subsubsection 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
@subsubsection news_31_single Single buffered framebuffers
 GLFW now supports the creation of single buffered windows, with the @ref
 GLFW_DOUBLEBUFFER hint.
@subsubsection news_31_glext Macro for including extension header
 GLFW now includes the extension header appropriate for the chosen OpenGL or
 OpenGL ES header when @ref GLFW_INCLUDE_GLEXT is defined.  GLFW does not provide
 these headers.  They must be provided by your development environment or your
 OpenGL or OpenGL ES SDK.
@subsubsection news_31_release Context release behaviors
 GLFW now supports controlling and querying whether the pipeline is flushed when
 a context is made non-current, with the @ref GLFW_CONTEXT_RELEASE_BEHAVIOR hint
 and attribute, provided the machine supports the `GL_KHR_context_flush_control`
 extension.
@subsubsection 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.
@subsubsection 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 Release notes for 3.0
 These are the release notes for version 3.0.  For a more detailed view including
 all fixed bugs see the [version history](https://www.glfw.org/changelog.html).
@subsection features_30 New features in version 3.0
@subsubsection 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](https://cmake.org/cmake/help/documentation.html).
@subsubsection 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.
@subsubsection 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.
@subsubsection 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).
@subsubsection 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.
@subsubsection 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.
@subsubsection news_30_gles OpenGL ES support
 GLFW now supports the creation of OpenGL ES contexts, by setting the
 [GLFW_CLIENT_API](@ref GLFW_CLIENT_API_hint) 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.
@subsubsection news_30_egl (Experimental) EGL support
 GLFW now has an experimental EGL context creation back end that can be selected
 through CMake options.
@subsubsection news_30_hidpi High-DPI support
 GLFW now supports high-DPI monitors on both Windows and macOS, 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.
@subsubsection 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.
@subsubsection 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.
@subsubsection news_30_iconifyfun Window iconification callback
 Each window now has a callback for iconification and restoration events,
 which is set with @ref glfwSetWindowIconifyCallback.
@subsubsection news_30_wndposfun Window position callback
 Each window now has a callback for position events, which is set with @ref
 glfwSetWindowPosCallback.
@subsubsection news_30_wndpos Window position query
 The position of a window can now be retrieved using @ref glfwGetWindowPos.
@subsubsection news_30_focusfun Window focus callback
 Each windows now has a callback for focus events, which is set with @ref
 glfwSetWindowFocusCallback.
@subsubsection news_30_enterleave Cursor enter/leave callback
 Each window now has a callback for when the mouse cursor enters or leaves its
 content area, which is set with @ref glfwSetCursorEnterCallback.
@subsubsection 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.
@subsubsection news_30_hidden Hidden windows
 Windows can now be hidden with @ref glfwHideWindow, shown using @ref
 glfwShowWindow and created initially hidden with the @ref GLFW_VISIBLE window
 hint and attribute.  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.
@subsubsection news_30_undecorated Undecorated windows
 Windowed mode windows can now be created without decorations, e.g. things like
 a frame, a title bar, with the @ref GLFW_DECORATED window hint and attribute.
 This allows for the creation of things like splash screens.
@subsubsection 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.
@subsubsection 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.
@subsubsection news_30_jsname Joystick names
 The name of a joystick can now be retrieved using @ref glfwGetJoystickName.
@subsubsection news_30_doxygen Doxygen documentation
 You are reading it.
 */
@@ -4,7 +4,7 @@
@tableofcontents
-This guide takes you through writing a simple application using GLFW 3.  The
+This guide takes you through writing a small application using GLFW 3.  The
 application will create a window and OpenGL context, render a rotating triangle
 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.
@@ -18,43 +18,42 @@ behave differently in GLFW 3.
@subsection quick_include Including the GLFW header
-In the source files of your application where you use OpenGL or GLFW, you need
+In the source files of your application where you use GLFW, you need to include
-to include the GLFW 3 header file.
+its header file.
@code
 #include <GLFW/glfw3.h>
@endcode
-This defines all the constants, types and function prototypes of the GLFW API.
+This header provides all the constants, types and function prototypes of the
-It also includes the OpenGL header from your development environment and
+GLFW API.
 defines all the constants and types necessary for it to work on your platform
 without including any platform-specific headers.
-In other words:
+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.
- Do _not_ include the OpenGL header yourself, as GLFW does this for you in
+Most programs will instead use an
-  a platform-independent way
+[extension loader library](@ref context_glext_auto) and include its header.
- Do _not_ include `windows.h` or other platform-specific headers unless
+This example uses files generated by [glad](https://gen.glad.sh/).  The GLFW
-  you plan on using those APIs yourself
+header can detect most such headers if they are included first and will then not
- If you _do_ need to include such headers, include them _before_ the GLFW
+include the one from your development environment.
  header and it will detect this
 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
 [glad2](https://github.com/Dav1dde/glad), but the same rule applies to all such
 libraries.
@code
 #include <glad/gl.h>
 #include <GLFW/glfw3.h>
@endcode
 To make sure there will be no header conflicts, you can define @ref
 GLFW_INCLUDE_NONE before the GLFW header to explicitly disable inclusion of the
 development environment header.  This also allows the two headers to be included
 in any order.
@code
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <glad/gl.h>
@endcode
@subsection quick_init_term Initializing and terminating GLFW
@@ -135,9 +134,14 @@ 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.
@code
-glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
+glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
 glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 GLFWwindow* window = glfwCreateWindow(640, 480, "My Title", NULL, NULL);
 if (!window)
 {
@@ -246,12 +250,16 @@ glViewport(0, 0, width, height);
 You can also set a framebuffer size callback using @ref
 glfwSetFramebufferSizeCallback and be notified when the size changes.
-Actual rendering with OpenGL is outside the scope of this tutorial, but there
+The details of how to render with OpenGL is outside the scope of this tutorial,
-are [many](https://open.gl/) [excellent](https://learnopengl.com/)
+but there are many excellent resources for learning modern OpenGL.  Here are
-[tutorial](http://openglbook.com/) [sites](http://ogldev.atspace.co.uk/) that
+a few of them:
-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
+ - [Anton's OpenGL 4 Tutorials](https://antongerdelan.net/opengl/)
-same.
+ - [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.
@subsection quick_timer Reading the timer
@@ -326,19 +334,20 @@ for example, many kinds of editing tools.
@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 simple program.
+keyboard input, it's possible to create a small 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 simple.c code
+@snippet triangle-opengl.c code
 The program above can be found in the
-[source package](https://www.glfw.org/download.html) as `examples/simple.c`
+[source package](https://www.glfw.org/download.html) as
-and is compiled along with all other examples when you build GLFW.  If you
+`examples/triangle-opengl.c` and is compiled along with all other examples when
-built GLFW from the source package then already have this as `simple.exe` on
+you build GLFW.  If you built GLFW from the source package then you already have
-Windows, `simple` on Linux or `simple.app` on macOS.
+this as `triangle-opengl.exe` on Windows, `triangle-opengl` on Linux or
 `triangle-opengl.app` on macOS.
 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
@@ -4,8 +4,8 @@
@tableofcontents
-This guide is intended to fill the gaps between the [Vulkan
+This guide is intended to fill the gaps between the official [Vulkan
-documentation](https://www.khronos.org/vulkan/) and the rest of the GLFW
+resources](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.
@@ -14,7 +14,12 @@ 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.
-For details on a specific function in this category, see the @ref vulkan.  There
+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.
 For details on a specific Vulkan support function, see the @ref vulkan.  There
 are also guides for the other areas of the GLFW API.
 - @ref intro_guide
@@ -248,6 +248,13 @@ This hint only has an effect on platforms where screen coordinates and pixels
 always map 1:1 such as Windows and X11.  On platforms like macOS the resolution
 of the framebuffer is changed independently of the window size.
@anchor GLFW_MOUSE_PASSTHROUGH_hint
 __GLFW_MOUSE_PASSTHROUGH__ specifies whether the window is transparent to mouse
 input, letting any mouse events pass through to whatever window is behind it.
 This is only supported for undecorated windows.  Decorated windows with this
 enabled will behave differently between platforms.  Possible values are
 `GLFW_TRUE` and `GLFW_FALSE`.
@subsubsection window_hints_fb Framebuffer related hints
@@ -383,12 +390,10 @@ Additionally, OpenGL ES 1.x cannot be returned if 2.0 or later was requested,
 and vice versa.  This is because OpenGL ES 3.x is backward compatible with 2.0,
 but OpenGL ES 2.0 is not backward compatible with 1.x.
-@note @macos The OS only supports forward-compatible core profile contexts for
+@note @macos The OS only supports core profile contexts for OpenGL versions 3.2
-OpenGL versions 3.2 and later.  Before creating an OpenGL context of version
+and later.  Before creating an OpenGL context of version 3.2 or later you must
-3.2 or later you must set the
+set the [GLFW_OPENGL_PROFILE](@ref GLFW_OPENGL_PROFILE_hint) hint accordingly.
-[GLFW_OPENGL_FORWARD_COMPAT](@ref GLFW_OPENGL_FORWARD_COMPAT_hint) and
+OpenGL 3.0 and 3.1 contexts are not supported at all on macOS.
 [GLFW_OPENGL_PROFILE](@ref GLFW_OPENGL_PROFILE_hint) hints accordingly.  OpenGL
 3.0 and 3.1 contexts are not supported at all on macOS.
@anchor GLFW_OPENGL_FORWARD_COMPAT_hint
 __GLFW_OPENGL_FORWARD_COMPAT__ specifies whether the OpenGL context should be
@@ -400,11 +405,20 @@ version is 3.0 or above.  If OpenGL ES is requested, this hint is ignored.
 Forward-compatibility is described in detail in the
 [OpenGL Reference Manual](https://www.opengl.org/registry/).
@anchor GLFW_CONTEXT_DEBUG_hint
@anchor GLFW_OPENGL_DEBUG_CONTEXT_hint
-__GLFW_OPENGL_DEBUG_CONTEXT__ specifies whether to create a debug OpenGL
+__GLFW_CONTEXT_DEBUG__ specifies whether the context should be created in debug
-context, which may have additional error and performance issue reporting
+mode, which may provide additional error and diagnostic reporting functionality.
-functionality.  Possible values are `GLFW_TRUE` and `GLFW_FALSE`.  If OpenGL ES
+Possible values are `GLFW_TRUE` and `GLFW_FALSE`.
-is requested, this hint is ignored.
+
@par
 Debug contexts for OpenGL and OpenGL ES are described in detail by the
 [GL_KHR_debug](https://www.khronos.org/registry/OpenGL/extensions/KHR/KHR_debug.txt)
 extension.
@par
 This is the new name, introduced in GLFW 3.4.  The older
 `GLFW_OPENGL_DEBUG_CONTEXT` name is also available for compatibility.
@anchor GLFW_OPENGL_PROFILE_hint
 __GLFW_OPENGL_PROFILE__ specifies which OpenGL profile to create the context
@@ -450,6 +464,14 @@ The no error mode for OpenGL and OpenGL ES is described in detail by the
 extension.
@subsubsection window_hints_win32 Windows specific window hints
@anchor GLFW_WIN32_KEYBOARD_MENU_hint
 __GLFW_WIN32_KEYBOARD_MENU__ specifies whether to allow access to the window
 menu via the Alt+Space and Alt-and-then-Space keyboard shortcuts.  This is
 ignored on other platforms.
@subsubsection window_hints_osx macOS specific window hints
@anchor GLFW_COCOA_RETINA_FRAMEBUFFER_hint
@@ -505,6 +527,7 @@ GLFW_CENTER_CURSOR            | `GLFW_TRUE`                 | `GLFW_TRUE` or `GL
 GLFW_TRANSPARENT_FRAMEBUFFER  | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_FOCUS_ON_SHOW            | `GLFW_TRUE`                 | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_SCALE_TO_MONITOR         | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_MOUSE_PASSTHROUGH        | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_RED_BITS                 | 8                           | 0 to `INT_MAX` or `GLFW_DONT_CARE`
 GLFW_GREEN_BITS               | 8                           | 0 to `INT_MAX` or `GLFW_DONT_CARE`
 GLFW_BLUE_BITS                | 8                           | 0 to `INT_MAX` or `GLFW_DONT_CARE`
@@ -528,8 +551,9 @@ GLFW_CONTEXT_VERSION_MINOR    | 0                           | Any valid minor ve
 GLFW_CONTEXT_ROBUSTNESS       | `GLFW_NO_ROBUSTNESS`        | `GLFW_NO_ROBUSTNESS`, `GLFW_NO_RESET_NOTIFICATION` or `GLFW_LOSE_CONTEXT_ON_RESET`
 GLFW_CONTEXT_RELEASE_BEHAVIOR | `GLFW_ANY_RELEASE_BEHAVIOR` | `GLFW_ANY_RELEASE_BEHAVIOR`, `GLFW_RELEASE_BEHAVIOR_FLUSH` or `GLFW_RELEASE_BEHAVIOR_NONE`
 GLFW_OPENGL_FORWARD_COMPAT    | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
-GLFW_OPENGL_DEBUG_CONTEXT     | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
+GLFW_CONTEXT_DEBUG            | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_OPENGL_PROFILE           | `GLFW_OPENGL_ANY_PROFILE`   | `GLFW_OPENGL_ANY_PROFILE`, `GLFW_OPENGL_COMPAT_PROFILE` or `GLFW_OPENGL_CORE_PROFILE`
 GLFW_WIN32_KEYBOARD_MENU      | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_COCOA_RETINA_FRAMEBUFFER | `GLFW_TRUE`                 | `GLFW_TRUE` or `GLFW_FALSE`
 GLFW_COCOA_FRAME_NAME         | `""`                        | A UTF-8 encoded frame autosave name
 GLFW_COCOA_GRAPHICS_SWITCHING | `GLFW_FALSE`                | `GLFW_TRUE` or `GLFW_FALSE`
@@ -1204,7 +1228,11 @@ If the system does not support whole window transparency, this function always
 returns one.
 GLFW comes with a test program that lets you control whole window transparency
-at run-time called `opacity`.
+at run-time called `window`.
 If you want to use either of these transparency methods to display a temporary
 overlay like for example a notification, the @ref GLFW_FLOATING and @ref
 GLFW_MOUSE_PASSTHROUGH window hints and attributes may be useful.
@subsection window_attribs Window attributes
@@ -1294,6 +1322,15 @@ focus when @ref glfwShowWindow is called. This can be set before creation
 with the [GLFW_FOCUS_ON_SHOW](@ref GLFW_FOCUS_ON_SHOW_hint) window hint or
 after with @ref glfwSetWindowAttrib.
@anchor GLFW_MOUSE_PASSTHROUGH_attrib
 __GLFW_MOUSE_PASSTHROUGH__ specifies whether the window is transparent to mouse
 input, letting any mouse events pass through to whatever window is behind it.
 This can be set before creation with the
 [GLFW_MOUSE_PASSTHROUGH](@ref GLFW_MOUSE_PASSTHROUGH_hint) window hint or after
 with @ref glfwSetWindowAttrib.  This is only supported for undecorated windows.
 Decorated windows with this enabled will behave differently between platforms.
@subsubsection window_attribs_ctx Context related attributes
@anchor GLFW_CLIENT_API_attrib
@@ -1320,9 +1357,14 @@ of the GLFW header.
 __GLFW_OPENGL_FORWARD_COMPAT__ is `GLFW_TRUE` if the window's context is an
 OpenGL forward-compatible one, or `GLFW_FALSE` otherwise.
@anchor GLFW_CONTEXT_DEBUG_attrib
@anchor GLFW_OPENGL_DEBUG_CONTEXT_attrib
-__GLFW_OPENGL_DEBUG_CONTEXT__ is `GLFW_TRUE` if the window's context is an
+__GLFW_CONTEXT_DEBUG__ is `GLFW_TRUE` if the window's context is in debug
-OpenGL debug context, or `GLFW_FALSE` otherwise.
+mode, or `GLFW_FALSE` otherwise.
@par
 This is the new name, introduced in GLFW 3.4.  The older
 `GLFW_OPENGL_DEBUG_CONTEXT` name is also available for compatibility.
@anchor GLFW_OPENGL_PROFILE_attrib
 __GLFW_OPENGL_PROFILE__ indicates the OpenGL profile used by the context.  This
@@ -1332,6 +1374,21 @@ unknown or the context is an OpenGL ES context.  Note that the returned profile
 may not match the profile bits of the context flags, as GLFW will try other
 means of detecting the profile when no bits are set.
@anchor GLFW_CONTEXT_RELEASE_BEHAVIOR_attrib
 __GLFW_CONTEXT_RELEASE_BEHAVIOR__ indicates the release used by the context.
 Possible values are one of `GLFW_ANY_RELEASE_BEHAVIOR`,
 `GLFW_RELEASE_BEHAVIOR_FLUSH` or `GLFW_RELEASE_BEHAVIOR_NONE`.  If the
 behavior is `GLFW_ANY_RELEASE_BEHAVIOR`, the default behavior of the context
 creation API will be used.  If the behavior is `GLFW_RELEASE_BEHAVIOR_FLUSH`,
 the pipeline will be flushed whenever the context is released from being the
 current one.  If the behavior is `GLFW_RELEASE_BEHAVIOR_NONE`, the pipeline will
 not be flushed on release.
@anchor GLFW_CONTEXT_NO_ERROR_attrib
 __GLFW_CONTEXT_NO_ERROR__ indicates whether errors are generated by the context.
 Possible values are `GLFW_TRUE` and `GLFW_FALSE`.  If enabled, situations that
 would have generated errors instead cause undefined behavior.
@anchor GLFW_CONTEXT_ROBUSTNESS_attrib
 __GLFW_CONTEXT_ROBUSTNESS__ indicates the robustness strategy used by the
 context.  This is `GLFW_LOSE_CONTEXT_ON_RESET` or `GLFW_NO_RESET_NOTIFICATION`
@@ -1385,7 +1442,7 @@ glfwSwapBuffers(window);
 Sometimes it can be useful to select when the buffer swap will occur.  With the
 function @ref glfwSwapInterval it is possible to select the minimum number of
-monitor refreshes the driver wait should from the time @ref glfwSwapBuffers was
+monitor refreshes the driver should wait from the time @ref glfwSwapBuffers was
 called before swapping the buffers:
@code
@@ -1,7 +1,7 @@
 link_libraries(glfw)
-include_directories(${glfw_INCLUDE_DIRS} "${GLFW_SOURCE_DIR}/deps")
+include_directories("${GLFW_SOURCE_DIR}/deps")
 if (MATH_LIBRARY)
    link_libraries("${MATH_LIBRARY}")
@@ -11,16 +11,10 @@ if (MSVC)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 if (GLFW_USE_OSMESA)
    add_definitions(-DUSE_NATIVE_OSMESA)
 endif()
 if (WIN32)
    set(ICON glfw.rc)
 elseif (APPLE)
    set(ICON glfw.icns)
    set_source_files_properties(glfw.icns PROPERTIES
        MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 set(GLAD_GL "${GLFW_SOURCE_DIR}/deps/glad/gl.h"
@@ -36,24 +30,32 @@ 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(simple WIN32 MACOSX_BUNDLE simple.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(wave WIN32 MACOSX_BUNDLE wave.c ${ICON} ${GLAD_GL})
 add_executable(windows WIN32 MACOSX_BUNDLE windows.c ${ICON} ${GLAD_GL})
-target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}")
+target_link_libraries(particles Threads::Threads)
 if (RT_LIBRARY)
    target_link_libraries(particles "${RT_LIBRARY}")
 endif()
-set(WINDOWS_BINARIES boing gears heightmap particles sharing simple splitview wave)
+set(GUI_ONLY_BINARIES boing gears heightmap particles sharing splitview
    triangle-opengl wave windows)
 set(CONSOLE_BINARIES offscreen)
-set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
+set_target_properties(${GUI_ONLY_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
                      C_STANDARD 99
                      FOLDER "GLFW3/Examples")
 if (GLFW_USE_OSMESA)
    find_package(OSMesa REQUIRED)
    target_compile_definitions(offscreen PRIVATE USE_NATIVE_OSMESA)
 endif()
 if (MSVC)
    # Tell MSVC to use main instead of WinMain for Windows subsystem executables
-    set_target_properties(${WINDOWS_BINARIES} PROPERTIES
+    set_target_properties(${GUI_ONLY_BINARIES} PROPERTIES
                          LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif()
@@ -63,15 +65,17 @@ if (APPLE)
    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(simple PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Simple")
+    set_target_properties(triangle-opengl PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenGL Triangle")
    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_target_properties(${WINDOWS_BINARIES} PROPERTIES
+    set_source_files_properties(glfw.icns PROPERTIES
-                          RESOURCE glfw.icns
+                                MACOSX_PACKAGE_LOCATION "Resources")
    set_target_properties(${GUI_ONLY_BINARIES} PROPERTIES
                          MACOSX_BUNDLE_SHORT_VERSION_STRING ${GLFW_VERSION}
-                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL}
+                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION}
                          MACOSX_BUNDLE_ICON_FILE glfw.icns
-                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
+                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/Info.plist.in")
 endif()
@@ -37,6 +37,7 @@
 #include <math.h>
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <linmath.h>
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 /**
@@ -30,6 +30,7 @@
 #include <stddef.h>
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 /* Map height updates */
@@ -24,6 +24,7 @@
 //========================================================================
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #if USE_NATIVE_OSMESA
@@ -147,6 +148,7 @@ int main(void)
    glUseProgram(program);
    glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) mvp);
    glDrawArrays(GL_TRIANGLES, 0, 3);
    glFinish();
 #if USE_NATIVE_OSMESA
    glfwGetOSMesaColorBuffer(window, &width, &height, NULL, (void**) &buffer);
@@ -40,6 +40,7 @@
 #include <linmath.h>
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 // Define tokens for GL_EXT_separate_specular_color if not already defined
@@ -443,7 +444,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 memeory access
+    // handle (in most situations) and it gives a linear memory 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).
@@ -653,7 +654,7 @@ static void draw_fountain(void)
 //========================================================================
-// Recursive function for building variable tesselated floor
+// Recursive function for building variable tessellated floor
 //========================================================================
 static void tessellate_floor(float x1, float y1, float x2, float y2, int depth)
@@ -720,7 +721,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 tesselation
+        // Draw floor as a bunch of triangle strips (high tessellation
        // improves lighting)
        glNormal3f(0.f, 0.f, 1.f);
        glBegin(GL_QUADS);
@@ -24,6 +24,7 @@
 //========================================================================
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <stdio.h>
@@ -3,7 +3,7 @@
 //
 // The program uses a "split window" view, rendering four views of the
 // same scene in one window (e.g. uesful for 3D modelling software). This
-// demo uses scissors to separete the four different rendering areas from
+// demo uses scissors to separate the four different rendering areas from
 // each other.
 //
 // (If the code seems a little bit strange here and there, it may be
@@ -11,6 +11,7 @@
 //========================================================================
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #if defined(_MSC_VER)
@@ -1,5 +1,5 @@
 //========================================================================
-// Simple GLFW example
+// OpenGL triangle example
 // Copyright (c) Camilla Löwy <elmindreda@glfw.org>
 //
 // This software is provided 'as-is', without any express or implied
@@ -25,30 +25,34 @@
 //! [code]
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include "linmath.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
-static const struct
+typedef struct Vertex
 {
-    float x, y;
+    vec2 pos;
-    float r, g, b;
+    vec3 col;
-} vertices[3] =
+} Vertex;
 static const Vertex vertices[3] =
 {
-    { -0.6f, -0.4f, 1.f, 0.f, 0.f },
+    { { -0.6f, -0.4f }, { 1.f, 0.f, 0.f } },
-    {  0.6f, -0.4f, 0.f, 1.f, 0.f },
+    { {  0.6f, -0.4f }, { 0.f, 1.f, 0.f } },
-    {   0.f,  0.6f, 0.f, 0.f, 1.f }
+    { {   0.f,  0.6f }, { 0.f, 0.f, 1.f } }
 };
 static const char* vertex_shader_text =
-"#version 110\n"
+"#version 330\n"
 "uniform mat4 MVP;\n"
-"attribute vec3 vCol;\n"
+"in vec3 vCol;\n"
-"attribute vec2 vPos;\n"
+"in vec2 vPos;\n"
-"varying vec3 color;\n"
+"out vec3 color;\n"
 "void main()\n"
 "{\n"
 "    gl_Position = MVP * vec4(vPos, 0.0, 1.0);\n"
@@ -56,11 +60,12 @@ static const char* vertex_shader_text =
 "}\n";
 static const char* fragment_shader_text =
-"#version 110\n"
+"#version 330\n"
-"varying vec3 color;\n"
+"in vec3 color;\n"
 "out vec4 fragment;\n"
 "void main()\n"
 "{\n"
-"    gl_FragColor = vec4(color, 1.0);\n"
+"    fragment = vec4(color, 1.0);\n"
 "}\n";
 static void error_callback(int error, const char* description)
@@ -76,19 +81,16 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
 int main(void)
 {
    GLFWwindow* window;
    GLuint vertex_buffer, vertex_shader, fragment_shader, program;
    GLint mvp_location, vpos_location, vcol_location;
    glfwSetErrorCallback(error_callback);
    if (!glfwInit())
        exit(EXIT_FAILURE);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-    window = glfwCreateWindow(640, 480, "Simple example", NULL, NULL);
+    GLFWwindow* window = glfwCreateWindow(640, 480, "OpenGL Triangle", NULL, NULL);
    if (!window)
    {
        glfwTerminate();
@@ -103,53 +105,56 @@ int main(void)
    // 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);
-    vertex_shader = glCreateShader(GL_VERTEX_SHADER);
+    const GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
    glShaderSource(vertex_shader, 1, &vertex_shader_text, NULL);
    glCompileShader(vertex_shader);
-    fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
+    const GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
    glShaderSource(fragment_shader, 1, &fragment_shader_text, NULL);
    glCompileShader(fragment_shader);
-    program = glCreateProgram();
+    const GLuint program = glCreateProgram();
    glAttachShader(program, vertex_shader);
    glAttachShader(program, fragment_shader);
    glLinkProgram(program);
-    mvp_location = glGetUniformLocation(program, "MVP");
+    const GLint mvp_location = glGetUniformLocation(program, "MVP");
-    vpos_location = glGetAttribLocation(program, "vPos");
+    const GLint vpos_location = glGetAttribLocation(program, "vPos");
-    vcol_location = glGetAttribLocation(program, "vCol");
+    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(vertices[0]), (void*) 0);
+                          sizeof(Vertex), (void*) offsetof(Vertex, pos));
    glEnableVertexAttribArray(vcol_location);
    glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE,
-                          sizeof(vertices[0]), (void*) (sizeof(float) * 2));
+                          sizeof(Vertex), (void*) offsetof(Vertex, col));
    while (!glfwWindowShouldClose(window))
    {
        float ratio;
        int width, height;
        mat4x4 m, p, mvp;
        glfwGetFramebufferSize(window, &width, &height);
-        ratio = width / (float) 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);
+        glUniformMatrix4fv(mvp_location, 1, GL_FALSE, (const GLfloat*) &mvp);
        glBindVertexArray(vertex_array);
        glDrawArrays(GL_TRIANGLES, 0, 3);
        glfwSwapBuffers(window);
@@ -18,6 +18,7 @@
 #include <math.h>
 #include <glad/gl.h>
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <linmath.h>
@@ -0,0 +1,109 @@
 //========================================================================
 // 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.
 //
 //========================================================================
 #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_VISIBLE, GLFW_FALSE);
    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);
        windows[i] = glfwCreateWindow(size, size, "Multi-Window Example", NULL, NULL);
        if (!windows[i])
        {
            glfwGetError(&description);
            printf("Error: %s\n", description);
            glfwTerminate();
            exit(EXIT_FAILURE);
        }
        glfwSetWindowPos(windows[i],
                         xpos + size * (1 + (i & 1)),
                         ypos + size * (1 + (i >> 1)));
        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 (int i = 0;  i < 4;  i++)
        glfwShowWindow(windows[i]);
    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();
    }
 }
@@ -1,5 +1,5 @@
 /*************************************************************************
- * GLFW 3.3 - www.glfw.org
+ * GLFW 3.4 - www.glfw.org
 * A library for OpenGL, window and input
 *------------------------------------------------------------------------
 * Copyright (c) 2002-2006 Marcus Geelnard
@@ -1,130 +1,194 @@
-set(common_HEADERS internal.h mappings.h
+add_library(glfw "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
-                   "${GLFW_BINARY_DIR}/src/glfw_config.h"
+                 "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h"
-                   "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
+                 internal.h mappings.h context.c init.c input.c monitor.c
-                   "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h")
+                 vulkan.c window.c)
 set(common_SOURCES context.c init.c input.c monitor.c vulkan.c window.c)
 if (_GLFW_COCOA)
-    set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h cocoa_joystick.h
+    target_sources(glfw PRIVATE cocoa_platform.h cocoa_joystick.h posix_thread.h
-                     posix_thread.h nsgl_context.h egl_context.h osmesa_context.h)
+                                nsgl_context.h egl_context.h osmesa_context.h
-    set(glfw_SOURCES ${common_SOURCES} cocoa_init.m cocoa_joystick.m
+                                cocoa_init.m cocoa_joystick.m cocoa_monitor.m
-                     cocoa_monitor.m cocoa_window.m cocoa_time.c posix_thread.c
+                                cocoa_window.m cocoa_time.c posix_thread.c
                                nsgl_context.m egl_context.c osmesa_context.c)
 elseif (_GLFW_WIN32)
-    set(glfw_HEADERS ${common_HEADERS} win32_platform.h win32_joystick.h
+    target_sources(glfw PRIVATE win32_platform.h win32_joystick.h wgl_context.h
-                     wgl_context.h egl_context.h osmesa_context.h)
+                                egl_context.h osmesa_context.h win32_init.c
-    set(glfw_SOURCES ${common_SOURCES} win32_init.c win32_joystick.c
+                                win32_joystick.c win32_monitor.c win32_time.c
-                     win32_monitor.c win32_time.c win32_thread.c win32_window.c
+                                win32_thread.c win32_window.c wgl_context.c
-                     wgl_context.c egl_context.c osmesa_context.c)
+                                egl_context.c osmesa_context.c)
 elseif (_GLFW_X11)
-    set(glfw_HEADERS ${common_HEADERS} x11_platform.h xkb_unicode.h posix_time.h
+    target_sources(glfw PRIVATE x11_platform.h xkb_unicode.h posix_time.h
-                     posix_thread.h glx_context.h egl_context.h osmesa_context.h)
+                                posix_thread.h glx_context.h egl_context.h
-    set(glfw_SOURCES ${common_SOURCES} x11_init.c x11_monitor.c x11_window.c
+                                osmesa_context.h x11_init.c x11_monitor.c
-                     xkb_unicode.c posix_time.c posix_thread.c glx_context.c
+                                x11_window.c xkb_unicode.c posix_time.c
-                     egl_context.c osmesa_context.c)
+                                posix_thread.c glx_context.c egl_context.c
                                osmesa_context.c)
 elseif (_GLFW_WAYLAND)
-    set(glfw_HEADERS ${common_HEADERS} wl_platform.h
+    target_sources(glfw PRIVATE wl_platform.h posix_time.h posix_thread.h
-                     posix_time.h posix_thread.h xkb_unicode.h egl_context.h
+                                xkb_unicode.h egl_context.h osmesa_context.h
-                     osmesa_context.h)
+                                wl_init.c wl_monitor.c wl_window.c posix_time.c
-    set(glfw_SOURCES ${common_SOURCES} wl_init.c wl_monitor.c wl_window.c
+                                posix_thread.c xkb_unicode.c egl_context.c
-                     posix_time.c posix_thread.c xkb_unicode.c
+                                osmesa_context.c)
                     egl_context.c osmesa_context.c)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml"
        BASENAME xdg-shell)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml"
        BASENAME xdg-decoration)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml"
        BASENAME viewporter)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml"
        BASENAME relative-pointer-unstable-v1)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml"
        BASENAME pointer-constraints-unstable-v1)
    ecm_add_wayland_client_protocol(glfw_SOURCES
        PROTOCOL
        "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml"
        BASENAME idle-inhibit-unstable-v1)
 elseif (_GLFW_OSMESA)
-    set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h
+    target_sources(glfw PRIVATE null_platform.h null_joystick.h posix_time.h
-                     posix_time.h posix_thread.h osmesa_context.h)
+                                posix_thread.h osmesa_context.h null_init.c
-    set(glfw_SOURCES ${common_SOURCES} null_init.c null_monitor.c null_window.c
+                                null_monitor.c null_window.c null_joystick.c
-                     null_joystick.c posix_time.c posix_thread.c osmesa_context.c)
+                                posix_time.c posix_thread.c osmesa_context.c)
 endif()
 if (_GLFW_X11 OR _GLFW_WAYLAND)
    if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-        set(glfw_HEADERS ${glfw_HEADERS} linux_joystick.h)
+        target_sources(glfw PRIVATE linux_joystick.h linux_joystick.c)
        set(glfw_SOURCES ${glfw_SOURCES} linux_joystick.c)
    else()
-        set(glfw_HEADERS ${glfw_HEADERS} null_joystick.h)
+        target_sources(glfw PRIVATE null_joystick.h null_joystick.c)
        set(glfw_SOURCES ${glfw_SOURCES} null_joystick.c)
    endif()
 endif()
-if (APPLE)
+if (_GLFW_WAYLAND)
-    # For some reason, CMake doesn't know about .m
+    find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
-    set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C)
+    pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15)
    pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
    macro(wayland_generate protocol_file output_file)
          add_custom_command(OUTPUT ${output_file}.h
              COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header
              < ${protocol_file} > ${output_file}.h
              DEPENDS ${protocol_file})
          list(APPEND GLFW_WAYLAND_PROTOCOL_SOURCES ${output_file}.h)
          add_custom_command(OUTPUT ${output_file}.c
              COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code
              < ${protocol_file} > ${output_file}.c
              DEPENDS ${protocol_file})
          list(APPEND GLFW_WAYLAND_PROTOCOL_SOURCES ${output_file}.c)
    endmacro()
    set(GLFW_WAYLAND_PROTOCOL_SOURCES)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml
        ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
        ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml
        ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
        ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
        ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/unstable/tablet/tablet-unstable-v2.xml
        ${CMAKE_BINARY_DIR}/src/wayland-tablet-unstable-v2-client-protocol)
    wayland_generate(
        ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
        ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol)
    target_sources(glfw PRIVATE ${GLFW_WAYLAND_PROTOCOL_SOURCES})
 endif()
-# Make GCC and Clang warn about declarations that VS 2010 and 2012 won't accept
+if (WIN32 AND BUILD_SHARED_LIBS)
-# for all source files that VS will build
+    configure_file(glfw.rc.in glfw.rc @ONLY)
-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
+    target_sources(glfw PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/glfw.rc")
    "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
    "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
    if (WIN32)
        set(windows_SOURCES ${glfw_SOURCES})
    else()
        set(windows_SOURCES ${common_SOURCES})
    endif()
    set_source_files_properties(${windows_SOURCES} PROPERTIES
        COMPILE_FLAGS -Wdeclaration-after-statement)
 endif()
-add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
+configure_file(glfw_config.h.in glfw_config.h @ONLY)
 target_compile_definitions(glfw PRIVATE _GLFW_USE_CONFIG_H)
 target_sources(glfw PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/glfw_config.h")
 set_target_properties(glfw PROPERTIES
                      OUTPUT_NAME ${GLFW_LIB_NAME}
-                      VERSION ${GLFW_VERSION}
+                      VERSION ${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}
                      SOVERSION ${GLFW_VERSION_MAJOR}
                      POSITION_INDEPENDENT_CODE ON
                      C_STANDARD 99
                      C_EXTENSIONS OFF
                      DEFINE_SYMBOL _GLFW_BUILD_DLL
                      FOLDER "GLFW3")
 target_compile_definitions(glfw PRIVATE _GLFW_USE_CONFIG_H)
 target_include_directories(glfw PUBLIC
                           "$<BUILD_INTERFACE:${GLFW_SOURCE_DIR}/include>"
-                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
+                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 target_include_directories(glfw PRIVATE
                           "${GLFW_SOURCE_DIR}/src"
                           "${GLFW_BINARY_DIR}/src"
                           ${glfw_INCLUDE_DIRS})
 target_link_libraries(glfw PRIVATE Threads::Threads ${glfw_LIBRARIES})
 # Workaround for CMake not knowing about .m files before version 3.16
 if (APPLE)
    set_source_files_properties(cocoa_init.m cocoa_joystick.m cocoa_monitor.m
                                cocoa_window.m nsgl_context.m PROPERTIES
                                LANGUAGE C)
 endif()
 if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
    "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
    "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
    # Make GCC and Clang warn about declarations that VS 2010 and 2012 won't
    # accept for all source files that VS will build
    set_source_files_properties(context.c init.c input.c monitor.c vulkan.c
                                window.c win32_init.c win32_joystick.c
                                win32_monitor.c win32_time.c win32_thread.c
                                win32_window.c wgl_context.c egl_context.c
                                osmesa_context.c PROPERTIES
                                COMPILE_FLAGS -Wdeclaration-after-statement)
    # Enable a reasonable set of warnings (no, -Wextra is not reasonable)
    target_compile_options(glfw PRIVATE "-Wall")
 endif()
 if (WIN32)
    target_compile_definitions(glfw PRIVATE _UNICODE)
 endif()
 # HACK: When building on MinGW, WINVER and UNICODE need to be defined before
 # the inclusion of stddef.h (by glfw3.h), which is itself included before
 # win32_platform.h.  We define them here until a saner solution can be found
 # NOTE: MinGW-w64 and Visual C++ do /not/ need this hack.
-target_compile_definitions(glfw PRIVATE
+if (MINGW)
-                           "$<$<BOOL:${MINGW}>:UNICODE;WINVER=0x0501>")
+    target_compile_definitions(glfw PRIVATE UNICODE WINVER=0x0501)
 endif()
-# Enable a reasonable set of warnings (no, -Wextra is not reasonable)
+# Workaround for legacy MinGW not providing XInput and DirectInput
-target_compile_options(glfw PRIVATE
+if (MINGW)
-                       "$<$<C_COMPILER_ID:AppleClang>:-Wall>"
+    include(CheckIncludeFile)
-                       "$<$<C_COMPILER_ID:Clang>:-Wall>"
+    check_include_file(dinput.h DINPUT_H_FOUND)
-                       "$<$<C_COMPILER_ID:GNU>:-Wall>")
+    check_include_file(xinput.h XINPUT_H_FOUND)
    if (NOT DINPUT_H_FOUND OR NOT XINPUT_H_FOUND)
        target_include_directories(glfw PRIVATE "${GLFW_SOURCE_DIR}/deps/mingw")
    endif()
 endif()
 # Workaround for VS deprecating parts of the standard library
 if (MSVC)
    target_compile_definitions(glfw PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif()
 # Workaround for VS 2008 not shipping with stdint.h
 if (MSVC90)
    target_include_directories(glfw PUBLIC "${GLFW_SOURCE_DIR}/deps/vs2008")
 endif()
 # Check for the DirectX 9 SDK as it is not included with VS 2008
 if (MSVC90)
    include(CheckIncludeFile)
    check_include_file(dinput.h DINPUT_H_FOUND)
    if (NOT DINPUT_H_FOUND)
        message(FATAL_ERROR "DirectX 9 headers not found; install DirectX 9 SDK")
    endif()
 endif()
 if (BUILD_SHARED_LIBS)
    if (WIN32)
        if (MINGW)
            # Remove the dependency on the shared version of libgcc
            # NOTE: MinGW-w64 has the correct default but MinGW needs this
            target_link_libraries(glfw PRIVATE "-static-libgcc")
            # Remove the lib prefix on the DLL (but not the import library)
            set_target_properties(glfw PROPERTIES PREFIX "")
@@ -134,25 +198,46 @@ if (BUILD_SHARED_LIBS)
            # Add a suffix to the import library to avoid naming conflicts
            set_target_properties(glfw PROPERTIES IMPORT_SUFFIX "dll.lib")
        endif()
    elseif (APPLE)
        # Add -fno-common to work around a bug in Apple's GCC
        target_compile_options(glfw PRIVATE "-fno-common")
        target_compile_definitions(glfw INTERFACE GLFW_DLL)
    elseif (APPLE)
        set_target_properties(glfw PROPERTIES
                              INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")
-    elseif (UNIX)
+    endif()
    if (MINGW)
        # 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)
            target_link_libraries(glfw PRIVATE "-Wl,--nxcompat")
        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)
            target_link_libraries(glfw PRIVATE "-Wl,--dynamicbase")
        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)
            target_link_libraries(glfw PRIVATE "-Wl,--high-entropy-va")
        endif()
        # Clear flags again to avoid breaking later tests
        set(CMAKE_REQUIRED_FLAGS)
    endif()
    if (UNIX)
        # Hide symbols not explicitly tagged for export from the shared library
        target_compile_options(glfw PRIVATE "-fvisibility=hidden")
    endif()
    target_compile_definitions(glfw INTERFACE GLFW_DLL)
    target_link_libraries(glfw PRIVATE ${glfw_LIBRARIES})
 else()
    target_link_libraries(glfw INTERFACE ${glfw_LIBRARIES})
 endif()
 if (MSVC)
    target_compile_definitions(glfw PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif()
 if (GLFW_INSTALL)
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
 #include <sys/param.h> // For MAXPATHLEN
@@ -429,9 +431,8 @@ static GLFWbool initializeTIS(void)
        // In case we are unbundled, make us a proper UI application
        [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
-        // Menu bar setup must go between sharedApplication above and
+        // Menu bar setup must go between sharedApplication and finishLaunching
-        // finishLaunching below, in order to properly emulate the behavior
+        // in order to properly emulate the behavior of NSApplicationMain
        // of NSApplicationMain
        if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
        {
@@ -446,9 +447,8 @@ static GLFWbool initializeTIS(void)
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
    [NSApp stop:nil];
    _glfwPlatformPostEmptyEvent();
    [NSApp stop:nil];
 }
 - (void)applicationDidHide:(NSNotification *)notification
@@ -462,6 +462,32 @@ static GLFWbool initializeTIS(void)
@end // GLFWApplicationDelegate
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
 void* _glfwLoadLocalVulkanLoaderNS(void)
 {
    CFBundleRef bundle = CFBundleGetMainBundle();
    if (!bundle)
        return NULL;
    CFURLRef url =
        CFBundleCopyAuxiliaryExecutableURL(bundle, CFSTR("libvulkan.1.dylib"));
    if (!url)
        return NULL;
    char path[PATH_MAX];
    void* handle = NULL;
    if (CFURLGetFileSystemRepresentation(url, true, (UInt8*) path, sizeof(path) - 1))
        handle = _glfw_dlopen(path);
    CFRelease(url);
    return handle;
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
@@ -476,9 +502,6 @@ int _glfwPlatformInit(void)
                             toTarget:_glfw.ns.helper
                           withObject:nil];
    if (NSApp)
        _glfw.ns.finishedLaunching = GLFW_TRUE;
    [NSApplication sharedApplication];
    _glfw.ns.delegate = [[GLFWApplicationDelegate alloc] init];
@@ -528,9 +551,12 @@ int _glfwPlatformInit(void)
        return GLFW_FALSE;
    _glfwInitTimerNS();
    _glfwInitJoysticksNS();
    _glfwPollMonitorsNS();
    if (![[NSRunningApplication currentApplication] isFinishedLaunching])
        [NSApp run];
    return GLFW_TRUE;
    } // autoreleasepool
@@ -578,7 +604,6 @@ void _glfwPlatformTerminate(void)
    free(_glfw.ns.clipboardString);
    _glfwTerminateNSGL();
    _glfwTerminateJoysticksNS();
    } // autoreleasepool
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Cocoa - www.glfw.org
+// GLFW 3.4 Cocoa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -30,7 +30,7 @@
 #include <IOKit/hid/IOHIDKeys.h>
 #define _GLFW_PLATFORM_JOYSTICK_STATE         _GLFWjoystickNS ns
-#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE
+#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE struct { int dummyJoystick; }
 #define _GLFW_PLATFORM_MAPPING_NAME "Mac OS X"
@@ -44,7 +44,3 @@ typedef struct _GLFWjoystickNS
    CFMutableArrayRef   hats;
 } _GLFWjoystickNS;
 void _glfwInitJoysticksNS(void);
 void _glfwTerminateJoysticksNS(void);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Cocoa - www.glfw.org
+// GLFW 3.4 Cocoa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 // Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -302,12 +304,10 @@ static void removeCallback(void* context,
 //////////////////////////////////////////////////////////////////////////
-//////                       GLFW internal API                      //////
+//////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
-// Initialize joystick interface
+GLFWbool _glfwPlatformInitJoysticks(void)
 //
 void _glfwInitJoysticksNS(void)
 {
    CFMutableArrayRef matching;
    const long usages[] =
@@ -326,10 +326,10 @@ void _glfwInitJoysticksNS(void)
    if (!matching)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR, "Cocoa: Failed to create array");
-        return;
+        return GLFW_FALSE;
    }
-    for (int i = 0;  i < sizeof(usages) / sizeof(long);  i++)
+    for (size_t i = 0;  i < sizeof(usages) / sizeof(long);  i++)
    {
        const long page = kHIDPage_GenericDesktop;
@@ -381,26 +381,24 @@ void _glfwInitJoysticksNS(void)
    // Execute the run loop once in order to register any initially-attached
    // joysticks
    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
    return GLFW_TRUE;
 }
-// Close all opened joystick handles
+void _glfwPlatformTerminateJoysticks(void)
 //
 void _glfwTerminateJoysticksNS(void)
 {
    int jid;
    for (jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
        closeJoystick(_glfw.joysticks + jid);
    if (_glfw.ns.hidManager)
    {
        CFRelease(_glfw.ns.hidManager);
        _glfw.ns.hidManager = NULL;
    }
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
 int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
 {
    if (mode & _GLFW_POLL_AXES)
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -142,7 +144,7 @@ static GLFWbool modeIsGood(CGDisplayModeRef mode)
 // Convert Core Graphics display mode to GLFW video mode
 //
 static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode,
-                                            CVDisplayLinkRef link)
+                                            double fallbackRefreshRate)
 {
    GLFWvidmode result;
    result.width = (int) CGDisplayModeGetWidth(mode);
@@ -150,11 +152,7 @@ static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode,
    result.refreshRate = (int) round(CGDisplayModeGetRefreshRate(mode));
    if (result.refreshRate == 0)
-    {
+        result.refreshRate = (int) round(fallbackRefreshRate);
        const CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(link);
        if (!(time.flags & kCVTimeIsIndefinite))
            result.refreshRate = (int) (time.timeScale / (double) time.timeValue);
    }
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= 101100
    CFStringRef format = CGDisplayModeCopyPixelEncoding(mode);
@@ -213,7 +211,7 @@ static void endFadeReservation(CGDisplayFadeReservationToken token)
 // Finds and caches the NSScreen corresponding to the specified monitor
 //
-GLFWbool refreshMonitorScreen(_GLFWmonitor* monitor)
+static GLFWbool refreshMonitorScreen(_GLFWmonitor* monitor)
 {
    if (monitor->ns.screen)
        return GLFW_TRUE;
@@ -236,6 +234,74 @@ GLFWbool refreshMonitorScreen(_GLFWmonitor* monitor)
    return GLFW_FALSE;
 }
 // Returns the display refresh rate queried from the I/O registry
 //
 static double getFallbackRefreshRate(CGDirectDisplayID displayID)
 {
    double refreshRate = 60.0;
    io_iterator_t it;
    io_service_t service;
    if (IOServiceGetMatchingServices(kIOMasterPortDefault,
                                     IOServiceMatching("IOFramebuffer"),
                                     &it) != 0)
    {
        return refreshRate;
    }
    while ((service = IOIteratorNext(it)) != 0)
    {
        const CFNumberRef indexRef =
            IORegistryEntryCreateCFProperty(service,
                                            CFSTR("IOFramebufferOpenGLIndex"),
                                            kCFAllocatorDefault,
                                            kNilOptions);
        if (!indexRef)
            continue;
        uint32_t index = 0;
        CFNumberGetValue(indexRef, kCFNumberIntType, &index);
        CFRelease(indexRef);
        if (CGOpenGLDisplayMaskToDisplayID(1 << index) != displayID)
            continue;
        const CFNumberRef clockRef =
            IORegistryEntryCreateCFProperty(service,
                                            CFSTR("IOFBCurrentPixelClock"),
                                            kCFAllocatorDefault,
                                            kNilOptions);
        const CFNumberRef countRef =
            IORegistryEntryCreateCFProperty(service,
                                            CFSTR("IOFBCurrentPixelCount"),
                                            kCFAllocatorDefault,
                                            kNilOptions);
        uint32_t clock = 0, count = 0;
        if (clockRef)
        {
            CFNumberGetValue(clockRef, kCFNumberIntType, &clock);
            CFRelease(clockRef);
        }
        if (countRef)
        {
            CFNumberGetValue(countRef, kCFNumberIntType, &count);
            CFRelease(countRef);
        }
        if (clock > 0 && count > 0)
            refreshRate = clock / (double) count;
        break;
    }
    IOObjectRelease(it);
    return refreshRate;
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
@@ -245,18 +311,16 @@ GLFWbool refreshMonitorScreen(_GLFWmonitor* monitor)
 //
 void _glfwPollMonitorsNS(void)
 {
-    uint32_t i, j, displayCount, disconnectedCount;
+    uint32_t displayCount;
    CGDirectDisplayID* displays;
    _GLFWmonitor** disconnected = NULL;
    CGGetOnlineDisplayList(0, NULL, &displayCount);
-    displays = calloc(displayCount, sizeof(CGDirectDisplayID));
+    CGDirectDisplayID* displays = calloc(displayCount, sizeof(CGDirectDisplayID));
    CGGetOnlineDisplayList(displayCount, displays, &displayCount);
-    for (i = 0;  i < _glfw.monitorCount;  i++)
+    for (int i = 0;  i < _glfw.monitorCount;  i++)
        _glfw.monitors[i]->ns.screen = nil;
-    disconnectedCount = _glfw.monitorCount;
+    _GLFWmonitor** disconnected = NULL;
    uint32_t disconnectedCount = _glfw.monitorCount;
    if (disconnectedCount)
    {
        disconnected = calloc(_glfw.monitorCount, sizeof(_GLFWmonitor*));
@@ -265,19 +329,17 @@ void _glfwPollMonitorsNS(void)
               _glfw.monitorCount * sizeof(_GLFWmonitor*));
    }
-    for (i = 0;  i < displayCount;  i++)
+    for (uint32_t i = 0;  i < displayCount;  i++)
    {
        _GLFWmonitor* monitor;
        const uint32_t unitNumber = CGDisplayUnitNumber(displays[i]);
        if (CGDisplayIsAsleep(displays[i]))
            continue;
        for (j = 0;  j < disconnectedCount;  j++)
        {
        // HACK: Compare unit numbers instead of display IDs to work around
        //       display replacement on machines with automatic graphics
        //       switching
        const uint32_t unitNumber = CGDisplayUnitNumber(displays[i]);
        for (uint32_t j = 0;  j < disconnectedCount;  j++)
        {
            if (disconnected[j] && disconnected[j]->ns.unitNumber == unitNumber)
            {
                disconnected[j] = NULL;
@@ -290,16 +352,21 @@ void _glfwPollMonitorsNS(void)
        if (!name)
            name = _glfw_strdup("Unknown");
-        monitor = _glfwAllocMonitor(name, size.width, size.height);
+        _GLFWmonitor* monitor = _glfwAllocMonitor(name, size.width, size.height);
        monitor->ns.displayID  = displays[i];
        monitor->ns.unitNumber = unitNumber;
        free(name);
        CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displays[i]);
        if (CGDisplayModeGetRefreshRate(mode) == 0.0)
            monitor->ns.fallbackRefreshRate = getFallbackRefreshRate(displays[i]);
        CGDisplayModeRelease(mode);
        _glfwInputMonitor(monitor, GLFW_CONNECTED, _GLFW_INSERT_LAST);
    }
-    for (i = 0;  i < disconnectedCount;  i++)
+    for (uint32_t i = 0;  i < disconnectedCount;  i++)
    {
        if (disconnected[i])
            _glfwInputMonitor(disconnected[i], GLFW_DISCONNECTED, 0);
@@ -313,30 +380,25 @@ void _glfwPollMonitorsNS(void)
 //
 void _glfwSetVideoModeNS(_GLFWmonitor* monitor, const GLFWvidmode* desired)
 {
    CFArrayRef modes;
    CFIndex count, i;
    CVDisplayLinkRef link;
    CGDisplayModeRef native = NULL;
    GLFWvidmode current;
    const GLFWvidmode* best;
    best = _glfwChooseVideoMode(monitor, desired);
    _glfwPlatformGetVideoMode(monitor, &current);
    const GLFWvidmode* best = _glfwChooseVideoMode(monitor, desired);
    if (_glfwCompareVideoModes(&current, best) == 0)
        return;
-    CVDisplayLinkCreateWithCGDisplay(monitor->ns.displayID, &link);
+    CFArrayRef modes = CGDisplayCopyAllDisplayModes(monitor->ns.displayID, NULL);
    const CFIndex count = CFArrayGetCount(modes);
    CGDisplayModeRef native = NULL;
-    modes = CGDisplayCopyAllDisplayModes(monitor->ns.displayID, NULL);
+    for (CFIndex i = 0;  i < count;  i++)
    count = CFArrayGetCount(modes);
    for (i = 0;  i < count;  i++)
    {
        CGDisplayModeRef dm = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);
        if (!modeIsGood(dm))
            continue;
-        const GLFWvidmode mode = vidmodeFromCGDisplayMode(dm, link);
+        const GLFWvidmode mode =
            vidmodeFromCGDisplayMode(dm, monitor->ns.fallbackRefreshRate);
        if (_glfwCompareVideoModes(best, &mode) == 0)
        {
            native = dm;
@@ -355,7 +417,6 @@ void _glfwSetVideoModeNS(_GLFWmonitor* monitor, const GLFWvidmode* desired)
    }
    CFRelease(modes);
    CVDisplayLinkRelease(link);
 }
 // Restore the previously saved (original) video mode
@@ -443,26 +504,21 @@ GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)
 {
    @autoreleasepool {
    CFArrayRef modes;
    CFIndex found, i, j;
    GLFWvidmode* result;
    CVDisplayLinkRef link;
    *count = 0;
-    CVDisplayLinkCreateWithCGDisplay(monitor->ns.displayID, &link);
+    CFArrayRef modes = CGDisplayCopyAllDisplayModes(monitor->ns.displayID, NULL);
    const CFIndex found = CFArrayGetCount(modes);
    GLFWvidmode* result = calloc(found, sizeof(GLFWvidmode));
-    modes = CGDisplayCopyAllDisplayModes(monitor->ns.displayID, NULL);
+    for (CFIndex i = 0;  i < found;  i++)
    found = CFArrayGetCount(modes);
    result = calloc(found, sizeof(GLFWvidmode));
    for (i = 0;  i < found;  i++)
    {
        CGDisplayModeRef dm = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);
        if (!modeIsGood(dm))
            continue;
-        const GLFWvidmode mode = vidmodeFromCGDisplayMode(dm, link);
+        const GLFWvidmode mode =
            vidmodeFromCGDisplayMode(dm, monitor->ns.fallbackRefreshRate);
        CFIndex j;
        for (j = 0;  j < *count;  j++)
        {
@@ -479,7 +535,6 @@ GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)
    }
    CFRelease(modes);
    CVDisplayLinkRelease(link);
    return result;
    } // autoreleasepool
@@ -489,16 +544,9 @@ void _glfwPlatformGetVideoMode(_GLFWmonitor* monitor, GLFWvidmode *mode)
 {
    @autoreleasepool {
-    CGDisplayModeRef displayMode;
+    CGDisplayModeRef native = CGDisplayCopyDisplayMode(monitor->ns.displayID);
-    CVDisplayLinkRef link;
+    *mode = vidmodeFromCGDisplayMode(native, monitor->ns.fallbackRefreshRate);
-
+    CGDisplayModeRelease(native);
    CVDisplayLinkCreateWithCGDisplay(monitor->ns.displayID, &link);
    displayMode = CGDisplayCopyDisplayMode(monitor->ns.displayID);
    *mode = vidmodeFromCGDisplayMode(displayMode, link);
    CGDisplayModeRelease(displayMode);
    CVDisplayLinkRelease(link);
    } // autoreleasepool
 }
@@ -507,7 +555,7 @@ GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
 {
    @autoreleasepool {
-    uint32_t i, size = CGDisplayGammaTableCapacity(monitor->ns.displayID);
+    uint32_t size = CGDisplayGammaTableCapacity(monitor->ns.displayID);
    CGGammaValue* values = calloc(size * 3, sizeof(CGGammaValue));
    CGGetDisplayTransferByTable(monitor->ns.displayID,
@@ -519,7 +567,7 @@ GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
    _glfwAllocGammaArrays(ramp, size);
-    for (i = 0; i < size; i++)
+    for (uint32_t i = 0; i < size; i++)
    {
        ramp->red[i]   = (unsigned short) (values[i] * 65535);
        ramp->green[i] = (unsigned short) (values[i + size] * 65535);
@@ -536,10 +584,9 @@ void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 {
    @autoreleasepool {
    int i;
    CGGammaValue* values = calloc(ramp->size * 3, sizeof(CGGammaValue));
-    for (i = 0;  i < ramp->size;  i++)
+    for (unsigned int i = 0;  i < ramp->size;  i++)
    {
        values[i]                  = ramp->red[i] / 65535.f;
        values[i + ramp->size]     = ramp->green[i] / 65535.f;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -28,8 +28,6 @@
 #include <dlfcn.h>
 #include <Carbon/Carbon.h>
 #include <CoreVideo/CVBase.h>
 #include <CoreVideo/CVDisplayLink.h>
 // NOTE: All of NSGL was deprecated in the 10.14 SDK
 //       This disables the pointless warnings for every symbol we use
@@ -41,6 +39,9 @@
 typedef void* id;
 #endif
 // NOTE: Many Cocoa enum values have been renamed and we need to build across
 //       SDK versions where one is unavailable or the other deprecated
 //       We use the newer names in code and these macros to handle compatibility
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 #define NSBitmapFormatAlphaNonpremultiplied NSAlphaNonpremultipliedBitmapFormat
 #define NSEventMaskAny NSAnyEventMask
@@ -60,6 +61,7 @@ typedef void* id;
 #endif
 typedef VkFlags VkMacOSSurfaceCreateFlagsMVK;
 typedef VkFlags VkMetalSurfaceCreateFlagsEXT;
 typedef struct VkMacOSSurfaceCreateInfoMVK
 {
@@ -69,21 +71,25 @@ typedef struct VkMacOSSurfaceCreateInfoMVK
    const void*                     pView;
 } VkMacOSSurfaceCreateInfoMVK;
 typedef struct VkMetalSurfaceCreateInfoEXT
 {
    VkStructureType                 sType;
    const void*                     pNext;
    VkMetalSurfaceCreateFlagsEXT    flags;
    const void*                     pLayer;
 } VkMetalSurfaceCreateInfoEXT;
 typedef VkResult (APIENTRY *PFN_vkCreateMacOSSurfaceMVK)(VkInstance,const VkMacOSSurfaceCreateInfoMVK*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 typedef VkResult (APIENTRY *PFN_vkCreateMetalSurfaceEXT)(VkInstance,const VkMetalSurfaceCreateInfoEXT*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 #include "posix_thread.h"
 #include "cocoa_joystick.h"
 #include "nsgl_context.h"
 #include "egl_context.h"
 #include "osmesa_context.h"
 #define _glfw_dlopen(name) dlopen(name, RTLD_LAZY | RTLD_LOCAL)
 #define _glfw_dlclose(handle) dlclose(handle)
 #define _glfw_dlsym(handle, name) dlsym(handle, name)
 #define _GLFW_EGL_NATIVE_WINDOW  ((EGLNativeWindowType) window->ns.view)
 #define _GLFW_EGL_NATIVE_DISPLAY EGL_DEFAULT_DISPLAY
 #define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowNS  ns
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryNS ns
 #define _GLFW_PLATFORM_LIBRARY_TIMER_STATE  _GLFWtimerNS   ns
@@ -110,6 +116,7 @@ typedef struct _GLFWwindowNS
    id              layer;
    GLFWbool        maximized;
    GLFWbool        occluded;
    GLFWbool        retina;
    // Cached window properties to filter out duplicate events
@@ -130,7 +137,6 @@ typedef struct _GLFWlibraryNS
 {
    CGEventSourceRef    eventSource;
    id                  delegate;
    GLFWbool            finishedLaunching;
    GLFWbool            cursorHidden;
    TISInputSourceRef   inputSource;
    IOHIDManagerRef     hidManager;
@@ -139,7 +145,7 @@ typedef struct _GLFWlibraryNS
    id                  keyUpMonitor;
    id                  nibObjects;
-    char                keyName[64];
+    char                keynames[GLFW_KEY_LAST + 1][17];
    short int           keycodes[256];
    short int           scancodes[GLFW_KEY_LAST + 1];
    char*               clipboardString;
@@ -167,6 +173,7 @@ typedef struct _GLFWmonitorNS
    CGDisplayModeRef    previousMode;
    uint32_t            unitNumber;
    id                  screen;
    double              fallbackRefreshRate;
 } _GLFWmonitorNS;
@@ -195,3 +202,5 @@ void _glfwRestoreVideoModeNS(_GLFWmonitor* monitor);
 float _glfwTransformYNS(float y);
 void* _glfwLoadLocalVulkanLoaderNS(void);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -33,15 +35,14 @@
 //
 static NSUInteger getStyleMask(_GLFWwindow* window)
 {
-    NSUInteger styleMask = 0;
+    NSUInteger styleMask = NSWindowStyleMaskMiniaturizable;
    if (window->monitor || !window->decorated)
        styleMask |= NSWindowStyleMaskBorderless;
    else
    {
        styleMask |= NSWindowStyleMaskTitled |
-                     NSWindowStyleMaskClosable |
+                     NSWindowStyleMaskClosable;
                     NSWindowStyleMaskMiniaturizable;
        if (window->resizable)
            styleMask |= NSWindowStyleMaskResizable;
@@ -321,10 +322,12 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
    _glfwInputWindowFocus(window, GLFW_FALSE);
 }
- (void)windowDidChangeScreen:(NSNotification *)notification
+- (void)windowDidChangeOcclusionState:(NSNotification* )notification
 {
-    if (window->context.source == GLFW_NATIVE_CONTEXT_API)
+    if ([window->ns.object occlusionState] & NSWindowOcclusionStateVisible)
-        _glfwUpdateDisplayLinkDisplayNSGL(window);
+        window->ns.occluded = GLFW_FALSE;
    else
        window->ns.occluded = GLFW_TRUE;
 }
@end
@@ -610,10 +613,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 - (void)scrollWheel:(NSEvent *)event
 {
-    double deltaX, deltaY;
+    double deltaX = [event scrollingDeltaX];
-
+    double deltaY = [event scrollingDeltaY];
    deltaX = [event scrollingDeltaX];
    deltaY = [event scrollingDeltaY];
    if ([event hasPreciseScrollingDeltas])
    {
@@ -730,17 +731,26 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
    else
        characters = (NSString*) string;
-    NSUInteger i, length = [characters length];
+    NSRange range = NSMakeRange(0, [characters length]);
-
+    while (range.length)
    for (i = 0;  i < length;  i++)
    {
-        const unichar codepoint = [characters characterAtIndex:i];
+        uint32_t codepoint = 0;
-        if ((codepoint & 0xff00) == 0xf700)
+
        if ([characters getBytes:&codepoint
                       maxLength:sizeof(codepoint)
                      usedLength:NULL
                        encoding:NSUTF32StringEncoding
                         options:0
                           range:range
                  remainingRange:&range])
        {
            if (codepoint >= 0xf700 && codepoint <= 0xf7ff)
                continue;
            _glfwInputChar(window, codepoint, mods, plain);
        }
    }
 }
 - (void)doCommandBySelector:(SEL)selector
 {
@@ -817,7 +827,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
        [window->ns.object setLevel:NSMainMenuWindowLevel + 1];
    else
    {
-        [window->ns.object center];
+        [(NSWindow*) window->ns.object center];
        _glfw.ns.cascadePoint =
            NSPointToCGPoint([window->ns.object cascadeTopLeftFromPoint:
                              NSPointFromCGPoint(_glfw.ns.cascadePoint)]);
@@ -892,12 +902,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 {
    @autoreleasepool {
    if (!_glfw.ns.finishedLaunching)
    {
        [NSApp run];
        _glfw.ns.finishedLaunching = GLFW_TRUE;
    }
    if (!createNativeWindow(window, wndconfig, fbconfig))
        return GLFW_FALSE;
@@ -912,6 +916,11 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
        }
        else if (ctxconfig->source == GLFW_EGL_CONTEXT_API)
        {
            // EGL implementation on macOS use CALayer* EGLNativeWindowType so we
            // need to get the layer for EGL window surface creation.
            [window->ns.view setWantsLayer:YES];
            window->ns.layer = [window->ns.view layer];
            if (!_glfwInitEGL())
                return GLFW_FALSE;
            if (!_glfwCreateContextEGL(window, ctxconfig, fbconfig))
@@ -963,23 +972,28 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
    [window->ns.object close];
    window->ns.object = nil;
    // HACK: Allow Cocoa to catch up before returning
    _glfwPlatformPollEvents();
    } // autoreleasepool
 }
 void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
 {
    @autoreleasepool {
-    [window->ns.object setTitle:@(title)];
+    NSString* string = @(title);
    [window->ns.object setTitle:string];
    // HACK: Set the miniwindow title explicitly as setTitle: doesn't update it
    //       if the window lacks NSWindowStyleMaskTitled
-    [window->ns.object setMiniwindowTitle:@(title)];
+    [window->ns.object setMiniwindowTitle:string];
    } // autoreleasepool
 }
 void _glfwPlatformSetWindowIcon(_GLFWwindow* window,
                                int count, const GLFWimage* images)
 {
-    // Regular windows do not have icons
+    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
                    "Cocoa: Regular windows do not have icons on macOS");
 }
 void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
@@ -1033,7 +1047,14 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
            acquireMonitor(window);
    }
    else
-        [window->ns.object setContentSize:NSMakeSize(width, height)];
+    {
        NSRect contentRect =
            [window->ns.object contentRectForFrameRect:[window->ns.object frame]];
        contentRect.origin.y += contentRect.size.height - height;
        contentRect.size = NSMakeSize(width, height);
        [window->ns.object setFrame:[window->ns.object frameRectForContentRect:contentRect]
                            display:YES];
    }
    } // autoreleasepool
 }
@@ -1222,7 +1243,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
    // HACK: Changing the style mask can cause the first responder to be cleared
    [window->ns.object makeFirstResponder:window->ns.view];
-    if (monitor)
+    if (window->monitor)
    {
        [window->ns.object setLevel:NSMainMenuWindowLevel + 1];
        [window->ns.object setHasShadow:NO];
@@ -1350,6 +1371,13 @@ void _glfwPlatformSetWindowFloating(_GLFWwindow* window, GLFWbool enabled)
    } // autoreleasepool
 }
 void _glfwPlatformSetWindowMousePassthrough(_GLFWwindow* window, GLFWbool enabled)
 {
    @autoreleasepool {
    [window->ns.object setIgnoresMouseEvents:enabled];
    }
 }
 float _glfwPlatformGetWindowOpacity(_GLFWwindow* window)
 {
    @autoreleasepool {
@@ -1366,6 +1394,8 @@ void _glfwPlatformSetWindowOpacity(_GLFWwindow* window, float opacity)
 void _glfwPlatformSetRawMouseMotion(_GLFWwindow *window, GLFWbool enabled)
 {
    _glfwInputError(GLFW_FEATURE_UNIMPLEMENTED,
                    "Cocoa: Raw mouse motion not yet implemented");
 }
 GLFWbool _glfwPlatformRawMouseMotionSupported(void)
@@ -1504,8 +1534,17 @@ const char* _glfwPlatformGetScancodeName(int scancode)
 {
    @autoreleasepool {
    if (scancode < 0 || scancode > 0xff ||
        _glfw.ns.keycodes[scancode] == GLFW_KEY_UNKNOWN)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid scancode");
        return NULL;
    }
    const int key = _glfw.ns.keycodes[scancode];
    UInt32 deadKeyState = 0;
-    UniChar characters[8];
+    UniChar characters[4];
    UniCharCount characterCount = 0;
    if (UCKeyTranslate([(NSData*) _glfw.ns.unicodeData bytes],
@@ -1530,12 +1569,12 @@ const char* _glfwPlatformGetScancodeName(int scancode)
                                                            characterCount,
                                                            kCFAllocatorNull);
    CFStringGetCString(string,
-                       _glfw.ns.keyName,
+                       _glfw.ns.keynames[key],
-                       sizeof(_glfw.ns.keyName),
+                       sizeof(_glfw.ns.keynames[key]),
                       kCFStringEncodingUTF8);
    CFRelease(string);
-    return _glfw.ns.keyName;
+    return _glfw.ns.keynames[key];
    } // autoreleasepool
 }
@@ -1593,23 +1632,49 @@ int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape)
 {
    @autoreleasepool {
    SEL cursorSelector = NULL;
    // HACK: Try to use a private message
    if (shape == GLFW_RESIZE_EW_CURSOR)
        cursorSelector = NSSelectorFromString(@"_windowResizeEastWestCursor");
    else if (shape == GLFW_RESIZE_NS_CURSOR)
        cursorSelector = NSSelectorFromString(@"_windowResizeNorthSouthCursor");
    else if (shape == GLFW_RESIZE_NWSE_CURSOR)
        cursorSelector = NSSelectorFromString(@"_windowResizeNorthWestSouthEastCursor");
    else if (shape == GLFW_RESIZE_NESW_CURSOR)
        cursorSelector = NSSelectorFromString(@"_windowResizeNorthEastSouthWestCursor");
    if (cursorSelector && [NSCursor respondsToSelector:cursorSelector])
    {
        id object = [NSCursor performSelector:cursorSelector];
        if ([object isKindOfClass:[NSCursor class]])
            cursor->ns.object = object;
    }
    if (!cursor->ns.object)
    {
        if (shape == GLFW_ARROW_CURSOR)
            cursor->ns.object = [NSCursor arrowCursor];
        else if (shape == GLFW_IBEAM_CURSOR)
            cursor->ns.object = [NSCursor IBeamCursor];
        else if (shape == GLFW_CROSSHAIR_CURSOR)
            cursor->ns.object = [NSCursor crosshairCursor];
-    else if (shape == GLFW_HAND_CURSOR)
+        else if (shape == GLFW_POINTING_HAND_CURSOR)
            cursor->ns.object = [NSCursor pointingHandCursor];
-    else if (shape == GLFW_HRESIZE_CURSOR)
+        else if (shape == GLFW_RESIZE_EW_CURSOR)
            cursor->ns.object = [NSCursor resizeLeftRightCursor];
-    else if (shape == GLFW_VRESIZE_CURSOR)
+        else if (shape == GLFW_RESIZE_NS_CURSOR)
            cursor->ns.object = [NSCursor resizeUpDownCursor];
        else if (shape == GLFW_RESIZE_ALL_CURSOR)
            cursor->ns.object = [NSCursor closedHandCursor];
        else if (shape == GLFW_NOT_ALLOWED_CURSOR)
            cursor->ns.object = [NSCursor operationNotAllowedCursor];
    }
    if (!cursor->ns.object)
    {
-        _glfwInputError(GLFW_PLATFORM_ERROR,
+        _glfwInputError(GLFW_CURSOR_UNAVAILABLE,
-                        "Cocoa: Failed to retrieve standard cursor");
+                        "Cocoa: Standard cursor shape unavailable");
        return GLFW_FALSE;
    }
@@ -1673,14 +1738,60 @@ const char* _glfwPlatformGetClipboardString(void)
    } // autoreleasepool
 }
 EGLenum _glfwPlatformGetEGLPlatform(EGLint** attribs)
 {
    if (_glfw.egl.ANGLE_platform_angle)
    {
        int type = 0;
        if (_glfw.egl.ANGLE_platform_angle_opengl)
        {
            if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGL)
                type = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
        }
        if (_glfw.egl.ANGLE_platform_angle_metal)
        {
            if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_METAL)
                type = EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE;
        }
        if (type)
        {
            *attribs = calloc(3, sizeof(EGLint));
            (*attribs)[0] = EGL_PLATFORM_ANGLE_TYPE_ANGLE;
            (*attribs)[1] = type;
            (*attribs)[2] = EGL_NONE;
            return EGL_PLATFORM_ANGLE_ANGLE;
        }
    }
    return 0;
 }
 EGLNativeDisplayType _glfwPlatformGetEGLNativeDisplay(void)
 {
    return EGL_DEFAULT_DISPLAY;
 }
 EGLNativeWindowType _glfwPlatformGetEGLNativeWindow(_GLFWwindow* window)
 {
    return window->ns.layer;
 }
 void _glfwPlatformGetRequiredInstanceExtensions(char** extensions)
 {
-    if (!_glfw.vk.KHR_surface || !_glfw.vk.MVK_macos_surface)
+    if (_glfw.vk.KHR_surface && _glfw.vk.EXT_metal_surface)
-        return;
+    {
-
+        extensions[0] = "VK_KHR_surface";
        extensions[1] = "VK_EXT_metal_surface";
    }
    else if (_glfw.vk.KHR_surface && _glfw.vk.MVK_macos_surface)
    {
        extensions[0] = "VK_KHR_surface";
        extensions[1] = "VK_MVK_macos_surface";
    }
 }
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                      VkPhysicalDevice device,
@@ -1697,19 +1808,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
    @autoreleasepool {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
    VkResult err;
    VkMacOSSurfaceCreateInfoMVK sci;
    PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
    vkCreateMacOSSurfaceMVK = (PFN_vkCreateMacOSSurfaceMVK)
        vkGetInstanceProcAddr(instance, "vkCreateMacOSSurfaceMVK");
    if (!vkCreateMacOSSurfaceMVK)
    {
        _glfwInputError(GLFW_API_UNAVAILABLE,
                        "Cocoa: Vulkan instance missing VK_MVK_macos_surface extension");
        return VK_ERROR_EXTENSION_NOT_PRESENT;
    }
    // HACK: Dynamically load Core Animation to avoid adding an extra
    //       dependency for the majority who don't use MoltenVK
    NSBundle* bundle = [NSBundle bundleWithPath:@"/System/Library/Frameworks/QuartzCore.framework"];
@@ -1735,11 +1833,49 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
    [window->ns.view setLayer:window->ns.layer];
    [window->ns.view setWantsLayer:YES];
    VkResult err;
    if (_glfw.vk.EXT_metal_surface)
    {
        VkMetalSurfaceCreateInfoEXT sci;
        PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT;
        vkCreateMetalSurfaceEXT = (PFN_vkCreateMetalSurfaceEXT)
            vkGetInstanceProcAddr(instance, "vkCreateMetalSurfaceEXT");
        if (!vkCreateMetalSurfaceEXT)
        {
            _glfwInputError(GLFW_API_UNAVAILABLE,
                            "Cocoa: Vulkan instance missing VK_EXT_metal_surface extension");
            return VK_ERROR_EXTENSION_NOT_PRESENT;
        }
        memset(&sci, 0, sizeof(sci));
        sci.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
        sci.pLayer = window->ns.layer;
        err = vkCreateMetalSurfaceEXT(instance, &sci, allocator, surface);
    }
    else
    {
        VkMacOSSurfaceCreateInfoMVK sci;
        PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
        vkCreateMacOSSurfaceMVK = (PFN_vkCreateMacOSSurfaceMVK)
            vkGetInstanceProcAddr(instance, "vkCreateMacOSSurfaceMVK");
        if (!vkCreateMacOSSurfaceMVK)
        {
            _glfwInputError(GLFW_API_UNAVAILABLE,
                            "Cocoa: Vulkan instance missing VK_MVK_macos_surface extension");
            return VK_ERROR_EXTENSION_NOT_PRESENT;
        }
        memset(&sci, 0, sizeof(sci));
        sci.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
        sci.pView = window->ns.view;
        err = vkCreateMacOSSurfaceMVK(instance, &sci, allocator, surface);
    }
    if (err)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 EGL - www.glfw.org
+// GLFW 3.4 EGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -121,6 +123,7 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
            continue;
 #if defined(_GLFW_X11)
        {
            XVisualInfo vi = {0};
            // Only consider EGLConfigs with associated Visuals
@@ -131,15 +134,15 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig,
            if (desired->transparent)
            {
                int count;
-            XVisualInfo* vis = XGetVisualInfo(_glfw.x11.display,
+                XVisualInfo* vis =
-                                              VisualIDMask, &vi,
+                    XGetVisualInfo(_glfw.x11.display, VisualIDMask, &vi, &count);
                                              &count);
                if (vis)
                {
                    u->transparent = _glfwIsVisualTransparentX11(vis[0].visual);
                    XFree(vis);
                }
            }
        }
 #endif // _GLFW_X11
        if (ctxconfig->client == GLFW_OPENGL_ES_API)
@@ -300,6 +303,8 @@ static void destroyContextEGL(_GLFWwindow* window)
 GLFWbool _glfwInitEGL(void)
 {
    int i;
    EGLint* attribs = NULL;
    const char* extensions;
    const char* sonames[] =
    {
 #if defined(_GLFW_EGL_LIBRARY)
@@ -392,7 +397,51 @@ GLFWbool _glfwInitEGL(void)
        return GLFW_FALSE;
    }
-    _glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY);
+    extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
    if (extensions && eglGetError() == EGL_SUCCESS)
        _glfw.egl.EXT_client_extensions = GLFW_TRUE;
    if (_glfw.egl.EXT_client_extensions)
    {
        _glfw.egl.EXT_platform_base =
            _glfwStringInExtensionString("EGL_EXT_platform_base", extensions);
        _glfw.egl.EXT_platform_x11 =
            _glfwStringInExtensionString("EGL_EXT_platform_x11", extensions);
        _glfw.egl.EXT_platform_wayland =
            _glfwStringInExtensionString("EGL_EXT_platform_wayland", extensions);
        _glfw.egl.ANGLE_platform_angle =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle", extensions);
        _glfw.egl.ANGLE_platform_angle_opengl =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_opengl", extensions);
        _glfw.egl.ANGLE_platform_angle_d3d =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_d3d", extensions);
        _glfw.egl.ANGLE_platform_angle_vulkan =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_vulkan", extensions);
        _glfw.egl.ANGLE_platform_angle_metal =
            _glfwStringInExtensionString("EGL_ANGLE_platform_angle_metal", extensions);
    }
    if (_glfw.egl.EXT_platform_base)
    {
        _glfw.egl.GetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
            eglGetProcAddress("eglGetPlatformDisplayEXT");
        _glfw.egl.CreatePlatformWindowSurfaceEXT = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)
            eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
    }
    _glfw.egl.platform = _glfwPlatformGetEGLPlatform(&attribs);
    if (_glfw.egl.platform)
    {
        _glfw.egl.display =
            eglGetPlatformDisplayEXT(_glfw.egl.platform,
                                     _glfwPlatformGetEGLNativeDisplay(),
                                     attribs);
    }
    else
        _glfw.egl.display = eglGetDisplay(_glfwPlatformGetEGLNativeDisplay());
    free(attribs);
    if (_glfw.egl.display == EGL_NO_DISPLAY)
    {
        _glfwInputError(GLFW_API_UNAVAILABLE,
@@ -460,6 +509,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
    EGLint attribs[40];
    EGLConfig config;
    EGLContext share = NULL;
    EGLNativeWindowType native;
    int index = 0;
    if (!_glfw.egl.display)
@@ -585,8 +635,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
    }
    // Set up attributes for surface creation
-    {
+    index = 0;
        int index = 0;
    if (fbconfig->sRGB)
    {
@@ -595,13 +644,21 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
    }
    setAttrib(EGL_NONE, EGL_NONE);
    native = _glfwPlatformGetEGLNativeWindow(window);
    // HACK: ANGLE does not implement eglCreatePlatformWindowSurfaceEXT
    //       despite reporting EGL_EXT_platform_base
    if (_glfw.egl.platform && _glfw.egl.platform != EGL_PLATFORM_ANGLE_ANGLE)
    {
        window->context.egl.surface =
            eglCreatePlatformWindowSurfaceEXT(_glfw.egl.display, config, native, attribs);
    }
    else
    {
        window->context.egl.surface =
            eglCreateWindowSurface(_glfw.egl.display, config, native, attribs);
    }
    window->context.egl.surface =
        eglCreateWindowSurface(_glfw.egl.display,
                               config,
                               _GLFW_EGL_NATIVE_WINDOW,
                               attribs);
    if (window->context.egl.surface == EGL_NO_SURFACE)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 EGL - www.glfw.org
+// GLFW 3.4 EGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -25,26 +25,10 @@
 //
 //========================================================================
-#if defined(_GLFW_USE_EGLPLATFORM_H)
+#if defined(_GLFW_WIN32)
 #include <EGL/eglplatform.h>
 #elif defined(_GLFW_WIN32)
 #define EGLAPIENTRY __stdcall
 typedef HDC EGLNativeDisplayType;
 typedef HWND EGLNativeWindowType;
 #elif defined(_GLFW_COCOA)
 #define EGLAPIENTRY
 typedef void* EGLNativeDisplayType;
 typedef id EGLNativeWindowType;
 #elif defined(_GLFW_X11)
 #define EGLAPIENTRY
 typedef Display* EGLNativeDisplayType;
 typedef Window EGLNativeWindowType;
 #elif defined(_GLFW_WAYLAND)
 #define EGLAPIENTRY
 typedef struct wl_display* EGLNativeDisplayType;
 typedef struct wl_egl_window* EGLNativeWindowType;
 #else
- #error "No supported EGL platform selected"
+ #define EGLAPIENTRY
 #endif
 #define EGL_SUCCESS 0x3000
@@ -106,6 +90,17 @@ typedef struct wl_egl_window* EGLNativeWindowType;
 #define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x2097
 #define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0
 #define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098
 #define EGL_PLATFORM_X11_EXT 0x31d5
 #define EGL_PLATFORM_WAYLAND_EXT 0x31d8
 #define EGL_PLATFORM_ANGLE_ANGLE 0x3202
 #define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3203
 #define EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE 0x320d
 #define EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE 0x320e
 #define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3207
 #define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3208
 #define EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE 0x3450
 #define EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE 0x3489
 #define EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE 0x348f
 typedef int EGLint;
 typedef unsigned int EGLBoolean;
@@ -115,6 +110,9 @@ typedef void* EGLContext;
 typedef void* EGLDisplay;
 typedef void* EGLSurface;
 typedef void* EGLNativeDisplayType;
 typedef void* EGLNativeWindowType;
 // EGL function pointer typedefs
 typedef EGLBoolean (EGLAPIENTRY * PFN_eglGetConfigAttrib)(EGLDisplay,EGLConfig,EGLint,EGLint*);
 typedef EGLBoolean (EGLAPIENTRY * PFN_eglGetConfigs)(EGLDisplay,EGLConfig*,EGLint,EGLint*);
@@ -149,9 +147,10 @@ typedef GLFWglproc (EGLAPIENTRY * PFN_eglGetProcAddress)(const char*);
 #define eglQueryString _glfw.egl.QueryString
 #define eglGetProcAddress _glfw.egl.GetProcAddress
-#define _GLFW_EGL_CONTEXT_STATE            _GLFWcontextEGL egl
+typedef EGLDisplay (EGLAPIENTRY * PFNEGLGETPLATFORMDISPLAYEXTPROC)(EGLenum,void*,const EGLint*);
-#define _GLFW_EGL_LIBRARY_CONTEXT_STATE    _GLFWlibraryEGL egl
+typedef EGLSurface (EGLAPIENTRY * PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)(EGLDisplay,EGLConfig,void*,const EGLint*);
-
+#define eglGetPlatformDisplayEXT _glfw.egl.GetPlatformDisplayEXT
 #define eglCreatePlatformWindowSurfaceEXT _glfw.egl.CreatePlatformWindowSurfaceEXT
 // EGL-specific per-context data
 //
@@ -169,6 +168,7 @@ typedef struct _GLFWcontextEGL
 //
 typedef struct _GLFWlibraryEGL
 {
    EGLenum         platform;
    EGLDisplay      display;
    EGLint          major, minor;
    GLFWbool        prefix;
@@ -178,6 +178,15 @@ typedef struct _GLFWlibraryEGL
    GLFWbool        KHR_gl_colorspace;
    GLFWbool        KHR_get_all_proc_addresses;
    GLFWbool        KHR_context_flush_control;
    GLFWbool        EXT_client_extensions;
    GLFWbool        EXT_platform_base;
    GLFWbool        EXT_platform_x11;
    GLFWbool        EXT_platform_wayland;
    GLFWbool        ANGLE_platform_angle;
    GLFWbool        ANGLE_platform_angle_opengl;
    GLFWbool        ANGLE_platform_angle_d3d;
    GLFWbool        ANGLE_platform_angle_vulkan;
    GLFWbool        ANGLE_platform_angle_metal;
    void*           handle;
@@ -198,6 +207,9 @@ typedef struct _GLFWlibraryEGL
    PFN_eglQueryString          QueryString;
    PFN_eglGetProcAddress       GetProcAddress;
    PFNEGLGETPLATFORMDISPLAYEXTPROC GetPlatformDisplayEXT;
    PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC CreatePlatformWindowSurfaceEXT;
 } _GLFWlibraryEGL;
@@ -0,0 +1,30 @@
 #include <winver.h>
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION @GLFW_VERSION_MAJOR@,@GLFW_VERSION_MINOR@,@GLFW_VERSION_PATCH@,0
 PRODUCTVERSION @GLFW_VERSION_MAJOR@,@GLFW_VERSION_MINOR@,@GLFW_VERSION_PATCH@,0
 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 FILEFLAGS 0
 FILEOS VOS_NT_WINDOWS32
 FILETYPE VFT_DLL
 FILESUBTYPE 0
 {
    BLOCK "StringFileInfo"
    {
        BLOCK "040904B0"
        {
            VALUE "CompanyName", "GLFW"
            VALUE "FileDescription", "GLFW @GLFW_VERSION@ DLL"
            VALUE "FileVersion", "@GLFW_VERSION@"
            VALUE "OriginalFilename", "glfw3.dll"
            VALUE "ProductName", "GLFW"
            VALUE "ProductVersion", "@GLFW_VERSION@"
        }
    }
    BLOCK "VarFileInfo"
    {
        VALUE "Translation", 0x409, 1200
    }
 }
@@ -1 +0,0 @@
 include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2010-2016 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -45,8 +45,6 @@
 // Define this to 1 if building GLFW for OSMesa
 #cmakedefine _GLFW_OSMESA
 // Define this to 1 if building as a shared library / dynamic library / DLL
 #cmakedefine _GLFW_BUILD_DLL
 // Define this to 1 to use Vulkan loader linked statically into application
 #cmakedefine _GLFW_VULKAN_STATIC
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 GLX - www.glfw.org
+// GLFW 3.4 GLX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -226,8 +228,6 @@ static GLFWglproc getProcAddressGLX(const char* procname)
        return _glfw_dlsym(_glfw.glx.handle, procname);
 }
 // Destroy the OpenGL context
 //
 static void destroyContextGLX(_GLFWwindow* window)
 {
    if (window->context.glx.window)
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 GLX - www.glfw.org
+// GLFW 3.4 GLX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
 #include "mappings.h"
@@ -51,6 +53,7 @@ static GLFWerrorfun _glfwErrorCallback;
 static _GLFWinitconfig _glfwInitHints =
 {
    GLFW_TRUE,      // hat buttons
    GLFW_ANGLE_PLATFORM_TYPE_NONE, // ANGLE backend
    {
        GLFW_TRUE,  // macOS menu bar
        GLFW_TRUE   // macOS bundle chdir
@@ -88,6 +91,7 @@ static void terminate(void)
    _glfw.mappingCount = 0;
    _glfwTerminateVulkan();
    _glfwPlatformTerminateJoysticks();
    _glfwPlatformTerminate();
    _glfw.initialized = GLFW_FALSE;
@@ -187,6 +191,12 @@ void _glfwInputError(int code, const char* format, ...)
            strcpy(description, "The requested format is unavailable");
        else if (code == GLFW_NO_WINDOW_CONTEXT)
            strcpy(description, "The specified window has no context");
        else if (code == GLFW_CURSOR_UNAVAILABLE)
            strcpy(description, "The specified cursor shape is unavailable");
        else if (code == GLFW_FEATURE_UNAVAILABLE)
            strcpy(description, "The requested feature cannot be implemented for this platform");
        else if (code == GLFW_FEATURE_UNIMPLEMENTED)
            strcpy(description, "The requested feature has not yet been implemented for this platform");
        else
            strcpy(description, "ERROR: UNKNOWN GLFW ERROR");
    }
@@ -279,6 +289,9 @@ GLFWAPI void glfwInitHint(int hint, int value)
        case GLFW_JOYSTICK_HAT_BUTTONS:
            _glfwInitHints.hatButtons = value;
            return;
        case GLFW_ANGLE_PLATFORM_TYPE:
            _glfwInitHints.angleType = value;
            return;
        case GLFW_COCOA_CHDIR_RESOURCES:
            _glfwInitHints.ns.chdir = value;
            return;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -41,6 +43,22 @@
 #define _GLFW_JOYSTICK_BUTTON   2
 #define _GLFW_JOYSTICK_HATBIT   3
 // Initializes the platform joystick API if it has not been already
 //
 static GLFWbool initJoysticks(void)
 {
    if (!_glfw.joysticksInitialized)
    {
        if (!_glfwPlatformInitJoysticks())
        {
            _glfwPlatformTerminateJoysticks();
            return GLFW_FALSE;
        }
    }
    return _glfw.joysticksInitialized = GLFW_TRUE;
 }
 // Finds a mapping based on joystick GUID
 //
 static _GLFWmapping* findMapping(const char* guid)
@@ -755,9 +773,13 @@ GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape)
    if (shape != GLFW_ARROW_CURSOR &&
        shape != GLFW_IBEAM_CURSOR &&
        shape != GLFW_CROSSHAIR_CURSOR &&
-        shape != GLFW_HAND_CURSOR &&
+        shape != GLFW_POINTING_HAND_CURSOR &&
-        shape != GLFW_HRESIZE_CURSOR &&
+        shape != GLFW_RESIZE_EW_CURSOR &&
-        shape != GLFW_VRESIZE_CURSOR)
+        shape != GLFW_RESIZE_NS_CURSOR &&
        shape != GLFW_RESIZE_NWSE_CURSOR &&
        shape != GLFW_RESIZE_NESW_CURSOR &&
        shape != GLFW_RESIZE_ALL_CURSOR &&
        shape != GLFW_NOT_ALLOWED_CURSOR)
    {
        _glfwInputError(GLFW_INVALID_ENUM, "Invalid standard cursor 0x%08X", shape);
        return NULL;
@@ -923,6 +945,9 @@ GLFWAPI int glfwJoystickPresent(int jid)
        return GLFW_FALSE;
    }
    if (!initJoysticks())
        return GLFW_FALSE;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return GLFW_FALSE;
@@ -948,6 +973,9 @@ GLFWAPI const float* glfwGetJoystickAxes(int jid, int* count)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -977,6 +1005,9 @@ GLFWAPI const unsigned char* glfwGetJoystickButtons(int jid, int* count)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -1010,6 +1041,9 @@ GLFWAPI const unsigned char* glfwGetJoystickHats(int jid, int* count)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -1036,6 +1070,9 @@ GLFWAPI const char* glfwGetJoystickName(int jid)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -1061,6 +1098,9 @@ GLFWAPI const char* glfwGetJoystickGUID(int jid)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -1106,6 +1146,10 @@ GLFWAPI void* glfwGetJoystickUserPointer(int jid)
 GLFWAPI GLFWjoystickfun glfwSetJoystickCallback(GLFWjoystickfun cbfun)
 {
    _GLFW_REQUIRE_INIT_OR_RETURN(NULL);
    if (!initJoysticks())
        return NULL;
    _GLFW_SWAP_POINTERS(_glfw.callbacks.joystick, cbfun);
    return cbfun;
 }
@@ -1185,6 +1229,9 @@ GLFWAPI int glfwJoystickIsGamepad(int jid)
        return GLFW_FALSE;
    }
    if (!initJoysticks())
        return GLFW_FALSE;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return GLFW_FALSE;
@@ -1210,6 +1257,9 @@ GLFWAPI const char* glfwGetGamepadName(int jid)
        return NULL;
    }
    if (!initJoysticks())
        return NULL;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return NULL;
@@ -1242,6 +1292,9 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state)
        return GLFW_FALSE;
    }
    if (!initJoysticks())
        return GLFW_FALSE;
    js = _glfw.joysticks + jid;
    if (!js->present)
        return GLFW_FALSE;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -128,6 +128,7 @@ typedef enum VkStructureType
    VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000,
    VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000,
    VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000,
    VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT = 1000217000,
    VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkStructureType;
@@ -193,6 +194,9 @@ typedef void (APIENTRY * PFN_vkVoidFunction)(void);
 #error "No supported window creation API selected"
 #endif
 #include "egl_context.h"
 #include "osmesa_context.h"
 // Constructs a version number string from the public header macros
 #define _GLFW_CONCAT_VERSION(m, n, r) #m "." #n "." #r
 #define _GLFW_MAKE_VERSION(m, n, r) _GLFW_CONCAT_VERSION(m, n, r)
@@ -239,6 +243,7 @@ struct _GLFWerror
 struct _GLFWinitconfig
 {
    GLFWbool      hatButtons;
    int           angleType;
    struct {
        GLFWbool  menubar;
        GLFWbool  chdir;
@@ -265,6 +270,7 @@ struct _GLFWwndconfig
    GLFWbool      maximized;
    GLFWbool      centerCursor;
    GLFWbool      focusOnShow;
    GLFWbool      mousePassthrough;
    GLFWbool      scaleToMonitor;
    struct {
        GLFWbool  retina;
@@ -274,6 +280,9 @@ struct _GLFWwndconfig
        char      className[256];
        char      instanceName[256];
    } x11;
    struct {
        GLFWbool  keymenu;
    } win32;
 };
 // Context configuration
@@ -355,9 +364,9 @@ struct _GLFWcontext
    // This is defined in the context API's context.h
    _GLFW_PLATFORM_CONTEXT_STATE;
    // This is defined in egl_context.h
-    _GLFW_EGL_CONTEXT_STATE;
+    _GLFWcontextEGL egl;
    // This is defined in osmesa_context.h
-    _GLFW_OSMESA_CONTEXT_STATE;
+    _GLFWcontextOSMesa osmesa;
 };
 // Window and context structure
@@ -372,6 +381,7 @@ struct _GLFWwindow
    GLFWbool            autoIconify;
    GLFWbool            floating;
    GLFWbool            focusOnShow;
    GLFWbool            mousePassthrough;
    GLFWbool            shouldClose;
    void*               userPointer;
    GLFWvidmode         videoMode;
@@ -529,6 +539,7 @@ struct _GLFWlibrary
    _GLFWmonitor**      monitors;
    int                 monitorCount;
    GLFWbool            joysticksInitialized;
    _GLFWjoystick       joysticks[GLFW_JOYSTICK_LAST + 1];
    _GLFWmapping*       mappings;
    int                 mappingCount;
@@ -556,6 +567,7 @@ struct _GLFWlibrary
        GLFWbool        KHR_win32_surface;
 #elif defined(_GLFW_COCOA)
        GLFWbool        MVK_macos_surface;
        GLFWbool        EXT_metal_surface;
 #elif defined(_GLFW_X11)
        GLFWbool        KHR_xlib_surface;
        GLFWbool        KHR_xcb_surface;
@@ -576,9 +588,9 @@ struct _GLFWlibrary
    // This is defined in the platform's joystick.h
    _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE;
    // This is defined in egl_context.h
-    _GLFW_EGL_LIBRARY_CONTEXT_STATE;
+    _GLFWlibraryEGL egl;
    // This is defined in osmesa_context.h
-    _GLFW_OSMESA_LIBRARY_CONTEXT_STATE;
+    _GLFWlibraryOSMesa osmesa;
 };
 // Global state shared between compilation units of GLFW
@@ -621,6 +633,8 @@ void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 void _glfwPlatformSetClipboardString(const char* string);
 const char* _glfwPlatformGetClipboardString(void);
 GLFWbool _glfwPlatformInitJoysticks(void);
 void _glfwPlatformTerminateJoysticks(void);
 int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode);
 void _glfwPlatformUpdateGamepadGUID(char* guid);
@@ -669,6 +683,7 @@ float _glfwPlatformGetWindowOpacity(_GLFWwindow* window);
 void _glfwPlatformSetWindowResizable(_GLFWwindow* window, GLFWbool enabled);
 void _glfwPlatformSetWindowDecorated(_GLFWwindow* window, GLFWbool enabled);
 void _glfwPlatformSetWindowFloating(_GLFWwindow* window, GLFWbool enabled);
 void _glfwPlatformSetWindowMousePassthrough(_GLFWwindow* window, GLFWbool enabled);
 void _glfwPlatformSetWindowOpacity(_GLFWwindow* window, float opacity);
 void _glfwPlatformPollEvents(void);
@@ -676,6 +691,10 @@ void _glfwPlatformWaitEvents(void);
 void _glfwPlatformWaitEventsTimeout(double timeout);
 void _glfwPlatformPostEmptyEvent(void);
 EGLenum _glfwPlatformGetEGLPlatform(EGLint** attribs);
 EGLNativeDisplayType _glfwPlatformGetEGLNativeDisplay(void);
 EGLNativeWindowType _glfwPlatformGetEGLNativeWindow(_GLFWwindow* window);
 void _glfwPlatformGetRequiredInstanceExtensions(char** extensions);
 int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
                                                      VkPhysicalDevice device,
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Linux - www.glfw.org
+// GLFW 3.4 Linux - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -104,9 +106,7 @@ static void handleAbsEvent(_GLFWjoystick* js, int code, int value)
 //
 static void pollAbsState(_GLFWjoystick* js)
 {
-    int code;
+    for (int code = 0;  code < ABS_CNT;  code++)
    for (code = 0;  code < ABS_CNT;  code++)
    {
        if (js->linjs.absMap[code] < 0)
            continue;
@@ -126,18 +126,7 @@ static void pollAbsState(_GLFWjoystick* js)
 //
 static GLFWbool openJoystickDevice(const char* path)
 {
-    int jid, code;
+    for (int jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
    char name[256] = "";
    char guid[33] = "";
    char evBits[(EV_CNT + 7) / 8] = {0};
    char keyBits[(KEY_CNT + 7) / 8] = {0};
    char absBits[(ABS_CNT + 7) / 8] = {0};
    int axisCount = 0, buttonCount = 0, hatCount = 0;
    struct input_id id;
    _GLFWjoystickLinux linjs = {0};
    _GLFWjoystick* js = NULL;
    for (jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
    {
        if (!_glfw.joysticks[jid].present)
            continue;
@@ -145,10 +134,16 @@ static GLFWbool openJoystickDevice(const char* path)
            return GLFW_FALSE;
    }
    _GLFWjoystickLinux linjs = {0};
    linjs.fd = open(path, O_RDONLY | O_NONBLOCK);
    if (linjs.fd == -1)
        return GLFW_FALSE;
    char evBits[(EV_CNT + 7) / 8] = {0};
    char keyBits[(KEY_CNT + 7) / 8] = {0};
    char absBits[(ABS_CNT + 7) / 8] = {0};
    struct input_id id;
    if (ioctl(linjs.fd, EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 ||
        ioctl(linjs.fd, EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 ||
        ioctl(linjs.fd, EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 ||
@@ -168,9 +163,13 @@ static GLFWbool openJoystickDevice(const char* path)
        return GLFW_FALSE;
    }
    char name[256] = "";
    if (ioctl(linjs.fd, EVIOCGNAME(sizeof(name)), name) < 0)
        strncpy(name, "Unknown", sizeof(name));
    char guid[33] = "";
    // Generate a joystick GUID that matches the SDL 2.0.5+ one
    if (id.vendor && id.product && id.version)
    {
@@ -189,7 +188,9 @@ static GLFWbool openJoystickDevice(const char* path)
                name[8], name[9], name[10]);
    }
-    for (code = BTN_MISC;  code < KEY_CNT;  code++)
+    int axisCount = 0, buttonCount = 0, hatCount = 0;
    for (int code = BTN_MISC;  code < KEY_CNT;  code++)
    {
        if (!isBitSet(code, keyBits))
            continue;
@@ -198,7 +199,7 @@ static GLFWbool openJoystickDevice(const char* path)
        buttonCount++;
    }
-    for (code = 0;  code < ABS_CNT;  code++)
+    for (int code = 0;  code < ABS_CNT;  code++)
    {
        linjs.absMap[code] = -1;
        if (!isBitSet(code, absBits))
@@ -221,7 +222,8 @@ static GLFWbool openJoystickDevice(const char* path)
        }
    }
-    js = _glfwAllocJoystick(name, guid, axisCount, buttonCount, hatCount);
+    _GLFWjoystick* js =
        _glfwAllocJoystick(name, guid, axisCount, buttonCount, hatCount);
    if (!js)
    {
        close(linjs.fd);
@@ -262,12 +264,51 @@ static int compareJoysticks(const void* fp, const void* sp)
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
-// Initialize joystick interface
+void _glfwDetectJoystickConnectionLinux(void)
-//
+{
-GLFWbool _glfwInitJoysticksLinux(void)
+    if (_glfw.linjs.inotify <= 0)
        return;
    ssize_t offset = 0;
    char buffer[16384];
    const ssize_t size = read(_glfw.linjs.inotify, buffer, sizeof(buffer));
    while (size > offset)
    {
        regmatch_t match;
        const struct inotify_event* e = (struct inotify_event*) (buffer + offset);
        offset += sizeof(struct inotify_event) + e->len;
        if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) != 0)
            continue;
        char path[PATH_MAX];
        snprintf(path, sizeof(path), "/dev/input/%s", e->name);
        if (e->mask & (IN_CREATE | IN_ATTRIB))
            openJoystickDevice(path);
        else if (e->mask & IN_DELETE)
        {
            for (int jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
            {
                if (strcmp(_glfw.joysticks[jid].linjs.path, path) == 0)
                {
                    closeJoystick(_glfw.joysticks + jid);
                    break;
                }
            }
        }
    }
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
 GLFWbool _glfwPlatformInitJoysticks(void)
 {
    DIR* dir;
    int count = 0;
    const char* dirname = "/dev/input";
    _glfw.linjs.inotify = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
@@ -289,7 +330,9 @@ GLFWbool _glfwInitJoysticksLinux(void)
        return GLFW_FALSE;
    }
-    dir = opendir(dirname);
+    int count = 0;
    DIR* dir = opendir(dirname);
    if (dir)
    {
        struct dirent* entry;
@@ -318,9 +361,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
    return GLFW_TRUE;
 }
-// Close all opened joystick handles
+void _glfwPlatformTerminateJoysticks(void)
 //
 void _glfwTerminateJoysticksLinux(void)
 {
    int jid;
@@ -331,63 +372,16 @@ void _glfwTerminateJoysticksLinux(void)
            closeJoystick(js);
    }
    regfree(&_glfw.linjs.regex);
    if (_glfw.linjs.inotify > 0)
    {
        if (_glfw.linjs.watch > 0)
            inotify_rm_watch(_glfw.linjs.inotify, _glfw.linjs.watch);
        close(_glfw.linjs.inotify);
        regfree(&_glfw.linjs.regex);
    }
 }
 void _glfwDetectJoystickConnectionLinux(void)
 {
    ssize_t offset = 0;
    char buffer[16384];
    if (_glfw.linjs.inotify <= 0)
        return;
    const ssize_t size = read(_glfw.linjs.inotify, buffer, sizeof(buffer));
    while (size > offset)
    {
        regmatch_t match;
        const struct inotify_event* e = (struct inotify_event*) (buffer + offset);
        offset += sizeof(struct inotify_event) + e->len;
        if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) != 0)
            continue;
        char path[PATH_MAX];
        snprintf(path, sizeof(path), "/dev/input/%s", e->name);
        if (e->mask & (IN_CREATE | IN_ATTRIB))
            openJoystickDevice(path);
        else if (e->mask & IN_DELETE)
        {
            int jid;
            for (jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
            {
                if (strcmp(_glfw.joysticks[jid].linjs.path, path) == 0)
                {
                    closeJoystick(_glfw.joysticks + jid);
                    break;
                }
            }
        }
    }
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
 int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
 {
    // Read all queued events (non-blocking)
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Linux - www.glfw.org
+// GLFW 3.4 Linux - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
 //
@@ -55,8 +55,5 @@ typedef struct _GLFWlibraryLinux
    GLFWbool                dropped;
 } _GLFWlibraryLinux;
 GLFWbool _glfwInitJoysticksLinux(void);
 void _glfwTerminateJoysticksLinux(void);
 void _glfwDetectJoystickConnectionLinux(void);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -84,7 +84,6 @@ const char* _glfwDefaultMappings[] =
 "030000000d0f00008700000000000000,Fighting Stick mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,",
 "030000000d0f00002700000000000000,FIGHTING STICK V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,",
 "78696e70757403000000000000000000,Fightstick TES,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Windows,",
 "03000000790000000600000000000000,G-Shark GS-GP702,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,",
 "03000000260900002625000000000000,Gamecube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,lefttrigger:a4,leftx:a0,lefty:a1,righttrigger:a5,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Windows,",
 "030000008f0e00000d31000000000000,GAMEPAD 3 TURBO,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,",
 "03000000280400000140000000000000,GamePad Pro USB,a:b1,b:b2,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,",
@@ -207,7 +206,6 @@ const char* _glfwDefaultMappings[] =
 "030000008305000031b0000000000000,Cideko AK08b,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,",
 "03000000260900008888000088020000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Mac OS X,",
 "03000000a306000022f6000001030000,Cyborg V.3 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,",
 "03000000790000000600000000000000,G-Shark GP-702,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Mac OS X,",
 "03000000ad1b000001f9000000000000,Gamestop BB-070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,",
 "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,",
 "030000000d0f00005f00000000010000,Hori Fighting Commander 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,",
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -54,6 +56,10 @@ static int compareVideoModes(const void* fp, const void* sp)
    if (farea != sarea)
        return farea - sarea;
    // Then sort on width
    if (fm->width != sm->width)
        return fm->width - sm->width;
    // Lastly sort on refresh rate
    return fm->refreshRate - sm->refreshRate;
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -24,6 +24,9 @@
 //
 //========================================================================
 // NOTE: Many Cocoa enum values have been renamed and we need to build across
 //       SDK versions where one is unavailable or the other deprecated
 //       We use the newer names in code and these macros to handle compatibility
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
 #define NSOpenGLContextParameterSwapInterval NSOpenGLCPSwapInterval
 #define NSOpenGLContextParameterSurfaceOpacity NSOpenGLCPSurfaceOpacity
@@ -41,10 +44,6 @@ typedef struct _GLFWcontextNSGL
 {
    id                pixelFormat;
    id                object;
    CVDisplayLinkRef  displayLink;
    atomic_int        swapInterval;
    int               swapIntervalsPassed;
    id                swapIntervalCond;
 } _GLFWcontextNSGL;
@@ -64,5 +63,4 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
                                const _GLFWctxconfig* ctxconfig,
                                const _GLFWfbconfig* fbconfig);
 void _glfwDestroyContextNSGL(_GLFWwindow* window);
 void _glfwUpdateDisplayLinkDisplayNSGL(_GLFWwindow* window);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 macOS - www.glfw.org
+// GLFW 3.4 macOS - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -23,32 +23,13 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
-// Display link callback for manual swap interval implementation
+#include <unistd.h>
-// This is based on a similar workaround added to SDL2
+#include <math.h>
 //
 static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink,
                                    const CVTimeStamp* now,
                                    const CVTimeStamp* outputTime,
                                    CVOptionFlags flagsIn,
                                    CVOptionFlags* flagsOut,
                                    void* userInfo)
 {
    _GLFWwindow* window = (_GLFWwindow *) userInfo;
    const int interval = atomic_load(&window->context.nsgl.swapInterval);
    if (interval > 0)
    {
        [window->context.nsgl.swapIntervalCond lock];
        window->context.nsgl.swapIntervalsPassed++;
        [window->context.nsgl.swapIntervalCond signal];
        [window->context.nsgl.swapIntervalCond unlock];
    }
    return kCVReturnSuccess;
 }
 static void makeContextCurrentNSGL(_GLFWwindow* window)
 {
@@ -68,19 +49,28 @@ static void swapBuffersNSGL(_GLFWwindow* window)
 {
    @autoreleasepool {
-    const int interval = atomic_load(&window->context.nsgl.swapInterval);
+    // HACK: Simulate vsync with usleep as NSGL swap interval does not apply to
    //       windows with a non-visible occlusion state
    if (window->ns.occluded)
    {
        int interval = 0;
        [window->context.nsgl.object getValues:&interval
                                  forParameter:NSOpenGLContextParameterSwapInterval];
        if (interval > 0)
        {
-        [window->context.nsgl.swapIntervalCond lock];
+            const double framerate = 60.0;
-        do
+            const uint64_t frequency = _glfwPlatformGetTimerFrequency();
-        {
+            const uint64_t value = _glfwPlatformGetTimerValue();
-            [window->context.nsgl.swapIntervalCond wait];
+
-        } while (window->context.nsgl.swapIntervalsPassed % interval != 0);
+            const double elapsed = value / (double) frequency;
-        window->context.nsgl.swapIntervalsPassed = 0;
+            const double period = 1.0 / framerate;
-        [window->context.nsgl.swapIntervalCond unlock];
+            const double delay = period - fmod(elapsed, period);
            usleep(floorl(delay * 1e6));
        }
    }
    // ARP appears to be unnecessary, but this is future-proof
    [window->context.nsgl.object flushBuffer];
    } // autoreleasepool
@@ -89,11 +79,14 @@ static void swapBuffersNSGL(_GLFWwindow* window)
 static void swapIntervalNSGL(int interval)
 {
    @autoreleasepool {
    _GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot);
-    atomic_store(&window->context.nsgl.swapInterval, interval);
+    if (window)
-    [window->context.nsgl.swapIntervalCond lock];
+    {
-    window->context.nsgl.swapIntervalsPassed = 0;
+        [window->context.nsgl.object setValues:&interval
-    [window->context.nsgl.swapIntervalCond unlock];
+                                  forParameter:NSOpenGLContextParameterSwapInterval];
    }
    } // autoreleasepool
 }
@@ -117,23 +110,10 @@ static GLFWglproc getProcAddressNSGL(const char* procname)
    return symbol;
 }
 // Destroy the OpenGL context
 //
 static void destroyContextNSGL(_GLFWwindow* window)
 {
    @autoreleasepool {
    if (window->context.nsgl.displayLink)
    {
        if (CVDisplayLinkIsRunning(window->context.nsgl.displayLink))
            CVDisplayLinkStop(window->context.nsgl.displayLink);
        CVDisplayLinkRelease(window->context.nsgl.displayLink);
    }
    [window->context.nsgl.swapIntervalCond release];
    window->context.nsgl.swapIntervalCond = nil;
    [window->context.nsgl.pixelFormat release];
    window->context.nsgl.pixelFormat = nil;
@@ -194,13 +174,6 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
                            "NSGL: The targeted version of macOS does not support OpenGL 3.0 or 3.1 but may support 3.2 and above");
            return GLFW_FALSE;
        }
        if (!ctxconfig->forward || ctxconfig->profile != GLFW_OPENGL_CORE_PROFILE)
        {
            _glfwInputError(GLFW_VERSION_UNAVAILABLE,
                            "NSGL: The targeted version of macOS only supports forward-compatible core profile contexts for OpenGL 3.2 and above");
            return GLFW_FALSE;
        }
    }
    // Context robustness modes (GL_KHR_robustness) are not yet supported by
@@ -339,7 +312,7 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
        return GLFW_FALSE;
    }
-    NSOpenGLContext* share = NULL;
+    NSOpenGLContext* share = nil;
    if (ctxconfig->share)
        share = ctxconfig->share->context.nsgl.object;
@@ -361,17 +334,10 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
                                  forParameter:NSOpenGLContextParameterSurfaceOpacity];
    }
-    if (window->ns.retina)
+    [window->ns.view setWantsBestResolutionOpenGLSurface:window->ns.retina];
        [window->ns.view setWantsBestResolutionOpenGLSurface:YES];
    GLint interval = 0;
    [window->context.nsgl.object setValues:&interval
                              forParameter:NSOpenGLContextParameterSwapInterval];
    [window->context.nsgl.object setView:window->ns.view];
    window->context.nsgl.swapIntervalCond = [NSCondition new];
    window->context.makeCurrent = makeContextCurrentNSGL;
    window->context.swapBuffers = swapBuffersNSGL;
    window->context.swapInterval = swapIntervalNSGL;
@@ -379,26 +345,9 @@ GLFWbool _glfwCreateContextNSGL(_GLFWwindow* window,
    window->context.getProcAddress = getProcAddressNSGL;
    window->context.destroy = destroyContextNSGL;
    CVDisplayLinkCreateWithActiveCGDisplays(&window->context.nsgl.displayLink);
    CVDisplayLinkSetOutputCallback(window->context.nsgl.displayLink,
                                   &displayLinkCallback,
                                   window);
    CVDisplayLinkStart(window->context.nsgl.displayLink);
    _glfwUpdateDisplayLinkDisplayNSGL(window);
    return GLFW_TRUE;
 }
 void _glfwUpdateDisplayLinkDisplayNSGL(_GLFWwindow* window)
 {
    CGDirectDisplayID displayID =
        [[[window->ns.object screen] deviceDescription][@"NSScreenNumber"] unsignedIntValue];
    if (!displayID)
        return;
    CVDisplayLinkSetCurrentCGDisplay(window->context.nsgl.displayLink, displayID);
 }
 //////////////////////////////////////////////////////////////////////////
 //////                        GLFW native API                       //////
@@ -412,7 +361,7 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* handle)
    if (window->context.client == GLFW_NO_API)
    {
        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
-        return NULL;
+        return nil;
    }
    return window->context.nsgl.object;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,9 +24,13 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
 #include <stdlib.h>
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
@@ -35,11 +39,14 @@
 int _glfwPlatformInit(void)
 {
    _glfwInitTimerPOSIX();
    _glfwPollMonitorsNull();
    return GLFW_TRUE;
 }
 void _glfwPlatformTerminate(void)
 {
    free(_glfw.null.clipboardString);
    _glfwTerminateOSMesa();
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -23,6 +23,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -31,6 +33,15 @@
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
 GLFWbool _glfwPlatformInitJoysticks(void)
 {
    return GLFW_TRUE;
 }
 void _glfwPlatformTerminateJoysticks(void)
 {
 }
 int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
 {
    return GLFW_FALSE;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -24,8 +24,8 @@
 //
 //========================================================================
-#define _GLFW_PLATFORM_JOYSTICK_STATE         int nulljs
+#define _GLFW_PLATFORM_JOYSTICK_STATE         struct { int dummyJoystick; }
-#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE int nulljs
+#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE struct { int dummyLibraryJoystick; }
 #define _GLFW_PLATFORM_MAPPING_NAME ""
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,9 +24,42 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 // The the sole (fake) video mode of our (sole) fake monitor
 //
 static GLFWvidmode getVideoMode(void)
 {
    GLFWvidmode mode;
    mode.width = 1920;
    mode.height = 1080;
    mode.redBits = 8;
    mode.greenBits = 8;
    mode.blueBits = 8;
    mode.refreshRate = 60;
    return mode;
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
 void _glfwPollMonitorsNull(void)
 {
    const float dpi = 141.f;
    const GLFWvidmode mode = getVideoMode();
    _GLFWmonitor* monitor = _glfwAllocMonitor("Null SuperNoop 0",
                                              (int) (mode.width * 25.4f / dpi),
                                              (int) (mode.height * 25.4f / dpi));
    _glfwInputMonitor(monitor, GLFW_CONNECTED, _GLFW_INSERT_FIRST);
 }
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW platform API                      //////
@@ -34,10 +67,15 @@
 void _glfwPlatformFreeMonitor(_GLFWmonitor* monitor)
 {
    _glfwFreeGammaArrays(&monitor->null.ramp);
 }
 void _glfwPlatformGetMonitorPos(_GLFWmonitor* monitor, int* xpos, int* ypos)
 {
    if (xpos)
        *xpos = 0;
    if (ypos)
        *ypos = 0;
 }
 void _glfwPlatformGetMonitorContentScale(_GLFWmonitor* monitor,
@@ -53,23 +91,69 @@ void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor,
                                     int* xpos, int* ypos,
                                     int* width, int* height)
 {
    const GLFWvidmode mode = getVideoMode();
    if (xpos)
        *xpos = 0;
    if (ypos)
        *ypos = 10;
    if (width)
        *width = mode.width;
    if (height)
        *height = mode.height - 10;
 }
 GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* found)
 {
-    return NULL;
+    GLFWvidmode* mode = calloc(1, sizeof(GLFWvidmode));
    *mode = getVideoMode();
    *found = 1;
    return mode;
 }
 void _glfwPlatformGetVideoMode(_GLFWmonitor* monitor, GLFWvidmode* mode)
 {
    *mode = getVideoMode();
 }
 GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
 {
-    return GLFW_FALSE;
+    if (!monitor->null.ramp.size)
    {
        _glfwAllocGammaArrays(&monitor->null.ramp, 256);
        for (unsigned int i = 0;  i < monitor->null.ramp.size;  i++)
        {
            const float gamma = 2.2f;
            float value;
            value = i / (float) (monitor->null.ramp.size - 1);
            value = powf(value, 1.f / gamma) * 65535.f + 0.5f;
            value = _glfw_fminf(value, 65535.f);
            monitor->null.ramp.red[i]   = (unsigned short) value;
            monitor->null.ramp.green[i] = (unsigned short) value;
            monitor->null.ramp.blue[i]  = (unsigned short) value;
        }
    }
    _glfwAllocGammaArrays(ramp, monitor->null.ramp.size);
    memcpy(ramp->red,   monitor->null.ramp.red,   sizeof(short) * ramp->size);
    memcpy(ramp->green, monitor->null.ramp.green, sizeof(short) * ramp->size);
    memcpy(ramp->blue,  monitor->null.ramp.blue,  sizeof(short) * ramp->size);
    return GLFW_TRUE;
 }
 void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 {
    if (monitor->null.ramp.size != ramp->size)
    {
        _glfwInputError(GLFW_PLATFORM_ERROR,
                        "Null: Gamma ramp size must match current ramp size");
        return;
    }
    memcpy(monitor->null.ramp.red,   ramp->red,   sizeof(short) * ramp->size);
    memcpy(monitor->null.ramp.green, ramp->green, sizeof(short) * ramp->size);
    memcpy(monitor->null.ramp.blue,  ramp->blue,  sizeof(short) * ramp->size);
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -28,16 +28,13 @@
 #include <dlfcn.h>
 #define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowNull null
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryNull null
 #define _GLFW_PLATFORM_MONITOR_STATE        _GLFWmonitorNull null
-#define _GLFW_PLATFORM_CONTEXT_STATE
+#define _GLFW_PLATFORM_CONTEXT_STATE         struct { int dummyContext; }
-#define _GLFW_PLATFORM_MONITOR_STATE
+#define _GLFW_PLATFORM_CURSOR_STATE          struct { int dummyCursor; }
-#define _GLFW_PLATFORM_CURSOR_STATE
+#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE struct { int dummyLibraryContext; }
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE
 #define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE
 #define _GLFW_EGL_CONTEXT_STATE
 #define _GLFW_EGL_LIBRARY_CONTEXT_STATE
 #include "osmesa_context.h"
 #include "posix_time.h"
 #include "posix_thread.h"
 #include "null_joystick.h"
@@ -56,7 +53,37 @@
 //
 typedef struct _GLFWwindowNull
 {
    int             xpos;
    int             ypos;
    int             width;
    int             height;
    char*           title;
    GLFWbool        visible;
    GLFWbool        iconified;
    GLFWbool        maximized;
    GLFWbool        resizable;
    GLFWbool        decorated;
    GLFWbool        floating;
    GLFWbool        transparent;
    float           opacity;
 } _GLFWwindowNull;
 // Null-specific per-monitor data
 //
 typedef struct _GLFWmonitorNull
 {
    GLFWgammaramp   ramp;
 } _GLFWmonitorNull;
 // Null-specific global data
 //
 typedef struct _GLFWlibraryNull
 {
    int             xcursor;
    int             ycursor;
    char*           clipboardString;
    _GLFWwindow*    focusedWindow;
 } _GLFWlibraryNull;
 void _glfwPollMonitorsNull(void);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,15 +24,76 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
 #include <stdlib.h>
 static void applySizeLimits(_GLFWwindow* window, int* width, int* height)
 {
    if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE)
    {
        const float ratio = (float) window->numer / (float) window->denom;
        *height = (int) (*width / ratio);
    }
    if (window->minwidth != GLFW_DONT_CARE && *width < window->minwidth)
        *width = window->minwidth;
    else if (window->maxwidth != GLFW_DONT_CARE && *width > window->maxwidth)
        *width = window->maxwidth;
    if (window->minheight != GLFW_DONT_CARE && *height < window->minheight)
        *height = window->minheight;
    else if (window->maxheight != GLFW_DONT_CARE && *height > window->maxheight)
        *height = window->maxheight;
 }
 static void fitToMonitor(_GLFWwindow* window)
 {
    GLFWvidmode mode;
    _glfwPlatformGetVideoMode(window->monitor, &mode);
    _glfwPlatformGetMonitorPos(window->monitor,
                               &window->null.xpos,
                               &window->null.ypos);
    window->null.width = mode.width;
    window->null.height = mode.height;
 }
 static void acquireMonitor(_GLFWwindow* window)
 {
    _glfwInputMonitorWindow(window->monitor, window);
 }
 static void releaseMonitor(_GLFWwindow* window)
 {
    if (window->monitor->window != window)
        return;
    _glfwInputMonitorWindow(window->monitor, NULL);
 }
 static int createNativeWindow(_GLFWwindow* window,
-                              const _GLFWwndconfig* wndconfig)
+                              const _GLFWwndconfig* wndconfig,
                              const _GLFWfbconfig* fbconfig)
 {
    if (window->monitor)
        fitToMonitor(window);
    else
    {
        window->null.xpos = 17;
        window->null.ypos = 17;
        window->null.width = wndconfig->width;
        window->null.height = wndconfig->height;
    }
    window->null.visible = wndconfig->visible;
    window->null.decorated = wndconfig->decorated;
    window->null.maximized = wndconfig->maximized;
    window->null.floating = wndconfig->floating;
    window->null.transparent = fbconfig->transparent;
    window->null.opacity = 1.f;
    return GLFW_TRUE;
 }
@@ -47,7 +108,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
                              const _GLFWctxconfig* ctxconfig,
                              const _GLFWfbconfig* fbconfig)
 {
-    if (!createNativeWindow(window, wndconfig))
+    if (!createNativeWindow(window, wndconfig, fbconfig))
        return GLFW_FALSE;
    if (ctxconfig->client != GLFW_NO_API)
@@ -67,11 +128,24 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
        }
    }
    if (window->monitor)
    {
        _glfwPlatformShowWindow(window);
        _glfwPlatformFocusWindow(window);
        acquireMonitor(window);
    }
    return GLFW_TRUE;
 }
 void _glfwPlatformDestroyWindow(_GLFWwindow* window)
 {
    if (window->monitor)
        releaseMonitor(window);
    if (_glfw.null.focusedWindow == window)
        _glfw.null.focusedWindow = NULL;
    if (window->context.destroy)
        window->context.destroy(window);
 }
@@ -91,14 +165,54 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
                                   int width, int height,
                                   int refreshRate)
 {
    if (window->monitor == monitor)
    {
        if (!monitor)
        {
            _glfwPlatformSetWindowPos(window, xpos, ypos);
            _glfwPlatformSetWindowSize(window, width, height);
        }
        return;
    }
    if (window->monitor)
        releaseMonitor(window);
    _glfwInputWindowMonitor(window, monitor);
    if (window->monitor)
    {
        window->null.visible = GLFW_TRUE;
        acquireMonitor(window);
        fitToMonitor(window);
    }
    else
    {
        _glfwPlatformSetWindowPos(window, xpos, ypos);
        _glfwPlatformSetWindowSize(window, width, height);
    }
 }
 void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
 {
    if (xpos)
        *xpos = window->null.xpos;
    if (ypos)
        *ypos = window->null.ypos;
 }
 void _glfwPlatformSetWindowPos(_GLFWwindow* window, int xpos, int ypos)
 {
    if (window->monitor)
        return;
    if (window->null.xpos != xpos || window->null.ypos != ypos)
    {
        window->null.xpos = xpos;
        window->null.ypos = ypos;
        _glfwInputWindowPos(window, xpos, ypos);
    }
 }
 void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
@@ -110,19 +224,35 @@ void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
 }
 void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
 {
    if (window->monitor)
        return;
    if (window->null.width != width || window->null.height != height)
    {
        window->null.width = width;
        window->null.height = height;
        _glfwInputWindowSize(window, width, height);
        _glfwInputFramebufferSize(window, width, height);
    }
 }
 void _glfwPlatformSetWindowSizeLimits(_GLFWwindow* window,
                                      int minwidth, int minheight,
                                      int maxwidth, int maxheight)
 {
    int width = window->null.width;
    int height = window->null.height;
    applySizeLimits(window, &width, &height);
    _glfwPlatformSetWindowSize(window, width, height);
 }
 void _glfwPlatformSetWindowAspectRatio(_GLFWwindow* window, int n, int d)
 {
    int width = window->null.width;
    int height = window->null.height;
    applySizeLimits(window, &width, &height);
    _glfwPlatformSetWindowSize(window, width, height);
 }
 void _glfwPlatformGetFramebufferSize(_GLFWwindow* window, int* width, int* height)
@@ -137,6 +267,28 @@ void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
                                     int* left, int* top,
                                     int* right, int* bottom)
 {
    if (window->null.decorated && !window->monitor)
    {
        if (left)
            *left = 1;
        if (top)
            *top = 10;
        if (right)
            *right = 1;
        if (bottom)
            *bottom = 1;
    }
    else
    {
        if (left)
            *left = 0;
        if (top)
            *top = 0;
        if (right)
            *right = 0;
        if (bottom)
            *bottom = 0;
    }
 }
 void _glfwPlatformGetWindowContentScale(_GLFWwindow* window,
@@ -150,50 +302,93 @@ void _glfwPlatformGetWindowContentScale(_GLFWwindow* window,
 void _glfwPlatformIconifyWindow(_GLFWwindow* window)
 {
    if (_glfw.null.focusedWindow == window)
    {
        _glfw.null.focusedWindow = NULL;
        _glfwInputWindowFocus(window, GLFW_FALSE);
    }
    if (!window->null.iconified)
    {
        window->null.iconified = GLFW_TRUE;
        _glfwInputWindowIconify(window, GLFW_TRUE);
        if (window->monitor)
            releaseMonitor(window);
    }
 }
 void _glfwPlatformRestoreWindow(_GLFWwindow* window)
 {
    if (window->null.iconified)
    {
        window->null.iconified = GLFW_FALSE;
        _glfwInputWindowIconify(window, GLFW_FALSE);
        if (window->monitor)
            acquireMonitor(window);
    }
    else if (window->null.maximized)
    {
        window->null.maximized = GLFW_FALSE;
        _glfwInputWindowMaximize(window, GLFW_FALSE);
    }
 }
 void _glfwPlatformMaximizeWindow(_GLFWwindow* window)
 {
    if (!window->null.maximized)
    {
        window->null.maximized = GLFW_TRUE;
        _glfwInputWindowMaximize(window, GLFW_TRUE);
    }
 }
 int _glfwPlatformWindowMaximized(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return window->null.maximized;
 }
 int _glfwPlatformWindowHovered(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return _glfw.null.xcursor >= window->null.xpos &&
           _glfw.null.ycursor >= window->null.ypos &&
           _glfw.null.xcursor <= window->null.xpos + window->null.width - 1 &&
           _glfw.null.ycursor <= window->null.ypos + window->null.height - 1;
 }
 int _glfwPlatformFramebufferTransparent(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return window->null.transparent;
 }
 void _glfwPlatformSetWindowResizable(_GLFWwindow* window, GLFWbool enabled)
 {
    window->null.resizable = enabled;
 }
 void _glfwPlatformSetWindowDecorated(_GLFWwindow* window, GLFWbool enabled)
 {
    window->null.decorated = enabled;
 }
 void _glfwPlatformSetWindowFloating(_GLFWwindow* window, GLFWbool enabled)
 {
    window->null.floating = enabled;
 }
 void _glfwPlatformSetWindowMousePassthrough(_GLFWwindow* window, GLFWbool enabled)
 {
 }
 float _glfwPlatformGetWindowOpacity(_GLFWwindow* window)
 {
-    return 1.f;
+    return window->null.opacity;
 }
 void _glfwPlatformSetWindowOpacity(_GLFWwindow* window, float opacity)
 {
    window->null.opacity = opacity;
 }
 void _glfwPlatformSetRawMouseMotion(_GLFWwindow *window, GLFWbool enabled)
@@ -202,43 +397,63 @@ void _glfwPlatformSetRawMouseMotion(_GLFWwindow *window, GLFWbool enabled)
 GLFWbool _glfwPlatformRawMouseMotionSupported(void)
 {
-    return GLFW_FALSE;
+    return GLFW_TRUE;
 }
 void _glfwPlatformShowWindow(_GLFWwindow* window)
 {
    window->null.visible = GLFW_TRUE;
 }
 void _glfwPlatformRequestWindowAttention(_GLFWwindow* window)
 {
 }
 void _glfwPlatformUnhideWindow(_GLFWwindow* window)
 {
 }
 void _glfwPlatformHideWindow(_GLFWwindow* window)
 {
    if (_glfw.null.focusedWindow == window)
    {
        _glfw.null.focusedWindow = NULL;
        _glfwInputWindowFocus(window, GLFW_FALSE);
    }
    window->null.visible = GLFW_FALSE;
 }
 void _glfwPlatformFocusWindow(_GLFWwindow* window)
 {
    if (_glfw.null.focusedWindow == window)
        return;
    if (!window->null.visible)
        return;
    _GLFWwindow* previous = _glfw.null.focusedWindow;
    _glfw.null.focusedWindow = window;
    if (previous)
    {
        _glfwInputWindowFocus(previous, GLFW_FALSE);
        if (previous->monitor && previous->autoIconify)
            _glfwPlatformIconifyWindow(previous);
    }
    _glfwInputWindowFocus(window, GLFW_TRUE);
 }
 int _glfwPlatformWindowFocused(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return _glfw.null.focusedWindow == window;
 }
 int _glfwPlatformWindowIconified(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return window->null.iconified;
 }
 int _glfwPlatformWindowVisible(_GLFWwindow* window)
 {
-    return GLFW_FALSE;
+    return window->null.visible;
 }
 void _glfwPlatformPollEvents(void)
@@ -259,10 +474,16 @@ void _glfwPlatformPostEmptyEvent(void)
 void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos)
 {
    if (xpos)
        *xpos = _glfw.null.xcursor - window->null.xpos;
    if (ypos)
        *ypos = _glfw.null.ycursor - window->null.ypos;
 }
 void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
 {
    _glfw.null.xcursor = window->null.xpos + (int) x;
    _glfw.null.ycursor = window->null.ypos + (int) y;
 }
 void _glfwPlatformSetCursorMode(_GLFWwindow* window, int mode)
@@ -291,21 +512,140 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
 void _glfwPlatformSetClipboardString(const char* string)
 {
    char* copy = _glfw_strdup(string);
    free(_glfw.null.clipboardString);
    _glfw.null.clipboardString = copy;
 }
 const char* _glfwPlatformGetClipboardString(void)
 {
-    return NULL;
+    return _glfw.null.clipboardString;
 }
 const char* _glfwPlatformGetScancodeName(int scancode)
 {
-    return "";
+    switch (scancode)
    {
        case GLFW_KEY_APOSTROPHE:
            return "'";
        case GLFW_KEY_COMMA:
            return ",";
        case GLFW_KEY_MINUS:
        case GLFW_KEY_KP_SUBTRACT:
            return "-";
        case GLFW_KEY_PERIOD:
        case GLFW_KEY_KP_DECIMAL:
            return ".";
        case GLFW_KEY_SLASH:
        case GLFW_KEY_KP_DIVIDE:
            return "/";
        case GLFW_KEY_SEMICOLON:
            return ";";
        case GLFW_KEY_EQUAL:
        case GLFW_KEY_KP_EQUAL:
            return "=";
        case GLFW_KEY_LEFT_BRACKET:
            return "[";
        case GLFW_KEY_RIGHT_BRACKET:
            return "]";
        case GLFW_KEY_KP_MULTIPLY:
            return "*";
        case GLFW_KEY_KP_ADD:
            return "+";
        case GLFW_KEY_BACKSLASH:
        case GLFW_KEY_WORLD_1:
        case GLFW_KEY_WORLD_2:
            return "\\";
        case GLFW_KEY_0:
        case GLFW_KEY_KP_0:
            return "0";
        case GLFW_KEY_1:
        case GLFW_KEY_KP_1:
            return "1";
        case GLFW_KEY_2:
        case GLFW_KEY_KP_2:
            return "2";
        case GLFW_KEY_3:
        case GLFW_KEY_KP_3:
            return "3";
        case GLFW_KEY_4:
        case GLFW_KEY_KP_4:
            return "4";
        case GLFW_KEY_5:
        case GLFW_KEY_KP_5:
            return "5";
        case GLFW_KEY_6:
        case GLFW_KEY_KP_6:
            return "6";
        case GLFW_KEY_7:
        case GLFW_KEY_KP_7:
            return "7";
        case GLFW_KEY_8:
        case GLFW_KEY_KP_8:
            return "8";
        case GLFW_KEY_9:
        case GLFW_KEY_KP_9:
            return "9";
        case GLFW_KEY_A:
            return "a";
        case GLFW_KEY_B:
            return "b";
        case GLFW_KEY_C:
            return "c";
        case GLFW_KEY_D:
            return "d";
        case GLFW_KEY_E:
            return "e";
        case GLFW_KEY_F:
            return "f";
        case GLFW_KEY_G:
            return "g";
        case GLFW_KEY_H:
            return "h";
        case GLFW_KEY_I:
            return "i";
        case GLFW_KEY_J:
            return "j";
        case GLFW_KEY_K:
            return "k";
        case GLFW_KEY_L:
            return "l";
        case GLFW_KEY_M:
            return "m";
        case GLFW_KEY_N:
            return "n";
        case GLFW_KEY_O:
            return "o";
        case GLFW_KEY_P:
            return "p";
        case GLFW_KEY_Q:
            return "q";
        case GLFW_KEY_R:
            return "r";
        case GLFW_KEY_S:
            return "s";
        case GLFW_KEY_T:
            return "t";
        case GLFW_KEY_U:
            return "u";
        case GLFW_KEY_V:
            return "v";
        case GLFW_KEY_W:
            return "w";
        case GLFW_KEY_X:
            return "x";
        case GLFW_KEY_Y:
            return "y";
        case GLFW_KEY_Z:
            return "z";
    }
    return NULL;
 }
 int _glfwPlatformGetKeyScancode(int key)
 {
-    return -1;
+    return key;
 }
 void _glfwPlatformGetRequiredInstanceExtensions(char** extensions)
@@ -325,6 +665,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
                                          VkSurfaceKHR* surface)
 {
    // This seems like the most appropriate error to return here
-    return VK_ERROR_INITIALIZATION_FAILED;
+    return VK_ERROR_EXTENSION_NOT_PRESENT;
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 OSMesa - www.glfw.org
+// GLFW 3.4 OSMesa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include <stdlib.h>
 #include <string.h>
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 OSMesa - www.glfw.org
+// GLFW 3.4 OSMesa - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2016 Google Inc.
 // Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -54,10 +54,6 @@ typedef GLFWglproc (GLAPIENTRY * PFN_OSMesaGetProcAddress)(const char*);
 #define OSMesaGetDepthBuffer _glfw.osmesa.GetDepthBuffer
 #define OSMesaGetProcAddress _glfw.osmesa.GetProcAddress
 #define _GLFW_OSMESA_CONTEXT_STATE              _GLFWcontextOSMesa osmesa
 #define _GLFW_OSMESA_LIBRARY_CONTEXT_STATE      _GLFWlibraryOSMesa osmesa
 // OSMesa-specific per-context data
 //
 typedef struct _GLFWcontextOSMesa
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #include "internal.h"
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,9 +24,14 @@
 //    distribution.
 //
 //========================================================================
 // It is fine to use C99 in this file because it will not be built with VS
 //========================================================================
 #define _POSIX_C_SOURCE 199309L
 #include "internal.h"
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
@@ -39,7 +44,7 @@
 //
 void _glfwInitTimerPOSIX(void)
 {
-#if defined(CLOCK_MONOTONIC)
+#if defined(_POSIX_TIMERS) && defined(_POSIX_MONOTONIC_CLOCK)
    struct timespec ts;
    if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
@@ -62,7 +67,7 @@ void _glfwInitTimerPOSIX(void)
 uint64_t _glfwPlatformGetTimerValue(void)
 {
-#if defined(CLOCK_MONOTONIC)
+#if defined(_POSIX_TIMERS) && defined(_POSIX_MONOTONIC_CLOCK)
    if (_glfw.timer.posix.monotonic)
    {
        struct timespec ts;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 POSIX - www.glfw.org
+// GLFW 3.4 POSIX - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 - www.glfw.org
+// GLFW 3.4 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -55,6 +57,8 @@ GLFWbool _glfwInitVulkan(int mode)
    _glfw.vk.handle = _glfw_dlopen("vulkan-1.dll");
 #elif defined(_GLFW_COCOA)
    _glfw.vk.handle = _glfw_dlopen("libvulkan.1.dylib");
    if (!_glfw.vk.handle)
        _glfw.vk.handle = _glfwLoadLocalVulkanLoaderNS();
 #else
    _glfw.vk.handle = _glfw_dlopen("libvulkan.so.1");
 #endif
@@ -128,6 +132,8 @@ GLFWbool _glfwInitVulkan(int mode)
 #elif defined(_GLFW_COCOA)
        else if (strcmp(ep[i].extensionName, "VK_MVK_macos_surface") == 0)
            _glfw.vk.MVK_macos_surface = GLFW_TRUE;
        else if (strcmp(ep[i].extensionName, "VK_EXT_metal_surface") == 0)
            _glfw.vk.EXT_metal_surface = GLFW_TRUE;
 #elif defined(_GLFW_X11)
        else if (strcmp(ep[i].extensionName, "VK_KHR_xlib_surface") == 0)
            _glfw.vk.KHR_xlib_surface = GLFW_TRUE;
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 WGL - www.glfw.org
+// GLFW 3.4 WGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -75,7 +77,7 @@ static int choosePixelFormat(_GLFWwindow* window,
    {
        const int attrib = WGL_NUMBER_PIXEL_FORMATS_ARB;
-        if (!_glfw.wgl.GetPixelFormatAttribivARB(window->context.wgl.dc,
+        if (!wglGetPixelFormatAttribivARB(window->context.wgl.dc,
                                          1, 0, 1, &attrib, &nativeCount))
        {
            _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
@@ -139,7 +141,7 @@ static int choosePixelFormat(_GLFWwindow* window,
        {
            // Get pixel format attributes through "modern" extension
-            if (!_glfw.wgl.GetPixelFormatAttribivARB(window->context.wgl.dc,
+            if (!wglGetPixelFormatAttribivARB(window->context.wgl.dc,
                                              pixelFormat, 0,
                                              attribCount,
                                              attribs, values))
@@ -360,7 +362,7 @@ static void swapIntervalWGL(int interval)
    }
    if (_glfw.wgl.EXT_swap_control)
-        _glfw.wgl.SwapIntervalEXT(interval);
+        wglSwapIntervalEXT(interval);
 }
 static int extensionSupportedWGL(const char* extension)
@@ -368,9 +370,9 @@ static int extensionSupportedWGL(const char* extension)
    const char* extensions = NULL;
    if (_glfw.wgl.GetExtensionsStringARB)
-        extensions = _glfw.wgl.GetExtensionsStringARB(wglGetCurrentDC());
+        extensions = wglGetExtensionsStringARB(wglGetCurrentDC());
    else if (_glfw.wgl.GetExtensionsStringEXT)
-        extensions = _glfw.wgl.GetExtensionsStringEXT();
+        extensions = wglGetExtensionsStringEXT();
    if (!extensions)
        return GLFW_FALSE;
@@ -387,8 +389,6 @@ static GLFWglproc getProcAddressWGL(const char* procname)
    return (GLFWglproc) GetProcAddress(_glfw.wgl.instance, procname);
 }
 // Destroy the OpenGL context
 //
 static void destroyContextWGL(_GLFWwindow* window)
 {
    if (window->context.wgl.handle)
@@ -693,8 +693,7 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
        setAttrib(0, 0);
        window->context.wgl.handle =
-            _glfw.wgl.CreateContextAttribsARB(window->context.wgl.dc,
+            wglCreateContextAttribsARB(window->context.wgl.dc, share, attribs);
                                              share, attribs);
        if (!window->context.wgl.handle)
        {
            const DWORD error = GetLastError();
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 WGL - www.glfw.org
+// GLFW 3.4 WGL - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
@@ -76,12 +76,19 @@
 #define ERROR_INVALID_PROFILE_ARB 0x2096
 #define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
 // WGL extension pointer typedefs
 typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC)(int);
 typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC)(HDC,int,int,UINT,const int*,int*);
 typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void);
 typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC);
 typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC,HGLRC,const int*);
 #define wglSwapIntervalEXT _glfw.wgl.SwapIntervalEXT
 #define wglGetPixelFormatAttribivARB _glfw.wgl.GetPixelFormatAttribivARB
 #define wglGetExtensionsStringEXT _glfw.wgl.GetExtensionsStringEXT
 #define wglGetExtensionsStringARB _glfw.wgl.GetExtensionsStringARB
 #define wglCreateContextAttribsARB _glfw.wgl.CreateContextAttribsARB
 // opengl32.dll function pointer typedefs
 typedef HGLRC (WINAPI * PFN_wglCreateContext)(HDC);
 typedef BOOL (WINAPI * PFN_wglDeleteContext)(HGLRC);
 typedef PROC (WINAPI * PFN_wglGetProcAddress)(LPCSTR);
@@ -89,8 +96,6 @@ typedef HDC (WINAPI * PFN_wglGetCurrentDC)(void);
 typedef HGLRC (WINAPI * PFN_wglGetCurrentContext)(void);
 typedef BOOL (WINAPI * PFN_wglMakeCurrent)(HDC,HGLRC);
 typedef BOOL (WINAPI * PFN_wglShareLists)(HGLRC,HGLRC);
 // opengl32.dll function pointer typedefs
 #define wglCreateContext _glfw.wgl.CreateContext
 #define wglDeleteContext _glfw.wgl.DeleteContext
 #define wglGetProcAddress _glfw.wgl.GetProcAddress
@@ -99,10 +104,6 @@ typedef BOOL (WINAPI * PFN_wglShareLists)(HGLRC,HGLRC);
 #define wglMakeCurrent _glfw.wgl.MakeCurrent
 #define wglShareLists _glfw.wgl.ShareLists
 #define _GLFW_RECREATION_NOT_NEEDED 0
 #define _GLFW_RECREATION_REQUIRED   1
 #define _GLFW_RECREATION_IMPOSSIBLE 2
 #define _GLFW_PLATFORM_CONTEXT_STATE            _GLFWcontextWGL wgl
 #define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE    _GLFWlibraryWGL wgl
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -141,6 +143,8 @@ static GLFWbool loadLibraries(void)
            GetProcAddress(_glfw.win32.dwmapi.instance, "DwmFlush");
        _glfw.win32.dwmapi.EnableBlurBehindWindow = (PFN_DwmEnableBlurBehindWindow)
            GetProcAddress(_glfw.win32.dwmapi.instance, "DwmEnableBlurBehindWindow");
        _glfw.win32.dwmapi.GetColorizationColor = (PFN_DwmGetColorizationColor)
            GetProcAddress(_glfw.win32.dwmapi.instance, "DwmGetColorizationColor");
    }
    _glfw.win32.shcore.instance = LoadLibraryA("shcore.dll");
@@ -523,7 +527,7 @@ BOOL _glfwIsWindowsVersionOrGreaterWin32(WORD major, WORD minor, WORD sp)
    cond = VerSetConditionMask(cond, VER_MINORVERSION, VER_GREATER_EQUAL);
    cond = VerSetConditionMask(cond, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
    // HACK: Use RtlVerifyVersionInfo instead of VerifyVersionInfoW as the
-    //       latter lies unless the user knew to embedd a non-default manifest
+    //       latter lies unless the user knew to embed a non-default manifest
    //       announcing support for Windows 10 via supportedOS GUID
    return RtlVerifyVersionInfo(&osvi, mask, cond) == 0;
 }
@@ -538,7 +542,7 @@ BOOL _glfwIsWindows10BuildOrGreaterWin32(WORD build)
    cond = VerSetConditionMask(cond, VER_MINORVERSION, VER_GREATER_EQUAL);
    cond = VerSetConditionMask(cond, VER_BUILDNUMBER, VER_GREATER_EQUAL);
    // HACK: Use RtlVerifyVersionInfo instead of VerifyVersionInfoW as the
-    //       latter lies unless the user knew to embedd a non-default manifest
+    //       latter lies unless the user knew to embed a non-default manifest
    //       announcing support for Windows 10 via supportedOS GUID
    return RtlVerifyVersionInfo(&osvi, mask, cond) == 0;
 }
@@ -578,7 +582,6 @@ int _glfwPlatformInit(void)
        return GLFW_FALSE;
    _glfwInitTimerWin32();
    _glfwInitJoysticksWin32();
    _glfwPollMonitorsWin32();
    return GLFW_TRUE;
@@ -605,8 +608,6 @@ void _glfwPlatformTerminate(void)
    _glfwTerminateWGL();
    _glfwTerminateEGL();
    _glfwTerminateJoysticksWin32();
    freeLibraries();
 }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -354,7 +356,7 @@ static BOOL CALLBACK deviceCallback(const DIDEVICEINSTANCE* di, void* user)
    for (jid = 0;  jid <= GLFW_JOYSTICK_LAST;  jid++)
    {
-        _GLFWjoystick* js = _glfw.joysticks + jid;
+        js = _glfw.joysticks + jid;
        if (js->present)
        {
            if (memcmp(&js->win32.guid, &di->guidInstance, sizeof(GUID)) == 0)
@@ -489,39 +491,6 @@ static BOOL CALLBACK deviceCallback(const DIDEVICEINSTANCE* di, void* user)
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
 // Initialize joystick interface
 //
 void _glfwInitJoysticksWin32(void)
 {
    if (_glfw.win32.dinput8.instance)
    {
        if (FAILED(DirectInput8Create(GetModuleHandle(NULL),
                                      DIRECTINPUT_VERSION,
                                      &IID_IDirectInput8W,
                                      (void**) &_glfw.win32.dinput8.api,
                                      NULL)))
        {
            _glfwInputError(GLFW_PLATFORM_ERROR,
                            "Win32: Failed to create interface");
        }
    }
    _glfwDetectJoystickConnectionWin32();
 }
 // Close all opened joystick handles
 //
 void _glfwTerminateJoysticksWin32(void)
 {
    int jid;
    for (jid = GLFW_JOYSTICK_1;  jid <= GLFW_JOYSTICK_LAST;  jid++)
        closeJoystick(_glfw.joysticks + jid);
    if (_glfw.win32.dinput8.api)
        IDirectInput8_Release(_glfw.win32.dinput8.api);
 }
 // Checks for new joysticks after DBT_DEVICEARRIVAL
 //
 void _glfwDetectJoystickConnectionWin32(void)
@@ -601,6 +570,37 @@ void _glfwDetectJoystickDisconnectionWin32(void)
 //////                       GLFW platform API                      //////
 //////////////////////////////////////////////////////////////////////////
 GLFWbool _glfwPlatformInitJoysticks(void)
 {
    if (_glfw.win32.dinput8.instance)
    {
        if (FAILED(DirectInput8Create(GetModuleHandle(NULL),
                                      DIRECTINPUT_VERSION,
                                      &IID_IDirectInput8W,
                                      (void**) &_glfw.win32.dinput8.api,
                                      NULL)))
        {
            _glfwInputError(GLFW_PLATFORM_ERROR,
                            "Win32: Failed to create interface");
            return GLFW_FALSE;
        }
    }
    _glfwDetectJoystickConnectionWin32();
    return GLFW_TRUE;
 }
 void _glfwPlatformTerminateJoysticks(void)
 {
    int jid;
    for (jid = GLFW_JOYSTICK_1;  jid <= GLFW_JOYSTICK_LAST;  jid++)
        closeJoystick(_glfw.joysticks + jid);
    if (_glfw.win32.dinput8.api)
        IDirectInput8_Release(_glfw.win32.dinput8.api);
 }
 int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
 {
    if (js->win32.device)
@@ -670,11 +670,11 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
                    };
                    // Screams of horror are appropriate at this point
-                    int state = LOWORD(*(DWORD*) data) / (45 * DI_DEGREES);
+                    int stateIndex = LOWORD(*(DWORD*) data) / (45 * DI_DEGREES);
-                    if (state < 0 || state > 8)
+                    if (stateIndex < 0 || stateIndex > 8)
-                        state = 8;
+                        stateIndex = 8;
-                    _glfwInputJoystickHat(js, pi, states[state]);
+                    _glfwInputJoystickHat(js, pi, states[stateIndex]);
                    pi++;
                    break;
                }
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 //
@@ -25,7 +25,7 @@
 //========================================================================
 #define _GLFW_PLATFORM_JOYSTICK_STATE         _GLFWjoystickWin32 win32
-#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE int dummy
+#define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE struct { int dummyLibraryJoystick; }
 #define _GLFW_PLATFORM_MAPPING_NAME "Windows"
@@ -48,9 +48,6 @@ typedef struct _GLFWjoystickWin32
    GUID                    guid;
 } _GLFWjoystickWin32;
 void _glfwInitJoysticksWin32(void);
 void _glfwTerminateJoysticksWin32(void);
 void _glfwDetectJoystickConnectionWin32(void);
 void _glfwDetectJoystickDisconnectionWin32(void);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -31,6 +33,7 @@
 #include <string.h>
 #include <limits.h>
 #include <malloc.h>
 #include <wchar.h>
 // Callback for EnumDisplayMonitors in createMonitor
@@ -182,6 +185,8 @@ void _glfwPollMonitorsWin32(void)
                           display.DeviceName) == 0)
                {
                    disconnected[i] = NULL;
                    // handle may have changed, update
                    EnumDisplayMonitors(NULL, NULL, monitorCallback, (LPARAM) _glfw.monitors[i]);
                    break;
                }
            }
@@ -475,7 +480,7 @@ void _glfwPlatformGetVideoMode(_GLFWmonitor* monitor, GLFWvidmode* mode)
 GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
 {
    HDC dc;
-    WORD values[768];
+    WORD values[3][256];
    dc = CreateDCW(L"DISPLAY", monitor->win32.adapterName, NULL, NULL);
    GetDeviceGammaRamp(dc, values);
@@ -483,9 +488,9 @@ GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
    _glfwAllocGammaArrays(ramp, 256);
-    memcpy(ramp->red,   values +   0, 256 * sizeof(unsigned short));
+    memcpy(ramp->red,   values[0], sizeof(values[0]));
-    memcpy(ramp->green, values + 256, 256 * sizeof(unsigned short));
+    memcpy(ramp->green, values[1], sizeof(values[1]));
-    memcpy(ramp->blue,  values + 512, 256 * sizeof(unsigned short));
+    memcpy(ramp->blue,  values[2], sizeof(values[2]));
    return GLFW_TRUE;
 }
@@ -493,7 +498,7 @@ GLFWbool _glfwPlatformGetGammaRamp(_GLFWmonitor* monitor, GLFWgammaramp* ramp)
 void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
 {
    HDC dc;
-    WORD values[768];
+    WORD values[3][256];
    if (ramp->size != 256)
    {
@@ -502,9 +507,9 @@ void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
        return;
    }
-    memcpy(values +   0, ramp->red,   256 * sizeof(unsigned short));
+    memcpy(values[0], ramp->red,   sizeof(values[0]));
-    memcpy(values + 256, ramp->green, 256 * sizeof(unsigned short));
+    memcpy(values[1], ramp->green, sizeof(values[1]));
-    memcpy(values + 512, ramp->blue,  256 * sizeof(unsigned short));
+    memcpy(values[2], ramp->blue,  sizeof(values[2]));
    dc = CreateDCW(L"DISPLAY", monitor->win32.adapterName, NULL, NULL);
    SetDeviceGammaRamp(dc, values);
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -77,6 +77,9 @@
 #ifndef WM_DWMCOMPOSITIONCHANGED
 #define WM_DWMCOMPOSITIONCHANGED 0x031E
 #endif
 #ifndef WM_DWMCOLORIZATIONCOLORCHANGED
 #define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
 #endif
 #ifndef WM_COPYGLOBALDATA
 #define WM_COPYGLOBALDATA 0x0049
 #endif
@@ -99,7 +102,7 @@
 #define DISPLAY_DEVICE_ACTIVE 0x00000001
 #endif
 #ifndef _WIN32_WINNT_WINBLUE
- #define _WIN32_WINNT_WINBLUE 0x0602
+ #define _WIN32_WINNT_WINBLUE 0x0603
 #endif
 #ifndef _WIN32_WINNT_WIN8
 #define _WIN32_WINNT_WIN8 0x0602
@@ -160,9 +163,6 @@ typedef enum
 #endif /*DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2*/
 // HACK: Define versionhelpers.h functions manually as MinGW lacks the header
 #define IsWindowsXPOrGreater()                                 \
    _glfwIsWindowsVersionOrGreaterWin32(HIBYTE(_WIN32_WINNT_WINXP),   \
                                        LOBYTE(_WIN32_WINNT_WINXP), 0)
 #define IsWindowsVistaOrGreater()                                     \
    _glfwIsWindowsVersionOrGreaterWin32(HIBYTE(_WIN32_WINNT_VISTA),   \
                                        LOBYTE(_WIN32_WINNT_VISTA), 0)
@@ -247,9 +247,11 @@ typedef BOOL (WINAPI * PFN_AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UIN
 typedef HRESULT (WINAPI * PFN_DwmIsCompositionEnabled)(BOOL*);
 typedef HRESULT (WINAPI * PFN_DwmFlush)(VOID);
 typedef HRESULT(WINAPI * PFN_DwmEnableBlurBehindWindow)(HWND,const DWM_BLURBEHIND*);
 typedef HRESULT (WINAPI * PFN_DwmGetColorizationColor)(DWORD*,BOOL*);
 #define DwmIsCompositionEnabled _glfw.win32.dwmapi.IsCompositionEnabled
 #define DwmFlush _glfw.win32.dwmapi.Flush
 #define DwmEnableBlurBehindWindow _glfw.win32.dwmapi.EnableBlurBehindWindow
 #define DwmGetColorizationColor _glfw.win32.dwmapi.GetColorizationColor
 // shcore.dll function pointer typedefs
 typedef HRESULT (WINAPI * PFN_SetProcessDpiAwareness)(PROCESS_DPI_AWARENESS);
@@ -277,8 +279,6 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(
 #include "win32_joystick.h"
 #include "wgl_context.h"
 #include "egl_context.h"
 #include "osmesa_context.h"
 #if !defined(_GLFW_WNDCLASSNAME)
 #define _GLFW_WNDCLASSNAME L"GLFW30"
@@ -288,9 +288,6 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(
 #define _glfw_dlclose(handle) FreeLibrary((HMODULE) handle)
 #define _glfw_dlsym(handle, name) GetProcAddress((HMODULE) handle, name)
 #define _GLFW_EGL_NATIVE_WINDOW  ((EGLNativeWindowType) window->win32.handle)
 #define _GLFW_EGL_NATIVE_DISPLAY EGL_DEFAULT_DISPLAY
 #define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowWin32  win32
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryWin32 win32
 #define _GLFW_PLATFORM_LIBRARY_TIMER_STATE  _GLFWtimerWin32   win32
@@ -315,9 +312,12 @@ typedef struct _GLFWwindowWin32
    // Whether to enable framebuffer transparency on DWM
    GLFWbool            transparent;
    GLFWbool            scaleToMonitor;
    GLFWbool            keymenu;
    // The last received cursor position, regardless of source
    int                 lastCursorPosX, lastCursorPosY;
    // The last recevied high surrogate when decoding pairs of UTF-16 messages
    WCHAR               highSurrogate;
 } _GLFWwindowWin32;
@@ -373,6 +373,7 @@ typedef struct _GLFWlibraryWin32
        PFN_DwmIsCompositionEnabled     IsCompositionEnabled;
        PFN_DwmFlush                    Flush;
        PFN_DwmEnableBlurBehindWindow   EnableBlurBehindWindow;
        PFN_DwmGetColorizationColor     GetColorizationColor;
    } dwmapi;
    struct {
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -1,5 +1,5 @@
 //========================================================================
-// GLFW 3.3 Win32 - www.glfw.org
+// GLFW 3.4 Win32 - www.glfw.org
 //------------------------------------------------------------------------
 // Copyright (c) 2002-2006 Marcus Geelnard
 // Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
@@ -24,6 +24,8 @@
 //    distribution.
 //
 //========================================================================
 // Please use C89 style variable declarations in this file because VS 2010
 //========================================================================
 #include "internal.h"
@@ -34,8 +36,6 @@
 #include <windowsx.h>
 #include <shellapi.h>
 #define _GLFW_KEY_INVALID -2
 // Returns the window style for the specified window
 //
 static DWORD getWindowStyle(const _GLFWwindow* window)
@@ -377,12 +377,17 @@ static void updateWindowStyles(const _GLFWwindow* window)
 //
 static void updateFramebufferTransparency(const _GLFWwindow* window)
 {
-    BOOL enabled;
+    BOOL composition, opaque;
    DWORD color;
    if (!IsWindowsVistaOrGreater())
        return;
-    if (SUCCEEDED(DwmIsCompositionEnabled(&enabled)) && enabled)
+    if (FAILED(DwmIsCompositionEnabled(&composition)) || !composition)
       return;
    if (IsWindows8OrGreater() ||
        (SUCCEEDED(DwmGetColorizationColor(&color, &opaque)) && !opaque))
    {
        HRGN region = CreateRectRgn(0, 0, -1, -1);
        DWM_BLURBEHIND bb = {0};
@@ -390,37 +395,18 @@ static void updateFramebufferTransparency(const _GLFWwindow* window)
        bb.hRgnBlur = region;
        bb.fEnable = TRUE;
-        if (SUCCEEDED(DwmEnableBlurBehindWindow(window->win32.handle, &bb)))
+        DwmEnableBlurBehindWindow(window->win32.handle, &bb);
        {
            // Decorated windows don't repaint the transparent background
            // leaving a trail behind animations
            // HACK: Making the window layered with a transparency color key
            //       seems to fix this.  Normally, when specifying
            //       a transparency color key to be used when composing the
            //       layered window, all pixels painted by the window in this
            //       color will be transparent.  That doesn't seem to be the
            //       case anymore, at least when used with blur behind window
            //       plus negative region.
            LONG exStyle = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
            exStyle |= WS_EX_LAYERED;
            SetWindowLongW(window->win32.handle, GWL_EXSTYLE, exStyle);
            // Using a color key not equal to black to fix the trailing
            // issue.  When set to black, something is making the hit test
            // not resize with the window frame.
            SetLayeredWindowAttributes(window->win32.handle,
                                       RGB(0, 193, 48), 255, LWA_COLORKEY);
        }
        DeleteObject(region);
    }
    else
    {
-        LONG exStyle = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
+        // HACK: Disable framebuffer transparency on Windows 7 when the
-        exStyle &= ~WS_EX_LAYERED;
+        //       colorization color is opaque, because otherwise the window
-        SetWindowLongW(window->win32.handle, GWL_EXSTYLE, exStyle);
+        //       contents is blended additively with the previous frame instead
-        RedrawWindow(window->win32.handle, NULL, NULL,
+        //       of replacing it
-                     RDW_ERASE | RDW_INVALIDATE | RDW_FRAME);
+        DWM_BLURBEHIND bb = {0};
        bb.dwFlags = DWM_BB_ENABLE;
        DwmEnableBlurBehindWindow(window->win32.handle, &bb);
    }
 }
@@ -446,77 +432,6 @@ static int getKeyMods(void)
    return mods;
 }
 // Retrieves and translates modifier keys
 //
 static int getAsyncKeyMods(void)
 {
    int mods = 0;
    if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
        mods |= GLFW_MOD_SHIFT;
    if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
        mods |= GLFW_MOD_CONTROL;
    if (GetAsyncKeyState(VK_MENU) & 0x8000)
        mods |= GLFW_MOD_ALT;
    if ((GetAsyncKeyState(VK_LWIN) | GetAsyncKeyState(VK_RWIN)) & 0x8000)
        mods |= GLFW_MOD_SUPER;
    if (GetAsyncKeyState(VK_CAPITAL) & 1)
        mods |= GLFW_MOD_CAPS_LOCK;
    if (GetAsyncKeyState(VK_NUMLOCK) & 1)
        mods |= GLFW_MOD_NUM_LOCK;
    return mods;
 }
 // Translates a Windows key to the corresponding GLFW key
 //
 static int translateKey(WPARAM wParam, LPARAM lParam)
 {
    // The Ctrl keys require special handling
    if (wParam == VK_CONTROL)
    {
        MSG next;
        DWORD time;
        // Right side keys have the extended key bit set
        if (lParam & 0x01000000)
            return GLFW_KEY_RIGHT_CONTROL;
        // HACK: Alt Gr sends Left Ctrl and then Right Alt in close sequence
        //       We only want the Right Alt message, so if the next message is
        //       Right Alt we ignore this (synthetic) Left Ctrl message
        time = GetMessageTime();
        if (PeekMessageW(&next, NULL, 0, 0, PM_NOREMOVE))
        {
            if (next.message == WM_KEYDOWN ||
                next.message == WM_SYSKEYDOWN ||
                next.message == WM_KEYUP ||
                next.message == WM_SYSKEYUP)
            {
                if (next.wParam == VK_MENU &&
                    (next.lParam & 0x01000000) &&
                    next.time == time)
                {
                    // Next message is Right Alt down so discard this
                    return _GLFW_KEY_INVALID;
                }
            }
        }
        return GLFW_KEY_LEFT_CONTROL;
    }
    if (wParam == VK_PROCESSKEY)
    {
        // IME notifies that keys have been filtered by setting the virtual
        // key-code to VK_PROCESSKEY
        return _GLFW_KEY_INVALID;
    }
    return _glfw.win32.keycodes[HIWORD(lParam) & 0x1FF];
 }
 static void fitToMonitor(_GLFWwindow* window)
 {
    MONITORINFO mi = { sizeof(mi) };
@@ -539,12 +454,9 @@ static void acquireMonitor(_GLFWwindow* window)
        // HACK: When mouse trails are enabled the cursor becomes invisible when
        //       the OpenGL ICD switches to page flipping
        if (IsWindowsXPOrGreater())
        {
        SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &_glfw.win32.mouseTrailSize, 0);
        SystemParametersInfo(SPI_SETMOUSETRAILS, 0, 0, 0);
    }
    }
    if (!window->monitor->window)
        _glfw.win32.acquiredMonitorCount++;
@@ -566,7 +478,6 @@ static void releaseMonitor(_GLFWwindow* window)
        SetThreadExecutionState(ES_CONTINUOUS);
        // HACK: Restore mouse trail length saved in acquireMonitor
        if (IsWindowsXPOrGreater())
        SystemParametersInfo(SPI_SETMOUSETRAILS, _glfw.win32.mouseTrailSize, 0, 0);
    }
@@ -601,6 +512,9 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
            case WM_DEVICECHANGE:
            {
                if (!_glfw.joysticksInitialized)
                    break;
                if (wParam == DBT_DEVICEARRIVAL)
                {
                    DEV_BROADCAST_HDR* dbh = (DEV_BROADCAST_HDR*) lParam;
@@ -629,13 +543,9 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
            //       clicking a caption button
            if (HIWORD(lParam) == WM_LBUTTONDOWN)
            {
-                if (LOWORD(lParam) == HTCLOSE ||
+                if (LOWORD(lParam) != HTCLIENT)
                    LOWORD(lParam) == HTMINBUTTON ||
                    LOWORD(lParam) == HTMAXBUTTON)
                {
                    window->win32.frameAction = GLFW_TRUE;
            }
            }
            break;
        }
@@ -701,7 +611,12 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
                // User trying to access application menu using ALT?
                case SC_KEYMENU:
                {
                    if (!window->win32.keymenu)
                        return 0;
                    break;
                }
            }
            break;
        }
@@ -720,11 +635,38 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
        case WM_CHAR:
        case WM_SYSCHAR:
        {
            if (wParam >= 0xd800 && wParam <= 0xdbff)
                window->win32.highSurrogate = (WCHAR) wParam;
            else
            {
                unsigned int codepoint = 0;
                if (wParam >= 0xdc00 && wParam <= 0xdfff)
                {
                    if (window->win32.highSurrogate)
                    {
                        codepoint += (window->win32.highSurrogate - 0xd800) << 10;
                        codepoint += (WCHAR) wParam - 0xdc00;
                        codepoint += 0x10000;
                    }
                }
                else
                    codepoint = (WCHAR) wParam;
                window->win32.highSurrogate = 0;
                _glfwInputChar(window, codepoint, getKeyMods(), uMsg != WM_SYSCHAR);
            }
            if (uMsg == WM_SYSCHAR && window->win32.keymenu)
                break;
            return 0;
        }
        case WM_UNICHAR:
        {
-            const GLFWbool plain = (uMsg != WM_SYSCHAR);
+            if (wParam == UNICODE_NOCHAR)
            if (uMsg == WM_UNICHAR && wParam == UNICODE_NOCHAR)
            {
                // WM_UNICHAR is not sent by Windows, but is sent by some
                // third-party input method engine
@@ -732,7 +674,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
                return TRUE;
            }
-            _glfwInputChar(window, (unsigned int) wParam, getKeyMods(), plain);
+            _glfwInputChar(window, (unsigned int) wParam, getKeyMods(), GLFW_TRUE);
            return 0;
        }
@@ -741,13 +683,64 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
        case WM_KEYUP:
        case WM_SYSKEYUP:
        {
-            const int key = translateKey(wParam, lParam);
+            int key, scancode;
-            const int scancode = (lParam >> 16) & 0x1ff;
+            const int action = (HIWORD(lParam) & KF_UP) ? GLFW_RELEASE : GLFW_PRESS;
            const int action = ((lParam >> 31) & 1) ? GLFW_RELEASE : GLFW_PRESS;
            const int mods = getKeyMods();
-            if (key == _GLFW_KEY_INVALID)
+            scancode = (HIWORD(lParam) & (KF_EXTENDED | 0xff));
            if (!scancode)
            {
                // NOTE: Some synthetic key messages have a scancode of zero
                // HACK: Map the virtual key back to a usable scancode
                scancode = MapVirtualKeyW((UINT) wParam, MAPVK_VK_TO_VSC);
            }
            key = _glfw.win32.keycodes[scancode];
            // The Ctrl keys require special handling
            if (wParam == VK_CONTROL)
            {
                if (HIWORD(lParam) & KF_EXTENDED)
                {
                    // Right side keys have the extended key bit set
                    key = GLFW_KEY_RIGHT_CONTROL;
                }
                else
                {
                    // NOTE: Alt Gr sends Left Ctrl followed by Right Alt
                    // HACK: We only want one event for Alt Gr, so if we detect
                    //       this sequence we discard this Left Ctrl message now
                    //       and later report Right Alt normally
                    MSG next;
                    const DWORD time = GetMessageTime();
                    if (PeekMessageW(&next, NULL, 0, 0, PM_NOREMOVE))
                    {
                        if (next.message == WM_KEYDOWN ||
                            next.message == WM_SYSKEYDOWN ||
                            next.message == WM_KEYUP ||
                            next.message == WM_SYSKEYUP)
                        {
                            if (next.wParam == VK_MENU &&
                                (HIWORD(next.lParam) & KF_EXTENDED) &&
                                next.time == time)
                            {
                                // Next message is Right Alt down so discard this
                                break;
                            }
                        }
                    }
                    // This is a regular Left Ctrl message
                    key = GLFW_KEY_LEFT_CONTROL;
                }
            }
            else if (wParam == VK_PROCESSKEY)
            {
                // IME notifies that keys have been filtered by setting the
                // virtual key-code to VK_PROCESSKEY
                break;
            }
            if (action == GLFW_RELEASE && wParam == VK_SHIFT)
            {
@@ -830,7 +823,19 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
            const int x = GET_X_LPARAM(lParam);
            const int y = GET_Y_LPARAM(lParam);
-            // Disabled cursor motion input is provided by WM_INPUT
+            if (!window->win32.cursorTracked)
            {
                TRACKMOUSEEVENT tme;
                ZeroMemory(&tme, sizeof(tme));
                tme.cbSize = sizeof(tme);
                tme.dwFlags = TME_LEAVE;
                tme.hwndTrack = window->win32.handle;
                TrackMouseEvent(&tme);
                window->win32.cursorTracked = GLFW_TRUE;
                _glfwInputCursorEnter(window, GLFW_TRUE);
            }
            if (window->cursorMode == GLFW_CURSOR_DISABLED)
            {
                const int dx = x - window->win32.lastCursorPosX;
@@ -851,19 +856,6 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
            window->win32.lastCursorPosX = x;
            window->win32.lastCursorPosY = y;
            if (!window->win32.cursorTracked)
            {
                TRACKMOUSEEVENT tme;
                ZeroMemory(&tme, sizeof(tme));
                tme.cbSize = sizeof(tme);
                tme.dwFlags = TME_LEAVE;
                tme.hwndTrack = window->win32.handle;
                TrackMouseEvent(&tme);
                window->win32.cursorTracked = GLFW_TRUE;
                _glfwInputCursorEnter(window, GLFW_TRUE);
            }
            return 0;
        }
@@ -942,6 +934,9 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
        case WM_ENTERSIZEMOVE:
        case WM_ENTERMENULOOP:
        {
            if (window->win32.frameAction)
                break;
            // HACK: Enable the cursor while the user is moving or
            //       resizing the window or using the window menu
            if (window->cursorMode == GLFW_CURSOR_DISABLED)
@@ -953,6 +948,9 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
        case WM_EXITSIZEMOVE:
        case WM_EXITMENULOOP:
        {
            if (window->win32.frameAction)
                break;
            // HACK: Disable the cursor once the user is done moving or
            //       resizing the window or using the menu
            if (window->cursorMode == GLFW_CURSOR_DISABLED)
@@ -1092,6 +1090,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
        }
        case WM_DWMCOMPOSITIONCHANGED:
        case WM_DWMCOLORIZATIONCOLORCHANGED:
        {
            if (window->win32.transparent)
                updateFramebufferTransparency(window);
@@ -1225,6 +1224,7 @@ static int createNativeWindow(_GLFWwindow* window,
        xpos = CW_USEDEFAULT;
        ypos = CW_USEDEFAULT;
        window->win32.maximized = wndconfig->maximized;
        if (wndconfig->maximized)
            style |= WS_MAXIMIZE;
@@ -1271,13 +1271,15 @@ static int createNativeWindow(_GLFWwindow* window,
    }
    window->win32.scaleToMonitor = wndconfig->scaleToMonitor;
    window->win32.keymenu = wndconfig->win32.keymenu;
-    // Adjust window size to account for DPI scaling of the window frame and
+    // Adjust window rect to account for DPI scaling of the window frame and
-    // optionally DPI scaling of the content area
+    // (if enabled) DPI scaling of the content area
-    // This cannot be done until we know what monitor it was placed on
+    // This cannot be done until we know what monitor the window was placed on
    if (!window->monitor)
    {
        RECT rect = { 0, 0, wndconfig->width, wndconfig->height };
        WINDOWPLACEMENT wp = { sizeof(wp) };
        if (wndconfig->scaleToMonitor)
        {
@@ -1298,10 +1300,11 @@ static int createNativeWindow(_GLFWwindow* window,
        else
            AdjustWindowRectEx(&rect, style, FALSE, exStyle);
-        SetWindowPos(window->win32.handle, NULL,
+        // Only update the restored window rect as the window may be maximized
-                     rect.left, rect.top,
+        GetWindowPlacement(window->win32.handle, &wp);
-                     rect.right - rect.left, rect.bottom - rect.top,
+        wp.rcNormalPosition = rect;
-                     SWP_NOACTIVATE | SWP_NOZORDER);
+        wp.showCmd = SW_HIDE;
        SetWindowPlacement(window->win32.handle, &wp);
    }
    DragAcceptFiles(window->win32.handle, TRUE);
@@ -1722,7 +1725,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
    _glfwInputWindowMonitor(window, monitor);
-    if (monitor)
+    if (window->monitor)
    {
        MONITORINFO mi = { sizeof(mi) };
        UINT flags = SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOCOPYBITS;
@@ -1813,7 +1816,8 @@ int _glfwPlatformWindowHovered(_GLFWwindow* window)
 int _glfwPlatformFramebufferTransparent(_GLFWwindow* window)
 {
-    BOOL enabled;
+    BOOL composition, opaque;
    DWORD color;
    if (!window->win32.transparent)
        return GLFW_FALSE;
@@ -1821,7 +1825,20 @@ int _glfwPlatformFramebufferTransparent(_GLFWwindow* window)
    if (!IsWindowsVistaOrGreater())
        return GLFW_FALSE;
-    return SUCCEEDED(DwmIsCompositionEnabled(&enabled)) && enabled;
+    if (FAILED(DwmIsCompositionEnabled(&composition)) || !composition)
        return GLFW_FALSE;
    if (!IsWindows8OrGreater())
    {
        // HACK: Disable framebuffer transparency on Windows 7 when the
        //       colorization color is opaque, because otherwise the window
        //       contents is blended additively with the previous frame instead
        //       of replacing it
        if (FAILED(DwmGetColorizationColor(&color, &opaque)) || opaque)
            return GLFW_FALSE;
    }
    return GLFW_TRUE;
 }
 void _glfwPlatformSetWindowResizable(_GLFWwindow* window, GLFWbool enabled)
@@ -1841,6 +1858,36 @@ void _glfwPlatformSetWindowFloating(_GLFWwindow* window, GLFWbool enabled)
                 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 }
 void _glfwPlatformSetWindowMousePassthrough(_GLFWwindow* window, GLFWbool enabled)
 {
    COLORREF key = 0;
    BYTE alpha = 0;
    DWORD flags = 0;
    DWORD exStyle = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
    if (exStyle & WS_EX_LAYERED)
        GetLayeredWindowAttributes(window->win32.handle, &key, &alpha, &flags);
    if (enabled)
        exStyle |= (WS_EX_TRANSPARENT | WS_EX_LAYERED);
    else
    {
        exStyle &= ~WS_EX_TRANSPARENT;
        // NOTE: Window opacity also needs the layered window style so do not
        //       remove it if the window is alpha blended
        if (exStyle & WS_EX_LAYERED)
        {
            if (!(flags & LWA_ALPHA))
                exStyle &= ~WS_EX_LAYERED;
        }
    }
    SetWindowLongW(window->win32.handle, GWL_EXSTYLE, exStyle);
    if (enabled)
        SetLayeredWindowAttributes(window->win32.handle, key, alpha, flags);
 }
 float _glfwPlatformGetWindowOpacity(_GLFWwindow* window)
 {
    BYTE alpha;
@@ -1858,19 +1905,22 @@ float _glfwPlatformGetWindowOpacity(_GLFWwindow* window)
 void _glfwPlatformSetWindowOpacity(_GLFWwindow* window, float opacity)
 {
-    if (opacity < 1.f)
+    LONG exStyle = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
    if (opacity < 1.f || (exStyle & WS_EX_TRANSPARENT))
    {
        const BYTE alpha = (BYTE) (255 * opacity);
-        DWORD style = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
+        exStyle |= WS_EX_LAYERED;
-        style |= WS_EX_LAYERED;
+        SetWindowLongW(window->win32.handle, GWL_EXSTYLE, exStyle);
        SetWindowLongW(window->win32.handle, GWL_EXSTYLE, style);
        SetLayeredWindowAttributes(window->win32.handle, 0, alpha, LWA_ALPHA);
    }
    else if (exStyle & WS_EX_TRANSPARENT)
    {
        SetLayeredWindowAttributes(window->win32.handle, 0, 0, 0);
    }
    else
    {
-        DWORD style = GetWindowLongW(window->win32.handle, GWL_EXSTYLE);
+        exStyle &= ~WS_EX_LAYERED;
-        style &= ~WS_EX_LAYERED;
+        SetWindowLongW(window->win32.handle, GWL_EXSTYLE, exStyle);
        SetWindowLongW(window->win32.handle, GWL_EXSTYLE, style);
    }
 }
@@ -1918,30 +1968,40 @@ void _glfwPlatformPollEvents(void)
        }
    }
    // HACK: Release modifier keys that the system did not emit KEYUP for
    // NOTE: Shift keys on Windows tend to "stick" when both are pressed as
    //       no key up message is generated by the first key release
    // NOTE: Windows key is not reported as released by the Win+V hotkey
    //       Other Win hotkeys are handled implicitly by _glfwInputWindowFocus
    //       because they change the input focus
    // NOTE: The other half of this is in the WM_*KEY* handler in windowProc
    handle = GetActiveWindow();
    if (handle)
    {
        // NOTE: Shift keys on Windows tend to "stick" when both are pressed as
        //       no key up message is generated by the first key release
        //       The other half of this is in the handling of WM_KEYUP
        // HACK: Query actual key state and synthesize release events as needed
        window = GetPropW(handle, L"GLFW");
        if (window)
        {
-            const GLFWbool lshift = (GetAsyncKeyState(VK_LSHIFT) >> 15) & 1;
+            int i;
-            const GLFWbool rshift = (GetAsyncKeyState(VK_RSHIFT) >> 15) & 1;
+            const int keys[4][2] =
            {
                { VK_LSHIFT, GLFW_KEY_LEFT_SHIFT },
                { VK_RSHIFT, GLFW_KEY_RIGHT_SHIFT },
                { VK_LWIN, GLFW_KEY_LEFT_SUPER },
                { VK_RWIN, GLFW_KEY_RIGHT_SUPER }
            };
-            if (!lshift && window->keys[GLFW_KEY_LEFT_SHIFT] == GLFW_PRESS)
+            for (i = 0;  i < 4;  i++)
            {
-                const int mods = getAsyncKeyMods();
+                const int vk = keys[i][0];
-                const int scancode = _glfw.win32.scancodes[GLFW_KEY_LEFT_SHIFT];
+                const int key = keys[i][1];
-                _glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, scancode, GLFW_RELEASE, mods);
+                const int scancode = _glfw.win32.scancodes[key];
-            }
+
-            else if (!rshift && window->keys[GLFW_KEY_RIGHT_SHIFT] == GLFW_PRESS)
+                if ((GetKeyState(vk) & 0x8000))
-            {
+                    continue;
-                const int mods = getAsyncKeyMods();
+                if (window->keys[key] != GLFW_PRESS)
-                const int scancode = _glfw.win32.scancodes[GLFW_KEY_RIGHT_SHIFT];
+                    continue;
-                _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, scancode, GLFW_RELEASE, mods);
+
                _glfwInputKey(window, key, scancode, GLFW_RELEASE, getKeyMods());
            }
        }
    }
@@ -2023,6 +2083,13 @@ void _glfwPlatformSetCursorMode(_GLFWwindow* window, int mode)
 const char* _glfwPlatformGetScancodeName(int scancode)
 {
    if (scancode < 0 || scancode > (KF_EXTENDED | 0xff) ||
        _glfw.win32.keycodes[scancode] == GLFW_KEY_UNKNOWN)
    {
        _glfwInputError(GLFW_INVALID_VALUE, "Invalid scancode");
        return NULL;
    }
    return _glfw.win32.keynames[_glfw.win32.keycodes[scancode]];
 }
@@ -2052,14 +2119,25 @@ int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape)
        id = OCR_IBEAM;
    else if (shape == GLFW_CROSSHAIR_CURSOR)
        id = OCR_CROSS;
-    else if (shape == GLFW_HAND_CURSOR)
+    else if (shape == GLFW_POINTING_HAND_CURSOR)
        id = OCR_HAND;
-    else if (shape == GLFW_HRESIZE_CURSOR)
+    else if (shape == GLFW_RESIZE_EW_CURSOR)
        id = OCR_SIZEWE;
-    else if (shape == GLFW_VRESIZE_CURSOR)
+    else if (shape == GLFW_RESIZE_NS_CURSOR)
        id = OCR_SIZENS;
    else if (shape == GLFW_RESIZE_NWSE_CURSOR)
        id = OCR_SIZENWSE;
    else if (shape == GLFW_RESIZE_NESW_CURSOR)
        id = OCR_SIZENESW;
    else if (shape == GLFW_RESIZE_ALL_CURSOR)
        id = OCR_SIZEALL;
    else if (shape == GLFW_NOT_ALLOWED_CURSOR)
        id = OCR_NO;
    else
    {
        _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Unknown standard cursor");
        return GLFW_FALSE;
    }
    cursor->win32.handle = LoadImageW(NULL,
                                      MAKEINTRESOURCEW(id), IMAGE_CURSOR, 0, 0,
@@ -2168,6 +2246,57 @@ const char* _glfwPlatformGetClipboardString(void)
    return _glfw.win32.clipboardString;
 }
 EGLenum _glfwPlatformGetEGLPlatform(EGLint** attribs)
 {
    if (_glfw.egl.ANGLE_platform_angle)
    {
        int type = 0;
        if (_glfw.egl.ANGLE_platform_angle_opengl)
        {
            if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGL)
                type = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
            else if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGLES)
                type = EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
        }
        if (_glfw.egl.ANGLE_platform_angle_d3d)
        {
            if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_D3D9)
                type = EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE;
            else if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_D3D11)
                type = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
        }
        if (_glfw.egl.ANGLE_platform_angle_vulkan)
        {
            if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_VULKAN)
                type = EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
        }
        if (type)
        {
            *attribs = calloc(3, sizeof(EGLint));
            (*attribs)[0] = EGL_PLATFORM_ANGLE_TYPE_ANGLE;
            (*attribs)[1] = type;
            (*attribs)[2] = EGL_NONE;
            return EGL_PLATFORM_ANGLE_ANGLE;
        }
    }
    return 0;
 }
 EGLNativeDisplayType _glfwPlatformGetEGLNativeDisplay(void)
 {
    return GetDC(_glfw.win32.helperWindowHandle);
 }
 EGLNativeWindowType _glfwPlatformGetEGLNativeWindow(_GLFWwindow* window)
 {
    return window->win32.handle;
 }
 void _glfwPlatformGetRequiredInstanceExtensions(char** extensions)
 {
    if (!_glfw.vk.KHR_surface || !_glfw.vk.KHR_win32_surface)
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							{"version":3,"sourceRoot":"","sources":["extra.scss"],"names":[],"mappings":"AA8EA,4GACI,gBACA,iBAGJ,yBACC,yDAGD,6HACC,sDAGD,yIACC,sDAGD,mBACI,WA9EuB,KA+EvB,iBAGJ,uBACC,MAzFoB,QA0FjB,iBAGJ,6UACC,gBAGD,mJACC,YAGD,yHACC,iBAGD,sBACC,gBAGD,4LACC,UAGD,yCACC,aAGD,kMACC,WAnHgC,QAsHjC,KACC,MA1HoB,QA6HrB,sDACC,MA/Ge,QAgHf,mBAGD,GACE,iBACA,eAGF,GACE,iBACA,gBACA,eAGF,GACE,iBACA,gBACA,eAGF,YACC,eACA,gBACA,gBACA,eACA,cAEA,aACA,mBACA,eACA,2BACA,mBACA,sBAGD,UACC,iBACA,mBACA,MA/J0B,KAgK1B,gBACA,qEAGD,YACC,qBACA,kBACA,YAGD,yBACC,WAGD,oCACC,iBACA,gBACA,cACA,MAlL0B,KAqL3B,YACC,eAGD,8CACC,qBAGD,mBACC,MA9L0B,KAiM3B,eACC,kBACA,YACA,eAGD,KACC,WAxM0B,KA2M3B,UACC,gBACA,cACA,eAGD,WACC,gBACA,cACA,eAGD,UACI,aAGJ,mBACI,iBACA,iBAGJ,WACC,gBACA,aACA,mBACA,eACA,2BACA,mBACA,sBAGD,mEACC,MA9OgC,QAiPjC,gCACC,MArPoB,QAwPrB,sCACC,MAjOoB,KAoOrB,yBACC,kBAGD,UACC,iBAGD,wBACC,gBACA,cACA,eACA,qBAGD,uDACC,gEACA,+BACA,+BACA,gBACA,MArPgB,KAwPjB,mBACC,MA5PoB,KA6PpB,aACA,kBACA,yBAGD,QACC,WACA,WAGD,WACC,iBAGD,WACC,mBAGD,WACC,cACA,eACA,qBAGD,oCACC,gEACA,kCACA,2BACA,MAlSe,QAmSf,yBACA,kBAGD,WACC,MA3QuB,QA8QxB,cACC,sBACA,2BACA,4BACA,mBAGD,cACC,sBACA,+BACA,8BACA,gBAGD,mCACC,wBACA,iBACA,sBACA,kBAGD,gIACC,MAxToB,KAyTpB,qBAGD,cACC,wBACA,iBACA,sBACA,kBAGD,iBACC,WACA,4EAGD,oCApSC,gEACA,kCACA,cACA,yBAqSD,wBAxSC,gEACA,kCACA,cACA,yBAySD,qBA5SC,gEACA,kCACA,cACA,yBA6SD,gBAhTC,gEACA,kCACA,cACA,yBAiTD,iGACC,kBACA,YACA,2BACA,aAGD,kRACC,cAGD,SACC,oBAGD,0BACC,mBACA,kBACA,YACA,YACA,cACA,2BACA,aAGD,+CACC,MA1YoB,QA6YrB,+BACC,cAGD,sBACC,cAGD,+CACC,cACA,iBAGD,mBACC,cAGD,KACC,aACA","file":"extra.css"}
		`@@ -1 +0,0 @@`
			`include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")`