caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-08-29 00:05:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	tests/modes.c
This commit is contained in:
Camilla Berglund
2012-08-14 14:02:37 +02:00
parent 854e634fec 6399fb19fd
commit 39c171a61d
53 changed files with 517 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/events.c
View File

@@ -40,9 +40,12 @@
#include <ctype.h>
#include <locale.h>
// These must match the input mode defaults
static GLboolean keyrepeat = GL_FALSE;
static GLboolean systemkeys = GL_TRUE;
static GLboolean closeable = GL_TRUE;
// Event index
static unsigned int counter = 0;
static const char* get_key_name(int key)
@@ -244,6 +247,7 @@ static void window_size_callback(GLFWwindow window, int width, int height)
static int window_close_callback(GLFWwindow window)
{
printf("%08x at %0.3f: Window close\n", counter++, glfwGetTime());
return closeable;
}
@@ -252,7 +256,7 @@ static void window_refresh_callback(GLFWwindow window)
printf("%08x at %0.3f: Window refresh\n", counter++, glfwGetTime());
glClear(GL_COLOR_BUFFER_BIT);
glfwSwapBuffers();
glfwSwapBuffers(window);
}
static void window_focus_callback(GLFWwindow window, int activated)
@@ -367,6 +371,7 @@ void monitor_callback(GLFWmonitor monitor, int event)
int main(void)
{
GLFWwindow window;
int width, height;
setlocale(LC_ALL, "");
@@ -391,7 +396,7 @@ int main(void)
glfwSetCharCallback(char_callback);
glfwSetMonitorDeviceCallback(monitor_callback);
window = glfwOpenWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
if (!window)
{
glfwTerminate();
@@ -402,14 +407,18 @@ int main(void)
printf("Window opened\n");
glfwMakeContextCurrent(window);
glfwSwapInterval(1);
glfwGetWindowSize(window, &width, &height);
printf("Window size should be %ix%i\n", width, height);
printf("Key repeat should be %s\n", keyrepeat ? "enabled" : "disabled");
printf("System keys should be %s\n", systemkeys ? "enabled" : "disabled");
printf("Main loop starting\n");
while (glfwIsWindow(window) == GL_TRUE)
while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
glfwWaitEvents();
glfwTerminate();