aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2017-12-31 23:50:22 +0100
committerraysan5 <raysan5@gmail.com>2017-12-31 23:50:22 +0100
commite69424c86fb2e754ebf5dcb95c9bdb2ebd4f0dbc (patch)
treeb4eb287f4ce5fde3ab4258042ec499dedf4109cc
parente7cf03b1e4c1aa7872bda7b35a7d064815332759 (diff)
downloadraylib-e69424c86fb2e754ebf5dcb95c9bdb2ebd4f0dbc.tar.gz
raylib-e69424c86fb2e754ebf5dcb95c9bdb2ebd4f0dbc.zip
Reviewed text input
-rw-r--r--examples/text/text_input_box.c2
-rw-r--r--src/core.c15
2 files changed, 11 insertions, 6 deletions
diff --git a/examples/text/text_input_box.c b/examples/text/text_input_box.c
index 54eebf40..5f8d1c01 100644
--- a/examples/text/text_input_box.c
+++ b/examples/text/text_input_box.c
@@ -52,7 +52,7 @@ int main()
letterCount++;
}
- if (key == KEY_BACKSPACE)
+ if (IsKeyPressed(KEY_BACKSPACE))
{
letterCount--;
name[letterCount] = '\0';
diff --git a/src/core.c b/src/core.c
index 7d7e188c..60bc58b8 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2432,7 +2432,9 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i
else
{
currentKeyState[key] = action;
- if (action == GLFW_PRESS) lastKeyPressed = key;
+
+ // NOTE: lastKeyPressed already registered on CharCallback()
+ //if (action == GLFW_PRESS) lastKeyPressed = key;
}
}
@@ -2498,12 +2500,15 @@ static void MouseCursorPosCallback(GLFWwindow *window, double x, double y)
#endif
}
-// GLFW3 Char Key Callback, runs on key pressed (get char value)
+// GLFW3 Char Key Callback, runs on key down (get unicode char value)
static void CharCallback(GLFWwindow *window, unsigned int key)
-{
+{
+ // NOTE: Registers any key down considering OS keyboard layout but
+ // do not detects action events, those should be managed by user...
+ // https://github.com/glfw/glfw/issues/668#issuecomment-166794907
+ // http://www.glfw.org/docs/latest/input_guide.html#input_char
+
lastKeyPressed = key;
-
- //TraceLog(LOG_INFO, "Char Callback Key pressed: %i\n", key);
}
// GLFW3 CursorEnter Callback, when cursor enters the window