From e049190ff13adcc5667cbe5453a2ff01e6888357 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 15 Jun 2015 15:19:55 +0200 Subject: [PATCH] Moved focus callback triggering last. --- src/x11_window.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/x11_window.c b/src/x11_window.c index def84616..8bb6da76 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -1231,11 +1231,10 @@ static void processEvent(XEvent *event) if (window->x11.ic) XSetICFocus(window->x11.ic); - _glfwInputWindowFocus(window, GL_TRUE); - if (window->cursorMode == GLFW_CURSOR_DISABLED) disableCursor(window); + _glfwInputWindowFocus(window, GL_TRUE); return; } @@ -1252,11 +1251,10 @@ static void processEvent(XEvent *event) if (window->x11.ic) XUnsetICFocus(window->x11.ic); - _glfwInputWindowFocus(window, GL_FALSE); - if (window->cursorMode == GLFW_CURSOR_DISABLED) restoreCursor(window); + _glfwInputWindowFocus(window, GL_FALSE); return; }