From 58c390991c3485db7da1531b22e1d3a9016d2930 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 17 Sep 2014 12:45:51 +0200 Subject: [PATCH] Made glfwGetX11Monitor return output, not CRTC. --- include/GLFW/glfw3native.h | 6 +++--- src/x11_monitor.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/GLFW/glfw3native.h b/include/GLFW/glfw3native.h index 1e176a12..ac94f50f 100644 --- a/include/GLFW/glfw3native.h +++ b/include/GLFW/glfw3native.h @@ -158,11 +158,11 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* window); */ GLFWAPI Display* glfwGetX11Display(void); -/*! @brief Returns the `RRCrtc` of the specified monitor. - * @return The the `RRCrtc` of the specified monitor. +/*! @brief Returns the `RROutput` of the specified monitor. + * @return The the `RROutput` of the specified monitor. * @ingroup native */ -GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* monitor); +GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* monitor); /*! @brief Returns the `Window` of the specified window. * @return The `Window` of the specified window. diff --git a/src/x11_monitor.c b/src/x11_monitor.c index a8c17511..679cafb0 100644 --- a/src/x11_monitor.c +++ b/src/x11_monitor.c @@ -449,10 +449,10 @@ void _glfwPlatformSetGammaRamp(_GLFWmonitor* monitor, const GLFWgammaramp* ramp) ////// GLFW native API ////// ////////////////////////////////////////////////////////////////////////// -GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* handle) +GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* handle) { _GLFWmonitor* monitor = (_GLFWmonitor*) handle; _GLFW_REQUIRE_INIT_OR_RETURN(None); - return monitor->x11.crtc; + return monitor->x11.output; }