Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/win32_window.c
	src/window.c
	src/x11_window.c
	tests/clipboard.c
	tests/defaults.c
	tests/events.c
	tests/fsfocus.c
	tests/glfwinfo.c
	tests/joysticks.c
	tests/peter.c
	tests/sharing.c
	tests/tearing.c
	tests/title.c
	tests/windows.c
This commit is contained in:
Camilla Berglund
2012-11-27 16:55:04 +01:00
parent 0f93d24306 fc69721807
commit 41bc0d18f4
36 changed files with 1239 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/fsfocus.c
+4 -4
View File
@@ -23,8 +23,8 @@
//
//========================================================================
//
// This test is used to test window activation and iconfication for
// fullscreen windows with a video mode differing from the current mode
// This test is used to test window focusing and iconfication for
// fullscreen windows with a video mode differing from the desktop mode
//
//========================================================================
@@ -35,11 +35,11 @@
static GLboolean running = GL_TRUE;
static void window_focus_callback(GLFWwindow window, int activated)
static void window_focus_callback(GLFWwindow window, int focused)
{
printf("%0.3f: Window %s\n",
glfwGetTime(),
activated ? "activated" : "deactivated");
focused ? "focused" : "defocused");
}
static void window_key_callback(GLFWwindow window, int key, int action)