diff options
| author | Sven Gothel <[email protected]> | 2019-12-05 07:24:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-05 07:24:03 +0100 |
| commit | ea23776919eff10dee57519ce72354bbaea3544e (patch) | |
| tree | d2a28d8c8763cc1ba1b4ab7576f79fe4cfc1b7cc | |
| parent | c80147e3112f3ac87e004c19819b820b42b737df (diff) | |
Bug 1406, Bug 1405: demos.Launcher0: Defaults to use multiple PointerIcons again
launch script test-demo-launcher0.sh: Tested with '-Xcheck:jni'
| -rw-r--r-- | make/scripts/test-demo-launcher0.sh | 4 | ||||
| -rw-r--r-- | src/demos/com/jogamp/opengl/demos/Launcher0.java | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/make/scripts/test-demo-launcher0.sh b/make/scripts/test-demo-launcher0.sh index 4004726a7..6f00345f0 100644 --- a/make/scripts/test-demo-launcher0.sh +++ b/make/scripts/test-demo-launcher0.sh @@ -31,6 +31,7 @@ bdirb=`basename "$bdir"` #export INTEL_DEBUG="buf bat" #export INTEL_STRICT_CONFORMANCE=1 +#X_ARGS="-Xcheck:jni $X_ARGS" X_ARGS="-Djava.awt.headless=true $X_ARGS" #D_ARGS="-Djogl.debug.GLProfile -Djogl.debug.GLContext" @@ -49,7 +50,8 @@ X_ARGS="-Djava.awt.headless=true $X_ARGS" #D_ARGS="-Djogl.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Djogl.debug.DebugGL" #D_ARGS="-Dnewt.debug=all" -D_ARGS="-Dnewt.debug.Display.PointerIcon -Dnewt.disable.PointerIcon" +#D_ARGS="-Dnewt.debug.Display.PointerIcon -Dnewt.debug.Window.KeyEvent -Dnewt.disable.PointerIcon" +#D_ARGS="-Dnewt.debug.Display.PointerIcon -Dnewt.debug.Window.KeyEvent" #D_ARGS="-Dnewt.disable.LinuxKeyEventTracker -Dnewt.disable.LinuxMouseTracker" #D_ARGS="-Dnewt.disable.LinuxKeyEventTracker" diff --git a/src/demos/com/jogamp/opengl/demos/Launcher0.java b/src/demos/com/jogamp/opengl/demos/Launcher0.java index 02bfa3c66..9f2e0d64e 100644 --- a/src/demos/com/jogamp/opengl/demos/Launcher0.java +++ b/src/demos/com/jogamp/opengl/demos/Launcher0.java @@ -87,7 +87,7 @@ public class Launcher0 { static boolean waitForKey = false; static boolean mouseVisible = true; static boolean mouseConfined = false; - static boolean useMultiplePointerIcon = false; + static boolean useMultiplePointerIcon = true; static boolean showFPS = true; static boolean forceES2 = false; static boolean forceES3 = false; @@ -353,8 +353,8 @@ public class Launcher0 { mouseVisible = false; } else if(args[i].equals("-mouseConfine")) { mouseConfined = true; - } else if(args[i].equals("-pointerIcon")) { - useMultiplePointerIcon = true; + } else if(args[i].equals("-noPointerIcons")) { + useMultiplePointerIcon = false; } else if(args[i].equals("-showFPS")) { showFPS = true; } else if(args[i].equals("-width")) { @@ -414,7 +414,7 @@ public class Launcher0 { System.err.println("fullscreen "+fullscreen); System.err.println("mouseVisible "+mouseVisible); System.err.println("mouseConfined "+mouseConfined); - System.err.println("pointerIcon "+useMultiplePointerIcon); + System.err.println("pointerIcons "+useMultiplePointerIcon); System.err.println("forceES2 "+forceES2); System.err.println("forceES3 "+forceES3); System.err.println("forceGL3 "+forceGL3); |