java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 2)

Revision: 2514
Author:   elias_naur
Date:     2006-07-14 09:14:52 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2514&view=rev

Log Message:
-----------
Split the external LWJGL version from the internal version of the native JNI library. The internal JNI version is now an integer. This has multiple advantages over the old way:

1. The JNI_VERSION field is now included automatically in the generated JNI headers, relieving us of the burden of updating the version number in both java and native code.
2. We can update the JNI version with every non-compatible change of the JNI library API, not just once per release, giving us extra safety when users download and build LWJGL from SVN.
3. We can now avoid rebuilding natives if a particular release only
contains java changes. Currently, This is mostly a problem when Brian bumps the
external version prior a release and I forget to re-build the natives ;)

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
    trunk/LWJGL/src/native/common/common_tools.c
Modified: trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2006-07-14 13:07:38 UTC (rev 2513)
+++ trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2006-07-14 16:14:52 UTC (rev 2514)
@@ -39,7 +39,10 @@
  * $Id$
  */
 abstract class DefaultSysImplementation implements SysImplementation {
-	public native String getNativeLibraryVersion();
+	/** Included to let native have easy access to Sys.JNI_VERSION */
+	private final static int JNI_VERSION = Sys.JNI_VERSION;
+
+	public native int getJNIVersion();
 	public native void setDebug(boolean debug);
 
 	public long getTimerResolution() {

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-14 13:07:38 UTC (rev 2513)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-14 16:14:52 UTC (rev 2514)
@@ -56,6 +56,9 @@
 	/** Current version of library */
 	private static final String VERSION = "1.0beta2";
 
+	/** Current version of the JNI library */
+	static final int JNI_VERSION = 1;
+
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;
 
@@ -97,10 +100,10 @@
 		implementation = createImplementation();
 		loadLibrary(JNI_LIBRARY_NAME);
 		
-		String native_version = implementation.getNativeLibraryVersion();
-		if (!native_version.equals(getVersion()))
-			throw new LinkageError("Version mismatch: jar version is '" + getVersion() +
-                             "', native libary version is '" + native_version + "'");
+		int native_jni_version = implementation.getJNIVersion();
+		if (native_jni_version != JNI_VERSION)
+			throw new LinkageError("Version mismatch: jar version is '" + JNI_VERSION +
+                             "', native libary version is '" + native_jni_version + "'");
 		implementation.setDebug(LWJGLUtil.DEBUG);
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2006-07-14 13:07:38 UTC (rev 2513)
+++ trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2006-07-14 16:14:52 UTC (rev 2514)
@@ -44,7 +44,7 @@
 	/**
 	 * Return the version of the native library
 	 */
-	String getNativeLibraryVersion();
+	int getJNIVersion();
 
 	void setDebug(boolean debug);
 

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-14 13:07:38 UTC (rev 2513)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-14 16:14:52 UTC (rev 2514)
@@ -48,7 +48,6 @@
 #include "org_lwjgl_DefaultSysImplementation.h"
 
 static bool debug = false;
-static const char* VERSION = "1.0beta2";
 static JavaVM *jvm;
 
 void initAttribList(attrib_list_t *list) {
@@ -64,9 +63,9 @@
 	list->current_index++;
 }
 
-JNIEXPORT jstring JNICALL Java_org_lwjgl_DefaultSysImplementation_getNativeLibraryVersion
+JNIEXPORT jint JNICALL Java_org_lwjgl_DefaultSysImplementation_getJNIVersion
   (JNIEnv *env, jobject ignored) {
-	return NewStringNative(env, VERSION);
+	return org_lwjgl_DefaultSysImplementation_JNI_VERSION;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_DefaultSysImplementation_setDebug


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2513
Author:   elias_naur
Date:     2006-07-14 06:07:38 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2513&view=rev

Log Message:
-----------
Added additional @NoErrorCheck annotations

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java	2006-07-14 12:07:20 UTC (rev 2512)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multitexture.java	2006-07-14 13:07:38 UTC (rev 2513)
@@ -75,35 +75,51 @@
 
 	void glActiveTextureARB(@GLenum int texture);
 
+	@NoErrorCheck
 	void glMultiTexCoord1fARB(@GLenum int target, float s);
 
+	@NoErrorCheck
 	void glMultiTexCoord1dARB(@GLenum int target, double s);
 
+	@NoErrorCheck
 	void glMultiTexCoord1iARB(@GLenum int target, int s);
 
+	@NoErrorCheck
 	void glMultiTexCoord1sARB(@GLenum int target, short s);
 
+	@NoErrorCheck
 	void glMultiTexCoord2fARB(@GLenum int target, float s, float t);
 
+	@NoErrorCheck
 	void glMultiTexCoord2dARB(@GLenum int target, double s, double t);
 
+	@NoErrorCheck
 	void glMultiTexCoord2iARB(@GLenum int target, int s, int t);
 
+	@NoErrorCheck
 	void glMultiTexCoord2sARB(@GLenum int target, short s, short t);
 
+	@NoErrorCheck
 	void glMultiTexCoord3fARB(@GLenum int target, float s, float t, float r);
 
+	@NoErrorCheck
 	void glMultiTexCoord3dARB(@GLenum int target, double s, double t, double r);
 
+	@NoErrorCheck
 	void glMultiTexCoord3iARB(@GLenum int target, int s, int t, int r);
 
+	@NoErrorCheck
 	void glMultiTexCoord3sARB(@GLenum int target, short s, short t, short r);
 
+	@NoErrorCheck
 	void glMultiTexCoord4fARB(@GLenum int target, float s, float t, float r, float q);
 
+	@NoErrorCheck
 	void glMultiTexCoord4dARB(@GLenum int target, double s, double t, double r, double q);
 
+	@NoErrorCheck
 	void glMultiTexCoord4iARB(@GLenum int target, int s, int t, int r, int q);
 
+	@NoErrorCheck
 	void glMultiTexCoord4sARB(@GLenum int target, short s, short t, short r, short q);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2006-07-14 12:07:20 UTC (rev 2512)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2006-07-14 13:07:38 UTC (rev 2513)
@@ -755,10 +755,12 @@
 			@Check("textures.remaining()")
 			@GLboolean ByteBuffer residences);
 
+	@NoErrorCheck
 	void glBegin(@GLenum int mode);
 
 	void glEnd();
 
+	@NoErrorCheck
 	void glArrayElement(int i);
 
 	void glClearDepth(@GLclampd double depth);
@@ -793,20 +795,28 @@
 
 	void glColorMask(boolean red, boolean green, boolean blue, boolean alpha);
 
+	@NoErrorCheck
 	void glColor3b(byte red, byte green, byte blue);
 
+	@NoErrorCheck
 	void glColor3f(float red, float green, float blue);
 
+	@NoErrorCheck
 	void glColor3d(double red, double green, double blue);
 
+	@NoErrorCheck
 	void glColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue);
 
+	@NoErrorCheck
 	void glColor4b(byte red, byte green, byte blue, byte alpha);
 
+	@NoErrorCheck
 	void glColor4f(float red, float green, float blue, float alpha);
 
+	@NoErrorCheck
 	void glColor4d(double red, double green, double blue, double alpha);
 
+	@NoErrorCheck
 	void glColor4ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue, @GLubyte byte alpha);
 
 	void glClipPlane(@GLenum int plane, @Check("4") @Const DoubleBuffer equation);
@@ -1118,12 +1128,16 @@
 	                     @GLfloat
 	                     @GLdouble Buffer pointer);
 
+	@NoErrorCheck
 	void glNormal3b(byte nx, byte ny, byte nz);
 
+	@NoErrorCheck
 	void glNormal3f(float nx, float ny, float nz);
 
+	@NoErrorCheck
 	void glNormal3d(double nx, double ny, double nz);
 
+	@NoErrorCheck
 	void glNormal3i(int nx, int ny, int nz);
 
 	void glNewList(@GLuint int list, @GLenum int mode);
@@ -1214,22 +1228,31 @@
 	                     @GLfloat
 	                     @GLdouble Buffer pointer);
 
+	@NoErrorCheck
 	void glVertex2f(float x, float y);
 
+	@NoErrorCheck
 	void glVertex2d(double x, double y);
 
+	@NoErrorCheck
 	void glVertex2i(int x, int y);
 
+	@NoErrorCheck
 	void glVertex3f(float x, float y, float z);
 
+	@NoErrorCheck
 	void glVertex3d(double x, double y, double z);
 
+	@NoErrorCheck
 	void glVertex3i(int x, int y, int z);
 
+	@NoErrorCheck
 	void glVertex4f(float x, float y, float z, float w);
 
+	@NoErrorCheck
 	void glVertex4d(double x, double y, double z, double w);
 
+	@NoErrorCheck
 	void glVertex4i(int x, int y, int z, int w);
 
 	void glTranslatef(float x, float y, float z);
@@ -1319,20 +1342,28 @@
 	                       @GLfloat
 	                       @GLdouble Buffer pointer);
 
+	@NoErrorCheck
 	void glTexCoord1f(float s);
 
