mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-28 23:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund 2014-01-13 23:27:11 +01:00
parent 16eb97dbc3
commit 75f916db44
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -45,8 +45,8 @@ The following dependencies are needed by the examples and test programs:
## Changelog ## Changelog
- Added native monitor handle access to native API - Added native monitor handle access to native API
- [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen - [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen
recorders to fail recorders to fail

6
include/GLFW/glfw3native.h
View File

@ -107,6 +107,7 @@ extern "C" {
* @ingroup native * @ingroup native
*/ */
GLFWAPI const WCHAR* glfwGetWin32Monitor(GLFWmonitor* monitor); GLFWAPI const WCHAR* glfwGetWin32Monitor(GLFWmonitor* monitor);
/*! @brief Returns the `HWND` of the specified window. /*! @brief Returns the `HWND` of the specified window.
* @return The `HWND` of the specified window. * @return The `HWND` of the specified window.
* @ingroup native * @ingroup native
@ -128,6 +129,7 @@ GLFWAPI HGLRC glfwGetWGLContext(GLFWwindow* window);
* @ingroup native * @ingroup native
*/ */
GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor); GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor);
/*! @brief Returns the `NSWindow` of the specified window. /*! @brief Returns the `NSWindow` of the specified window.
* @return The `NSWindow` of the specified window. * @return The `NSWindow` of the specified window.
* @ingroup native * @ingroup native
@ -149,11 +151,13 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* window);
* @ingroup native * @ingroup native
*/ */
GLFWAPI Display* glfwGetX11Display(void); GLFWAPI Display* glfwGetX11Display(void);
/*! @brief Returns the `RRCrtc` of the specified monitor. /*! @brief Returns the `RRCrtc` of the specified monitor.
* @return The the `RRCrtc` of the specified monitor. * @return The the `RRCrtc` of the specified monitor.
* @ingroup native * @ingroup native
*/ */
GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* monitor); GLFWAPI RRCrtc 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.
* @ingroup native * @ingroup native
@ -175,11 +179,13 @@ GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* window);
* @ingroup native * @ingroup native
*/ */
GLFWAPI EGLDisplay glfwGetEGLDisplay(void); GLFWAPI EGLDisplay glfwGetEGLDisplay(void);
/*! @brief Returns the `EGLContext` of the specified window. /*! @brief Returns the `EGLContext` of the specified window.
* @return The `EGLContext` of the specified window. * @return The `EGLContext` of the specified window.
* @ingroup native * @ingroup native
*/ */
GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window); GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window);
/*! @brief Returns the `EGLSurface` of the specified window. /*! @brief Returns the `EGLSurface` of the specified window.
* @return The `EGLSurface` of the specified window. * @return The `EGLSurface` of the specified window.
* @ingroup native * @ingroup native