Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor

This commit is contained in:
Camilla Berglund 2012-09-12 21:14:15 +02:00
commit 4bcb1b38f9

View File

@ -97,13 +97,15 @@ static void list_modes(GLFWmonitor monitor)
GLFWvidmode* modes = glfwGetVideoModes(monitor, &count); GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
glfwGetVideoMode(monitor, &mode); glfwGetVideoMode(monitor, &mode);
printf("Current mode: %s\n", format_mode(&mode));
printf("Monitor %s (%ix%i mm):\n", printf("Name: %s\n", glfwGetMonitorString(monitor, GLFW_MONITOR_NAME));
glfwGetMonitorString(monitor, GLFW_MONITOR_NAME), printf("Current mode: %s\n", format_mode(&mode));
printf("Physical size: %i x %i\n",
glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_WIDTH), glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_WIDTH),
glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_HEIGHT)); glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_HEIGHT));
printf("Modes:\n");
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
printf("%3u: %s", (unsigned int) i, format_mode(modes + i)); printf("%3u: %s", (unsigned int) i, format_mode(modes + i));