From 161c73ea66fb8d85dad78d2e07bfef4c879a7c99 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 30 Apr 2013 17:30:24 +0200 Subject: [PATCH] Removed centered flag. --- src/x11_platform.h | 1 - src/x11_window.c | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/x11_platform.h b/src/x11_platform.h index e5fea416..5f52eb02 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -85,7 +85,6 @@ typedef struct _GLFWwindowX11 GLboolean overrideRedirect; // True if window is OverrideRedirect GLboolean cursorGrabbed; // True if cursor is currently grabbed GLboolean cursorHidden; // True if cursor is currently hidden - GLboolean cursorCentered; // True if cursor was moved since last poll // The last received cursor position, regardless of source double cursorPosX, cursorPosY; diff --git a/src/x11_window.c b/src/x11_window.c index 55c36eea..75719b8f 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -301,7 +301,6 @@ static void captureCursor(_GLFWwindow* window) GrabSuccess) { window->x11.cursorGrabbed = GL_TRUE; - window->x11.cursorCentered = GL_FALSE; } } } @@ -601,7 +600,6 @@ static void processEvent(XEvent *event) y = event->xmotion.y; } - window->x11.cursorCentered = GL_FALSE; _glfwInputCursorMotion(window, x, y); } @@ -764,7 +762,6 @@ static void processEvent(XEvent *event) y = data->event_y; } - window->x11.cursorCentered = GL_FALSE; _glfwInputCursorMotion(window, x, y); } @@ -1052,13 +1049,11 @@ void _glfwPlatformPollEvents(void) window = _glfw.focusedWindow; if (window) { - if (window->cursorMode == GLFW_CURSOR_CAPTURED && - !window->x11.cursorCentered) + if (window->cursorMode == GLFW_CURSOR_CAPTURED) { int width, height; _glfwPlatformGetWindowSize(window, &width, &height); _glfwPlatformSetCursorPos(window, width / 2, height / 2); - window->x11.cursorCentered = GL_TRUE; // NOTE: This is a temporary fix. It works as long as you use // offsets accumulated over the course of a frame, instead of