Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 00:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed _glfwInputError and moved to event API.

Browse Source
This commit is contained in:
Camilla Berglund
2012-12-31 21:05:28 +01:00
parent 21f41a2bb7
commit 1790194828
29 changed files with 271 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.c
+19 -20
View File
@@ -43,7 +43,7 @@ static void setCursorMode(_GLFWwindow* window, int newMode)
newMode != GLFW_CURSOR_HIDDEN &&
newMode != GLFW_CURSOR_CAPTURED)
{
_glfwSetError(GLFW_INVALID_ENUM, NULL);
_glfwInputError(GLFW_INVALID_ENUM, NULL);
return;
}
@@ -255,7 +255,7 @@ GLFWAPI int glfwGetInputMode(GLFWwindow handle, int mode)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return 0;
}
@@ -268,7 +268,7 @@ GLFWAPI int glfwGetInputMode(GLFWwindow handle, int mode)
case GLFW_STICKY_MOUSE_BUTTONS:
return window->stickyMouseButtons;
default:
_glfwSetError(GLFW_INVALID_ENUM, NULL);
_glfwInputError(GLFW_INVALID_ENUM, NULL);
return 0;
}
}
@@ -284,7 +284,7 @@ GLFWAPI void glfwSetInputMode(GLFWwindow handle, int mode, int value)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -300,7 +300,7 @@ GLFWAPI void glfwSetInputMode(GLFWwindow handle, int mode, int value)
setStickyMouseButtons(window, value ? GL_TRUE : GL_FALSE);
break;
default:
_glfwSetError(GLFW_INVALID_ENUM, NULL);
_glfwInputError(GLFW_INVALID_ENUM, NULL);
break;
}
}
@@ -316,14 +316,13 @@ GLFWAPI int glfwGetKey(GLFWwindow handle, int key)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return GLFW_RELEASE;
}
if (key < 0 || key > GLFW_KEY_LAST)
{
_glfwSetError(GLFW_INVALID_ENUM,
"The specified key is invalid");
_glfwInputError(GLFW_INVALID_ENUM, "The specified key is invalid");
return GLFW_RELEASE;
}
@@ -348,14 +347,14 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow handle, int button)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return GLFW_RELEASE;
}
if (button < 0 || button > GLFW_MOUSE_BUTTON_LAST)
{
_glfwSetError(GLFW_INVALID_ENUM,
"The specified mouse button is invalid");
_glfwInputError(GLFW_INVALID_ENUM,
"The specified mouse button is invalid");
return GLFW_RELEASE;
}
@@ -380,7 +379,7 @@ GLFWAPI void glfwGetCursorPos(GLFWwindow handle, int* xpos, int* ypos)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -403,7 +402,7 @@ GLFWAPI void glfwSetCursorPos(GLFWwindow handle, int xpos, int ypos)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -437,7 +436,7 @@ GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, double* xoffset, double* yof
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -459,7 +458,7 @@ GLFWAPI void glfwSetKeyCallback(GLFWwindow handle, GLFWkeyfun cbfun)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -477,7 +476,7 @@ GLFWAPI void glfwSetCharCallback(GLFWwindow handle, GLFWcharfun cbfun)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -495,7 +494,7 @@ GLFWAPI void glfwSetMouseButtonCallback(GLFWwindow handle, GLFWmousebuttonfun cb
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -513,7 +512,7 @@ GLFWAPI void glfwSetCursorPosCallback(GLFWwindow handle, GLFWcursorposfun cbfun)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -531,7 +530,7 @@ GLFWAPI void glfwSetCursorEnterCallback(GLFWwindow handle, GLFWcursorenterfun cb
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -549,7 +548,7 @@ GLFWAPI void glfwSetScrollCallback(GLFWwindow handle, GLFWscrollfun cbfun)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}