Made character unsigned.

This commit is contained in:
Camilla Berglund 2013-02-25 17:02:28 +01:00
parent dfc48d7170
commit 182e0afe25
4 changed files with 5 additions and 5 deletions

View File

@ -687,7 +687,7 @@ typedef void (* GLFWkeyfun)(GLFWwindow*,int,int);
* *
* @sa glfwSetCharCallback * @sa glfwSetCharCallback
*/ */
typedef void (* GLFWcharfun)(GLFWwindow*,int); typedef void (* GLFWcharfun)(GLFWwindow*,unsigned int);
/*! @brief The function signature for monitor configuration callbacks. /*! @brief The function signature for monitor configuration callbacks.
* @param[in] monitor The monitor that was connected or disconnected. * @param[in] monitor The monitor that was connected or disconnected.

View File

@ -135,7 +135,7 @@ void _glfwInputKey(_GLFWwindow* window, int key, int action)
window->callbacks.key((GLFWwindow*) window, key, action); window->callbacks.key((GLFWwindow*) window, key, action);
} }
void _glfwInputChar(_GLFWwindow* window, int character) void _glfwInputChar(_GLFWwindow* window, unsigned int character)
{ {
// Valid Unicode (ISO 10646) character? // Valid Unicode (ISO 10646) character?
if (!((character >= 32 && character <= 126) || character >= 160)) if (!((character >= 32 && character <= 126) || character >= 160))

View File

@ -591,7 +591,7 @@ void _glfwInputKey(_GLFWwindow* window, int key, int action);
* @param[in] character The Unicode code point of the input character. * @param[in] character The Unicode code point of the input character.
* @ingroup event * @ingroup event
*/ */
void _glfwInputChar(_GLFWwindow* window, int character); void _glfwInputChar(_GLFWwindow* window, unsigned int character);
/*! @brief Notifies shared code of a scroll event. /*! @brief Notifies shared code of a scroll event.
* @param[in] window The window that received the event. * @param[in] window The window that received the event.

View File

@ -334,9 +334,9 @@ static void key_callback(GLFWwindow* window, int key, int action)
} }
} }
static void char_callback(GLFWwindow* window, int character) static void char_callback(GLFWwindow* window, unsigned int character)
{ {
printf("%08x at %0.3f: Character 0x%04x (%s) input\n", printf("%08x at %0.3f: Character 0x%08x (%s) input\n",
counter++, counter++,
glfwGetTime(), glfwGetTime(),
character, character,