Fixed key names in the example and test programs.
diff --git a/examples/boing.c b/examples/boing.c
index b90f373..914d129 100644
--- a/examples/boing.c
+++ b/examples/boing.c
@@ -608,7 +608,7 @@
glfwPollEvents();
/* Check if we are still running */
- running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESC );
+ running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESCAPE );
}
while( running );
diff --git a/examples/gears.c b/examples/gears.c
index 7271cf6..cb31b1f 100644
--- a/examples/gears.c
+++ b/examples/gears.c
@@ -220,13 +220,13 @@
if( action != GLFW_PRESS ) return;
switch (k) {
- case 'Z':
- if( glfwGetKey( window, GLFW_KEY_LSHIFT ) )
+ case GLFW_KEY_Z:
+ if( glfwGetKey( window, GLFW_KEY_LEFT_SHIFT ) )
view_rotz -= 5.0;
else
view_rotz += 5.0;
break;
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
running = 0;
break;
case GLFW_KEY_UP:
diff --git a/examples/heightmap.c b/examples/heightmap.c
index 4f8c1c0..f37c732 100644
--- a/examples/heightmap.c
+++ b/examples/heightmap.c
@@ -497,7 +497,7 @@
{
switch(key)
{
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
/* Exit program on Escape */
running = GL_FALSE;
break;
diff --git a/examples/splitview.c b/examples/splitview.c
index d05b078..d7fd482 100644
--- a/examples/splitview.c
+++ b/examples/splitview.c
@@ -493,7 +493,7 @@
} // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) &&
- glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS);
+ glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW
glfwTerminate();
diff --git a/examples/triangle.c b/examples/triangle.c
index 3143881..c61baef 100644
--- a/examples/triangle.c
+++ b/examples/triangle.c
@@ -83,7 +83,7 @@
} // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) &&
- glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS);
+ glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW
glfwTerminate();
diff --git a/examples/wave.c b/examples/wave.c
index 49bf1a6..87faa79 100644
--- a/examples/wave.c
+++ b/examples/wave.c
@@ -262,7 +262,7 @@
switch (key)
{
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
running = 0;
break;
case GLFW_KEY_SPACE:
@@ -280,11 +280,11 @@
case GLFW_KEY_DOWN:
beta += 5;
break;
- case GLFW_KEY_PAGEUP:
+ case GLFW_KEY_PAGE_UP:
if (zoom > 1)
zoom -= 1;
break;
- case GLFW_KEY_PAGEDOWN:
+ case GLFW_KEY_PAGE_DOWN:
zoom += 1;
break;
default:
diff --git a/tests/events.c b/tests/events.c
index 7898751..ec3d001 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -99,7 +99,7 @@
case GLFW_KEY_WORLD_2: return "WORLD 2";
// Function keys
- case GLFW_KEY_ESC: return "ESCAPE";
+ case GLFW_KEY_ESCAPE: return "ESCAPE";
case GLFW_KEY_F1: return "F1";
case GLFW_KEY_F2: return "F2";
case GLFW_KEY_F3: return "F3";
diff --git a/tests/fsfocus.c b/tests/fsfocus.c
index 21631f2..2cce078 100644
--- a/tests/fsfocus.c
+++ b/tests/fsfocus.c
@@ -49,7 +49,7 @@
switch (key)
{
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
{
printf("%0.3f: User pressed Escape\n", glfwGetTime());
running = GL_FALSE;
diff --git a/tests/gamma.c b/tests/gamma.c
index 0d2ff09..0c567b2 100644
--- a/tests/gamma.c
+++ b/tests/gamma.c
@@ -51,35 +51,35 @@
switch (key)
{
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
glfwCloseWindow(window);
break;
- case 'Q':
+ case GLFW_KEY_Q:
ggamma += 0.1f;
printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
- case 'W':
+ case GLFW_KEY_W:
ggamma -= 0.1f;
printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
- case 'A':
+ case GLFW_KEY_A:
ggain += 0.1f;
printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
- case 'S':
+ case GLFW_KEY_S:
ggain -= 0.1f;
printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
- case 'Z':
+ case GLFW_KEY_Z:
gblacklevel += 0.1f;
printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
- case 'X':
+ case GLFW_KEY_X:
gblacklevel -= 0.1f;
printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
diff --git a/tests/iconify.c b/tests/iconify.c
index 6868c9a..6d001ea 100644
--- a/tests/iconify.c
+++ b/tests/iconify.c
@@ -54,7 +54,7 @@
case GLFW_KEY_SPACE:
glfwIconifyWindow(window);
break;
- case GLFW_KEY_ESC:
+ case GLFW_KEY_ESCAPE:
glfwCloseWindow(window);
break;
}
diff --git a/tests/peter.c b/tests/peter.c
index e267124..0f61af8 100644
--- a/tests/peter.c
+++ b/tests/peter.c
@@ -67,7 +67,7 @@
break;
}
- case 'R':
+ case GLFW_KEY_R:
{
if (action == GLFW_PRESS)
{
diff --git a/tests/reopen.c b/tests/reopen.c
index 76f914a..e963768 100644
--- a/tests/reopen.c
+++ b/tests/reopen.c
@@ -73,8 +73,8 @@
switch (key)
{
- case 'Q':
- case GLFW_KEY_ESC:
+ case GLFW_KEY_Q:
+ case GLFW_KEY_ESCAPE:
closed = GL_TRUE;
break;
}
diff --git a/tests/sharing.c b/tests/sharing.c
index b1b335c..f81580c 100644
--- a/tests/sharing.c
+++ b/tests/sharing.c
@@ -37,7 +37,7 @@
static void key_callback(GLFWwindow window, int key, int action)
{
- if (action == GLFW_PRESS && key == GLFW_KEY_ESC)
+ if (action == GLFW_PRESS && key == GLFW_KEY_ESCAPE)
glfwCloseWindow(window);
}
