Added two-dimensional scrolling API and X11 implementation.

This commit is contained in:
Camilla Berglund
2010-09-27 02:09:54 +02:00
parent 9fc3fe644b
commit 007766bd91
7 changed files with 58 additions and 46 deletions
+3 -3
View File
@@ -218,9 +218,9 @@ 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 mouse_wheel_callback(GLFWwindow window, int position)
static void scroll_callback(GLFWwindow window, int x, int y)
{
printf("%08x at %0.3f: Mouse wheel: %i\n", counter++, glfwGetTime(), position);
printf("%08x at %0.3f: Scroll: %i %i\n", counter++, glfwGetTime(), x, y);
}
static void key_callback(GLFWwindow window, int key, int action)
@@ -310,7 +310,7 @@ int main(void)
glfwSetWindowIconifyCallback(window, window_iconify_callback);
glfwSetMouseButtonCallback(window, mouse_button_callback);
glfwSetMousePosCallback(window, mouse_position_callback);
glfwSetMouseWheelCallback(window, mouse_wheel_callback);
glfwSetScrollCallback(window, scroll_callback);
glfwSetKeyCallback(window, key_callback);
glfwSetCharCallback(window, char_callback);