mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-12 17:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move glfwGetMonitorWorkarea test to monitors

Browse Source 
This moves the test use of glfwGetMonitorWorkarea from the simple
example to the monitors test program.

Related to #1322.
This commit is contained in:
Doug Binks 2018-09-08 16:38:43 +02:00 committed by Camilla Löwy
parent be295ccbea
commit c733ab0a22
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/simple.c
View File

@ -79,7 +79,6 @@ int main(void)
GLFWwindow* window; GLFWwindow* window;
GLuint vertex_buffer, vertex_shader, fragment_shader, program; GLuint vertex_buffer, vertex_shader, fragment_shader, program;
GLint mvp_location, vpos_location, vcol_location; GLint mvp_location, vpos_location, vcol_location;
int workarea_x, workarea_y, workarea_width, workarea_height;
glfwSetErrorCallback(error_callback); glfwSetErrorCallback(error_callback);
@ -132,8 +131,6 @@ int main(void)
glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE, glVertexAttribPointer(vcol_location, 3, GL_FLOAT, GL_FALSE,
sizeof(vertices[0]), (void*) (sizeof(float) * 2)); sizeof(vertices[0]), (void*) (sizeof(float) * 2));
glfwGetMonitorWorkarea(glfwGetPrimaryMonitor(), &workarea_x, &workarea_y, &workarea_width, &workarea_height);
printf("Monitor work area: %d, %d, %d, %d\n", workarea_x, workarea_y, workarea_width, workarea_height);
while (!glfwWindowShouldClose(window)) while (!glfwWindowShouldClose(window))
{ {
float ratio; float ratio;

5
tests/monitors.c
View File

@ -93,13 +93,16 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
static void list_modes(GLFWmonitor* monitor) static void list_modes(GLFWmonitor* monitor)
{ {
int count, x, y, width_mm, height_mm, i; int count, x, y, width_mm, height_mm, i;
int workarea_x, workarea_y, workarea_width, workarea_height;
float xscale, yscale; float xscale, yscale;
const GLFWvidmode* mode = glfwGetVideoMode(monitor); const GLFWvidmode* mode = glfwGetVideoMode(monitor);
const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count); const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
glfwGetMonitorPos(monitor, &x, &y); glfwGetMonitorPos(monitor, &x, &y);
glfwGetMonitorPhysicalSize(monitor, &width_mm, &height_mm); glfwGetMonitorPhysicalSize(monitor, &width_mm, &height_mm);
glfwGetMonitorContentScale(monitor, &xscale, &yscale); glfwGetMonitorContentScale(monitor, &xscale, &yscale);
glfwGetMonitorWorkarea(monitor, &workarea_x, &workarea_y, &workarea_width, &workarea_height);
printf("Name: %s (%s)\n", printf("Name: %s (%s)\n",
glfwGetMonitorName(monitor), glfwGetMonitorName(monitor),
@ -110,6 +113,8 @@ static void list_modes(GLFWmonitor* monitor)
printf("Physical size: %i x %i mm (%0.2f dpi)\n", printf("Physical size: %i x %i mm (%0.2f dpi)\n",
width_mm, height_mm, mode->width * 25.4f / width_mm); width_mm, height_mm, mode->width * 25.4f / width_mm);
printf("Monitor work area: pos=(%d,%d) size=(%dx%d)\n",
workarea_x, workarea_y, workarea_width, workarea_height);
printf("Modes:\n"); printf("Modes:\n");