Bläddra i källkod

Dropped fsfocus test.

Camilla Berglund 12 år sedan
förälder
incheckning
9a5feaad05
3 ändrade filer med 1 tillägg och 108 borttagningar
  1. 0 1
      .gitignore
  2. 1 2
      tests/CMakeLists.txt
  3. 0 105
      tests/fsfocus.c

+ 0 - 1
.gitignore

@@ -29,7 +29,6 @@ tests/clipboard
 tests/defaults
 tests/defaults
 tests/events
 tests/events
 tests/fsaa
 tests/fsaa
-tests/fsfocus
 tests/gamma
 tests/gamma
 tests/glfwinfo
 tests/glfwinfo
 tests/iconify
 tests/iconify

+ 1 - 2
tests/CMakeLists.txt

@@ -29,7 +29,6 @@ add_executable(clipboard clipboard.c ${GETOPT})
 add_executable(defaults defaults.c)
 add_executable(defaults defaults.c)
 add_executable(events events.c)
 add_executable(events events.c)
 add_executable(fsaa fsaa.c ${GETOPT})
 add_executable(fsaa fsaa.c ${GETOPT})
-add_executable(fsfocus fsfocus.c)
 add_executable(gamma gamma.c ${GETOPT})
 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})
@@ -59,7 +58,7 @@ set_target_properties(windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Windows")
 target_link_libraries(threads ${CMAKE_THREAD_LIBS_INIT} ${RT_LIBRARY})
 target_link_libraries(threads ${CMAKE_THREAD_LIBS_INIT} ${RT_LIBRARY})
 
 
 set(WINDOWS_BINARIES accuracy sharing tearing threads title windows)
 set(WINDOWS_BINARIES accuracy sharing tearing threads title windows)
-set(CONSOLE_BINARIES clipboard defaults events fsaa fsfocus gamma glfwinfo
+set(CONSOLE_BINARIES clipboard defaults events fsaa gamma glfwinfo
                      iconify joysticks modes peter reopen)
                      iconify joysticks modes peter reopen)
 
 
 if (MSVC)
 if (MSVC)

+ 0 - 105
tests/fsfocus.c

@@ -1,105 +0,0 @@
-//========================================================================
-// Fullscreen window (un)focus test
-// Copyright (c) Camilla Berglund <[email protected]>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-//
-// This test is used to test window focusing and iconfication for
-// fullscreen windows with a video mode differing from the desktop mode
-//
-//========================================================================
-
-#include <GL/glfw3.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static void error_callback(int error, const char* description)
-{
-    fprintf(stderr, "Error: %s\n", description);
-}
-
-static void window_focus_callback(GLFWwindow* window, int focused)
-{
-    printf("%0.3f: Window %s\n",
-           glfwGetTime(),
-           focused ? "focused" : "defocused");
-}
-
-static void window_key_callback(GLFWwindow* window, int key, int action)
-{
-    if (action != GLFW_PRESS)
-        return;
-
-    switch (key)
-    {
-        case GLFW_KEY_ESCAPE:
-        {
-            printf("%0.3f: User pressed Escape\n", glfwGetTime());
-            glfwSetWindowShouldClose(window, GL_TRUE);
-            break;
-        }
-
-        case GLFW_KEY_SPACE:
-        {
-            printf("%0.3f: User pressed Space\n", glfwGetTime());
-            glfwIconifyWindow(window);
-            break;
-        }
-    }
-}
-
-int main(void)
-{
-    GLFWwindow* window;
-
-    glfwSetErrorCallback(error_callback);
-
-    if (!glfwInit())
-        exit(EXIT_FAILURE);
-
-    window = glfwCreateWindow(640, 480, "Fullscreen focus", glfwGetPrimaryMonitor(), NULL);
-    if (!window)
-    {
-        glfwTerminate();
-        exit(EXIT_FAILURE);
-    }
-
-    glfwMakeContextCurrent(window);
-    glfwSwapInterval(1);
-
-    glfwSetInputMode(window, GLFW_CURSOR_MODE, GLFW_CURSOR_NORMAL);
-
-    glfwSetWindowFocusCallback(window, window_focus_callback);
-    glfwSetKeyCallback(window, window_key_callback);
-
-    while (!glfwWindowShouldClose(window))
-    {
-        glClear(GL_COLOR_BUFFER_BIT);
-        glfwSwapBuffers(window);
-        glfwWaitEvents();
-    }
-
-    glfwTerminate();
-    exit(EXIT_SUCCESS);
-}
-