From bea9667f8bf8daae836aed4371e2bf1a84658a50 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 31 May 2007 21:00:13 +0000 Subject: [PATCH] Mac OS X: Don't use global is_grabbed variable in MacOSXMouseEventQueue.nWarpCursor --- src/native/macosx/org_lwjgl_input_Mouse.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/native/macosx/org_lwjgl_input_Mouse.c b/src/native/macosx/org_lwjgl_input_Mouse.c index f7f824dd..2c33a901 100644 --- a/src/native/macosx/org_lwjgl_input_Mouse.c +++ b/src/native/macosx/org_lwjgl_input_Mouse.c @@ -44,18 +44,12 @@ #include "org_lwjgl_opengl_MacOSXMouseEventQueue.h" #include "common_tools.h" -static bool is_grabbed; - JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXMouseEventQueue_nGrabMouse(JNIEnv *env, jclass unused, jboolean grab) { - bool new_grabbed = grab == JNI_TRUE; - if (is_grabbed != new_grabbed) { - is_grabbed = new_grabbed; - CGAssociateMouseAndMouseCursorPosition(is_grabbed ? FALSE : TRUE); - if (is_grabbed) - CGDisplayHideCursor(kCGDirectMainDisplay); - else - CGDisplayShowCursor(kCGDirectMainDisplay); - } + CGAssociateMouseAndMouseCursorPosition(grab == JNI_TRUE ? FALSE : TRUE); + if (grab) + CGDisplayHideCursor(kCGDirectMainDisplay); + else + CGDisplayShowCursor(kCGDirectMainDisplay); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXMouseEventQueue_nWarpCursor(JNIEnv *env, jclass unused, jint x, jint y) {