+	@NoErrorCheck
 	void glTexCoord1d(double s);
 
+	@NoErrorCheck
 	void glTexCoord2f(float s, float t);
 
+	@NoErrorCheck
 	void glTexCoord2d(double s, double t);
 
+	@NoErrorCheck
 	void glTexCoord3f(float s, float t, float r);
 
+	@NoErrorCheck
 	void glTexCoord3d(double s, double t, double r);
 
+	@NoErrorCheck
 	void glTexCoord4f(float s, float t, float r, float q);
 
+	@NoErrorCheck
 	void glTexCoord4d(double s, double t, double r, double q);
 
 	void glStencilOp(@GLenum int fail, @GLenum int zfail, @GLenum int zpass);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java	2006-07-14 12:07:20 UTC (rev 2512)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java	2006-07-14 13:07:38 UTC (rev 2513)
@@ -218,20 +218,28 @@
 	                             @GLshort
 	                             @GLint Buffer img);
 
+	@NoErrorCheck
 	void glMultiTexCoord1f(@GLenum int target, float s);
 
+	@NoErrorCheck
 	void glMultiTexCoord1d(@GLenum int target, double s);
 
+	@NoErrorCheck
 	void glMultiTexCoord2f(@GLenum int target, float s, float t);
 
+	@NoErrorCheck
 	void glMultiTexCoord2d(@GLenum int target, double s, double t);
 
+	@NoErrorCheck
 	void glMultiTexCoord3f(@GLenum int target, float s, float t, float r);
 
+	@NoErrorCheck
 	void glMultiTexCoord3d(@GLenum int target, double s, double t, double r);
 
+	@NoErrorCheck
 	void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q);
 
+	@NoErrorCheck
 	void glMultiTexCoord4d(@GLenum int target, double s, double t, double r, double q);
 
 	@StripPostfix("m")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2512
Author:   elias_naur
Date:     2006-07-14 05:07:20 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2512&view=rev

Log Message:
-----------
Added @NoErrorCheck to GL11.glGetError

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2006-07-14 11:54:52 UTC (rev 2511)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2006-07-14 12:07:20 UTC (rev 2512)
@@ -905,6 +905,7 @@
 	@StripPostfix("params")
 	void glGetLightiv(@GLenum int light, @GLenum int pname, @Check("4") IntBuffer params);
 
+	@NoErrorCheck
 	int glGetError();
 
 	void glGetClipPlane(@GLenum int plane, @Check("4") DoubleBuffer equation);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2511
Author:   elias_naur
Date:     2006-07-14 04:54:52 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2511&view=rev

Log Message:
-----------
Added a commented out generatechecks option to the opengl stubs generator. It can can be activated to add Utils.checkGLError everywhere

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-14 10:38:31 UTC (rev 2510)
+++ trunk/LWJGL/build.xml	2006-07-14 11:54:52 UTC (rev 2511)
@@ -605,6 +605,7 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
+			<!--<arg value="-Ageneratechecks"/>-->
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2510
Author:   elias_naur
Date:     2006-07-14 03:38:31 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2510&view=rev

