Merged cursor enter/leave callbacks.

This commit is contained in:
Camilla Berglund
2012-01-30 22:59:38 +01:00
parent e5d85a5cc4
commit c4806b9532
5 changed files with 13 additions and 47 deletions
+5 -8
View File
@@ -274,14 +274,12 @@ static void mouse_position_callback(GLFWwindow window, int x, int y)
printf("%08x at %0.3f: Mouse position: %i %i\n", counter++, glfwGetTime(), x, y);
}
static void cursor_enter_callback(GLFWwindow window)
static void cursor_enter_callback(GLFWwindow window, int entered)
{
printf("%08x at %0.3f: Cursor entered window\n", counter++, glfwGetTime());
}
static void cursor_leave_callback(GLFWwindow window)
{
printf("%08x at %0.3f: Cursor left window\n", counter++, glfwGetTime());
printf("%08x at %0.3f: Cursor %s window\n",
counter++,
glfwGetTime(),
entered ? "entered" : "left");
}
static void scroll_callback(GLFWwindow window, int x, int y)
@@ -362,7 +360,6 @@ int main(void)
glfwSetMouseButtonCallback(mouse_button_callback);
glfwSetMousePosCallback(mouse_position_callback);
glfwSetCursorEnterCallback(cursor_enter_callback);
glfwSetCursorLeaveCallback(cursor_leave_callback);
glfwSetScrollCallback(scroll_callback);
glfwSetKeyCallback(key_callback);
glfwSetCharCallback(char_callback);