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

Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10337

Added Files:
	EXT_packed_depth_stencil.java 
Log Message:
Added EXT_packed_depth_stencil

--- NEW FILE: EXT_packed_depth_stencil.java ---
/*
 * 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;

public interface EXT_packed_depth_stencil {

	int GL_DEPTH_STENCIL_EXT = 0x84F9;
	int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
	int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
	int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;

}

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10270/src/native/win32

Modified Files:
	display.c display.h org_lwjgl_opengl_Display.c 
Log Message:
Win32: Moved some Win32Display.getVersion code to java

Index: display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display.h	22 Sep 2004 18:21:28 -0000	1.3
+++ display.h	23 Sep 2005 10:39:56 -0000	1.4
@@ -52,6 +52,6 @@
 extern void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer);
 extern jobject initDisplay(JNIEnv * env);
 extern jstring getAdapter(JNIEnv * env);
-extern jstring getVersion(JNIEnv * env);
+extern jstring getVersion(JNIEnv * env, char *driver);
 
-#endif
\ No newline at end of file
+#endif

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- display.c	23 Sep 2005 10:25:24 -0000	1.5
+++ display.c	23 Sep 2005 10:39:56 -0000	1.6
@@ -276,65 +276,7 @@
 	}
 }
 
-static char * getDriver() {
-	#define MY_BUFSIZE 256
-
-	HKEY hKey;
-	static TCHAR szAdapterKey[MY_BUFSIZE], szDriverValue[MY_BUFSIZE];
-	DWORD dwBufLen = MY_BUFSIZE;
-	LONG lRet;
-
-	if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-		TEXT("HARDWARE\\DeviceMap\\Video"),
-					0,
-					KEY_QUERY_VALUE,
-					&hKey) != ERROR_SUCCESS) return NULL;
-
-	lRet = RegQueryValueEx(hKey,
-					TEXT("\\Device\\Video0"),
-					NULL,
-					NULL,
-					(LPBYTE)szAdapterKey,
-					&dwBufLen);
-
-	RegCloseKey(hKey);
-
-	if(lRet != ERROR_SUCCESS) return NULL;
-
-	printfDebug("Adapter key: %s\n", szAdapterKey);
-
-	// szAdapterKey now contains something like \Registry\Machine\System\CurrentControlSet\Control\Video\{B70DBD2A-90C4-41CF-A58E-F3BA69F1A6BC}\0000
-	// We'll check for the first chunk:
-	if (strnicmp("\\Registry\\Machine", szAdapterKey, 17) == 0) {
-		// Yes, it's right, so let's look for that key now
-
-		TCHAR szDriverKey[MY_BUFSIZE];
-		strcpy(szDriverKey, &szAdapterKey[18]);
-
-		if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			TEXT(szDriverKey),
-						0,
-						KEY_QUERY_VALUE,
-						&hKey) != ERROR_SUCCESS) return NULL;
-
-		lRet = RegQueryValueEx(hKey,
-						TEXT("InstalledDisplayDrivers"),
-						NULL,
-						NULL,
-						(LPBYTE)szDriverValue,
-						&dwBufLen);
-
-		RegCloseKey(hKey);
-
-	}
-
-	if(lRet != ERROR_SUCCESS) return NULL;
-
-	return szDriverValue;
-}
-
-
-jstring getVersion(JNIEnv * env)
+jstring getVersion(JNIEnv * env, char *driver)
 {
 	jstring ret = NULL;
 
@@ -343,7 +285,6 @@
         DWORD dwInfoSize;
         LPVOID lpInfoBuff;
         BOOL bRetval;
-        char *driver = getDriver();
 
 	if (driver == NULL) {
 		return NULL;

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- org_lwjgl_opengl_Display.c	23 Sep 2005 10:25:24 -0000	1.29
+++ org_lwjgl_opengl_Display.c	23 Sep 2005 10:39:56 -0000	1.30
@@ -362,8 +362,15 @@
 	setGammaRamp(env, gamma_buffer);
 }
 
-JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_Win32Display_getVersion(JNIEnv *env, jobject self) {
-	return getVersion(env);
+JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_Win32Display_nGetVersion(JNIEnv *env, jobject self, jstring driver) {
+	char *driver_str;
+	jstring result;
+	driver_str = GetStringNativeChars(env, driver);
+	if (driver_str == NULL)
+		return NULL;
+	result = getVersion(env, driver_str);
+	free(driver_str);
+	return result;
 }
 
 JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_Win32Display_init(JNIEnv *env, jobject self) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10270/src/java/org/lwjgl/opengl

Modified Files:
	Win32Display.java 
Log Message:
Win32: Moved some Win32Display.getVersion code to java

Index: Win32Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Win32Display.java	23 Sep 2005 10:25:24 -0000	1.22
+++ Win32Display.java	23 Sep 2005 10:39:56 -0000	1.23
@@ -79,7 +79,10 @@
 		return null;
 	}
 	
-	public native String getVersion();
+	public String getVersion() {
+		return nGetVersion(getAdapter());
+	}
+	private native String nGetVersion(String driver);
 	public native DisplayMode init() throws LWJGLException;
 	public native void setTitle(String title);
 	public native boolean isCloseRequested();

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6890/src/native/win32

Modified Files:
	display.c org_lwjgl_opengl_Display.c 
Added Files:
	org_lwjgl_opengl_Win32Registry.c 
Log Message:
Win32: Moved some registry access code to java (for Win32Display.getAdapter())

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- display.c	12 May 2005 07:47:07 -0000	1.4
+++ display.c	23 Sep 2005 10:25:24 -0000	1.5
@@ -333,19 +333,6 @@
 	return szDriverValue;
 }
 
-jstring getAdapter(JNIEnv * env)
-{
-
-	jstring ret = NULL;
-	char *driver = getDriver();
-	if (driver == NULL) {
-		return NULL;
-	}
-	ret = NewStringNative(env, driver);
-	return ret;
-}
-
-
 
 jstring getVersion(JNIEnv * env)
 {

--- NEW FILE: org_lwjgl_opengl_Win32Registry.c ---
/* 
 * 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.
 */

