diff options
author | Sven Gothel <[email protected]> | 2010-04-24 19:39:59 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-04-24 19:39:59 +0200 |
commit | 0715cdc7d978db00c15b9a79cc21af8fd466174b (patch) | |
tree | 4a155f45045494d77eea3d810d96802a80e47634 | |
parent | 6e273ec07af21ad3c2a1b50fece9f46a3cc92658 (diff) |
NEWT: Add missing return in recursive lock; Add MacOSX EVENT_KEY_TYPED
-rwxr-xr-x | make/java-run-newt.sh | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/Window.java | 1 | ||||
-rwxr-xr-x | src/newt/native/NewtMacWindow.m | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh index 384cf24c8..bc9dc845c 100755 --- a/make/java-run-newt.sh +++ b/make/java-run-newt.sh @@ -21,7 +21,7 @@ if [ $MOSX -eq 1 ] ; then fi # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" -D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" +# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" # D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" # D_ARGS="-Dnativewindow.debug.X11Util=true" diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index 6f585a20a..db1b694b9 100755 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -989,6 +989,7 @@ public abstract class Window implements NativeWindow Thread cur = Thread.currentThread(); if (owner == cur) { ++recursionCount; + return; } while (owner != null) { try { diff --git a/src/newt/native/NewtMacWindow.m b/src/newt/native/NewtMacWindow.m index 3d8d32a40..d8d59a7af 100755 --- a/src/newt/native/NewtMacWindow.m +++ b/src/newt/native/NewtMacWindow.m @@ -242,6 +242,7 @@ static jint mods2JavaMods(NSUInteger mods) - (void) keyUp: (NSEvent*) theEvent { [self sendKeyEvent: theEvent eventType: EVENT_KEY_RELEASED]; + [self sendKeyEvent: theEvent eventType: EVENT_KEY_TYPED]; } - (void) sendMouseEvent: (NSEvent*) event eventType: (jint) evType |