Merge branch 'master' of github.com:sgothel/jogl

8 files changed, 34 insertions, 52 deletions

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index b087a5ba7..861dc00c5 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -73,7 +73,7 @@
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/impl/*, com/jogamp/nativewindow/impl/jvm/*"/>
+                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/util/*, com/jogamp/nativewindow/impl/*, com/jogamp/nativewindow/impl/jvm/*"/>
 
         <property name="java.part.awt"
                   value="javax/media/nativewindow/awt/*, com/jogamp/nativewindow/impl/jawt/**, com/jogamp/nativewindow/impl/**/awt/**"/>
@@ -155,7 +155,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.util.*,com.jogamp.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 08c0f308b..2cb848588 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -90,7 +90,7 @@
                   value="com/jogamp/newt/*, com/jogamp/newt/event/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*"/>
 
         <property name="java.part.awt"
-                  value="com/jogamp/newt/impl/awt/*, com/jogamp/newt/event/awt/*"/>
+                  value="com/jogamp/newt/impl/awt/*, com/jogamp/newt/awt/*, com/jogamp/newt/event/awt/*"/>
 
         <property name="java.part.x11"
                   value="com/jogamp/newt/impl/x11/*"/>
diff --git a/make/config/nativewindow/jawt-common.cfg b/make/config/nativewindow/jawt-common.cfg
new file mode 100644
index 000000000..4ed0a88f1
--- /dev/null
+++ b/make/config/nativewindow/jawt-common.cfg
@@ -0,0 +1,26 @@
+# Common JAWT config file
+Style AllStatic
+Package com.jogamp.nativewindow.impl.jawt
+JavaClass JAWTFactory
+JavaOutputDir gensrc/classes
+#NativeOutputDir gensrc/native/<PLATFORM>
+
+HierarchicalNativeOutput false
+
+Opaque boolean jboolean
+Opaque long struct jawt_DrawingSurface*
+
+ReturnValueCapacity GetDrawingSurface sizeof(JAWT_DrawingSurface)
+ReturnValueCapacity GetDrawingSurfaceInfo sizeof(JAWT_DrawingSurfaceInfo)
+
+IgnoreField JAWT GetComponent
+IgnoreField JAWT_DrawingSurfaceInfo platformInfo
+
+IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java
+
+CustomCCode #include <jawt.h>
+
+import java.security.*
+import com.jogamp.nativewindow.impl.jawt.*
+
+IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java
diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg
index dea1a27b7..e018af0dc 100644
--- a/make/config/nativewindow/jawt-macosx.cfg
+++ b/make/config/nativewindow/jawt-macosx.cfg
@@ -1,30 +1,14 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the MacOSXOnscreenGLContext.
-Style AllStatic
-Package com.jogamp.nativewindow.impl.jawt
-JavaClass JAWTFactory
-JavaOutputDir gensrc/classes
+Include jawt-common.cfg
 NativeOutputDir gensrc/native/MacOSX
 
-HierarchicalNativeOutput false
-
-Opaque boolean jboolean
 Opaque long void *
 Opaque long NSView *
 
-IgnoreField JAWT GetComponent
-IgnoreField JAWT_DrawingSurfaceInfo      platformInfo
-
-IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java
-
 CustomCCode #include <inttypes.h>
-CustomCCode #include <jawt.h>
 CustomCCode #include </usr/include/machine/types.h>
 
-import java.security.*
-import com.jogamp.nativewindow.impl.jawt.*
 StructPackage JAWT_MacOSXDrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.macosx
 EmitStruct JAWT_MacOSXDrawingSurfaceInfo
 Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo
-
-IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java
diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg
index af0c7ce29..00b3a3322 100644
--- a/make/config/nativewindow/jawt-win32.cfg
+++ b/make/config/nativewindow/jawt-win32.cfg
@@ -1,30 +1,15 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the WindowsOnscreenGLContext.
-Style AllStatic
-Package com.jogamp.nativewindow.impl.jawt
-JavaClass JAWTFactory
-JavaOutputDir gensrc/classes
+Include jawt-common.cfg
 NativeOutputDir gensrc/native/Windows
 
-HierarchicalNativeOutput false
-
-Opaque boolean jboolean
 Opaque long HDC
 
-IgnoreField JAWT GetComponent
-IgnoreField JAWT_DrawingSurfaceInfo      platformInfo
 IgnoreField JAWT_Win32DrawingSurfaceInfo null
 IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette
 
-IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java
-
-CustomCCode #include <jawt.h>
 Include ../intptr.cfg
 
-import java.security.*
-import com.jogamp.nativewindow.impl.jawt.*
 StructPackage JAWT_Win32DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.windows
 EmitStruct JAWT_Win32DrawingSurfaceInfo
 Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo
-
-IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java
diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg
index ccfe009dd..4e7ed267b 100644
--- a/make/config/nativewindow/jawt-x11.cfg
+++ b/make/config/nativewindow/jawt-x11.cfg
@@ -1,30 +1,15 @@
 # This .cfg file is used to generate the interface to the JAWT, which
 # is used by the X11OnscreenGLContext.
-Style AllStatic
-Package com.jogamp.nativewindow.impl.jawt
-JavaClass JAWTFactory
-JavaOutputDir gensrc/classes
+Include jawt-common.cfg
 NativeOutputDir gensrc/native/X11
 
-HierarchicalNativeOutput false
-
-Opaque boolean jboolean
 Opaque long Drawable
 Opaque long Display *
 
-IgnoreField JAWT GetComponent
-IgnoreField JAWT_DrawingSurfaceInfo platformInfo
 IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor
 
-IncludeAs CustomJavaCode JAWT jawt-CustomJavaCode.java
-
 CustomCCode #include <inttypes.h>
-CustomCCode #include <jawt.h>
 
-import java.security.*
-import com.jogamp.nativewindow.impl.jawt.*
 StructPackage JAWT_X11DrawingSurfaceInfo com.jogamp.nativewindow.impl.jawt.x11
 EmitStruct JAWT_X11DrawingSurfaceInfo
 Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo
-
-IncludeAs CustomJavaCode JAWT_DrawingSurfaceInfo jawt-DrawingSurfaceInfo-CustomJavaCode.java
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh
index 8c50d0933..0e5be242a 100755
--- a/make/scripts/java-run-all.sh
+++ b/make/scripts/java-run-all.sh
@@ -35,6 +35,7 @@ uname -a | grep -i Darwin && MOSX=1
 # 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"
+# D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all"
 # D_ARGS="-Dnewt.debug=all"
 # D_ARGS="-Dnewt.debug.Window"
 # D_ARGS="-Djogl.debug=all"
diff --git a/make/scripts/java-run-newt.sh b/make/scripts/java-run-newt.sh
index 94f77143f..796e22da4 100755
--- a/make/scripts/java-run-newt.sh
+++ b/make/scripts/java-run-newt.sh
@@ -39,5 +39,6 @@ fi
 # 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"
+# D_ARGS="-Dnewt.debug=all"
 
 java $X_ARGS -Djava.awt.headless=true $D_ARGS com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log