gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-26 20:28:49 -05:00
Code Issues Projects Releases Wiki Activity

Made glfwGetX11Monitor return output, not CRTC.

Browse Source
This commit is contained in:
Camilla Berglund 2014-09-17 12:45:51 +02:00
parent 4b27050afe
commit 58c390991c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/GLFW/glfw3native.h
View File

@ -158,11 +158,11 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* window);
*/ */
GLFWAPI Display* glfwGetX11Display(void); GLFWAPI Display* glfwGetX11Display(void);
/*! @brief Returns the `RRCrtc` of the specified monitor. /*! @brief Returns the `RROutput` of the specified monitor.
* @return The the `RRCrtc` of the specified monitor. * @return The the `RROutput` of the specified monitor.
* @ingroup native * @ingroup native
*/ */
GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* monitor); GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* monitor);
/*! @brief Returns the `Window` of the specified window. /*! @brief Returns the `Window` of the specified window.
* @return The `Window` of the specified window. * @return The `Window` of the specified window.

4
src/x11_monitor.c
View File

@ -449,10 +449,10 @@ void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp)
////// GLFW native API ////// ////// GLFW native API //////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* handle) GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle)
{ {
_GLFWmonitor* monitor = (_GLFWmonitor*) handle; _GLFWmonitor* monitor = (_GLFWmonitor*) handle;
_GLFW_REQUIRE_INIT_OR_RETURN(None); _GLFW_REQUIRE_INIT_OR_RETURN(None);
return monitor->x11.crtc; return monitor->x11.output;
} }