/**
 * $Id: org_lwjgl_opengl_Win32Registry.c,v 1.1 2005/09/23 10:25:24 elias_naur Exp $
 *
 * @author elias_naur <eli...@us...>
 * @version $Revision: 1.1 $
 */

#include <jni.h>
#include <windows.h>
#include "org_lwjgl_opengl_Win32Registry.h"
#include "common_tools.h"

/*
 * Return a string containing the queried value, or NULL of the method fails.
 * In that case, a java exception is thrown.
 */
static jstring queryRegistrationKey(JNIEnv *env, HKEY root_key, LPCTSTR subkey, LPCTSTR value) {
	DWORD buf_size = 1;
	char *result;
	HKEY hKey;
	LONG lRet;
	jstring java_result;


	if(RegOpenKeyEx(root_key,
		TEXT(subkey),
		0,
		KEY_QUERY_VALUE,
		&hKey) != ERROR_SUCCESS) {
		throwException(env, "Failed to open registry key");
		return NULL;
	}

	result = (char *)malloc(buf_size);
	if (result == NULL) {
		RegCloseKey(hKey);
		throwException(env, "Failed to allocate buffer");
		return NULL;
	}

	while (1) {
		lRet = RegQueryValueEx(hKey,
						TEXT(value),
						NULL,
						NULL,
						(LPBYTE)result,
						&buf_size);
		if (lRet != ERROR_SUCCESS && lRet != ERROR_MORE_DATA) {
			RegCloseKey(hKey);
			free(result);
			throwException(env, "Failed query key value");
			return NULL;
		}
		if (lRet == ERROR_SUCCESS) {
			RegCloseKey(hKey);
			// make sure the result has a terminating null
			buf_size += 1;
			result = (char *)realloc(result, buf_size);
			if (result == NULL) {
				throwException(env, "Failed to resize buffer");
				return NULL;
			}
			result[buf_size - 1] = '\0';
			java_result = NewStringNative(env, result);
			free(result);
			return java_result;
		}
		result = (char *)realloc(result, buf_size);
		if (result == NULL) {
			RegCloseKey(hKey);
			throwException(env, "Failed to resize buffer");
			return NULL;
		}
	}
}

static HKEY enumToRootKey(jint root_key_enum) {
	switch (root_key_enum) {
		case org_lwjgl_opengl_Win32Registry_HKEY_CLASSES_ROOT:
			return HKEY_CLASSES_ROOT;
		case org_lwjgl_opengl_Win32Registry_HKEY_CURRENT_USER:
			return HKEY_CURRENT_USER;
		case org_lwjgl_opengl_Win32Registry_HKEY_LOCAL_MACHINE:
			return HKEY_LOCAL_MACHINE;
		case org_lwjgl_opengl_Win32Registry_HKEY_USERS:
			return HKEY_USERS;
		default:
			return 0;
	}
}

JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_Win32Registry_nQueryRegistrationKey  (JNIEnv *env, jclass unused, jint root_key, jstring subkey, jstring value) {
	HKEY root = enumToRootKey(root_key);
	char *subkey_native;
	char *value_native;
	jstring result;

	subkey_native = GetStringNativeChars(env, subkey);
	if (subkey_native == NULL) {
		throwException(env, "Failed to fetch the native string");
		return NULL;
	}
	value_native = GetStringNativeChars(env, value);
	if (value_native == NULL) {
		free(subkey_native);
		throwException(env, "Failed to fetch the native string");
		return NULL;
	}
	result = queryRegistrationKey(env, root, subkey_native, value_native);
	free(subkey_native);
	free(value_native);
	return result;
}

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- org_lwjgl_opengl_Display.c	16 Jul 2005 11:27:58 -0000	1.28
+++ org_lwjgl_opengl_Display.c	23 Sep 2005 10:25:24 -0000	1.29
@@ -362,10 +362,6 @@
 	setGammaRamp(env, gamma_buffer);
 }
 
-JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_Win32Display_getAdapter(JNIEnv *env, jobject self) {
-	return getAdapter(env);
-}
-
 JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_Win32Display_getVersion(JNIEnv *env, jobject self) {
 	return getVersion(env);
 }
@@ -555,4 +551,4 @@
 	}
 	
 	return -1;
-}
\ No newline at end of file
+}

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6890

Modified Files:
	build.xml 
Log Message:
Win32: Moved some registry access code to java (for Win32Display.getAdapter())

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- build.xml	18 Aug 2005 13:48:18 -0000	1.86
+++ build.xml	23 Sep 2005 10:25:24 -0000	1.87
@@ -353,6 +353,7 @@
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/win32" force="yes">
 			<class name="org.lwjgl.opengl.Win32PbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.Win32Display" />
+			<class name="org.lwjgl.opengl.Win32Registry" />
 			<class name="org.lwjgl.NativeSysImplementation" />
 			<class name="org.lwjgl.opengl.Win32AWTGLCanvasPeerInfo" />
 			<class name="org.lwjgl.opengl.Win32PeerInfo" />

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6890/src/java/org/lwjgl/opengl

Modified Files:
	Win32Display.java 
Added Files:
	Win32Registry.java 
