Explorar el Código

Renamed monitor test program.

Camilla Berglund hace 10 años
padre
commit
d79beb9539
Se han modificado 4 ficheros con 9 adiciones y 8 borrados
  1. 1 1
      .gitignore
  2. 1 1
      docs/monitor.dox
  3. 2 2
      tests/CMakeLists.txt
  4. 5 4
      tests/monitors.c

+ 1 - 1
.gitignore

@@ -62,7 +62,7 @@ tests/gamma
 tests/glfwinfo
 tests/glfwinfo
 tests/iconify
 tests/iconify
 tests/joysticks
 tests/joysticks
-tests/modes
+tests/monitors
 tests/peter
 tests/peter
 tests/reopen
 tests/reopen
 tests/sharing
 tests/sharing

+ 1 - 1
docs/monitor.dox

@@ -31,7 +31,7 @@ video mode, describes the viewports that the connected monitors provide into the
 virtual desktop that spans them.
 virtual desktop that spans them.
 
 
 To see how GLFW views your monitor setup and its available video modes, run the
 To see how GLFW views your monitor setup and its available video modes, run the
-`modes` test program.
+`monitors` test program.
 
 
 
 
 @subsection monitor_monitors Retrieving monitors
 @subsection monitor_monitors Retrieving monitors

+ 2 - 2
tests/CMakeLists.txt

@@ -28,7 +28,7 @@ add_executable(gamma gamma.c ${GETOPT})
 add_executable(glfwinfo glfwinfo.c ${GETOPT})
 add_executable(glfwinfo glfwinfo.c ${GETOPT})
 add_executable(iconify iconify.c ${GETOPT})
 add_executable(iconify iconify.c ${GETOPT})
 add_executable(joysticks joysticks.c)
 add_executable(joysticks joysticks.c)
-add_executable(modes modes.c ${GETOPT})
+add_executable(monitors monitors.c ${GETOPT})
 add_executable(peter peter.c)
 add_executable(peter peter.c)
 add_executable(reopen reopen.c)
 add_executable(reopen reopen.c)
 add_executable(cursor cursor.c)
 add_executable(cursor cursor.c)
@@ -62,7 +62,7 @@ target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
 
 
 set(WINDOWS_BINARIES accuracy empty sharing tearing threads title windows cursoranim)
 set(WINDOWS_BINARIES accuracy empty sharing tearing threads title windows cursoranim)
 set(CONSOLE_BINARIES clipboard defaults events fsaa gamma glfwinfo
 set(CONSOLE_BINARIES clipboard defaults events fsaa gamma glfwinfo
-                     iconify joysticks modes peter reopen cursor)
+                     iconify joysticks monitors peter reopen cursor)
 
 
 set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
 set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
                       FOLDER "GLFW3/Tests")
                       FOLDER "GLFW3/Tests")

+ 5 - 4
tests/modes.c → tests/monitors.c

@@ -1,5 +1,5 @@
 //========================================================================
 //========================================================================
-// Video mode test
+// Monitor information tool
 // Copyright (c) Camilla Berglund <[email protected]>
 // Copyright (c) Camilla Berglund <[email protected]>
 //
 //
 // This software is provided 'as-is', without any express or implied
 // This software is provided 'as-is', without any express or implied
@@ -23,7 +23,8 @@
 //
 //
 //========================================================================
 //========================================================================
 //
 //
-// This test enumerates or verifies video modes
+// This test prints monitor and video mode information or verifies video
+// modes
 //
 //
 //========================================================================
 //========================================================================
 
 
@@ -43,8 +44,8 @@ enum Mode
 
 
 static void usage(void)
 static void usage(void)
 {
 {
-    printf("Usage: modes [-t]\n");
-    printf("       modes -h\n");
+    printf("Usage: monitors [-t]\n");
+    printf("       monitors -h\n");
 }
 }
 
 
 static const char* format_mode(const GLFWvidmode* mode)
 static const char* format_mode(const GLFWvidmode* mode)