mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Made glfwGetVideoMode return a GLFWvidmode.
This commit is contained in:
parent
9af960e2dd
commit
316ee1d77d
@ -1043,7 +1043,7 @@ GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* monitor, int* count);
|
||||
* @param[out] mode The current mode of the monitor.
|
||||
* @ingroup monitor
|
||||
*/
|
||||
GLFWAPI void glfwGetVideoMode(GLFWmonitor* monitor, GLFWvidmode* mode);
|
||||
GLFWAPI GLFWvidmode glfwGetVideoMode(GLFWmonitor* monitor);
|
||||
|
||||
/*! @brief Sets the system gamma ramp to one generated from the specified
|
||||
* exponent.
|
||||
|
@ -476,22 +476,18 @@ GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* handle, int* count)
|
||||
// Get the current video mode for the specified monitor
|
||||
//========================================================================
|
||||
|
||||
GLFWAPI void glfwGetVideoMode(GLFWmonitor* handle, GLFWvidmode* mode)
|
||||
GLFWAPI GLFWvidmode glfwGetVideoMode(GLFWmonitor* handle)
|
||||
{
|
||||
_GLFWmonitor* monitor = (_GLFWmonitor*) handle;
|
||||
GLFWvidmode mode = { 0, 0, 0, 0, 0 };
|
||||
|
||||
if (!_glfwInitialized)
|
||||
{
|
||||
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
|
||||
return;
|
||||
return mode;
|
||||
}
|
||||
|
||||
if (mode == NULL)
|
||||
{
|
||||
_glfwInputError(GLFW_INVALID_VALUE, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
_glfwPlatformGetVideoMode(monitor, mode);
|
||||
_glfwPlatformGetVideoMode(monitor, &mode);
|
||||
return mode;
|
||||
}
|
||||
|
||||
|
@ -346,8 +346,7 @@ void monitor_callback(GLFWmonitor* monitor, int event)
|
||||
{
|
||||
if (event == GLFW_CONNECTED)
|
||||
{
|
||||
GLFWvidmode mode;
|
||||
glfwGetVideoMode(monitor, &mode);
|
||||
GLFWvidmode mode = glfwGetVideoMode(monitor);
|
||||
|
||||
printf("%08x at %0.3f: Monitor %s (%ix%i at %ix%i, %ix%i mm) was connected\n",
|
||||
counter++,
|
||||
|
@ -130,8 +130,7 @@ int main(int argc, char** argv)
|
||||
|
||||
if (monitor)
|
||||
{
|
||||
GLFWvidmode mode;
|
||||
glfwGetVideoMode(monitor, &mode);
|
||||
GLFWvidmode mode = glfwGetVideoMode(monitor);
|
||||
width = mode.width;
|
||||
height = mode.height;
|
||||
}
|
||||
|
@ -125,8 +125,7 @@ int main(int argc, char** argv)
|
||||
|
||||
if (monitor)
|
||||
{
|
||||
GLFWvidmode mode;
|
||||
glfwGetVideoMode(monitor, &mode);
|
||||
GLFWvidmode mode = glfwGetVideoMode(monitor);
|
||||
width = mode.width;
|
||||
height = mode.height;
|
||||
}
|
||||
|
@ -93,11 +93,9 @@ static void key_callback(GLFWwindow* window, int key, int action)
|
||||
static void list_modes(GLFWmonitor* monitor)
|
||||
{
|
||||
int count, widthMM, heightMM, dpi, i;
|
||||
GLFWvidmode mode;
|
||||
GLFWvidmode mode = glfwGetVideoMode(monitor);
|
||||
const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
|
||||
|
||||
glfwGetVideoMode(monitor, &mode);
|
||||
|
||||
printf("Name: %s (%s)\n",
|
||||
glfwGetMonitorName(monitor),
|
||||
glfwGetPrimaryMonitor() == monitor ? "primary" : "secondary");
|
||||
|
Loading…
Reference in New Issue
Block a user