Merge branch 'glfw_upstream' of https://github.com/Luflosi/kitty

This commit is contained in:
Kovid Goyal 2019-10-15 18:16:22 +05:30
commit 51eff372f8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

2
glfw/glfw3.h vendored
View File

@ -2067,7 +2067,7 @@ GLFWAPI GLFWmonitor* glfwGetPrimaryMonitor(void);
*/ */
GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos); GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos);
/*! @brief Returns the work area of the monitor. /*! @brief Retrieves the work area of the monitor.
* *
* This function returns the position, in screen coordinates, of the upper-left * This function returns the position, in screen coordinates, of the upper-left
* corner of the specified monitor alongwith the work area size in screen co-ordinates. * corner of the specified monitor alongwith the work area size in screen co-ordinates.