From e67d717c4ed4470901dba7430d5b12870b874e05 Mon Sep 17 00:00:00 2001 From: kappaOne Date: Fri, 15 Feb 2013 21:49:19 +0000 Subject: [PATCH] simplify mouse code a little --- src/java/org/lwjgl/opengl/MacOSXDisplay.java | 12 ++---------- src/native/macosx/org_lwjgl_opengl_Display.m | 10 +++++----- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index df620375..2cc0005b 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -170,20 +170,12 @@ final class MacOSXDisplay implements DisplayImplementation { } } - public void mouseInsideWindow() { + public void mouseInsideWindow(boolean inside) { synchronized (this) { - mouseInsideWindow = true; + mouseInsideWindow = inside; } updateNativeCursor = true; } - - public void mouseOutsideWindow() { - synchronized (this) { - mouseInsideWindow = false; - } - - updateNativeCursor = true; - } public native void nDestroyCALayer(ByteBuffer peer_info_handle); diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m index 8b5016af..7a3e5c7b 100644 --- a/src/native/macosx/org_lwjgl_opengl_Display.m +++ b/src/native/macosx/org_lwjgl_opengl_Display.m @@ -59,7 +59,7 @@ static MacOSXPeerInfo *peer_info; + (void) createWindow { MacOSXWindowInfo *window_info = peer_info->window_info; - // + int width = window_info->display_rect.size.width; int height = window_info->display_rect.size.height; @@ -476,8 +476,8 @@ static MacOSXPeerInfo *peer_info; } jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay); - jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "()V"); - (*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback); + jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "(Z)V"); + (*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback, JNI_TRUE); } -(void)mouseExited:(NSEvent *)event { @@ -487,8 +487,8 @@ static MacOSXPeerInfo *peer_info; } jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay); - jmethodID mouseOutsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseOutsideWindow", "()V"); - (*env)->CallVoidMethod(env, _parent->jdisplay, mouseOutsideWindow_callback); + jmethodID mouseInsideWindow_callback = (*env)->GetMethodID(env, display_class, "mouseInsideWindow", "(Z)V"); + (*env)->CallVoidMethod(env, _parent->jdisplay, mouseInsideWindow_callback, JNI_FALSE); } - (void) drawRect:(NSRect)rect {