diff options
| author | Michael Bien <[email protected]> | 2010-04-25 16:00:34 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-04-25 16:00:34 +0200 |
| commit | 13e3d9bca4aa57fca322ccfc31fe9afc7765b72f (patch) | |
| tree | 79b26bb89eb5499da8010d8f2f5542b4f07f10cf | |
| parent | 6033b01389ec1f17d0831ed22a41cdfe24a3b435 (diff) | |
| parent | edaf669e1b8c8412c1fd4acfc799138b629bf031 (diff) | |
Merge branch 'master' of github.com:mbien/jogl
| -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 |