Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-30 05:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed internal macro to match conventions.

Browse Source
This commit is contained in:
Camilla Berglund 2013-01-15 22:44:50 +01:00
parent d406b48007
commit 355af57b91
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input.c
View File

@ -81,7 +81,7 @@ static void setStickyKeys(_GLFWwindow* window, int enabled)
// Release all sticky keys // Release all sticky keys
for (i = 0; i <= GLFW_KEY_LAST; i++) for (i = 0; i <= GLFW_KEY_LAST; i++)
{ {
if (window->key[i] == GLFW_STICK) if (window->key[i] == _GLFW_STICK)
window->key[i] = GLFW_RELEASE; window->key[i] = GLFW_RELEASE;
} }
} }
@ -106,7 +106,7 @@ static void setStickyMouseButtons(_GLFWwindow* window, int enabled)
// Release all sticky mouse buttons // Release all sticky mouse buttons
for (i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i++) for (i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i++)
{ {
if (window->mouseButton[i] == GLFW_STICK) if (window->mouseButton[i] == _GLFW_STICK)
window->mouseButton[i] = GLFW_RELEASE; window->mouseButton[i] = GLFW_RELEASE;
} }
} }
@ -136,7 +136,7 @@ void _glfwInputKey(_GLFWwindow* window, int key, int action)
// Register key action // Register key action
if (action == GLFW_RELEASE && window->stickyKeys) if (action == GLFW_RELEASE && window->stickyKeys)
window->key[key] = GLFW_STICK; window->key[key] = _GLFW_STICK;
else else
{ {
if (action == GLFW_PRESS && window->key[key] == GLFW_PRESS) if (action == GLFW_PRESS && window->key[key] == GLFW_PRESS)
@ -191,7 +191,7 @@ void _glfwInputMouseClick(_GLFWwindow* window, int button, int action)
// Register mouse button action // Register mouse button action
if (action == GLFW_RELEASE && window->stickyMouseButtons) if (action == GLFW_RELEASE && window->stickyMouseButtons)
window->mouseButton[button] = GLFW_STICK; window->mouseButton[button] = _GLFW_STICK;
else else
window->mouseButton[button] = (char) action; window->mouseButton[button] = (char) action;
@ -328,7 +328,7 @@ GLFWAPI int glfwGetKey(GLFWwindow* handle, int key)
return GLFW_RELEASE; return GLFW_RELEASE;
} }
if (window->key[key] == GLFW_STICK) if (window->key[key] == _GLFW_STICK)
{ {
// Sticky mode: release key now // Sticky mode: release key now
window->key[key] = GLFW_RELEASE; window->key[key] = GLFW_RELEASE;
@ -360,7 +360,7 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button)
return GLFW_RELEASE; return GLFW_RELEASE;
} }
if (window->mouseButton[button] == GLFW_STICK) if (window->mouseButton[button] == _GLFW_STICK)
{ {
// Sticky mode: release mouse button now // Sticky mode: release mouse button now
window->mouseButton[button] = GLFW_RELEASE; window->mouseButton[button] = GLFW_RELEASE;

2
src/internal.h
View File

@ -103,7 +103,7 @@ typedef struct _GLFWmonitor _GLFWmonitor;
//======================================================================== //========================================================================
// Internal key state used for sticky keys // Internal key state used for sticky keys
#define GLFW_STICK 2 #define _GLFW_STICK 2
//======================================================================== //========================================================================