Log Message:
-----------
Windows: Fixed setCursorPosition.

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-14 08:32:01 UTC (rev 2509)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-14 10:38:31 UTC (rev 2510)
@@ -468,7 +468,7 @@
 	return -1;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_setCursorPosition
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetCursorPosition
 (JNIEnv * env, jclass unused, jint x, jint y, jboolean fullscreen) {
 	DWORD windowflags, exstyle;
 	int transformed_x, transformed_y;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2509
Author:   elias_naur
Date:     2006-07-14 01:32:01 -0700 (Fri, 14 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2509&view=rev

Log Message:
-----------
Added a Controllers applet test

Modified Paths:
--------------
    trunk/LWJGL/applet/applet.html
    trunk/LWJGL/build.xml
    trunk/LWJGL/libs/jinput.jar

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/applet/ControllersTest.java
Modified: trunk/LWJGL/applet/applet.html
===================================================================
--- trunk/LWJGL/applet/applet.html	2006-07-13 18:56:19 UTC (rev 2508)
+++ trunk/LWJGL/applet/applet.html	2006-07-14 08:32:01 UTC (rev 2509)
@@ -1,6 +1,6 @@
 <html>
 <body>
-	<applet code="org.lwjgl.test.applet.AppletTest" archive="lwjgl_applet.jar,lwjgl_util_applet.jar,lwjgl.jar,res.jar,lwjgl_util.jar,lwjgl_fmod3.jar,lwjgl_devil.jar,natives.jar" width="640" height="480">
+	<applet code="org.lwjgl.test.applet.AppletTest" archive="lwjgl_applet.jar,lwjgl_util_applet.jar,lwjgl.jar,res.jar,lwjgl_util.jar,lwjgl_fmod3.jar,lwjgl_devil.jar,natives.jar,jinput.jar" width="640" height="480">
 		<param name="test" value="org.lwjgl.test.applet.OpenGL">
 	</applet>
 </body>

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-13 18:56:19 UTC (rev 2508)
+++ trunk/LWJGL/build.xml	2006-07-14 08:32:01 UTC (rev 2509)
@@ -359,7 +359,7 @@
 		<condition property="native_path" value="libs/macosx">
 			<os name="Mac OS X" />
 		</condition>
-		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar" fork="true">
+		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
 			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
 			<jvmarg value="-Djava.library.path=${native_path}"/>
 		</java>
@@ -416,10 +416,12 @@
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/>
+		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
 		<zip destfile="applet/res.jar">
 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
 		</zip>
 		<signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="applet/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
 		<signjar jar="applet/lwjgl_util_applet.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
 		<signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
 		<signjar jar="applet/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>		

Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)

Added: trunk/LWJGL/src/java/org/lwjgl/test/applet/ControllersTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/ControllersTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/ControllersTest.java	2006-07-14 08:32:01 UTC (rev 2509)
@@ -0,0 +1,52 @@
+/* 
+ * Copyright (c) 2006 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.test.applet;
+
+import java.awt.Canvas;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.input.Controllers;
+
+public class ControllersTest extends Canvas implements Test {
+	public void start() {
+		try {
+			Controllers.create();
+		} catch (LWJGLException e) {
+			e.printStackTrace();
+			return;
+		}
+		System.out.println("Controllers.getControllerCount() = " + Controllers.getControllerCount());
+	}
+	
+	public void stop() {
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2508
Author:   elias_naur
Date:     2006-07-13 11:56:19 -0700 (Thu, 13 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2508&view=rev

Log Message:
-----------
Refresh Jinput.jar

Modified Paths:
--------------
    trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2507
Author:   matzon
Date:     2006-07-12 14:29:31 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2507&view=rev

Log Message:
-----------
no more source dist - get from svn
date fixes
fixed signing and path issue when doing jnlp

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-12 19:57:22 UTC (rev 2506)
+++ trunk/LWJGL/build.xml	2006-07-12 21:29:31 UTC (rev 2507)
@@ -149,13 +149,6 @@
 		<include name="libILUT.dylib" />
 	</patternset>
 
-	<!-- Files to include in source distribution -->
-	<fileset id="lwjgl.source.fileset" dir=".">
-		<include name="build.xml" />
-		<include name="src/**" />
-		<include name="platform_build/**/*" />
-	</fileset>
-	
 	<!-- files in the base package -->
 	<patternset id="lwjgl_base">
 		<include name="**" />
@@ -293,7 +286,6 @@
 		
 		<!-- create distribution from files in libs/ and temp/ -->
 		<antcall target="-distribution_javadoc" />
-		<antcall target="-distribution_source" />
 		<antcall target="-distribute" />
 	</target>
 
@@ -478,13 +470,6 @@
 		<zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**" />
 	</target>
 
-	<!-- Creates a versioned distribution of the source code -->
-	<target name="-distribution_source">
-		<zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip">
-			<fileset refid="lwjgl.source.fileset" />
-		</zip>
-	</target>
-	
 	<!-- Compiles the Java source code -->
 	<target name="compile" description="Compiles the java source code" depends="-initialize">
 		<javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core">
@@ -575,7 +560,7 @@
 		<javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
-			<bottom><![CDATA[<i>Copyright &#169; 2002-2005 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2006 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
 
@@ -753,33 +738,42 @@
 		<unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/>
 		<unzip src="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/>
 		
+		<!-- move files to unified structure -->
+		<move todir="${lwjgl.temp}/jnlp/temp">
+			<fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl_optional-${lwjgl.version}/">
+				<include name="**"/>
+			</fileset>
+		</move>
+		
 		<!-- move relevant files to root -->
-		<move todir="${lwjgl.temp}/jnlp" flatten="true">
+		<move todir="${lwjgl.temp}/jnlp/" flatten="true">
 			<fileset dir="${lwjgl.temp}/jnlp/temp">
 				<include name="**/**.jar"/>
 			</fileset>
 		</move>
 		
 		<!-- create native jars -->
-		<jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/win32"/>
-		<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/linux"/>
-		<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/macosx"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/>
 		
 		<!-- create media jar -->
 		<jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/>	
 	
 		<!-- sign 'em -->
-		<input message="Please enter store password:" addproperty="store.pwd" />
-		<signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" 		storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/media.jar" 		storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" 		storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
+		<signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" 		alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/media.jar" 		alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" 		alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
 	</target>
 	
 	<!-- -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2506
Author:   matzon
Date:     2006-07-12 12:57:22 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2506&view=rev

Log Message:
-----------
using constants for names

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-12 19:55:57 UTC (rev 2505)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-12 19:57:22 UTC (rev 2506)
@@ -302,11 +302,11 @@
 	public static String getPlatformName() {
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
-				return "linux";
+				return PLATFORM_LINUX_NAME;
 			case LWJGLUtil.PLATFORM_MACOSX:
-				return "macosx";
+				return PLATFORM_MACOSX_NAME;
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				return "windows";
+				return PLATFORM_WINDOWS_NAME;
 			default:
 				return "unknown";
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2505
Author:   matzon
Date:     2006-07-12 12:55:57 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2505&view=rev

Log Message:
-----------
win32->windows

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-12 19:38:24 UTC (rev 2504)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-12 19:55:57 UTC (rev 2505)
@@ -306,7 +306,7 @@
 			case LWJGLUtil.PLATFORM_MACOSX:
 				return "macosx";
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				return "win32";
+				return "windows";
 			default:
 				return "unknown";
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2504
Author:   matzon
Date:     2006-07-12 12:38:24 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2504&view=rev

Log Message:
-----------
check for fmod property when it's actually been imported

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-07-12 19:36:29 UTC (rev 2503)
+++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-07-12 19:38:24 UTC (rev 2504)
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="fmod3" basedir="../../bin/fmod3" default="compile">
-	<fail message="Missing FMOD path environment property" unless="env.FMOD"/>
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="fmod.home" location="${env.FMOD}"/>
@@ -10,6 +9,8 @@
 	<property name="libs32" value="-lpthread"/>
 	<property name="libs64" value="-lpthread"/>
 	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
+
+	<fail message="Missing FMOD path environment property" unless="env.FMOD"/>
 	
 	<target name="clean">
 		<delete>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2503
Author:   matzon
Date:     2006-07-12 12:36:29 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2503&view=rev

Log Message:
-----------
using ant build files for linux

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-12 19:35:54 UTC (rev 2502)
+++ trunk/LWJGL/build.xml	2006-07-12 19:36:29 UTC (rev 2503)
@@ -714,19 +714,11 @@
 	</target>
 
 	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
-	<!-- check for required properties -->
-		<property environment="env"/>
-		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>		
-		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>		
-		
-		<exec executable="make" dir="${lwjgl.src.native}/common/devil">
-			<arg line="-f Makefile.linux"/>
-		</exec>
-		<exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
-                        <arg line="-f Makefile.linux"/>
-                </exec>
-		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.so" tofile="${lwjgl.lib}/linux/liblwjgl-devil.so" />
-		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" />
+		<ant antfile="platform_build/linux_ant/build_fmod3.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.so" todir="${lwjgl.lib}/linux"/>
+
+		<ant antfile="platform_build/linux_ant/build_devil.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/devil/liblwjgl-devil.so" todir="${lwjgl.lib}/linux"/>
 	</target>
 
 	<target name="-compile_native_macosx" if="lwjgl.platform.macosx">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2502
Author:   matzon
Date:     2006-07-12 12:35:54 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2502&view=rev

Log Message:
-----------
check for fmod

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-07-12 19:32:48 UTC (rev 2501)
+++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-07-12 19:35:54 UTC (rev 2502)
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <project name="fmod3" basedir="../../bin/fmod3" default="compile">
+	<fail message="Missing FMOD path environment property" unless="env.FMOD"/>
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="fmod.home" location="${env.FMOD}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2501
Author:   matzon
Date:     2006-07-12 12:32:48 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2501&view=rev

Log Message:
-----------
linux ant build files

Added Paths:
-----------
    trunk/LWJGL/platform_build/linux_ant/build_devil.xml
    trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
Added: trunk/LWJGL/platform_build/linux_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_devil.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/linux_ant/build_devil.xml	2006-07-12 19:32:48 UTC (rev 2501)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<project name="devil" basedir="../../bin/devil" default="compile">
+	<property name="native" location="../../src/native"/>
+	<property name="libname32" value="liblwjgl-devil.so"/>
+	<property name="libname64" value="liblwjgl64-devil.so"/>
+	<property name="libs32" value="-lpthread"/>
+	<property name="libs64" value="-lpthread"/>
+	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
+	
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.o"/>
+			<fileset dir="." includes="*.so"/>
+		</delete>
+	</target>
+	
+    <target name="compile">
+		<exec executable="uname" outputproperty="hwplatform">
+			<arg value="-i"/>
+		</exec>
+		<condition property="libs" value="${libs64}" else="${libs32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<condition property="libname" value="${libname64}" else="${libname32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
+		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
+			<arg line="${cflags}"/>
+			<arg value="-I${java.home}/include"/>
+			<arg value="-I${java.home}/include/linux"/>
+			<arg value="-I${native}/common"/>
+			<arg value="-I${native}/common/devil"/>
+			<mapper type="glob" from="*.c" to="*.o"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<fileset dir="${native}/common/devil" includes="*.c"/>
+		</apply>
+		<apply dir="." parallel="true" executable="cc" failonerror="true">
+			<srcfile/>
+			<arg line="${linker_flags}"/>
+			<fileset dir="." includes="*.o"/>
+		</apply>
+		<apply dir="." parallel="true" executable="strip" failonerror="true">
+			<fileset file="${libname}"/>
+		</apply>
+    </target>
+</project>
+

Added: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-07-12 19:32:48 UTC (rev 2501)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<project name="fmod3" basedir="../../bin/fmod3" default="compile">
+	<property name="native" location="../../src/native"/>
+	<property environment="env"/>
+	<property name="fmod.home" location="${env.FMOD}"/>
+	<property name="libname32" value="liblwjgl-fmod3.so"/>
+	<property name="libname64" value="liblwjgl64-fmod3.so"/>
+	<property name="libs32" value="-lpthread"/>
+	<property name="libs64" value="-lpthread"/>
+	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
+	
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.o"/>
+			<fileset dir="." includes="*.so"/>
+		</delete>
+	</target>
+	
+    <target name="compile">
+		<exec executable="uname" outputproperty="hwplatform">
+			<arg value="-i"/>
+		</exec>
+		<condition property="libs" value="${libs64}" else="${libs32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<condition property="libname" value="${libname64}" else="${libname32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
+		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
+			<arg line="${cflags}"/>
+			<arg value="-I${java.home}/include"/>
+			<arg value="-I${java.home}/include/linux"/>
+			<arg value="-I${fmod.home}/api/inc"/>
+			<arg value="-I${native}/common"/>
+			<arg value="-I${native}/common/fmod3"/>			
+			<mapper type="glob" from="*.c" to="*.o"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<fileset dir="${native}/common/fmod3" includes="*.c"/>
+		</apply>
+		<apply dir="." parallel="true" executable="cc" failonerror="true">
+			<srcfile/>
+			<arg line="${linker_flags}"/>
+			<fileset dir="." includes="*.o"/>
+		</apply>
+		<apply dir="." parallel="true" executable="strip" failonerror="true">
+			<fileset file="${libname}"/>
+		</apply>
+    </target>
+</project>
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2500
Author:   elias_naur
Date:     2006-07-12 12:07:20 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2500&view=rev

Log Message:
-----------
Windows: Fix double compiler flag

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 18:32:58 UTC (rev 2499)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 19:07:20 UTC (rev 2500)
@@ -11,7 +11,7 @@
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /c"/>
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${alhome}\include"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2499
Author:   elias_naur
Date:     2006-07-12 11:32:58 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2499&view=rev

Log Message:
-----------
Windows: Rename Win32* files to Windows*

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
    trunk/LWJGL/src/native/windows/LWJGL.c
    trunk/LWJGL/src/native/windows/context.c
    trunk/LWJGL/src/native/windows/context.h
    trunk/LWJGL/src/native/windows/display.c
    trunk/LWJGL/src/native/windows/display.h
    trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c
    trunk/LWJGL/src/native/windows/org_lwjgl_input_Cursor.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPbufferPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsRegistry.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsRegistry.c
    trunk/LWJGL/src/native/windows/windows_al.c

Removed Paths:
-------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32AWTGLCanvasPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32ContextImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32DisplayPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PbufferPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Registry.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Win32AWTGLCanvasPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Win32ContextImplementation.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Win32DisplayPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Win32PeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Win32Registry.c
    trunk/LWJGL/src/native/windows/win32_al.c
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/build.xml	2006-07-12 18:32:58 UTC (rev 2499)
@@ -524,14 +524,14 @@
 			<class name="org.lwjgl.opengl.WindowsDirectInputDevice8" />
 			<class name="org.lwjgl.opengl.WindowsDirectInput3" />
 			<class name="org.lwjgl.opengl.WindowsDirectInputDevice3" />			
-			<class name="org.lwjgl.opengl.Win32PbufferPeerInfo" />
-			<class name="org.lwjgl.opengl.Win32Display" />
-			<class name="org.lwjgl.opengl.Win32Registry" />
+			<class name="org.lwjgl.opengl.WindowsPbufferPeerInfo" />
+			<class name="org.lwjgl.opengl.WindowsDisplay" />
+			<class name="org.lwjgl.opengl.WindowsRegistry" />
 			<class name="org.lwjgl.NativeSysImplementation" />
-			<class name="org.lwjgl.opengl.Win32AWTGLCanvasPeerInfo" />
-			<class name="org.lwjgl.opengl.Win32PeerInfo" />
-			<class name="org.lwjgl.opengl.Win32DisplayPeerInfo" />
-			<class name="org.lwjgl.opengl.Win32ContextImplementation" />
+			<class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo" />
+			<class name="org.lwjgl.opengl.WindowsPeerInfo" />
+			<class name="org.lwjgl.opengl.WindowsDisplayPeerInfo" />
+			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
 		</javah>
 		
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -89,7 +89,7 @@
 				class_name = "org.lwjgl.opengl.LinuxCanvasImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.opengl.Win32CanvasImplementation";
+				class_name = "org.lwjgl.opengl.WindowsCanvasImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_MACOSX:
 				class_name = "org.lwjgl.opengl.MacOSXCanvasImplementation";

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -79,7 +79,7 @@
 				class_name = "org.lwjgl.opengl.LinuxContextImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.opengl.Win32ContextImplementation";
+				class_name = "org.lwjgl.opengl.WindowsContextImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_MACOSX:
 				class_name = "org.lwjgl.opengl.MacOSXContextImplementation";

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -144,7 +144,7 @@
 			class_name = "org.lwjgl.opengl.LinuxDisplay";
 				break;
 			case LWJGLUtil.PLATFORM_WINDOWS:
-			class_name = "org.lwjgl.opengl.Win32Display";
+			class_name = "org.lwjgl.opengl.WindowsDisplay";
 				break;
 			case LWJGLUtil.PLATFORM_MACOSX:
 			class_name = "org.lwjgl.opengl.MacOSXDisplay";

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32AWTGLCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32AWTGLCanvasPeerInfo.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32AWTGLCanvasPeerInfo.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.nio.ByteBuffer;
-
-import org.lwjgl.LWJGLException;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-final class Win32AWTGLCanvasPeerInfo extends Win32PeerInfo {
-	private final AWTGLCanvas canvas;
-	private final AWTSurfaceLock awt_surface = new AWTSurfaceLock();
-	private final PixelFormat pixel_format;
-	private boolean has_pixel_format= false;
-
-	public Win32AWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) {
-		this.canvas = canvas;
-		this.pixel_format = pixel_format;
-	}
-
-	protected void doLockAndInitHandle() throws LWJGLException {
-		nInitHandle(awt_surface.lockAndGetHandle(canvas), getHandle());
-		if (!has_pixel_format) {
-			// If we haven't applied a pixel format yet, do it now
-			choosePixelFormat(canvas.getX(), canvas.getY(), pixel_format, null, true, true, false, true);
-			has_pixel_format = true;
-		}
-	}
-	private static native void nInitHandle(ByteBuffer surface_buffer, ByteBuffer peer_info_handle) throws LWJGLException;
-
-	protected void doUnlock() throws LWJGLException {
-		awt_surface.unlock();
-	}
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.Toolkit;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-final class Win32CanvasImplementation implements AWTCanvasImplementation {
-	static {
-		// Make sure the awt stuff is properly initialised (the jawt library in particular)
-		Toolkit.getDefaultToolkit();
-		AccessController.doPrivileged(new PrivilegedAction() {
-			public Object run() {
-				try {
-					System.loadLibrary("jawt");
-				} catch (UnsatisfiedLinkError e) {
-					/* It is probably already loaded, potentially by a different ClassLoader
-					 * so just log the exception and continue
-					 */
-					LWJGLUtil.log("Failed to load jawt: " + e.getMessage());
-				}
-				return null;
-			}
-		});
-	}
-
-	public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {
-		return new Win32AWTGLCanvasPeerInfo(canvas, pixel_format);
-	}
-
-	/**
-	 * Find a proper GraphicsConfiguration from the given GraphicsDevice and PixelFormat.
-	 *
-	 * @return The GraphicsConfiguration corresponding to a visual that matches the pixel format.
-	 */
-	public GraphicsConfiguration findConfiguration(GraphicsDevice device, PixelFormat pixel_format) throws LWJGLException {
-		/*
-		 * It seems like the best way is to simply return null and
-		 * use SetPixelFormat in JNI later.
-		 */
-		return null;
-	}
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32ContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32ContextImplementation.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32ContextImplementation.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.nio.ByteBuffer;
-
-import org.lwjgl.LWJGLException;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-final class Win32ContextImplementation implements ContextImplementation {
-	public ByteBuffer create(PeerInfo peer_info, ByteBuffer shared_context_handle) throws LWJGLException {
-		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
-		try {
-			return nCreate(peer_handle, shared_context_handle);
-		} finally {
-			peer_info.unlock();
-		}
-	}
-	private static native ByteBuffer nCreate(ByteBuffer peer_handle, ByteBuffer shared_context_handle) throws LWJGLException;
-
-	public void swapBuffers() throws LWJGLException {
-		Context current_context = Context.getCurrentContext();
-		if (current_context == null)
-			throw new IllegalStateException("No context is current");
-		synchronized (current_context) {
-			PeerInfo current_peer_info = current_context.getPeerInfo();
-			ByteBuffer peer_handle = current_peer_info.lockAndGetHandle();
-			try {
-				nSwapBuffers(peer_handle);
-			} finally {
-				current_peer_info.unlock();
-			}
-		}
-	}
-	private static native void nSwapBuffers(ByteBuffer peer_info_handle) throws LWJGLException;
-
-	public void releaseDrawable(ByteBuffer context_handle) throws LWJGLException {
-	}
-
-	public void update(ByteBuffer context_handle) {
-	}
-
-	public void releaseCurrentContext() throws LWJGLException {
-		nReleaseCurrentContext();
-	}
-	private static native void nReleaseCurrentContext() throws LWJGLException;
-
-	public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
-		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
-		try {
-			nMakeCurrent(peer_handle, handle);
-		} finally {
-			peer_info.unlock();
-		}
-	}
-	private static native void nMakeCurrent(ByteBuffer peer_handle, ByteBuffer context_handle) throws LWJGLException;
-
-	public boolean isCurrent(ByteBuffer handle) throws LWJGLException {
-		boolean result = nIsCurrent(handle);
-		return result;
-	}
-	private static native boolean nIsCurrent(ByteBuffer context_handle) throws LWJGLException;
-
-	public void setSwapInterval(int value) {
-		Context current_context = Context.getCurrentContext();
-		if (current_context == null)
-			throw new IllegalStateException("No context is current");
-		synchronized (current_context) {
-			nSetSwapInterval(current_context.getHandle(), value);
-		}
-	}
-	private static native void nSetSwapInterval(ByteBuffer context_handle, int value);
-
-	public void destroy(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
-		nDestroy(handle);
-	}
-	private static native void nDestroy(ByteBuffer context_handle) throws LWJGLException;
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,590 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-/**
- * This is the Display implementation interface. Display delegates
- * to implementors of this interface. There is one DisplayImplementation
- * for each supported platform.
- * @author elias_naur
- */
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.input.Cursor;
-
-final class Win32Display implements DisplayImplementation {
-	private final static int GAMMA_LENGTH = 256;
-	private final static int WM_MOUSEMOVE                     = 0x0200;
-	private final static int WM_LBUTTONDOWN                   = 0x0201;
-	private final static int WM_LBUTTONUP                     = 0x0202;
-	private final static int WM_LBUTTONDBLCLK                 = 0x0203;
-	private final static int WM_RBUTTONDOWN                   = 0x0204;
-	private final static int WM_RBUTTONUP                     = 0x0205;
-	private final static int WM_RBUTTONDBLCLK                 = 0x0206;
-	private final static int WM_MBUTTONDOWN                   = 0x0207;
-	private final static int WM_MBUTTONUP                     = 0x0208;
-	private final static int WM_MBUTTONDBLCLK                 = 0x0209;
-	private final static int WM_MOUSEWHEEL                    = 0x020A;
-
-	private final static int WM_QUIT						  = 0x0012;
-	private final static int WM_SYSCOMMAND					  = 0x0112;
-	private final static int WM_PAINT 						  = 0x000F;
-
-	private final static int SC_SIZE          = 0xF000;
-	private final static int SC_MOVE          = 0xF010;
-	private final static int SC_MINIMIZE      = 0xF020;
-	private final static int SC_MAXIMIZE      = 0xF030;
-	private final static int SC_NEXTWINDOW    = 0xF040;
-	private final static int SC_PREVWINDOW    = 0xF050;
-	private final static int SC_CLOSE         = 0xF060;
-	private final static int SC_VSCROLL       = 0xF070;
-	private final static int SC_HSCROLL       = 0xF080;
-	private final static int SC_MOUSEMENU     = 0xF090;
-	private final static int SC_KEYMENU       = 0xF100;
-	private final static int SC_ARRANGE       = 0xF110;
-	private final static int SC_RESTORE       = 0xF120;
-	private final static int SC_TASKLIST      = 0xF130;
-	private final static int SC_SCREENSAVE    = 0xF140;
-	private final static int SC_HOTKEY        = 0xF150;
-	private final static int SC_DEFAULT       = 0xF160;
-	private final static int SC_MONITORPOWER  = 0xF170;
-	private final static int SC_CONTEXTHELP   = 0xF180;
-	private final static int SC_SEPARATOR     = 0xF00F;
-
-	private final static int SM_CXCURSOR      = 13;
-
-	private final static int SIZE_RESTORED        = 0;
-	private final static int SIZE_MINIMIZED       = 1;
-	private final static int SIZE_MAXIMIZED       = 2;
-	private final static int WM_SIZE          = 0x0005;
-	private final static int WM_ACTIVATE          = 0x0006;
-	private final static int     WA_INACTIVE      = 0;
-	private final static int     WA_ACTIVE        = 1;
-	private final static int     WA_CLICKACTIVE   = 2;
-	private final static int SW_SHOWMINNOACTIVE   = 7;
-	private final static int SW_RESTORE           = 9;
-
-	private static Win32Display current_display;
-
-	private Win32DisplayPeerInfo peer_info;
-
-	private WindowsKeyboard keyboard;
-	private WindowsMouse mouse;
-
-	private boolean close_requested;
-	private boolean is_dirty;
-
-	private ByteBuffer current_gamma;
-	private ByteBuffer saved_gamma;
-	private DisplayMode current_mode;
-
-	private boolean mode_set;
-	private boolean isFullscreen;
-	private boolean isMinimized;
-	private boolean isFocused;
-	private boolean did_maximize;
-	private boolean inAppActivate;
-
-	public Win32Display() {
-		current_display = this;
-	}
-
-	public void createWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException {
-		close_requested = false;
-		is_dirty = false;
-		isFullscreen = fullscreen;
-		isMinimized = false;
-		isFocused = false;
-		did_maximize = false;
-		nCreateWindow(mode, fullscreen, x, y);
-		peer_info.initDC();
-	}
-	private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
-
-	public void destroyWindow() {
-		nDestroyWindow();
-		if (isFullscreen)
-			resetCursorClipping();
-	}
-	private static native void nDestroyWindow();
-	private static native void resetCursorClipping();
-	private static native void setupCursorClipping(long hwnd) throws LWJGLException;
-
-	public void switchDisplayMode(DisplayMode mode) throws LWJGLException {
-		nSwitchDisplayMode(mode);
-		current_mode = mode;
-		mode_set = true;
-	}
-	private static native void nSwitchDisplayMode(DisplayMode mode) throws LWJGLException;
-
-	/*
-	 * Called when the application is alt-tabbed to or from
-	 */
-	private void appActivate(boolean active) {
-		if (inAppActivate) {
-			return;
-		}
-		inAppActivate = true;
-		isFocused = active;
-		if (active) {
-			if (isFullscreen) {
-				restoreDisplayMode();
-			}
-			showWindow(getHwnd(), SW_RESTORE);
-			setForegroundWindow(getHwnd());
-			setFocus(getHwnd());
-			did_maximize = true;
-		} else if (isFullscreen) {
-			showWindow(getHwnd(), SW_SHOWMINNOACTIVE);
-			resetDisplayMode();
-		}
-		inAppActivate = false;
-	}
-	private static native void showWindow(long hwnd, int mode);
-	private static native void setForegroundWindow(long hwnd);
-	private static native void setFocus(long hwnd);
-
-	private void restoreDisplayMode() {
-		try {
-			doSetGammaRamp(current_gamma);
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Failed to restore gamma: " + e.getMessage());
-		}
-
-		if (!mode_set) {
-			mode_set = true;
-			try {
-				nSwitchDisplayMode(current_mode);
-			} catch (LWJGLException e) {
-				LWJGLUtil.log("Failed to restore display mode: " + e.getMessage());
-			}
-		}
-	}
-
-	public void resetDisplayMode() {
-		try {
-			doSetGammaRamp(saved_gamma);
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Failed to reset gamma ramp: " + e.getMessage());
-		}
-		current_gamma = saved_gamma;
-		if (mode_set) {
-			mode_set = false;
-			nResetDisplayMode();
-		}
-		resetCursorClipping();
-	}
-	private static native void nResetDisplayMode();
-
-	public int getGammaRampLength() {
-		return GAMMA_LENGTH;
-	}
-
-	public void setGammaRamp(FloatBuffer gammaRamp) throws LWJGLException {
-		doSetGammaRamp(convertToNativeRamp(gammaRamp));
-	}
-	private static native ByteBuffer convertToNativeRamp(FloatBuffer gamma_ramp) throws LWJGLException;
-	private static native ByteBuffer getCurrentGammaRamp() throws LWJGLException;
-
-	private void doSetGammaRamp(ByteBuffer native_gamma) throws LWJGLException {
-		nSetGammaRamp(native_gamma);
-		current_gamma = native_gamma;
-	}
-	private static native void nSetGammaRamp(ByteBuffer native_ramp) throws LWJGLException;
-
-	public String getAdapter() {
-		try {
-			String adapter_string = Win32Registry.queryRegistrationKey(
-					Win32Registry.HKEY_LOCAL_MACHINE,
-					"HARDWARE\\DeviceMap\\Video",
-					"\\Device\\Video0");
-			String root_key = "\\registry\\machine\\";
-			if (adapter_string.toLowerCase().startsWith(root_key)) {
-				String driver_value = Win32Registry.queryRegistrationKey(
-						Win32Registry.HKEY_LOCAL_MACHINE,
-						adapter_string.substring(root_key.length()),
-						"InstalledDisplayDrivers");
-				return driver_value;
-			}
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Exception occurred while querying registry: " + e);
-		}
-		return null;
-	}
-	
-	public String getVersion() {
-		String driver = getAdapter();
-		if (driver != null)
-			return nGetVersion(driver);
-		else
-			return null;
-	}
-	private native String nGetVersion(String driver);
-
-	public DisplayMode init() throws LWJGLException {
-		current_gamma = saved_gamma = getCurrentGammaRamp();
-		return current_mode = getCurrentDisplayMode();
-	}
-	private static native DisplayMode getCurrentDisplayMode() throws LWJGLException;
-
-	public native void setTitle(String title);
-
-	public boolean isCloseRequested() {
-		boolean saved = close_requested;
-		close_requested = false;
-		return saved;
-	}
-
-	public boolean isVisible() {
-		return !isMinimized;
-	}
-
-	public boolean isActive() {
-		return isFocused;
-	}
-
-	public boolean isDirty() {
-		boolean saved = is_dirty;
-		is_dirty = false;
-		return saved;
-	}
-
-	public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
-		peer_info = new Win32DisplayPeerInfo(pixel_format);
-		return peer_info;
-	}
-	public void update() {
-		nUpdate();
-		if (did_maximize) {
-			did_maximize = false;
-			/**
-			 * WORKAROUND:
-			 * Making the context current (redundantly) when the window
-			 * is maximized helps some gfx recover from fullscreen
-			 */
-			try {
-				if (Display.getContext().isCurrent())
-					Display.getContext().makeCurrent();
-			} catch (LWJGLException e) {
-				LWJGLUtil.log("Exception occurred while trying to make context current: " + e);
-			}
-		}
-	}
-	private static native void nUpdate();
-
-	public void reshape(int x, int y, int width, int height) {
-		if (!isFullscreen)
-			nReshape(getHwnd(), x, y, width, height);
-	}
-	private static native void nReshape(long hwnd, int x, int y, int width, int height);
-	public native DisplayMode[] getAvailableDisplayModes() throws LWJGLException;
-
-	/* Mouse */
-	public boolean hasWheel() {
-		return mouse.hasWheel();
-	}
-
-	public int getButtonCount() {
-		return mouse.getButtonCount();
-	}
-
-	public void createMouse() throws LWJGLException {
-		mouse = new WindowsMouse(createDirectInput(), getHwnd());
-	}
-
-	public void destroyMouse() {
-		mouse.destroy();
-		mouse = null;
-	}
-
-	public void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons) {
-		update();
-		mouse.poll(coord_buffer, buttons);
-	}
-	
-	public void readMouse(ByteBuffer buffer) {
-		update();
-		mouse.read(buffer);
-	}
-		
-	public void grabMouse(boolean grab) {
-		mouse.grab(grab);
-	}
-
-	public int getNativeCursorCapabilities() {
-		return Cursor.CURSOR_ONE_BIT_TRANSPARENCY;
-	}
-
-	public void setCursorPosition(int x, int y) {
-		nSetCursorPosition(x, y, isFullscreen);
-	}
-	private static native void nSetCursorPosition(int x, int y, boolean fullscreen);
-
-	public native void setNativeCursor(Object handle) throws LWJGLException;
-
-	public int getMinCursorSize() {
-		return getSystemMetrics(SM_CXCURSOR);
-	}
-
-	public int getMaxCursorSize() {
-		return getSystemMetrics(SM_CXCURSOR);
-	}
-
-	public native int getSystemMetrics(int index);
-
-	private static native long getDllInstance();
-	private static native long getHwnd();
-
-	/* Keyboard */
-	public void createKeyboard() throws LWJGLException {
-		keyboard = new WindowsKeyboard(createDirectInput(), getHwnd());
-	}
-
-	public void destroyKeyboard() {
-		keyboard.destroy();
-		keyboard = null;
-	}
-	
-	public void pollKeyboard(ByteBuffer keyDownBuffer) {
-		update();
-		keyboard.poll(keyDownBuffer);
-	}
-	
-	public void readKeyboard(ByteBuffer buffer) {
-		update();
-		keyboard.read(buffer);
-	}
-
-//	public native int isStateKeySet(int key);
-
-	public native ByteBuffer nCreateCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, int images_offset, IntBuffer delays, int delays_offset) throws LWJGLException;
-
-	public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException {
-		return nCreateCursor(width, height, xHotspot, yHotspot, numImages, images, images.position(), delays, delays != null ? delays.position() : -1);
-	}
-
-	public native void destroyCursor(Object cursorHandle);
-	public int getPbufferCapabilities() {
-		try {
-		// Return the capabilities of a minimum pixel format
-			return nGetPbufferCapabilities(new PixelFormat(0, 0, 0, 0, 0, 0, 0, 0, false));
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Exception occurred while determining pbuffer capabilities: " + e);
-			return 0;
-		}
-	}
-	private native int nGetPbufferCapabilities(PixelFormat format) throws LWJGLException;
-	
-	public boolean isBufferLost(PeerInfo handle) {
-		return ((Win32PbufferPeerInfo)handle).isBufferLost();
-	}
-
-	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
-			IntBuffer pixelFormatCaps,
-			IntBuffer pBufferAttribs) throws LWJGLException {
-		return new Win32PbufferPeerInfo(width, height, pixel_format, pixelFormatCaps, pBufferAttribs);
-	}
-	
-	public void setPbufferAttrib(PeerInfo handle, int attrib, int value) {
-		((Win32PbufferPeerInfo)handle).setPbufferAttrib(attrib, value);
-	}
-
-	public void bindTexImageToPbuffer(PeerInfo handle, int buffer) {
-		((Win32PbufferPeerInfo)handle).bindTexImageToPbuffer(buffer);
-	}
-	
-	public void releaseTexImageFromPbuffer(PeerInfo handle, int buffer) {
-		((Win32PbufferPeerInfo)handle).releaseTexImageFromPbuffer(buffer);
-	}
-	
-
-	/**
-	 * Sets one or more icons for the Display.
-	 * <ul>
-	 * <li>On Windows you should supply at least one 16x16 icon and one 32x32.</li>
-	 * <li>Linux (and similar platforms) expect one 32x32 icon.</li>
-	 * <li>Mac OS X should be supplied one 128x128 icon</li>
-	 * </ul>
-	 * The implementation will use the supplied ByteBuffers with image data in RGBA and perform any conversions nescesarry for the specific platform.
-	 *
-	 * @param icons Array of icons in RGBA mode
-	 * @return number of icons used.
-	 */
-	public int setIcon(ByteBuffer[] icons) {
-		boolean done16 = false;
-		boolean done32 = false;
-		int used = 0;
-		
-		for (int i=0;i<icons.length;i++) {
-			int size = icons[i].limit() / 4;
-			
-			if ((((int) Math.sqrt(size)) == 16) && (!done16)) {
-				nSetWindowIcon16(icons[i].asIntBuffer());
-				used++;
-				done16 = true;
-			}
-			if ((((int) Math.sqrt(size)) == 32) && (!done32)) {
-				nSetWindowIcon32(icons[i].asIntBuffer());
-				used++;
-				done32 = true;
-			}
-		}
-		
-		return used;
-	}
-
-	private static native int nSetWindowIcon16(IntBuffer icon);
-	
-	private static native int nSetWindowIcon32(IntBuffer icon);
-
-	private void handleMouseButton(int button, int state, long millis) {
-		if (mouse != null)
-			mouse.handleMouseButton((byte)button, (byte)state, millis);
-	}
-
-	private void handleMouseMoved(int x, int y, long millis) {
-		if (mouse != null)
-			mouse.handleMouseMoved(x, y, millis);
-	}
-
-	private void handleMouseScrolled(int amount, long millis) {
-		if (mouse != null)
-			mouse.handleMouseScrolled(amount, millis);
-	}
-
-	private static native int transformY(long hwnd, int y);
-
-	private static boolean handleMessage(long hwnd, int msg, long wParam, long lParam, long millis) {
-		if (current_display != null)
-			return current_display.doHandleMessage(hwnd, msg, wParam, lParam, millis);
-		else
-			return false;
-	}
-
-	private boolean doHandleMessage(long hwnd, int msg, long wParam, long lParam, long millis) {
-		if (isFullscreen && !isMinimized && isFocused) {
-			try {
-				setupCursorClipping(getHwnd());
-			} catch (LWJGLException e) {
-				LWJGLUtil.log("setupCursorClipping failed: " + e.getMessage());
-			}
-		}
-		switch (msg) {
-			// disable screen saver and monitor power down messages which wreak havoc
-			case WM_ACTIVATE:
-				switch ((int)wParam) {
-					case WA_ACTIVE:
-					case WA_CLICKACTIVE:
-						appActivate(true);
-						break;
-					case WA_INACTIVE:
-						appActivate(false);
-						break;
-				}
-				return true;
-			case WM_SIZE:
-				switch ((int)wParam) {
-					case SIZE_RESTORED:
-					case SIZE_MAXIMIZED:
-						isMinimized = false;
-						break;
-					case SIZE_MINIMIZED:
-						isMinimized = true;
-						break;
-				}
-				return false;
-			case WM_MOUSEMOVE:
-				int xPos = (int)(short)(lParam & 0xFFFF);
-				int yPos = transformY(getHwnd(), (int)(short)((lParam >> 16) & 0xFFFF));
-				handleMouseMoved(xPos, yPos, millis);
-				return true;
-			case WM_MOUSEWHEEL:
-				int dwheel = (int)(short)((wParam >> 16) & 0xFFFF);
-				handleMouseScrolled(dwheel, millis);
-				return true;
-			case WM_LBUTTONDOWN:
-				handleMouseButton(0, 1, millis);
-				return true;
-			case WM_LBUTTONUP:
-				handleMouseButton(0, 0, millis);
-				return true;
-			case WM_RBUTTONDOWN:
-				handleMouseButton(1, 1, millis);
-				return true;
-			case WM_RBUTTONUP:
-				handleMouseButton(1, 0, millis);
-				return true;
-			case WM_MBUTTONDOWN:
-				handleMouseButton(2, 1, millis);
-				return true;
-			case WM_MBUTTONUP:
-				handleMouseButton(2, 0, millis);
-				return true;
-			case WM_QUIT:
-				close_requested = true;
-				return true;
-			case WM_SYSCOMMAND:
-				switch ((int)wParam) {
-					case SC_KEYMENU:
-					case SC_MOUSEMENU:
-					case SC_SCREENSAVE:
-					case SC_MONITORPOWER:
-						return true;
-					case SC_CLOSE:
-						close_requested = true;
-						return true;
-					default:
-						break;
-				}
-				return false;
-			case WM_PAINT:
-				is_dirty = true;
-				return false;
-			default:
-				return false;
-		}
-	}
-
-	private static WindowsDirectInput createDirectInput() throws LWJGLException {
-		try {
-			return new WindowsDirectInput8(getDllInstance());
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Failed to create DirectInput 8 interface, falling back to DirectInput 3");
-			return new WindowsDirectInput3(getDllInstance());
-		}
-	}
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32DisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32DisplayPeerInfo.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32DisplayPeerInfo.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.nio.ByteBuffer;
-
-import org.lwjgl.LWJGLException;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-final class Win32DisplayPeerInfo extends Win32PeerInfo {
-	public Win32DisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException {
-		GLContext.loadOpenGLLibrary();
-		try {
-			createDummyDC(getHandle());
-			try {
-				choosePixelFormat(0, 0, pixel_format, null, true, true, false, true);
-			} catch (LWJGLException e) {
-				nDestroy(getHandle());
-				throw e;
-			}
-		} catch (LWJGLException e) {
-			GLContext.unloadOpenGLLibrary();
-			throw e;
-		}
-	}
-	private static native void createDummyDC(ByteBuffer peer_info_handle) throws LWJGLException;
-
-	void initDC() {
-		nInitDC(getHandle());
-	}
-	private static native void nInitDC(ByteBuffer peer_info_handle);
-
-	private static native void nDestroy(ByteBuffer peer_info_handle);
-	
-	protected void doLockAndInitHandle() throws LWJGLException {
-		// NO-OP
-	}
-
-	private static native void setPixelFormat(ByteBuffer peer_info_handle);
-	
-	protected void doUnlock() throws LWJGLException {
-		// NO-OP
-	}
-
-	public void destroy() {
-		super.destroy();
-		nDestroy(getHandle());
-		GLContext.unloadOpenGLLibrary();
-	}
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PbufferPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PbufferPeerInfo.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PbufferPeerInfo.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-import org.lwjgl.LWJGLException;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-final class Win32PbufferPeerInfo extends Win32PeerInfo {
-	public Win32PbufferPeerInfo(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException {
-		nCreate(getHandle(), width, height, pixel_format, pixelFormatCaps, pBufferAttribs);
-	}
-	private static native void nCreate(ByteBuffer handle, int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException;
-
-	public boolean isBufferLost() {
-		return nIsBufferLost(getHandle());
-	}
-	private static native boolean nIsBufferLost(ByteBuffer handle);
-
-	public void setPbufferAttrib(int attrib, int value) {
-		nSetPbufferAttrib(getHandle(), attrib, value);
-	}
-	private static native void nSetPbufferAttrib(ByteBuffer handle, int attrib, int value);
-
-	public void bindTexImageToPbuffer(int buffer) {
-		nBindTexImageToPbuffer(getHandle(), buffer);
-	}
-	private static native void nBindTexImageToPbuffer(ByteBuffer handle, int buffer);
-	
-	public void releaseTexImageFromPbuffer(int buffer) {
-		nReleaseTexImageFromPbuffer(getHandle(), buffer);
-	}
-	private static native void nReleaseTexImageFromPbuffer(ByteBuffer handle, int buffer);
-	
-	public void destroy() {
-		nDestroy(getHandle());
-	}
-	private static native void nDestroy(ByteBuffer handle);
-
-	protected void doLockAndInitHandle() throws LWJGLException {
-		// NO-OP
-	}
-
-	protected void doUnlock() throws LWJGLException {
-		// NO-OP
-	}
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PeerInfo.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32PeerInfo.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-import org.lwjgl.LWJGLException;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- * $Id$
- */
-abstract class Win32PeerInfo extends PeerInfo {
-	public Win32PeerInfo() {
-		super(createHandle());
-	}
-	private static native ByteBuffer createHandle();
-
-	protected void choosePixelFormat(int origin_x, int origin_y, PixelFormat pixel_format, IntBuffer pixel_format_caps, boolean use_hdc_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException {
-		nChoosePixelFormat(getHandle(), origin_x, origin_y, pixel_format, pixel_format_caps, use_hdc_bpp, support_window, support_pbuffer, double_buffered);
-	}
-	private static native void nChoosePixelFormat(ByteBuffer peer_info_handle, int origin_x, int origin_y, PixelFormat pixel_format, IntBuffer pixel_format_caps, boolean use_hdc_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException;
-}

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Registry.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Registry.java	2006-07-12 18:10:43 UTC (rev 2498)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32Registry.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-/**
- * This is an interface to the windows registry
- * @author elias_naur
- */
-
-import org.lwjgl.LWJGLException;
-
-final class Win32Registry {
-	final static int HKEY_CLASSES_ROOT = 1;
-	final static int HKEY_CURRENT_USER = 2;
-	final static int HKEY_LOCAL_MACHINE = 3;
-	final static int HKEY_USERS = 4;
-	
-	/**
-	 * Query the registry value specified by the root key, subkey, value tuple
-	 */
-	static String queryRegistrationKey(int root_key, String subkey, String value) throws LWJGLException {
-		switch (root_key) {
-			case HKEY_CLASSES_ROOT:
-			case HKEY_CURRENT_USER:
-			case HKEY_LOCAL_MACHINE:
-			case HKEY_USERS:
-				break;
-			default:
-				throw new IllegalArgumentException("Invalid enum: " + root_key);
-		}
-		return nQueryRegistrationKey(root_key, subkey, value);
-	}
-	
-	private static native String nQueryRegistrationKey(int root_key, String subkey, String value) throws LWJGLException;
-}

Copied: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java (from rev 2495, trunk/LWJGL/src/java/org/lwjgl/opengl/Win32AWTGLCanvasPeerInfo.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import java.nio.ByteBuffer;
+
+import org.lwjgl.LWJGLException;
+
+/**
+ *
+ * @author elias_naur <eli...@us...>
+ * @version $Revision$
+ * $Id$
+ */
+final class WindowsAWTGLCanvasPeerInfo extends WindowsPeerInfo {
+	private final AWTGLCanvas canvas;
+	private final AWTSurfaceLock awt_surface = new AWTSurfaceLock();
+	private final PixelFormat pixel_format;
+	private boolean has_pixel_format= false;
+
+	public WindowsAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) {
+		this.canvas = canvas;
+		this.pixel_format = pixel_format;
+	}
+
+	protected void doLockAndInitHandle() throws LWJGLException {
+		nInitHandle(awt_surface.lockAndGetHandle(canvas), getHandle());
+		if (!has_pixel_format) {
+			// If we haven't applied a pixel format yet, do it now
+			choosePixelFormat(canvas.getX(), canvas.getY(), pixel_format, null, true, true, false, true);
+			has_pixel_format = true;
+		}
+	}
+	private static native void nInitHandle(ByteBuffer surface_buffer, ByteBuffer peer_info_handle) throws LWJGLException;
+
+	protected void doUnlock() throws LWJGLException {
+		awt_surface.unlock();
+	}
+}

Copied: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java (from rev 2495, trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.Toolkit;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+
+/**
+ *
+ * @author elias_naur <eli...@us...>
+ * @version $Revision$
+ * $Id$
+ */
+final class WindowsCanvasImplementation implements AWTCanvasImplementation {
+	static {
+		// Make sure the awt stuff is properly initialised (the jawt library in particular)
+		Toolkit.getDefaultToolkit();
+		AccessController.doPrivileged(new PrivilegedAction() {
+			public Object run() {
+				try {
+					System.loadLibrary("jawt");
+				} catch (UnsatisfiedLinkError e) {
+					/* It is probably already loaded, potentially by a different ClassLoader
+					 * so just log the exception and continue
+					 */
+					LWJGLUtil.log("Failed to load jawt: " + e.getMessage());
+				}
+				return null;
+			}
+		});
+	}
+
+	public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {
+		return new WindowsAWTGLCanvasPeerInfo(canvas, pixel_format);
+	}
+
+	/**
+	 * Find a proper GraphicsConfiguration from the given GraphicsDevice and PixelFormat.
+	 *
+	 * @return The GraphicsConfiguration corresponding to a visual that matches the pixel format.
+	 */
+	public GraphicsConfiguration findConfiguration(GraphicsDevice device, PixelFormat pixel_format) throws LWJGLException {
+		/*
+		 * It seems like the best way is to simply return null and
+		 * use SetPixelFormat in JNI later.
+		 */
+		return null;
+	}
+}

Copied: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java (from rev 2495, trunk/LWJGL/src/java/org/lwjgl/opengl/Win32ContextImplementation.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java	2006-07-12 18:32:58 UTC (rev 2499)
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import java.nio.ByteBuffer;
+
+import org.lwjgl.LWJGLException;
+
+/**
+ *
+ * @author elias_naur <eli...@us...>
+ * @version $Revision$
+ * $Id$
+ */
+final class WindowsContextImplementation implements ContextImplementation {
+	public ByteBuffer create(PeerInfo peer_info, ByteBuffer shared_context_handle) throws LWJGLException {
+		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
+		try {
+			return nCreate(peer_handle, shared_context_handle);
+		} finally {
+			peer_info.unlock();
+		}
+	}
+	private static native ByteBuffer nCreate(ByteBuffer peer_handle, ByteBuffer shared_context_handle) throws LWJGLException;
+
+	public void swapBuffers() throws LWJGLException {
+		Context current_context = Context.getCurrentContext();
+		if (current_context == null)
+			throw new IllegalStateException("No context is current");
+		synchronized (current_context) {
+			PeerInfo current_peer_info = current_context.getPeerInfo();
+			ByteBuffer peer_handle = current_peer_info.lockAndGetHandle();
+			try {
+				nSwapBuffers(peer_handle);
+			} finally {
+				current_peer_info.unlock();
+			}
+		}
+	}
+	private static native void nSwapBuffers(ByteBuffer peer_info_handle) throws LWJGLException;
+
+	public void releaseDrawable(ByteBuffer context_handle) throws LWJGLException {
+	}
+
+	public void update(ByteBuffer context_handle) {
+	}
+
+	public void releaseCurrentContext() throws LWJGLException {
+		nReleaseCurrentContext();
+	}
+	private static native void nReleaseCurrentContext() throws LWJGLException;
+
+	public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
+		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
+		try {
+			nMakeCurrent(peer_handle, handle);
+		} finally {
+			peer_info.unlock();
+		}
+	}
+	private static native void nMakeCurrent(ByteBu...
 
[truncated message content]

Revision: 2498
Author:   elias_naur
Date:     2006-07-12 11:10:43 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2498&view=rev

Log Message:
-----------
remove .cvsignore files

Removed Paths:
-------------
    trunk/LWJGL/.cvsignore
    trunk/LWJGL/src/native/common/.cvsignore
    trunk/LWJGL/src/native/common/devil/.cvsignore
    trunk/LWJGL/src/native/common/fmod3/.cvsignore
    trunk/LWJGL/src/native/linux/.cvsignore
    trunk/LWJGL/src/native/macosx/.cvsignore
    trunk/LWJGL/src/native/windows/.cvsignore
Deleted: trunk/LWJGL/.cvsignore
===================================================================
--- trunk/LWJGL/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1,4 +0,0 @@
-.classpath *.class *.class~ *.java~ .nbattrs .project
-dist
-libs
-temp

Deleted: trunk/LWJGL/src/native/common/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/common/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/common/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1,13 +0,0 @@
-Debug
-Release
-org_lwjgl_input_Cursor.h
-org_lwjgl_input_Keyboard.h
-org_lwjgl_input_Mouse.h
-org_lwjgl_openal_AL.h
-org_lwjgl_openal_ALC.h
-org_lwjgl_opengl_GLContext.h
-org_lwjgl_opengl_Pbuffer.h
-org_lwjgl_Sys.h
-org_lwjgl_opengl_Display.h
-org_lwjgl_DefaultSysImplementation.h
-org_lwjgl_NativeSysImplementation.h

Deleted: trunk/LWJGL/src/native/common/devil/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/common/devil/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/common/devil/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1 +0,0 @@
-org_lwjgl_devil_ILNative.h
\ No newline at end of file

Deleted: trunk/LWJGL/src/native/common/fmod3/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/common/fmod3/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1,3 +0,0 @@
-org_lwjgl_fmod3_FMOD.h
-org_lwjgl_fmod3_FMusic.h
-org_lwjgl_fmod3_FSound.h

Deleted: trunk/LWJGL/src/native/linux/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/linux/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/linux/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1 +0,0 @@
-org_lwjgl_opengl_LinuxDisplay.h

Deleted: trunk/LWJGL/src/native/macosx/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/macosx/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/macosx/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1 +0,0 @@
-org_lwjgl_opengl_MacOSXDisplay.h

Deleted: trunk/LWJGL/src/native/windows/.cvsignore
===================================================================
--- trunk/LWJGL/src/native/windows/.cvsignore	2006-07-12 18:09:11 UTC (rev 2497)
+++ trunk/LWJGL/src/native/windows/.cvsignore	2006-07-12 18:10:43 UTC (rev 2498)
@@ -1,5 +0,0 @@
-Debug
-Release
-org_lwjgl_opengl_Win32Display.h
-org_lwjgl_Win32SysImplementation.h
-org_lwjgl_NativeSysImplementation.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2497
Author:   elias_naur
Date:     2006-07-12 11:09:11 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2497&view=rev

Log Message:
-----------
Windows: move natives from src/native/win32 to src/native/windows because the source really is bitness neutral, not 32 bit specific.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/windows_ant/build.xml

Added Paths:
-----------
    trunk/LWJGL/src/native/windows/

Removed Paths:
-------------
    trunk/LWJGL/src/native/win32/
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-12 16:55:05 UTC (rev 2496)
+++ trunk/LWJGL/build.xml	2006-07-12 18:09:11 UTC (rev 2497)
@@ -153,7 +153,7 @@
 	<fileset id="lwjgl.source.fileset" dir=".">
 		<include name="build.xml" />
 		<include name="src/**" />
-		<include name="platform_build/win32_ms_cmdline/*.bat" />
+		<include name="platform_build/**/*" />
 	</fileset>
 	
 	<!-- files in the base package -->
@@ -201,7 +201,7 @@
 	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" >
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
 	    <srcfiles dir= "${lwjgl.src.native}/generated" includes="*.c"/>
-	    <srcfiles dir= "${lwjgl.src.native}/win32" includes="*.cpp"/>
+	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
 	</uptodate>	
 	
 	<uptodate property="lwjgl.fmod.built" targetfile="${lwjgl.lib}/win32/lwjgl-fmod3.dll" >
@@ -356,9 +356,20 @@
 
 	<target name="runtest" depends="all">
 		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
+		<condition property="native_path" value="libs/win32">
+			<os family="windows" />
+		</condition>
+
+		<condition property="native_path" value="libs/linux">
+			<os name="Linux" />
+		</condition>
+
+		<condition property="native_path" value="libs/macosx">
+			<os name="Mac OS X" />
+		</condition>
 		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar" fork="true">
 			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
-			<jvmarg value="-Djava.library.path=libs/linux:libs/win32:libs/macosx"/>
+			<jvmarg value="-Djava.library.path=${native_path}"/>
 		</java>
 	</target>
 
@@ -507,7 +518,7 @@
 			<class name="org.lwjgl.opengl.LinuxCanvasImplementation" />
 		</javah>
 		
-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/win32" force="yes">
+		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/windows" force="yes">
 			<class name="org.lwjgl.opengl.WindowsKeyboard" />
 			<class name="org.lwjgl.opengl.WindowsDirectInput8" />
 			<class name="org.lwjgl.opengl.WindowsDirectInputDevice8" />

Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 16:55:05 UTC (rev 2496)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 18:09:11 UTC (rev 2497)
@@ -18,9 +18,9 @@
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
 			<arg value="/I${native}\common"/>
-			<arg value="/I${native}\win32"/>
+			<arg value="/I${native}\windows"/>
 			<srcfile/>
-			<fileset dir="${native}/win32" includes="*.c"/>
+			<fileset dir="${native}/windows" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
 			<fileset dir="${native}/generated" includes="*.c"/>
 			<mapper type="glob" from="*.c" to="*.obj"/>

Copied: trunk/LWJGL/src/native/windows (from rev 2495, trunk/LWJGL/src/native/win32)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2496
Author:   elias_naur
Date:     2006-07-12 09:55:05 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2496&view=rev

Log Message:
-----------
Windows: Use the standard _WIN32 macro instead of the LWJGL defined WIN32.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
    trunk/LWJGL/src/native/common/common_tools.c
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 23:03:11 UTC (rev 2495)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 16:55:05 UTC (rev 2496)
@@ -11,7 +11,7 @@
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /c"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${alhome}\include"/>

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-11 23:03:11 UTC (rev 2495)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-12 16:55:05 UTC (rev 2496)
@@ -40,7 +40,7 @@
 #include <jni.h>
 #include <stdlib.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <wtypes.h>
 #endif
 
@@ -82,7 +82,7 @@
 #define BUFFER_SIZE 4000
 	char buffer[BUFFER_SIZE];
 	jstring str;
-#ifdef WIN32
+#ifdef _WIN32
 	vsnprintf_s(buffer, BUFFER_SIZE, _TRUNCATE, format, ap);
 #else
 	vsnprintf(buffer, BUFFER_SIZE, format, ap);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2495
Author:   elias_naur
Date:     2006-07-11 16:03:11 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2495&view=rev

Log Message:
-----------
Added runtest ant target for easy execution of tests

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 21:55:24 UTC (rev 2494)
+++ trunk/LWJGL/build.xml	2006-07-11 23:03:11 UTC (rev 2495)
@@ -354,6 +354,14 @@
 		</jar>
 	</target>
 
+	<target name="runtest" depends="all">
+		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
+		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar" fork="true">
+			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
+			<jvmarg value="-Djava.library.path=libs/linux:libs/win32:libs/macosx"/>
+		</java>
+	</target>
+
 	<target name="applet" depends="jars">
 		<!-- Create lwjgl_applet.jar -->
 		<jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2494
Author:   matzon
Date:     2006-07-11 14:55:24 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2494&view=rev

Log Message:
-----------
obsolete stuff - all hail svn remove!

Removed Paths:
-------------
    trunk/LWJGL/doc/changelogs/
    trunk/LWJGL/doc/templates/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2493
Author:   matzon
Date:     2006-07-11 14:53:19 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2493&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/mac_xcode/
    trunk/LWJGL/platform_build/win32_ms_cmdline/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2492
Author:   matzon
Date:     2006-07-11 14:50:42 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2492&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/win32_vs_net/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2491
Author:   matzon
Date:     2006-07-11 14:48:58 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2491&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/sharp_develop/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2490
Author:   matzon
Date:     2006-07-11 14:47:04 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2490&view=rev

Log Message:
-----------
build natives into bin/<name>

Modified Paths:
--------------
    trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-07-11 21:46:44 UTC (rev 2489)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-07-11 21:47:04 UTC (rev 2490)
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<project name="OS X Native code" basedir="../../bin" default="nativelibrary">
-	<property name="native" location="../src/native"/>
+<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
+	<property name="native" location="../../src/native"/>
 
 	<target name="init">
 		<mkdir dir="ppc"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.