Made glfwGetX11Monitor return output, not CRTC.

master
Camilla Berglund ago%!(EXTRA string=11 years)
parent 4b27050afe
commit 58c390991c
  1. 6
      include/GLFW/glfw3native.h
  2. 4
      src/x11_monitor.c

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

@ -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;
} }

Loading…
Cancel
Save