Log Message:
Win32: Moved some registry access code to java (for Win32Display.getAdapter())

Index: Win32Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Win32Display.java	10 Jul 2005 20:15:55 -0000	1.21
+++ Win32Display.java	23 Sep 2005 10:25:24 -0000	1.22
@@ -59,7 +59,26 @@
 	public native void resetDisplayMode();
 	public native int getGammaRampLength();
 	public native void setGammaRamp(FloatBuffer gammaRamp) throws LWJGLException;
-	public native String getAdapter();
+	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 native String getVersion();
 	public native DisplayMode init() throws LWJGLException;
 	public native void setTitle(String title);

--- NEW FILE: Win32Registry.java ---
/*
 * 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;
}

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4633

Modified Files:
	projects.php 
Log Message:
SubHunt

Index: projects.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/projects.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- projects.php	22 Jul 2005 15:28:24 -0000	1.9
+++ projects.php	21 Sep 2005 17:22:33 -0000	1.10
@@ -111,7 +111,7 @@
 								       2 => array('small' => 'cultris_small_3.jpg',
 												  'big'   => 'cultris_3.jpg')));	
                           
-$projects[] = array('name'    => 'Keith Goes Painting ',
+$projects[] = array('name'    => 'Keith Goes Painting',
 					'url'     => 'http://www.wolfys.co.uk/',
 					'type'    => 'Free game',
 					'desc'    => 'Keiths\' Boss has left town with intstructions that all the furniture in his house must be painted. It is up to you to guide Keith around the big house and paint the furniture before his Boss comes home and sacks him. The house seems to be infested with giant worms, flappy bat things and other rare baddies. But fear not, for Keith is armed with a paint gun which can be used splat a path through the house. There are many hidden places to explore and secrets to find, good luck!',
@@ -121,6 +121,17 @@
 												  'big'   => 'keith_goes_painting_2.jpg'),
 								       2 => array('small' => 'keith_goes_painting_small_3.jpg',
 												  'big'   => 'keith_goes_painting_3.jpg')));	                          
+
+$projects[] = array('name'    => 'SubHunt ',
+					'url'     => 'http://www.efd.lth.se/~d01dj/subhunt/',
+					'type'    => 'Freeware',
+					'desc'    => 'A remake of the old arcade game Sub Hunter. You control a surface ship with the mission to destroy as many enemy subs as you can.',
+					'screens' => array(0 => array('small' => 'subhunt_small_1.jpg',
+											      'big'   => 'subhunt_1.jpg'),
+								       1 => array('small' => 'subhunt_small_2.jpg',
+												  'big'   => 'subhunt_2.jpg'),
+								       2 => array('small' => 'subhunt_small_3.jpg',
+												  'big'   => 'subhunt_3.jpg')));
 												  
 function displayProjects() {
 	

Update of /cvsroot/java-game-lib/LWJGL/www/_gfx/projects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4505

Added Files:
	subhunt_1.jpg subhunt_2.jpg subhunt_3.jpg subhunt_small_1.jpg 
	subhunt_small_2.jpg subhunt_small_3.jpg 
Log Message:
SubHunt

--- NEW FILE: subhunt_small_1.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: subhunt_small_3.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: subhunt_3.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: subhunt_1.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: subhunt_small_2.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: subhunt_2.jpg ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27267/src/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
OpenAL: Made AL.create complain if it is already created to match Display.create behaviour

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- AL.java	16 Sep 2005 06:43:10 -0000	1.45
+++ AL.java	16 Sep 2005 06:50:34 -0000	1.46
@@ -92,9 +92,8 @@
 	public static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized)
 		throws LWJGLException {
 			
-		if (created) {
-			return;
-		}
+		if (created)
+			throw new IllegalStateException("Only one OpenAL context may be instantiated at any one time.");
 		String[] oalPaths = LWJGLUtil.getLibraryPaths(new String[]{
                                                   "lwjglaudio", "lwjglaudio.dll",
                                                   "openal", "libopenal.so",

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25948/src/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
OpenAL: Cleaned up visibility and removed unnecessary static fields from AL

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- AL.java	15 Sep 2005 23:15:13 -0000	1.44
+++ AL.java	16 Sep 2005 06:43:10 -0000	1.45
@@ -44,34 +44,14 @@
  * @version $Revision$
  */
 public final class AL {
-
-	/** ALC instance. */
-	protected static ALC alc;
-
 	/** ALCdevice instance. */
 	protected static ALCdevice device;
 
 	/** Current ALCcontext. */
 	protected static ALCcontext context;
 
-	/** 
-	 * String that requests a certain device or device configuration. 
-	 * If null is specified, the implementation will provide an 
-	 * implementation specific default. 
-	 */
-	protected static String deviceArguments;
-
-	/** Frequency for mixing output buffer, in units of Hz. */
-	protected static int contextFrequency = -1;
-
-	/** Refresh intervalls, in units of Hz. */
-	protected static int contextRefresh = -1;
-
-	/** Flag, indicating a synchronous context. */
-	protected static int contextSynchronized = ALC.ALC_FALSE;
-
 	/** Have we been created? */
-	protected static boolean created;
+	private static boolean created;
 
 	static {
 		Sys.initialize();
@@ -85,12 +65,12 @@
 	 * 
 	 * @param oalPaths Array of strings containing paths to search for OpenAL library
 	 */
-	protected static native void nCreate(String[] oalPaths) throws LWJGLException;
+	private static native void nCreate(String[] oalPaths) throws LWJGLException;
 
 	/**
 	 * Native method the destroy the AL
 	 */
-	protected static native void nDestroy();
+	private static native void nDestroy();
 	
 	/**
 	 * @return true if AL has been created
@@ -127,20 +107,16 @@
 			AL10.initNativeStubs();
 			ALC.initNativeStubs();
 
-			AL.deviceArguments = deviceArguments;
-			AL.contextFrequency = contextFrequency;
-			AL.contextRefresh = contextRefresh;
-			AL.contextSynchronized = contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE;
-
 			device = ALC.alcOpenDevice(deviceArguments);
 			if (device == null)
 				throw new LWJGLException("Could not open ALC device");
 
-			if (AL.contextFrequency == -1) {
+			if (contextFrequency == -1) {
 				context = ALC.alcCreateContext(device.device, null);
 			} else {
 				context = ALC.alcCreateContext(device.device,
-						ALCcontext.createAttributeList(AL.contextFrequency, AL.contextRefresh, AL.contextSynchronized));
+						ALCcontext.createAttributeList(contextFrequency, contextRefresh, 
+							contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE));
 			}
 			ALC.alcMakeContextCurrent(context.context);
 		} catch (LWJGLException e) {
@@ -175,12 +151,6 @@
 		resetNativeStubs(AL10.class);
 		resetNativeStubs(ALC.class);
 
-		deviceArguments = null;
-
-		contextFrequency = -1;
-		contextRefresh = -1;
-		contextSynchronized = ALC.ALC_FALSE;
-		
 		if (created)
 			nDestroy();
 		created = false;

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14797/src/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
Further tweakage

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- AL.java	15 Sep 2005 19:30:49 -0000	1.43
+++ AL.java	15 Sep 2005 23:15:13 -0000	1.44
@@ -127,29 +127,26 @@
 			AL10.initNativeStubs();
 			ALC.initNativeStubs();
 
-			device = ALC.alcOpenDevice(deviceArguments);
-			if (device == null)
-				throw new LWJGLException("Could not open ALC device");
-
 			AL.deviceArguments = deviceArguments;
 			AL.contextFrequency = contextFrequency;
 			AL.contextRefresh = contextRefresh;
 			AL.contextSynchronized = contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE;
 
-			if (contextFrequency == -1) {
+			device = ALC.alcOpenDevice(deviceArguments);
+			if (device == null)
+				throw new LWJGLException("Could not open ALC device");
+
+			if (AL.contextFrequency == -1) {
 				context = ALC.alcCreateContext(device.device, null);
 			} else {
 				context = ALC.alcCreateContext(device.device,
 						ALCcontext.createAttributeList(AL.contextFrequency, AL.contextRefresh, AL.contextSynchronized));
 			}
 			ALC.alcMakeContextCurrent(context.context);
-			created = true;
 		} catch (LWJGLException e) {
 			destroy();
 			throw e;
 		}
-
-		create();
 	}
 
 	/**

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27692/src/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
Altered create() methods to supply sane defaults

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- AL.java	12 May 2005 07:47:06 -0000	1.42
+++ AL.java	15 Sep 2005 19:30:49 -0000	1.43
@@ -115,24 +115,6 @@
 		if (created) {
 			return;
 		}
-			
-			
-		AL.deviceArguments = deviceArguments;
-		AL.contextFrequency = contextFrequency;
-		AL.contextRefresh = contextRefresh;
-		AL.contextSynchronized = contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE;
-
-		create();
-	}
-
-	/**
-	 * Creates an OpenAL instance. The empty create will cause OpenAL to
-	 * open the default device, and create a context using default values. 
-	 */
-	public static void create() throws LWJGLException {
-		if (created) {
-			return;
-		}
 		String[] oalPaths = LWJGLUtil.getLibraryPaths(new String[]{
                                                   "lwjglaudio", "lwjglaudio.dll",
                                                   "openal", "libopenal.so",
@@ -148,12 +130,17 @@
 			device = ALC.alcOpenDevice(deviceArguments);
 			if (device == null)
 				throw new LWJGLException("Could not open ALC device");
-			//check if doing default values or not
+
+			AL.deviceArguments = deviceArguments;
+			AL.contextFrequency = contextFrequency;
+			AL.contextRefresh = contextRefresh;
+			AL.contextSynchronized = contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE;
+
 			if (contextFrequency == -1) {
 				context = ALC.alcCreateContext(device.device, null);
 			} else {
 				context = ALC.alcCreateContext(device.device,
-						ALCcontext.createAttributeList(contextFrequency, contextRefresh, contextSynchronized));
+						ALCcontext.createAttributeList(AL.contextFrequency, AL.contextRefresh, AL.contextSynchronized));
 			}
 			ALC.alcMakeContextCurrent(context.context);
 			created = true;
@@ -161,6 +148,19 @@
 			destroy();
 			throw e;
 		}
+
+		create();
+	}
+
+	/**
+	 * Creates an OpenAL instance. The empty create will cause OpenAL to
+	 * open the default device, and create a context using default values.
+	 * This method used to use default values that the OpenAL implementation
+	 * chose but this produces unexpected results on some systems; so now
+	 * it defaults to 44100Hz mixing @ 60Hz refresh. 
+	 */
+	public static void create() throws LWJGLException {
+		create(null, 44100, 60, false);
 	}
 
 	/**

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31972

Modified Files:
	display.c 
Log Message:
Linux: Added support for LWJGL_DISABLE_XRANDR environment variable to override Xrandr support on broken window managers

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- display.c	12 Sep 2005 13:05:54 -0000	1.9
+++ display.c	13 Sep 2005 06:56:14 -0000	1.10
@@ -89,6 +89,11 @@
 	return current_extension;
 }
 
+static bool isXrandrForceDisabled() {
+	char *supported_env = getenv("LWJGL_DISABLE_XRANDR");
+	return supported_env != NULL;
+}
+
 static bool getXF86VidModeVersion(JNIEnv *env, Display *disp, int *major, int *minor) {
 	int event_base, error_base;
 
@@ -121,6 +126,8 @@
 
 static bool isXrandrSupported(JNIEnv *env, Display *disp) {
 	int major, minor;
+	if (isXrandrForceDisabled())
+		return false;
 	if (!getXrandrVersion(env, disp, &major, &minor))
 		return false;
 	return major >= 1;

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22167

Modified Files:
	display.c 
Log Message:
Linux: Drop out of Xrandr loop after a set amount of iterations

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- display.c	21 Aug 2005 20:27:20 -0000	1.8
+++ display.c	12 Sep 2005 13:05:54 -0000	1.9
@@ -51,6 +51,8 @@
 #include "common_tools.h"
 #include "Window.h"
 
+#define NUM_XRANDR_RETRIES 5
+
 typedef struct {
 	int width;
 	int height;
@@ -230,12 +232,13 @@
 }
 
 static bool setXrandrMode(Display *disp, int screen, mode_info *mode) {
+	int iteration;
 	Time timestamp;
 	Status status = trySetXrandrMode(disp, screen, mode, &timestamp);
 	if (status == 0)
 		return true; // Success
 	Time new_timestamp;
-	while (true) {
+	for (iteration = 0; iteration < NUM_XRANDR_RETRIES; iteration++) {
 		status = trySetXrandrMode(disp, screen, mode, &new_timestamp);
 		if (status == 0)
 			return true; // Success
@@ -243,6 +246,7 @@
 			return false; // Failure, and the stamps are equal meaning that the failure is not merely transient
 		timestamp = new_timestamp;
 	}
+	return false;
 }
 
 static bool setMode(JNIEnv *env, Display *disp, int screen, int width, int height, int freq, bool temporary) {

Update of /cvsroot/java-game-lib/LWJGL/www/_include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14650

Modified Files:
	header.php 
Log Message:
updated to reflect online contents

Index: header.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/_include/header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- header.php	16 Jun 2005 14:39:23 -0000	1.5
+++ header.php	10 Sep 2005 23:01:00 -0000	1.6
@@ -58,7 +58,7 @@
 					<p>
 					    <a href="links.php"<?=((strpos($_SERVER['SCRIPT_NAME'], 'links.php') !== false) ? ' class="activeItem"' : '');?>>Links</a><br/>
 					    <a href="changelog.php"<?=((strpos($_SERVER['SCRIPT_NAME'], 'changelog.php') !== false) ? ' class="activeItem"' : '');?>>Changelog</a><br/>
-					    <a href="irclog.php"<?=((strpos($_SERVER['SCRIPT_NAME'], 'irclog.php') !== false) ? ' class="activeItem"' : '');?>>IRC Chatlog</a><br/>
+					    <a href="irclog_browse.php"<?=((strpos($_SERVER['SCRIPT_NAME'], 'irclog.php') !== false) ? ' class="activeItem"' : '');?>>IRC Chatlog</a><br/>
 					    <a href="http://irc-stats.lwjgl.org" target="_blank">IRC Stats</a><br/>
 					</p>
 					<p>

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14348

Modified Files:
	changelog.php download.php index.php 
Log Message:
updated to reflect online contents

Index: changelog.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/changelog.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- changelog.php	19 May 2005 16:18:27 -0000	1.11
+++ changelog.php	10 Sep 2005 22:59:54 -0000	1.12
@@ -17,6 +17,7 @@
 </p>
 <ul>
 	<li><a href="http://www.lwjgl.org/changelogs/full-changelog.txt" target="_blank">Full changelog</a></li>
+	<li><a href="#0.98">LWJGL 0.98</a></li>
 	<li><a href="#0.97">LWJGL 0.97</a></li>
 	<li><a href="#0.96">LWJGL 0.96</a></li>
 	<li><a href="#0.95">LWJGL 0.95</a></li>
@@ -36,6 +37,7 @@
 </ul>
 
 <?
+displayChangelog('0.98');
 displayChangelog('0.97');
 displayChangelog('0.96');
 displayChangelog('0.95');

Index: download.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/download.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- download.php	19 May 2005 16:18:27 -0000	1.12
+++ download.php	10 Sep 2005 22:59:54 -0000	1.13
@@ -2,8 +2,8 @@
 
 <h1>Download</h1>
 <p>
-	Latest stable release is 0.97. Please download it here:<br/>
-	<a href="https://sourceforge.net/project/showfiles.php?group_id=58488" target="_blank">LWJGL 0.97 alpha</a>
+	Latest stable release is 0.98. Please download it here:<br/>
+	<a href="https://sourceforge.net/project/showfiles.php?group_id=58488" target="_blank">LWJGL 0.98</a>
 </p>
 <p>
     Latest CVS tarball. Please download it here:<br/>

Index: index.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.php	16 Jun 2005 14:03:13 -0000	1.11
+++ index.php	10 Sep 2005 22:59:54 -0000	1.12
@@ -8,6 +8,10 @@
 
 <h1>News</h1>
 <p style="border-bottom: 1px solid #cccccc;">
+	<b>Another release! 0.98</b> <span class="newsdate">Thursday, August 18th, 2005</span><br/>
+	Getting closer to 1.0 with this latest release. <a href="http://lwjgl.org/forum/viewtopic.php?t=1238">Grab and discuss</a><br/><br/>
+</p>
+<p style="border-bottom: 1px solid #cccccc;">
 	<b>AdSense added</b> <span class="newsdate">Thursday, June 16th, 2005</span><br/>
 	We have added Google AdSense, which should allow us to cover the cost of hosting lwjgl.org<br/><br/>
 </p>
@@ -27,8 +31,4 @@
 	<b>LWJGL 0.94 released!</b> <span class="newsdate">Tuesday, December 14th, 2004</span><br/>
 	Time for yet another relase - this time featuring the long awaited Mac OS X port which was made possible using the donated money. Thanks everybody. Please check <a href="http://lwjgl.org/forum/viewtopic.php?t=846">this thread</a> for more info regarding the release<br/><br/>
 </p>
-<p style="border-bottom: 1px solid #cccccc;">
-	<b>New site!</b> <span class="newsdate">Wednesday, November 10th, 2004</span><br/>
-	With the help of <a href="http://www.gomjabbar.de/" target="_blank">Daniel Leinich</a> we have a new site online! If you find any bugs, please send an email to <a href="mailto:in...@lw...">in...@lw...</a><br/><br/>
-</p>
 <? require('_include/footer.php'); ?>

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14095

Modified Files:
	installation.php 
Log Message:
updated installation text

Index: installation.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/installation.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- installation.php	17 Apr 2005 08:01:48 -0000	1.10
+++ installation.php	10 Sep 2005 22:57:06 -0000	1.11
@@ -11,7 +11,7 @@
 <ul>
 	<li><a href="download.php">Download</a> the distribution</li>
 	<li>
-		Unpack the archive, file contents should include (amongst other things):<br/><br/>
+		Unpack the archive, file contents (in sub folders) should include (amongst other things):<br/><br/>
 		<pre>lwjgl.dll
 lwjglaudio.dll
 lwjgl.jar
@@ -20,7 +20,8 @@
 	</li>
 	<li>
 		Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
-		<pre>java -cp lwjgl.jar;lwjgl_util.jar;lwjgl_test.jar; org.lwjgl.test.WindowCreationTest</pre>
+		<pre>java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar; 
+    -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
 		A window should appear and you should see the following output:<br/><br/>
 		<pre>Found &lt;number&gt; display modes
 240, 320, WindowCreationTest
@@ -29,10 +30,6 @@
 Window created
 600, 800, Game</pre>
 	</li>
-	<li>
-		Should you wish to place the dll's in some other directory than your class files (say /native as opposed to /classes) you could do so, by using the java.library.path property. For example:<br/><br/>
-		<pre>java -cp classes; -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
-	</li>
 </ul>
 
 <p>
@@ -41,7 +38,7 @@
 <ul>
 	<li><a href="download.php">Download</a> the distribution</li>
 	<li>
-		Unpack the archive, file contents should include (amongst other things):<br/><br/>
+		Unpack the archive, file contents (in sub folders) should include (amongst other things):<br/><br/>
 		<pre>liblwjgl.so
 libopenal.so
 lwjgl.jar
@@ -50,9 +47,11 @@
 	</li>
 	<li>
 		Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
-		<pre>java -cp lwjgl.jar:lwjgl_util.jar:lwjgl_test.jar: org.lwjgl.test.WindowCreationTest</pre>
+		<pre>java -cp .:res;jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar: 
+    -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
 		Should library loading fail, try using -Djava.library.path to specify the path. For example:<br/><br/>
-		<pre>java -cp lwjgl.jar:lwjgl_util.jar:lwjgl_test.jar: -Djava.library.path=/home/lwjgluser/lwjgl/ org.lwjgl.test.WindowCreationTest</pre>
+		<pre>java -cp .:res;jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar: 
+    -Djava.library.path=/home/lwjgluser/lwjgl/ org.lwjgl.test.WindowCreationTest</pre>
 		A window should appear and you should see the following output:<br/><br/>
 		<pre>Found &lt;number&gt; display modes
 240, 320, WindowCreationTest
@@ -61,10 +60,6 @@
 Window created
 600, 800, Game</pre>
 	</li>
-	<li>
-		Should you wish to place the so files in some other directory than you're class files (say /native as opposed to /classes) you could do so, by using the java.library.path property. For example:<br/><br/>
-		<pre>java -cp classes -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
-	</li>
 </ul>
 
 <p>
@@ -73,7 +68,7 @@
 <ul>
 	<li><a href="download.php">Download</a> the distribution</li>
 	<li>
-		Unpack the archive, file contents should include (amongst other things):<br/><br/>
+		Unpack the archive, file contents (in sub folders) should include (amongst other things):<br/><br/>
 		<pre>liblwjgl.jnilib
 libopenal.dylib
 lwjgl.jar
@@ -82,7 +77,8 @@
 	</li>
 	<li>
 		Test LWJGL by opening a command prompt, and navigating to the folder where the archive was extracted. Once navigated, issue the following command:<br/><br/>
-		<pre>java -cp lwjgl.jar:lwjgl_util.jar:lwjgl_test.jar: org.lwjgl.test.WindowCreationTest</pre>
+		<pre>java -cp .:res;jar/lwjgl.jar:jar/lwjgl_test.jar:jar/lwjgl_util.jar:jar/lwjgl_fmod3.jar:jar/lwjgl_devil.jar:jar/jinput.jar: 
+    -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
 		A window should appear and you should see the following output:<br/><br/>
 		<pre>Found &lt;number&gt; display modes
 240, 320, WindowCreationTest
@@ -91,10 +87,6 @@
 Window created
 600, 800, Game</pre>
 	</li>
-	<li>
-		Should you wish to place the files in some other directory than you're class files (say /native as opposed to /classes) you could do so, by using the java.library.path property. For example:<br/><br/>
-		<pre>java -cp classes -Djava.library.path=native org.lwjgl.test.WindowCreationTest</pre>
-	</li>
 </ul>
 
 <h1><a name="ide">Installation</a></h1>

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14029

Added Files:
	irclog_browse.php 
Removed Files:
	irclog.php 
Log Message:
added log browsing

--- NEW FILE: irclog_browse.php ---
<?php 
  require('_include/header.php');

  $date = $_GET['date'];
  if(!$date) {
    $date = time();
  }

  function get_file($file) {
    $ch = curl_init($file);
    curl_setopt($ch,CURLOPT_ENCODING , "gzip");
    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
    $body = curl_exec ($ch);
    curl_close ($ch);
    return $body;
  }

  $date = $_GET['date'];
  if(!$date) {
    $date = time();
  }

  echo "<h1>LWJGL Log: " . date("Y-m-d", $date) . " (<a href='irc://irc.freenode.net/lwjgl'>#LWJGL IRC channel</a>)</h1>";
  echo "<p>";
  $body = get_file("http://matzon.dk/brian/lwjgl/stats/lwjgl_browse.php?date=$date");
  echo $body;
  echo "</p>";
  require('_include/footer.php'); 
?>
--- irclog.php DELETED ---

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7089/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
Mac OS X: Fetch the current viewport dimensions instead of assuming them equal to the current window size

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- MacOSXDisplay.java	7 Sep 2005 15:43:52 -0000	1.35
+++ MacOSXDisplay.java	9 Sep 2005 10:27:13 -0000	1.36
@@ -62,6 +62,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
 
+import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 import org.lwjgl.input.Keyboard;
@@ -217,6 +218,7 @@
 		return new MacOSXDisplayPeerInfo(pixel_format);
 	}
 
+	private final static IntBuffer current_viewport = BufferUtils.createIntBuffer(16);
 	public void update() {
 		boolean should_update = frame.getCanvas().syncShouldUpdateContext();
 		/*
@@ -250,7 +252,8 @@
 		if (should_update) {
 			Display.getContext().update();
 			/* This is necessary to make sure the context won't "forget" about the view size */
-			GL11.glViewport(0, 0, frame.getCanvas().syncGetWidth(), frame.getCanvas().syncGetHeight());
+			GL11.glGetInteger(GL11.GL_VIEWPORT, current_viewport);
+			GL11.glViewport(current_viewport.get(0), current_viewport.get(1), current_viewport.get(2), current_viewport.get(3));
 		}
 		if (frame.syncShouldWarpCursor()) {
 			warpCursor();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10800/src/java/org/lwjgl/test/devil

Modified Files:
	BasicTest.java 
Log Message:
applied DarkProphets patch for better error handling and more types

Index: BasicTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/devil/BasicTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BasicTest.java	22 May 2005 12:12:02 -0000	1.11
+++ BasicTest.java	7 Sep 2005 16:06:06 -0000	1.12
@@ -70,7 +70,12 @@
 		System.out.println("error = " + ILU.iluErrorString(IL.ilGetError()));
 		URL imageURL = BasicTest.class.getResource("/res/ILtest.tga");
 		System.out.println("ilLoadFromURL " + imageURL);
-		System.out.println("load lump = " + IL.ilLoadFromURL(imageURL));
+		try {
+			System.out.println("load lump = " + IL.ilLoadFromURL(imageURL));
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.exit(0);
+		}
 		System.out.println("error = " + ILU.iluErrorString(IL.ilGetError()));
 		int newIm = IL.ilCloneCurImage();
 		IL.ilCopyImage(im.get(0));

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10800/src/java/org/lwjgl/devil

Modified Files:
	IL.java 
Log Message:
applied DarkProphets patch for better error handling and more types

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- IL.java	29 May 2005 22:16:56 -0000	1.19
+++ IL.java	7 Sep 2005 16:06:06 -0000	1.20
@@ -447,74 +447,96 @@
 	 * @param filename File to determine type for
 	 * @return IL type, or IL_TYPE_UNKNOWN if undeterminable
 	 */
-	public static int getILType(String filename) {
-		int index = filename.lastIndexOf('.');
-		if (index != -1) {
-			String extension = filename.substring(index + 1);
-			if (extension.equalsIgnoreCase("bmp")) {
-				return IL_BMP;
-			} else if (extension.equalsIgnoreCase("cut")) {
-				return IL_CUT;
-			} else if (extension.equalsIgnoreCase("gif")) {
-				return IL_GIF;
-			} else if (extension.equalsIgnoreCase("ico")) {
-				return IL_ICO;
-			} else if (extension.equalsIgnoreCase("jpg")
-					|| extension.equalsIgnoreCase("jpeg")
-					|| extension.equalsIgnoreCase("jpe")) {
-				return IL.IL_JPG;
-			} else if (extension.equalsIgnoreCase("lif")) {
-				return IL_LIF;
-			} else if (extension.equalsIgnoreCase("mng")) {
-				return IL_MNG;
-			} else if (extension.equalsIgnoreCase("pcd")) {
-				return IL_PCD;
-			} else if (extension.equalsIgnoreCase("pcx")) {
-				return IL_PCX;
-			} else if (extension.equalsIgnoreCase("pic")) {
-				return IL_PIC;
-			} else if (extension.equalsIgnoreCase("png")) {
-				return IL_PNG;
-			} else if (extension.equalsIgnoreCase("pbm") || extension.equalsIgnoreCase("pgm")
-					|| extension.equalsIgnoreCase("ppm")) {
-				return IL_PNM;
-			} else if (extension.equalsIgnoreCase("psd")) {
-				return IL_PSD;
-			} else if (extension.equalsIgnoreCase("psp")) {
-				return IL_PSP;
-			} else if (extension.equalsIgnoreCase("bw") || extension.equalsIgnoreCase("rgb")
-					|| extension.equalsIgnoreCase("rgba") || extension.equalsIgnoreCase("sgi")) {
-				return IL_SGI;
-			} else if (extension.equalsIgnoreCase("tga")) {
-				return IL_TGA;
-			} else if (extension.equalsIgnoreCase("tif") || extension.equalsIgnoreCase("tiff")) {
-				return IL_TIF;
-			}
+	public static int ilGetType(String extension) {
+		// Save having to use equalsIgnoreCase all the time
+		extension = extension.toLowerCase();
+		int type = IL_TYPE_UNKNOWN;
+		
+		if (extension.equals("bmp")) {
+			type = IL_BMP;
+		} else if (extension.equals("cut")) {
+			type = IL_CUT;
+		} else if (extension.equals("gif")) {
+			type = IL_GIF;
+		} else if (extension.equals("ico")) {
+			type = IL_ICO;
+		} else if (extension.equals("jpg")) {
+			type = IL_JPG;
+		} else if (extension.equals("lif")) {
+			type = IL_LIF;
+		} else if (extension.equals("mng")) {
+			type = IL_MNG;
+		} else if (extension.equals("pcd")) {
+			type = IL_PCD;
+		} else if (extension.equals("pcx")) {
+			type = IL_PCX;
+		} else if (extension.equals("pic")) {
+			type = IL_PIC;
+		} else if (extension.equals("png")) {
+			type = IL_PNG;
+		} else if (extension.equals("pbm") || extension.equals("pgm")
+				|| extension.equals("ppm")) {
+			type = IL_PNM;
+		} else if (extension.equals("psd")) {
+			type = IL_PSD;
+		} else if (extension.equals("psp")) {
+			type = IL_PSP;
+		} else if (extension.equals("bw") || extension.equals("rgb")
+				|| extension.equals("rgba") || extension.equals("sgi")) {
+			type = IL_SGI;
+		} else if (extension.equals("tga")) {
+			type = IL_TGA;
+		} else if (extension.equals("tif") || extension.equals("tiff")) {
+			type = IL_TIF;
+		} else if (extension.equals("dds")) {
+			type = IL_DDS;
+		} else if (extension.equals("raw")) {
+			type = IL_RAW;
+		} else if (extension.equals("lbm")) {
+			type = IL_LBM;
+		} else if (extension.equals("jng")) {
+			type = IL_JNG;
+		} else if (extension.equals("wal")) {
+			type = IL_WAL;
+		} else if (extension.equals("pix")) {
+			type = IL_PIX;
+		} else if (extension.equals("mdl")) {
+			type = IL_MDL;
+		} else if (extension.equals("exif")) {
+			type = IL_EXIF;
+		} else if (extension.equals("oil")) {
+			type = IL_OIL;
+		} else if (extension.equals("dcx")) {
+			type = IL_DCX;
+		} else if (extension.equals("pxr")) {
+			type = IL_PXR;
+		} else if (extension.equals("xpm")) {
+			type = IL_XPM;
+		} else if (extension.equals("pal")) {
+			type = IL_JASC_PAL;
+		} else if (extension.equals("h")) {
+			type = IL_CHEAD;
 		}
-		return IL_TYPE_UNKNOWN;
+		
+		return type;
 	}
 
-
 	/**
 	 * Loads an image from the specified url
 	 * 
 	 * @param url URL to load from
 	 * @return true if image was loaded
 	 */
-	public static boolean ilLoadFromURL(URL url) {
-		boolean result = false;
-
+	public static boolean ilLoadFromURL(URL url) throws IOException {
+		int type = IL_TYPE_UNKNOWN;
+		
 		String file = url.toString();
-
-		// read stream
-		try {
-			result = ilLoadFromStream(url.openStream(), getILType(file));
-		} catch (IOException e) {
-			e.printStackTrace();
-			result = false;
+		int index = file.lastIndexOf('.');
+		if (index != -1) {
+			String extension = file.substring(index + 1);
+			type = ilGetType(extension);
 		}
-
-		return result;
+		return ilLoadFromStream(url.openStream(), type); 
 	}
 
 	/**
@@ -524,7 +546,7 @@
 	 * @param type Type of image to expect
 	 * @return true if image was loaded
 	 */
-	public static boolean ilLoadFromStream(InputStream stream, int type) {
+	public static boolean ilLoadFromStream(InputStream stream, int type) throws IOException {
 		boolean result = false;
 		int lastRead = 0;
 		byte[] buffer = new byte[4096];
@@ -542,8 +564,10 @@
 			lump.flip();
 			result = ilLoadL(type, lump);
 		} catch (IOException e) {
-			e.printStackTrace();
-			result = false;
+			try {
+				buf.close();
+			} catch (IOException f ) {}
+			throw e; 
 		}
 
 		return result;

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4963/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
use buffer.get since we dont have a backing array

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- MacOSXDisplay.java	5 Jul 2005 21:54:12 -0000	1.34
+++ MacOSXDisplay.java	7 Sep 2005 15:43:52 -0000	1.35
@@ -545,7 +545,8 @@
 		int height;
 		
 		width = height = (int) Math.sqrt(size);
-		int[] imageData = icons[biggest].asIntBuffer().array();
+		int[] imageData = new int[icons[biggest].remaining()];
+		icons[biggest].asIntBuffer().get(imageData);
 		
 		BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
 		img.setRGB(0, 0, width, height, imageData, 0, width);