Fixes for JOGL changes 6e599a2696f878786783e0fea17534e67655a5c9

15 files changed, 16 insertions, 15 deletions

diff --git a/java-run-newt.sh b/java-run-newt.sh
index 14069af..f60a05e 100755
--- a/java-run-newt.sh
+++ b/java-run-newt.sh
@@ -16,7 +16,8 @@ if [ $CPOK -eq 0 ] ; then
 else
     if [ $MOSX -eq 1 ] ; then
         X_ARGS="-XstartOnFirstThread"
+        C_ARG="com.jogamp.newt.util.MainThread"
     fi
 
-    java $X_ARGS -Djava.awt.headless=true com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
+    java $X_ARGS -Djava.awt.headless=true $C_ARG $* 2>&1 | tee java-run-newt.log
 fi
diff --git a/java-run-swing.sh b/java-run-swing.sh
index 5ea0e6f..8a5cf50 100644
--- a/java-run-swing.sh
+++ b/java-run-swing.sh
@@ -3,7 +3,7 @@
 CPOK=0
 echo $CLASSPATH | grep jogl && CPOK=1
 
-#SWING_PROPS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true"
+# SWING_PROPS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true"
 SWING_PROPS_DBG="-Djnlp.jogl.debug.GLJPanel=true"
 
 if [ $CPOK -eq 0 ] ; then
diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index 55bf9cd..0d0c1e2 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -34,7 +34,7 @@ public class GLInfo extends Thread implements GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 System.err.println(glp+" "+nWindow);
                 window = GLWindow.create(nWindow);
             } else {
diff --git a/src/demos/GLNewtRun.java b/src/demos/GLNewtRun.java
index c981012..72389e3 100755
--- a/src/demos/GLNewtRun.java
+++ b/src/demos/GLNewtRun.java
@@ -219,7 +219,7 @@ public class GLNewtRun implements WindowListener, KeyListener, MouseListener {
                     parent.setPosition(x_p, y_p);
                     parent.setSize(width+width/10, height+height/10);
                     parent.setVisible(true);
-                    nWindow = NewtFactory.createWindow(parent, nScreen, caps);
+                    nWindow = NewtFactory.createWindow(parent, caps, undecorated);
                 } else {
                     nWindow = NewtFactory.createWindow(nScreen, caps, undecorated);
                 }
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 20e6687..81d2f18 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -26,7 +26,7 @@ public class Info implements GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 2f1e4c1..c7ad8bc 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -116,7 +116,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 9d903dd..0ad882b 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -63,7 +63,7 @@ public class Main implements WindowListener, MouseListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index 95c9514..4717b2d 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -329,7 +329,7 @@ public class Cube implements GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index 584a7f2..beda590 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -394,7 +394,7 @@ public class CubeImmModeSink implements GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index bef2761..8951d0c 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -64,7 +64,7 @@ public class Main implements WindowListener, MouseListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index f289bdb..12b2a5a 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -103,7 +103,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index a6dfc53..7cbfb9c 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -322,7 +322,7 @@ public class Cube implements GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index d44479e..f739ef5 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -55,7 +55,7 @@ public class Perftst implements MouseListener, GLEventListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);
diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java
index 566750e..2311ace 100755
--- a/src/demos/readbuffer/Main.java
+++ b/src/demos/readbuffer/Main.java
@@ -95,7 +95,7 @@ public class Main implements WindowListener, MouseListener, SurfaceUpdatedListen
                 if(0!=(typeNewt&USE_AWT)) {
                     Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                     Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                    Window nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                    Window nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                     window = GLWindow.create(nWindow);
                 } else {
                     Display nDisplay = NewtFactory.createDisplay(null); // local display
diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
index cd98906..44afa0d 100644
--- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java
+++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
@@ -87,7 +87,7 @@ public class JOGL implements WindowListener, MouseListener {
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
-                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps, false);
                 window = GLWindow.create(nWindow);
             } else {
                 window = GLWindow.create(caps);