java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3832
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3832&view=rev
Author:   spasi
Date:     2012-11-25 10:02:20 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Fixed duplicate fields in GL References.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessorFactory.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessorFactory.java	2012-11-25 01:34:08 UTC (rev 3831)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLReferencesGeneratorProcessorFactory.java	2012-11-25 10:02:20 UTC (rev 3832)
@@ -32,6 +32,7 @@
 
 package org.lwjgl.util.generator.opengl;
 
+import org.lwjgl.util.generator.Alternate;
 import org.lwjgl.util.generator.CachedReference;
 import org.lwjgl.util.generator.Utils;
 
@@ -138,12 +139,18 @@
 
 		private static void generateClearsFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
 			for (MethodDeclaration method : interface_decl.getMethods()) {
+				if ( method.getAnnotation(Alternate.class) != null )
+					continue;
+
 				generateClearsFromParameters(writer, interface_decl, method);
 			}
 		}
 
 		private static void generateCopiesFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
 			for (MethodDeclaration method : interface_decl.getMethods()) {
+				if ( method.getAnnotation(Alternate.class) != null )
+					continue;
+
 				generateCopiesFromParameters(writer, interface_decl, method);
 			}
 		}
@@ -164,6 +171,9 @@
 
 		private static void generateReferencesFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
 			for (MethodDeclaration method : interface_decl.getMethods()) {
+				if ( method.getAnnotation(Alternate.class) != null )
+					continue;
+
 				generateReferencesFromParameters(writer, interface_decl, method);
 			}
 		}

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

Revision: 3831
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3831&view=rev
Author:   spasi
Date:     2012-11-25 01:34:08 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
More alternate *Pointer functions with explicit type.

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	2012-11-25 00:54:00 UTC (rev 3830)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2012-11-25 01:34:08 UTC (rev 3831)
@@ -32,7 +32,6 @@
 package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.Alternate;
 import org.lwjgl.util.generator.opengl.*;
 
 import java.nio.*;
@@ -810,6 +809,14 @@
 	                    @GLbyte Buffer pointer);
 
 	@DeprecatedGL
+	@Alternate("glColorPointer")
+	void glColorPointer(int size, @GLenum int type, @GLsizei int stride,
+	                    @CachedReference
+	                    @Check
+	                    @BufferObject(BufferKind.ArrayVBO)
+	                    @Const ByteBuffer pointer);
+
+	@DeprecatedGL
 	void glColorMaterial(@GLenum int face, @GLenum int mode);
 
 	void glColorMask(boolean red, boolean green, boolean blue, boolean alpha);
@@ -1304,6 +1311,14 @@
 	                     @GLfloat
 	                     @GLdouble Buffer pointer);
 
+	@DeprecatedGL
+	@Alternate("glNormalPointer")
+	void glNormalPointer(@GLenum int type, @GLsizei int stride,
+	                     @CachedReference
+	                     @BufferObject(BufferKind.ArrayVBO)
+	                     @Check
+	                     @Const ByteBuffer pointer);
+
 	@NoErrorCheck
 	@DeprecatedGL
 	void glNormal3b(byte nx, byte ny, byte nz);
@@ -1443,6 +1458,14 @@
 	                     @GLfloat
 	                     @GLdouble Buffer pointer);
 
+	@DeprecatedGL
+	@Alternate("glVertexPointer")
+	void glVertexPointer(int size, @GLenum int type, @GLsizei int stride,
+	                     @CachedReference
+	                     @BufferObject(BufferKind.ArrayVBO)
+	                     @Check
+	                     @Const ByteBuffer pointer);
+
 	@NoErrorCheck
 	@DeprecatedGL
 	void glVertex2f(float x, float y);
@@ -1577,6 +1600,14 @@
 	                       @GLfloat
 	                       @GLdouble Buffer pointer);
 
+	@DeprecatedGL
+	@Alternate("glTexCoordPointer")
+	void glTexCoordPointer(int size, @GLenum int type, @GLsizei int stride,
+	                       @CachedReference(index = "StateTracker.getReferences(caps).glClientActiveTexture", name = "glTexCoordPointer_buffer")
+	                       @BufferObject(BufferKind.ArrayVBO)
+	                       @Check
+	                       @Const ByteBuffer pointer);
+
 	@NoErrorCheck
 	@DeprecatedGL
 	void glTexCoord1f(float s);

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

Revision: 3830
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3830&view=rev
Author:   spasi
Date:     2012-11-25 00:54:00 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Added alternative VertexAttribPointer with ByteBuffer data and explicit type.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2012-11-20 19:10:15 UTC (rev 3829)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2012-11-25 00:54:00 UTC (rev 3830)
@@ -32,7 +32,6 @@
 package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.Alternate;
 import org.lwjgl.util.generator.opengl.*;
 
 import java.nio.*;
@@ -49,13 +48,13 @@
 	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
-	int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
-	int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
-	int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
-	int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
-	int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
+	int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB    = 0x8B4A;
+	int GL_MAX_VARYING_FLOATS_ARB               = 0x8B4B;
+	int GL_MAX_VERTEX_ATTRIBS_ARB               = 0x8869;
+	int GL_MAX_TEXTURE_IMAGE_UNITS_ARB          = 0x8872;
+	int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB   = 0x8B4C;
 	int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
-	int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
+	int GL_MAX_TEXTURE_COORDS_ARB               = 0x8871;
 
 	/**
 	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
@@ -63,19 +62,19 @@
 	 * GetDoublev:
 	 */
 	int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
-	int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
+	int GL_VERTEX_PROGRAM_TWO_SIDE_ARB   = 0x8643;
 
 	/** Accepted by the <pname> parameter GetObjectParameter{if}vARB: */
-	int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
+	int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB           = 0x8B89;
 	int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
 
 	/** Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB: */
-	int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
-	int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
-	int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
-	int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
+	int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB    = 0x8622;
+	int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB       = 0x8623;
+	int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB     = 0x8624;
+	int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB       = 0x8625;
 	int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
-	int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+	int GL_CURRENT_VERTEX_ATTRIB_ARB          = 0x8626;
 
 	/** Accepted by the <pname> parameter of GetVertexAttribPointervARB: */
 	int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
@@ -141,6 +140,13 @@
 	                              @GLfloat
 	                              @GLdouble Buffer buffer);
 
+	@Alternate("glVertexAttribPointerARB")
+	void glVertexAttribPointerARB(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride,
+	                              @CachedReference(index = "index", name = "glVertexAttribPointer_buffer")
+	                              @BufferObject(BufferKind.ArrayVBO)
+	                              @Check
+	                              @Const ByteBuffer buffer);
+
 	void glEnableVertexAttribArrayARB(@GLuint int index);
 
 	void glDisableVertexAttribArrayARB(@GLuint int index);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-11-20 19:10:15 UTC (rev 3829)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-11-25 00:54:00 UTC (rev 3830)
@@ -367,6 +367,13 @@
 	                           @GLfloat
 	                           @GLdouble Buffer buffer);
 
+	@Alternate("glVertexAttribPointer")
+	void glVertexAttribPointer(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride,
+	                           @CachedReference(index = "index", name = "glVertexAttribPointer_buffer")
+	                           @BufferObject(BufferKind.ArrayVBO)
+	                           @Check
+	                           @Const ByteBuffer buffer);
+
 	void glEnableVertexAttribArray(@GLuint int index);
 
 	void glDisableVertexAttribArray(@GLuint int index);

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

Revision: 3829
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3829&view=rev
Author:   spasi
Date:     2012-11-20 19:10:15 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Added GREMEDY_frame_terminator.

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_frame_terminator.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_frame_terminator.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_frame_terminator.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GREMEDY_frame_terminator.java	2012-11-20 19:10:15 UTC (rev 3829)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2002-2012 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 GREMEDY_frame_terminator {
+
+	void glFrameTerminatorGREMEDY();
+
+}
\ No newline at end of file

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

Revision: 3828
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3828&view=rev
Author:   spasi
Date:     2012-11-20 10:42:54 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Fixed GetAsyncKeyState usage. We read the MSB, not the LSB.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-11-14 21:06:09 UTC (rev 3827)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-11-20 10:42:54 UTC (rev 3828)
@@ -154,6 +154,10 @@
 		return (state & 1) == 1;
 	}
 
+	private static boolean isKeyPressedAsync(int state) {
+		return (state >>> 31) == 1;
+	}
+
 	public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
 		virt_key = translateExtended(virt_key, scan_code, event_state, extended);
 		if ( !repeat && isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
@@ -176,7 +180,7 @@
 
 	public void fireLostKeyEvents() {
 		for ( int i = 0; i < virt_key_down_buffer.length; i++ ) {
-			if ( isKeyPressed(virt_key_down_buffer[i]) && !isKeyPressed(GetAsyncKeyState(i)) )
+			if ( isKeyPressed(virt_key_down_buffer[i]) && !isKeyPressedAsync(GetAsyncKeyState(i)) )
 				handleKey(i, 0, false, (byte)0, System.currentTimeMillis(), false);
 		}
 	}

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

Revision: 3827
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3827&view=rev
Author:   kappa1
Date:     2012-11-14 21:06:09 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Implement Mouse Dragging when using the Right Mouse Button or the Scroll Wheel Button

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-13 21:13:11 UTC (rev 3826)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-14 21:06:09 UTC (rev 3827)
@@ -294,6 +294,30 @@
     (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
 }
 
+- (void)rightMouseDragged:(NSEvent *)event {
+    JNIEnv *env = attachCurrentThread();
+    if (env == nil || event == nil || _parent == nil) {
+        return;
+    }
+    long time = [event timestamp] * 1000000000;
+    jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+    jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+    NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+    (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
+}
+
+- (void)otherMouseDragged:(NSEvent *)event {
+    JNIEnv *env = attachCurrentThread();
+    if (env == nil || event == nil || _parent == nil) {
+        return;
+    }
+    long time = [event timestamp] * 1000000000;
+    jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+    jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+    NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+    (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time);
+}
+
 - (void)mouseMoved:(NSEvent *)event {
     JNIEnv *env = attachCurrentThread();
     if (env == nil || event == nil || _parent == nil || _parent->jmouse == nil) {

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

Revision: 3826
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3826&view=rev
Author:   kappa1
Date:     2012-11-13 21:13:11 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Cleaned up code by removing unneeded java classes MacOSXFrame and MacOSXMouseEventQueue and native code by removing mouse.c

Modified Paths:
--------------
    branches/osx-java7/LWJGL/build.xml
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java

Removed Paths:
-------------
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.c

Modified: branches/osx-java7/LWJGL/build.xml
===================================================================
--- branches/osx-java7/LWJGL/build.xml	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/build.xml	2012-11-13 21:13:11 UTC (rev 3826)
@@ -316,7 +316,6 @@
 
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
 			<class name="org.lwjgl.MacOSXSysImplementation" />
-			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-13 21:13:11 UTC (rev 3826)
@@ -70,7 +70,7 @@
 	private MacOSXCanvasListener canvas_listener;
 	private Canvas canvas;
 	private Robot robot;
-	private MacOSXMouseEventQueue mouse_queue;
+	//private MacOSXMouseEventQueue mouse_queue;
 	private KeyboardEventQueue keyboard_queue;
 	private java.awt.DisplayMode requested_mode;
     
@@ -84,30 +84,10 @@
     private int width;
     private int height;
     
-    /* Whether we're using a native window or an AWT canvas */
-    private boolean native_mode;
+    private boolean close_requested;
 
-	private boolean close_requested;
-
 	MacOSXDisplay() {
-		try {
-			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-				public Object run() throws Exception {
-					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
-						public void handleQuit(ApplicationEvent event) {
-							doHandleQuit();
-						}
-					});
-					return null;
-				}
-			});
-		} catch (Throwable e) {
-			/**
-			 * In an applet environment, referencing com.apple.eawt.Application can fail with
-			 * a native exception. So log any exceptions instead of re-throwing.
-			 */
-			LWJGLUtil.log("Failed to register quit handler: " + e.getMessage());
-		}
+		
 	}
 
 	private native ByteBuffer nCreateWindow(int x, int y, int width, int height, boolean fullscreen, boolean undecorated, ByteBuffer peer_info_handle, ByteBuffer window_handle) throws LWJGLException;
@@ -142,7 +122,6 @@
             window = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(),
                                    fullscreen, isUndecorated(),
                                    peer_handle, window);
-            native_mode = true;
             this.x = x;
             this.y = y;
             this.width = mode.getWidth();
@@ -165,15 +144,8 @@
 	public native void nDestroyWindow(ByteBuffer window_handle);
 
 	public void destroyWindow() {
-        if (native_mode) {
-            nDestroyWindow(window);
-        } else {
-            if (canvas_listener != null) {
-                canvas_listener.disableListeners();
-                canvas_listener = null;
-            }
-        }
-		hideUI(false);
+        nDestroyWindow(window);
+        hideUI(false);
 	}
 
 	public int getGammaRampLength() {
@@ -213,11 +185,7 @@
 	}
 
 	public void resetDisplayMode() {
-        if (!native_mode) {
-            if (getDevice().getFullScreenWindow() != null)
-                getDevice().setFullScreenWindow(null);
-        }
-		requested_mode = null;
+        requested_mode = null;
 		restoreGamma();
 	}
 
@@ -273,12 +241,8 @@
 	}
 
 	public boolean isActive() {
-        if (native_mode) {
-            boolean ret = nIsFocused(window);
-            return ret;
-        } else {
-            return canvas.isFocusOwner();
-        }
+        boolean ret = nIsFocused(window);
+        return ret;
 	}
 
 	public Canvas getCanvas() {
@@ -300,10 +264,7 @@
 	private static final IntBuffer current_viewport = BufferUtils.createIntBuffer(16);
 	public void update() {
 		boolean should_update = true;
-        if (!native_mode) {
-            should_update = canvas_listener.syncShouldUpdateContext();
-        }
-		/*
+        /*
 		 * Workaround for the "white screen in fullscreen mode" problem
 		 *
 		 * Sometimes, switching from windowed mode to fullscreen or simply creating the Display
@@ -331,14 +292,6 @@
 			glGetInteger(GL_VIEWPORT, current_viewport);
 			glViewport(current_viewport.get(0), current_viewport.get(1), current_viewport.get(2), current_viewport.get(3));
 		}
-        /*
-		if (frame != null && mouse_queue != null) {
-			if (frame.syncShouldReleaseCursor())
-				MacOSXMouseEventQueue.nGrabMouse(false);
-			if (frame.syncShouldWarpCursor())
-				mouse_queue.warpCursor();
-		}
-         */
 	}
 
 	/**
@@ -369,52 +322,29 @@
 	}
 
 	public void createMouse() throws LWJGLException {
-        if (native_mode) {
-            mouse = new MacOSXNativeMouse(this, window);
-            mouse.register();
-        } else {
-            mouse_queue = new MacOSXMouseEventQueue(canvas);
-            mouse_queue.register();
-        }
+        mouse = new MacOSXNativeMouse(this, window);
+        mouse.register();
 	}
 
 	public void destroyMouse() {
-        MacOSXMouseEventQueue.nGrabMouse(false);
-        if (native_mode) {
-            if (mouse != null) {
-                mouse.unregister();
-            }
-            mouse = null;
-        } else {
-            if (mouse_queue != null) {
-                mouse_queue.unregister();
-            }
-            mouse_queue = null;
+        //MacOSXMouseEventQueue.nGrabMouse(false);
+        
+        if (mouse != null) {
+        		mouse.unregister();
         }
+        mouse = null;
 	}
 
 	public void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons_buffer) {
-        if (native_mode) {
-            mouse.poll(coord_buffer, buttons_buffer);
-        } else {
-            mouse_queue.poll(coord_buffer, buttons_buffer);
-        }
+		mouse.poll(coord_buffer, buttons_buffer);
 	}
 
 	public void readMouse(ByteBuffer buffer) {
-        if (native_mode) {
-            mouse.copyEvents(buffer);
-        } else {
-            mouse_queue.copyEvents(buffer);
-        }
+		mouse.copyEvents(buffer);
 	}
 
 	public void grabMouse(boolean grab) {
-        if (native_mode) {
-            mouse.setGrabbed(grab);
-        } else {
-            mouse_queue.setGrabbed(grab);
-        }
+		mouse.setGrabbed(grab);
 	}
 
 	public int getNativeCursorCapabilities() {
@@ -422,7 +352,10 @@
 	}
 
 	public void setCursorPosition(int x, int y) {
-        MacOSXMouseEventQueue.nWarpCursor(x, y);
+		if (mouse != null) {
+			mouse.warpCursor(x, y);
+		}
+        //MacOSXMouseEventQueue.nWarpCursor(x, y);
 	}
 
 	public void setNativeCursor(Object handle) throws LWJGLException {
@@ -438,41 +371,23 @@
 
 	/* Keyboard */
 	public void createKeyboard() throws LWJGLException {
-        if (native_mode) {
-            this.keyboard = new MacOSXNativeKeyboard(window);
-            keyboard.register();
-        } else {
-            this.keyboard_queue = new KeyboardEventQueue(canvas);
-            keyboard_queue.register();
-        }
+        this.keyboard = new MacOSXNativeKeyboard(window);
+        keyboard.register();
 	}
 
 	public void destroyKeyboard() {
-        if (native_mode) {
-            if (keyboard != null)
-                keyboard.unregister();
-            keyboard = null;
-        } else {
-            if (keyboard_queue != null)
-                keyboard_queue.unregister();
-            keyboard_queue = null;
-        }
+		if (keyboard != null) {
+			keyboard.unregister();
+		}
+		keyboard = null;
 	}
 
 	public void pollKeyboard(ByteBuffer keyDownBuffer) {
-        if (native_mode) {
-            keyboard.poll(keyDownBuffer);
-        } else {
-            keyboard_queue.poll(keyDownBuffer);
-        }
+		keyboard.poll(keyDownBuffer);
 	}
 
 	public void readKeyboard(ByteBuffer buffer) {
-        if (native_mode) {
-            keyboard.copyEvents(buffer);
-        } else {
-            keyboard_queue.copyEvents(buffer);
-        }
+		keyboard.copyEvents(buffer);
 	}
 
 	/** Native cursor handles */
@@ -577,9 +492,7 @@
     }
 
     public void setResizable(boolean resizable) {
-        if (native_mode) {
-            nSetResizable(window, resizable);
-        }
+        nSetResizable(window, resizable);
 	}
 
 	public boolean wasResized() {

Deleted: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java	2012-11-13 21:13:11 UTC (rev 3826)
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2002-2008 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 Mac OS X AWT Frame. It contains thread safe
- * methods to manipulateit from non-AWT threads
- * @author elias_naur
- */
-
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Insets;
-import java.awt.Rectangle;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import org.lwjgl.LWJGLException;
-
-final class MacOSXFrame extends Frame implements WindowListener, ComponentListener {
-
-	private static final long serialVersionUID = -5823294716668988777L;
-
-	private final MacOSXGLCanvas canvas;
-	private boolean close_requested;
-
-	/* States */
-	private Rectangle bounds;
-	private boolean active;
-	private boolean minimized;
-	private boolean should_warp_cursor;
-	private boolean should_release_cursor;
-
-	MacOSXFrame(DisplayMode mode, final java.awt.DisplayMode requested_mode, boolean fullscreen, int x, int y) throws LWJGLException {
-		setResizable(Display.isResizable());
-		addWindowListener(this);
-		addComponentListener(this);
-		canvas = new MacOSXGLCanvas();
-		canvas.setFocusTraversalKeysEnabled(false);
-		add(canvas, BorderLayout.CENTER);
-		boolean undecorated = Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated");
-		setUndecorated(fullscreen || undecorated);
-		if ( fullscreen ) {
-			try {
-				AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-					public Object run() throws Exception {
-						getDevice().setFullScreenWindow(MacOSXFrame.this);
-						getDevice().setDisplayMode(requested_mode);
-						java.awt.DisplayMode real_mode = getDevice().getDisplayMode();
-						/** For some strange reason, the display mode is sometimes silently capped even though the mode is reported as supported */
-						if ( requested_mode.getWidth() != real_mode.getWidth() || requested_mode.getHeight() != real_mode.getHeight() ) {
-							getDevice().setFullScreenWindow(null);
-							if (isDisplayable())
-								dispose();
-							throw new LWJGLException("AWT capped mode: requested mode = " + requested_mode.getWidth() + "x" + requested_mode.getHeight() +
-								" but got " + real_mode.getWidth() + " " + real_mode.getHeight());
-						}
-						return null;
-					}
-				});
-			} catch (PrivilegedActionException e) {
-				throw new LWJGLException(e);
-			}
-		}
-		pack();
-		resize(x, y, mode.getWidth(), mode.getHeight());
-		setVisible(true);
-		requestFocus();
-		canvas.requestFocus();
-		updateBounds();
-	}
-
-	public void resize(int x, int y, int width, int height) {
-		Insets insets = getInsets();
-		setBounds(x, y, width + insets.left + insets.right, height + insets.top + insets.bottom);
-	}
-	
-	public int getWidth() {
-		Insets insets = getInsets();
-		return super.getWidth() - insets.left - insets.right;
-	}
-
-	public int getHeight() {
-		Insets insets = getInsets();
-		return super.getHeight() - insets.top - insets.bottom;
-	}
-
-	public Rectangle syncGetBounds() {
-		synchronized ( this ) {
-			return bounds;
-		}
-	}
-
-	public void componentShown(ComponentEvent e) {
-	}
-
-	public void componentHidden(ComponentEvent e) {
-	}
-
-	private void updateBounds() {
-		synchronized ( this ) {
-			bounds = getBounds();
-		}
-	}
-
-	public void componentResized(ComponentEvent e) {
-		updateBounds();
-	}
-
-	public void componentMoved(ComponentEvent e) {
-		updateBounds();
-	}
-
-	public static GraphicsDevice getDevice() {
-		GraphicsEnvironment g_env = GraphicsEnvironment.getLocalGraphicsEnvironment();
-		GraphicsDevice device = g_env.getDefaultScreenDevice();
-		return device;
-	}
-
-	public void windowIconified(WindowEvent e) {
-		synchronized ( this ) {
-			minimized = true;
-		}
-	}
-
-	public void windowDeiconified(WindowEvent e) {
-		synchronized ( this ) {
-			minimized = false;
-		}
-	}
-
-	public void windowOpened(WindowEvent e) {
-	}
-
-	public void windowClosed(WindowEvent e) {
-	}
-
-	public void windowClosing(WindowEvent e) {
-		synchronized ( this ) {
-			close_requested = true;
-		}
-	}
-
-	public void windowDeactivated(WindowEvent e) {
-		synchronized ( this ) {
-			active = false;
-			should_release_cursor = true;
-			should_warp_cursor = false;
-		}
-	}
-
-	public void windowActivated(WindowEvent e) {
-		synchronized ( this ) {
-			active = true;
-			should_warp_cursor = true;
-			should_release_cursor = false;
-		}
-	}
-
-	public boolean syncIsCloseRequested() {
-		boolean result;
-		synchronized ( this ) {
-			result = close_requested;
-			close_requested = false;
-		}
-		return result;
-	}
-
-	public boolean syncIsVisible() {
-		synchronized ( this ) {
-			return !minimized;
-		}
-	}
-
-	public boolean syncIsActive() {
-		synchronized ( this ) {
-			return active;
-		}
-	}
-
-	public MacOSXGLCanvas getCanvas() {
-		return canvas;
-	}
-
-	public boolean syncShouldReleaseCursor() {
-		boolean result;
-		synchronized ( this ) {
-			result = should_release_cursor;
-			should_release_cursor = false;
-		}
-		return result;
-	}
-
-	public boolean syncShouldWarpCursor() {
-		boolean result;
-		synchronized ( this ) {
-			result = should_warp_cursor;
-			should_warp_cursor = false;
-		}
-		return result;
-	}
-}

Deleted: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXMouseEventQueue.java	2012-11-13 21:13:11 UTC (rev 3826)
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2002-2008 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;
-
-/**
- * An AWT implementation of a LWJGL compatible Mouse event queue.
- * @author elias_naur
- */
-
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.nio.IntBuffer;
-
-import org.lwjgl.BufferUtils;
-
-final class MacOSXMouseEventQueue extends MouseEventQueue {
-    private IntBuffer delta_buffer = BufferUtils.createIntBuffer(2);
-    
-    private boolean skip_event;
-    private static boolean is_grabbed;
-	
-	MacOSXMouseEventQueue(Component component) {
-        super(component);
-	}
-
-	public void setGrabbed(boolean grab) {
-		if (is_grabbed != grab) {
-			super.setGrabbed(grab);
-			warpCursor();
-			grabMouse(grab);
-		}
-	}
-	
-	private static synchronized void grabMouse(boolean grab) {
-		is_grabbed = grab;
-		if (!grab)
-			nGrabMouse(grab);
-	}
-
-	protected void resetCursorToCenter() {
-		super.resetCursorToCenter();
-		/* Clear accumulated deltas */
-		getMouseDeltas(delta_buffer);
-	}
-
-	protected void updateDeltas(long nanos) {
-		super.updateDeltas(nanos);
-		synchronized ( this ) {
-			getMouseDeltas(delta_buffer);
-			int dx = delta_buffer.get(0);
-			int dy = -delta_buffer.get(1);
-			if (skip_event) {
-				skip_event = false;
-				nGrabMouse(isGrabbed());
-				return;
-			}
-			if ( dx != 0 || dy != 0 ) {
-				putMouseEventWithCoords((byte)-1, (byte)0, dx, dy, 0, nanos);
-				addDelta(dx, dy);
-			}
-		}
-	}
-
-	void warpCursor() {
-		synchronized (this) {
-			// If we're going to warp the cursor position, we'll skip the next event to avoid bogus delta values
-			skip_event = isGrabbed();
-		}
-	}
-
-	private static native void getMouseDeltas(IntBuffer delta_buffer);
-
-	public static native void nWarpCursor(int x, int y);
-
-	public static native void nGrabMouse(boolean grab);
-}

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java	2012-11-13 21:13:11 UTC (rev 3826)
@@ -92,6 +92,10 @@
         nRegisterMouseListener(window_handle);
     }
     
+    public synchronized void warpCursor(int x, int y) {
+    		nWarpCursor(window_handle, x, y);
+    }
+    
     public synchronized void unregister() {
         nUnregisterMouseListener(window_handle);
     }

Deleted: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.c
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.c	2012-11-11 19:03:50 UTC (rev 3825)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.c	2012-11-13 21:13:11 UTC (rev 3826)
@@ -1,73 +0,0 @@
-/* 
- * Copyright (c) 2002-2008 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$
- *
- * Mac OS X mouse handling.
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- */
-
-#include <jni.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include "org_lwjgl_opengl_MacOSXMouseEventQueue.h"
-#include "common_tools.h"
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXMouseEventQueue_nGrabMouse(JNIEnv *env, jclass unused, jboolean grab) {
-	CGAssociateMouseAndMouseCursorPosition(grab == JNI_TRUE ? FALSE : TRUE);
-	if (grab)
-		CGDisplayHideCursor(kCGDirectMainDisplay);
-	else
-		CGDisplayShowCursor(kCGDirectMainDisplay);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXMouseEventQueue_nWarpCursor(JNIEnv *env, jclass unused, jint x, jint y) {
-	CGPoint p;
-	p.x = x;
-	p.y = y;
-	CGWarpMouseCursorPosition(p);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXMouseEventQueue_getMouseDeltas(JNIEnv *env, jclass unused, jobject delta_buffer) {
-	CGMouseDelta dx, dy;
-	CGGetLastMouseDelta(&dx, &dy);
-	int buffer_length = (*env)->GetDirectBufferCapacity(env, delta_buffer);
-	if (buffer_length != 2) {
-		printfDebugJava(env, "Delta buffer not large enough!");
-		return;
-	}
-	jint *buffer = (*env)->GetDirectBufferAddress(env, delta_buffer);
-	buffer[0] = dx;
-	buffer[1] = dy;
-}

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

Revision: 3825
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3825&view=rev
Author:   kappa1
Date:     2012-11-11 19:03:50 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
fix resizing when using Display.setParent()

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-11 18:43:14 UTC (rev 3824)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-11 19:03:50 UTC (rev 3825)
@@ -583,11 +583,7 @@
 	}
 
 	public boolean wasResized() {
-        if (native_mode) {
-            return nWasResized(window);
-        } else {
-            return canvas_listener.wasResized();
-        }
+        return nWasResized(window);
 	}
 
 }

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

Revision: 3824
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3824&view=rev
Author:   kappa1
Date:     2012-11-11 18:43:14 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
implement missing functionality for Display.getWidth() and Display.getHeight() not updating correctly on resize

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-11 15:48:08 UTC (rev 3823)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-11-11 18:43:14 UTC (rev 3824)
@@ -121,6 +121,10 @@
 	private native void nResizeWindow(ByteBuffer window_handle, int x, int y, int width, int height);
     
 	private native boolean nWasResized(ByteBuffer window_handle);
+	
+	private native int nGetWidth(ByteBuffer window_handle);
+	
+	private native int nGetHeight(ByteBuffer window_handle);
     
 	private static boolean isUndecorated() {
 		return Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated");
@@ -561,11 +565,11 @@
 	}
 
 	public int getWidth() {
-        return width;
+        return nGetWidth(window);
 	}
-
+	
 	public int getHeight() {
-        return height;
+        return nGetHeight(window);
 	}
 
     public boolean isInsideWindow() {

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-11 15:48:08 UTC (rev 3823)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-11 18:43:14 UTC (rev 3824)
@@ -370,6 +370,18 @@
     return was_resized;
 }
 
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nGetWidth(JNIEnv *env, jobject this, jobject window_handle) {
+	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+    jint width = window_info->display_rect.size.width;
+    return width;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nGetHeight(JNIEnv *env, jobject this, jobject window_handle) {
+	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+    jint height = window_info->display_rect.size.height;
+    return height;
+}
+
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nSetResizable(JNIEnv *env, jobject this, jobject window_handle, jboolean resizable) {
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
     NSUInteger style_mask = [window_info->window styleMask];

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

Revision: 3823
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3823&view=rev
Author:   kappa1
Date:     2012-11-11 15:48:08 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Run some Cocoa methods in nCreateWindow on the main thread (Thread-0) instead of the JNI thread.

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-10 00:42:34 UTC (rev 3822)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-11 15:48:08 UTC (rev 3823)
@@ -430,10 +430,14 @@
     [window_info->view setParent:window_info];
     
     [window_info->window setContentView:window_info->view];
-    [window_info->window makeKeyAndOrderFront:[NSApplication sharedApplication]];
-    [window_info->window makeFirstResponder:window_info->view];
-    [window_info->window setReleasedWhenClosed:YES];
-    [window_info->window setInitialFirstResponder:window_info->view];
+    //[window_info->window makeKeyAndOrderFront:[NSApplication sharedApplication]];
+    //[window_info->window makeFirstResponder:window_info->view];
+    //[window_info->window setReleasedWhenClosed:YES];
+    //[window_info->window setInitialFirstResponder:window_info->view];
+	[window_info->window performSelectorOnMainThread:@selector(makeKeyAndOrderFront:) withObject:[NSApplication sharedApplication] waitUntilDone:NO];
+    [window_info->window performSelectorOnMainThread:@selector(makeFirstResponder:) withObject:window_info->view waitUntilDone:NO];
+    [window_info->window performSelectorOnMainThread:@selector(setReleasedWhenClosed:) withObject:window_info->window waitUntilDone:NO];
+    [window_info->window performSelectorOnMainThread:@selector(setInitialFirstResponder:) withObject:window_info->view waitUntilDone:NO];
 
     if (window_info->window_options != NSApplicationPresentationDefault) {
         printf("Non-default\n"); fflush(stdout);

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

Revision: 3822
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3822&view=rev
Author:   kappa1
Date:     2012-11-10 00:42:34 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Switch to using the correct Cocoa method for Display.isCloseRequested()

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-06 21:55:11 UTC (rev 3821)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-10 00:42:34 UTC (rev 3822)
@@ -78,16 +78,14 @@
     return default_format;
 }
 
-- (void) windowWillClose:(NSNotification *)notification
-{
-    MacOSXKeyableWindow *closingWindow = [notification object];
-    
-    if (_parent != nil && closingWindow == _parent->window) {
+- (BOOL)windowShouldClose:(id)sender {
+	if (_parent != nil) {
         JNIEnv *env = attachCurrentThread();
         jclass display_class = (*env)->GetObjectClass(env, _parent->jdisplay);
         jmethodID close_callback = (*env)->GetMethodID(env, display_class, "doHandleQuit", "()V");
         (*env)->CallVoidMethod(env, _parent->jdisplay, close_callback);
     }
+	return NO;
 }
 
 - (id)initWithFrame:(NSRect)frameRect pixelFormat:(NSOpenGLPixelFormat*)format
@@ -163,18 +161,10 @@
 }
 
 - (void)setParent:(MacOSXWindowInfo*)parent {
-    // Un-register for native window close events if we have a parent window already
-    if (_parent != nil) {
-        [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                 name:NSWindowWillCloseNotification
-                                                   object:_parent->window];
-    }
     _parent = parent;
-    // Register for native window close events if we now have a parent window
+    // Set this NSView as delegate to get native window close events for windowShouldClose method
     if (_parent != nil) {
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(windowWillClose:) name:NSWindowWillCloseNotification
-                                                   object:_parent->window];
+        [_parent->window setDelegate:self];
     }
 }
 

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

Revision: 3821
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3821&view=rev
Author:   kappa1
Date:     2012-11-06 21:55:11 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Fix main build file to generate MacOSXNativeKeyboard and MacOSXNativeMouse native headers

Modified Paths:
--------------
    branches/osx-java7/LWJGL/build.xml

Modified: branches/osx-java7/LWJGL/build.xml
===================================================================
--- branches/osx-java7/LWJGL/build.xml	2012-11-06 21:45:45 UTC (rev 3820)
+++ branches/osx-java7/LWJGL/build.xml	2012-11-06 21:55:11 UTC (rev 3821)
@@ -322,6 +322,8 @@
 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
+			<class name="org.lwjgl.opengl.MacOSXNativeKeyboard" />
+			<class name="org.lwjgl.opengl.MacOSXNativeMouse" />
 		</javah>
 
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">

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

Revision: 3820
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3820&view=rev
Author:   kappa1
Date:     2012-11-06 21:45:45 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
upload mc78's latest build.xml fixes, gets rid of the depreciated warnings

Modified Paths:
--------------
    branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml

Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-06 16:18:28 UTC (rev 3819)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-06 21:45:45 UTC (rev 3820)
@@ -7,8 +7,11 @@
 		<mkdir dir="x86_64"/>
 		<property environment="env" />
 		<!-- Check which gcc we have, newer releasse of Mac OS do not have gcc-4.2 installed by defaault -->
-		<available file="gcc" filepath="${env.PATH}" property="gcc" value="gcc"/>
-		<available file="gcc-4.2" filepath="${env.PATH}" property="gcc" value="gcc-4.2"/>
+		<available file="gcc" filepath="${env.PATH}" property="gcc.name" value="gcc"/>
+		<available file="gcc-4.2" filepath="${env.PATH}" property="gcc42.name" value="gcc-4.2"/>
+		<condition property="gcc" value="${gcc42.name}" else="${gcc.name}">
+			<isset property="gcc42.name" />
+		</condition>
 		<!-- Ask Xcode for correct path to XCode tools -->
 		<!-- Will fail if XCode Command Line Tools are not installed on 10.7+ (Lion) -->
 		<exec executable="xcode-select" outputproperty="developer_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
@@ -18,33 +21,77 @@
 		<condition property="developer_path" value="/Developer">
 			<isset property="xcode-select.error" />
 		</condition>
-		<!-- Lion and above do not have /Developer nor the 10.6 SDK, so use 10.7 SDK -->
-		<condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+		<!-- Detect Mac OS X 10.7 SDK in new Xcode path for for Mac OS  10.7+ -->
+		<condition property="sdk-10.7" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
 			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" type="dir"/>
 		</condition>
-		<condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+		<condition property="javavm-10.7" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
 			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
 		</condition>
-		<!-- Fallback to 10.6 SDK if present on file system under new Xcode location -->
-		<condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+		<!-- Detect Mac OS X 10.6 SDK copied into new Xcode path for Mac OS  10.7+ -->
+		<condition property="sdk-10.6" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
 			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" type="dir"/>
 		</condition>
-		<condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+		<condition property="javavm-10.6" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
 			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
 		</condition>
-		<!-- Fallback to 10.6 SDK if present on old /Developer path -->
-		<condition property="sdkroot" value="${developer_path}/SDKs/MacOSx10.6.sdk">
+		<!-- Detect Mac OS X 10.6 SDK in old XCode location for Mac OS 10.6 -->
+		<condition property="old.sdk-10.6" value="${developer_path}/SDKs/MacOSx10.6.sdk">
 			<available file="${developer_path}/SDKs/MacOSx10.6.sdk" type="dir"/>
 		</condition>
-		<!-- Only use /System/Library/Frameworks/JavaVM.framework/ if nothing under other SDK's is found -->
-		<condition property="javavmroot" value="">
+		<condition property="old.javavm-10.6" value="">
+			<available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+		</condition>
+		<!-- Use old JavaVM.framework location if nothing else is available -->
+		<condition property="javavmroot" value="${old.javavm-10.6}">
 			<and>
-				<available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+				<isset property="old.javavm-10.6" />
 				<not>
-					<isset property="javavmroot" />
+					<or>
+						<isset property="javavm-10.6" />
+						<isset property="javavm-10.7" />
+					</or>
 				</not>
 			</and>
 		</condition>
+		<!-- Use JavaVM.framework from 10.6 in new Xcode path if available -->
+		<condition property="javavmroot" value="${javavm-10.6}">
+			<isset property="javavm-10.6" />
+		</condition>
+		<!-- Use JavaVM.framework from 10.7 in new Xcode path if available and 10.6 isn't also there -->
+		<condition property="javavmroot" value="${javavm-10.7}">
+			<and>
+				<isset property="javavm-10.7" />
+				<not>
+					<isset property="javavm-10.6" />
+				</not>
+			</and>
+		</condition>
+		<!-- Use MacOS SDK 10.6 from /Developer if nothing else is available -->
+		<condition property="sdkroot" value="${old.sdk-10.6}">
+			<and>
+				<isset property="old.sdk-10.6" />
+				<not>
+					<or>
+						<isset property="sdk-10.6" />
+						<isset property="sdk-10.7" />
+					</or>
+				</not>
+			</and>
+		</condition>
+		<!-- Use MacOS SDK 10.6 from new Xcode location if available -->
+		<condition property="sdkroot" value="${sdk-10.6}">
+			<isset property="sdk-10.6" />
+		</condition>
+		<!-- Use MacOS SDK 10.7 in new Xcode path if available and 10.6 SDK isn't also there -->
+		<condition property="sdkroot" value="${sdk-10.7}">
+			<and>
+				<isset property="sdk-10.7" />
+				<not>
+					<isset property="sdk-10.6" />
+				</not>
+			</and>
+		</condition>
 	</target>
 
 	<target name="clean">
@@ -83,6 +130,9 @@
 	</target>
 
 	<target name="nativelibrary" depends="init">
+		<echo message="             GCC: ${gcc}"/>
+		<echo message="      Mac OS SDK: ${sdkroot}"/>
+		<echo message="JavaVM.framework: ${javavmroot}"/>
 		<property name="universal_sdkroot" location="${sdkroot}"/>
 		<property name="x86_64_sdkroot" location="${sdkroot}"/>
 		<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
@@ -123,4 +173,4 @@
 			<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
 		</apply>
 	</target>
-</project>
+</project>
\ No newline at end of file

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

Revision: 3819
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3819&view=rev
Author:   spasi
Date:     2012-11-06 16:18:28 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Added missing alternative signature functions.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-11-06 12:14:03 UTC (rev 3818)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-11-06 16:18:28 UTC (rev 3819)
@@ -64,11 +64,19 @@
 	@Reuse("GL40")
 	int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
 
+	@Alternate("glGetSubroutineUniformLocation")
 	@Reuse("GL40")
+	int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
+	@Reuse("GL40")
 	@GLuint
 	int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
 
+	@Alternate("glGetSubroutineIndex")
 	@Reuse("GL40")
+	int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
+	@Reuse("GL40")
 	@StripPostfix("values")
 	void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                    @Check("1") @OutParameter IntBuffer values);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-11-06 12:14:03 UTC (rev 3818)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-11-06 16:18:28 UTC (rev 3819)
@@ -218,9 +218,16 @@
 
 	int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
 
+	@Alternate("glGetSubroutineUniformLocation")
+	int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
 	@GLuint
 	int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
 
+	@Alternate("glGetSubroutineIndex")
+	@GLuint
+	int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
 	@StripPostfix("values")
 	void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                    @OutParameter @Check("1") IntBuffer values);

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

Revision: 3818
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3818&view=rev
Author:   spasi
Date:     2012-11-06 12:14:03 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Removed redundant GLsync definition and replaced APIENTRY with GL_APIENTRY.

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/opengles/extgl.h
    trunk/LWJGL/src/native/common/opengles/extgl_types.h

Modified: trunk/LWJGL/src/native/common/opengles/extgl.h
===================================================================
--- trunk/LWJGL/src/native/common/opengles/extgl.h	2012-11-06 00:34:36 UTC (rev 3817)
+++ trunk/LWJGL/src/native/common/opengles/extgl.h	2012-11-06 12:14:03 UTC (rev 3818)
@@ -79,7 +79,7 @@
 #include "extgl_types.h"
 
 /* KHR_debug callback function pointer. */
-typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
+typedef void (GL_APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
 
 /* initializes everything, call this right after the rc is created. the function returns true if successful */
 extern bool extgl_Open(JNIEnv *env);

Modified: trunk/LWJGL/src/native/common/opengles/extgl_types.h
===================================================================
--- trunk/LWJGL/src/native/common/opengles/extgl_types.h	2012-11-06 00:34:36 UTC (rev 3817)
+++ trunk/LWJGL/src/native/common/opengles/extgl_types.h	2012-11-06 12:14:03 UTC (rev 3818)
@@ -70,7 +70,4 @@
 // EGL_image_OES
 typedef void* GLeglImageOES;
 
-// We need this to compile OpenCL
-typedef struct __GLsync *   GLsync;
-
 #endif
\ No newline at end of file

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

Revision: 3817
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3817&view=rev
Author:   kappa1
Date:     2012-11-06 00:34:36 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
remove unused AWT import

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-11-05 23:19:46 UTC (rev 3816)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-11-06 00:34:36 UTC (rev 3817)
@@ -31,8 +31,6 @@
  */
 package org.lwjgl;
 
-import java.awt.Toolkit;
-
 import com.apple.eio.FileManager;
 
 /**

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

Revision: 3816
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3816&view=rev
Author:   kappa1
Date:     2012-11-05 23:19:46 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Remove unneeded old hack for OS X 10.3 in the mac Sys class implementation which loaded the AWT Toolkit

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java

Modified: branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-11-05 23:17:34 UTC (rev 3815)
+++ branches/osx-java7/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2012-11-05 23:19:46 UTC (rev 3816)
@@ -44,11 +44,6 @@
 final class MacOSXSysImplementation extends J2SESysImplementation {
 	private static final int JNI_VERSION = 23;
 
-	static {
-		// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
-		Toolkit.getDefaultToolkit();
-	}
-
 	public int getRequiredJNIVersion() {
 		return JNI_VERSION;
 	}

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

Revision: 3815
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3815&view=rev
Author:   kappa1
Date:     2012-11-05 23:17:34 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Added support to the OS X build.xml for Xcode location discovery, Mac OS SDK discovery, JavaVM.framework discovery and gcc vs gcc-4.2 discovery, special thanks to MC78 for providing this patch

Modified Paths:
--------------
    branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml

Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-04 20:11:03 UTC (rev 3814)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-05 23:17:34 UTC (rev 3815)
@@ -1,86 +1,126 @@
-
-<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
-	<property name="native" location="../../src/native"/>
-
-	<target name="init">
-		<mkdir dir="i386"/>
-		<mkdir dir="x86_64"/>
-	</target>
-
-	<target name="clean">
-		<delete failonerror="false">
-			<fileset dir="i386"/>
-			<fileset dir="x86_64"/>
-			<fileset dir="." includes="liblwjgl.jnilib"/>
-			<fileset dir="." includes="lwjgl.symbols"/>
-		</delete>
-	</target>
-
-	<target name="compile">
-		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx"/>
-			<!-- Map from *.m and *.c to .o -->
-			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
-			<fileset dir="${native}/macosx" includes="*.m"/>
-			<fileset dir="${native}/macosx" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*.c"/>
-			<fileset dir="${native}/common/opengl" includes="*.c"/>
-			<fileset dir="${native}/generated/openal" includes="*.c"/>
-			<fileset dir="${native}/generated/opencl" includes="*.c"/>
-			<fileset dir="${native}/generated/opengl" includes="*.c"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
-			<fileset dir="${objdir}" includes="*.o"/>
-		</apply>
-		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
-			<arg line="-S -X"/>
-			<fileset dir="." file="${libname}"/>
-		</apply>
-	</target>
-
-	<target name="nativelibrary" depends="init">
-		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
-		<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
-		<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
-		<antcall target="compile">
-			<param name="dstdir" location="i386"/>
-			<param name="compiler" value="gcc-4.2"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
-		</antcall>
-		<antcall target="compile">
-			<param name="dstdir" location="x86_64"/>
-			<param name="compiler" value="gcc-4.2"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
-		</antcall>
-		<exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
-			<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
-			<arg path="i386"/>
-		</exec>
-		<antcall target="link">
-			<param name="objdir" location="i386"/>
-			<param name="libname" value="liblwjgl-i386.jnilib"/>
-			<param name="linker" value="gcc-4.2"/>
-			<param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="x86_64"/>
-			<param name="libname" value="liblwjgl-i86_64.jnilib"/>
-			<param name="linker" value="gcc-4.2"/>
-			<param name="linkerflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
-		</antcall>
-		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
-			<arg value="-create"/>
-			<srcfile/>
-			<arg value="-output"/>
-			<arg path="liblwjgl.jnilib"/>
-			<fileset file="i386/liblwjgl-i386.jnilib"/>
-			<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
-		</apply>
-	</target>
-</project>
+
+<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
+	<property name="native" location="../../src/native"/>
+
+	<target name="init">
+		<mkdir dir="i386"/>
+		<mkdir dir="x86_64"/>
+		<property environment="env" />
+		<!-- Check which gcc we have, newer releasse of Mac OS do not have gcc-4.2 installed by defaault -->
+		<available file="gcc" filepath="${env.PATH}" property="gcc" value="gcc"/>
+		<available file="gcc-4.2" filepath="${env.PATH}" property="gcc" value="gcc-4.2"/>
+		<!-- Ask Xcode for correct path to XCode tools -->
+		<!-- Will fail if XCode Command Line Tools are not installed on 10.7+ (Lion) -->
+		<exec executable="xcode-select" outputproperty="developer_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
+			<arg value="-print-path" />
+		</exec>
+		<!-- Default to /Developer if xcode-select fails -->
+		<condition property="developer_path" value="/Developer">
+			<isset property="xcode-select.error" />
+		</condition>
+		<!-- Lion and above do not have /Developer nor the 10.6 SDK, so use 10.7 SDK -->
+		<condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" type="dir"/>
+		</condition>
+		<condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+		</condition>
+		<!-- Fallback to 10.6 SDK if present on file system under new Xcode location -->
+		<condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" type="dir"/>
+		</condition>
+		<condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+			<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+		</condition>
+		<!-- Fallback to 10.6 SDK if present on old /Developer path -->
+		<condition property="sdkroot" value="${developer_path}/SDKs/MacOSx10.6.sdk">
+			<available file="${developer_path}/SDKs/MacOSx10.6.sdk" type="dir"/>
+		</condition>
+		<!-- Only use /System/Library/Frameworks/JavaVM.framework/ if nothing under other SDK's is found -->
+		<condition property="javavmroot" value="">
+			<and>
+				<available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+				<not>
+					<isset property="javavmroot" />
+				</not>
+			</and>
+		</condition>
+	</target>
+
+	<target name="clean">
+		<delete failonerror="false">
+			<fileset dir="i386"/>
+			<fileset dir="x86_64"/>
+			<fileset dir="." includes="liblwjgl.jnilib"/>
+			<fileset dir="." includes="lwjgl.symbols"/>
+		</delete>
+	</target>
+
+	<target name="compile" depends="init">
+		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I${javavmroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx  -I${javavmroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
+			<!-- Map from *.m and *.c to .o -->
+			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
+			<fileset dir="${native}/macosx" includes="*.m"/>
+			<fileset dir="${native}/macosx" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+			<fileset dir="${native}/common/opengl" includes="*.c"/>
+			<fileset dir="${native}/generated/openal" includes="*.c"/>
+			<fileset dir="${native}/generated/opencl" includes="*.c"/>
+			<fileset dir="${native}/generated/opengl" includes="*.c"/>
+		</apply>
+	</target>
+
+	<target name="link" depends="init">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F${javavmroot}/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+			<fileset dir="${objdir}" includes="*.o"/>
+		</apply>
+		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+			<arg line="-S -X"/>
+			<fileset dir="." file="${libname}"/>
+		</apply>
+	</target>
+
+	<target name="nativelibrary" depends="init">
+		<property name="universal_sdkroot" location="${sdkroot}"/>
+		<property name="x86_64_sdkroot" location="${sdkroot}"/>
+		<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
+		<antcall target="compile">
+			<param name="dstdir" location="i386"/>
+			<param name="compiler" value="${gcc}"/>
+			<param name="sdkroot" location="${universal_sdkroot}"/>
+			<param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
+		</antcall>
+		<antcall target="compile">
+			<param name="dstdir" location="x86_64"/>
+			<param name="compiler" value="${gcc}"/>
+			<param name="sdkroot" location="${universal_sdkroot}"/>
+			<param name="cflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+		</antcall>
+		<exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
+			<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
+			<arg path="i386"/>
+		</exec>
+		<antcall target="link">
+			<param name="objdir" location="i386"/>
+			<param name="libname" value="liblwjgl-i386.jnilib"/>
+			<param name="linker" value="${gcc}"/>
+			<param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
+		</antcall>
+		<antcall target="link">
+			<param name="objdir" location="x86_64"/>
+			<param name="libname" value="liblwjgl-i86_64.jnilib"/>
+			<param name="linker" value="${gcc}"/>
+			<param name="linkerflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+		</antcall>
+		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+			<arg value="-create"/>
+			<srcfile/>
+			<arg value="-output"/>
+			<arg path="liblwjgl.jnilib"/>
+			<fileset file="i386/liblwjgl-i386.jnilib"/>
+			<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
+		</apply>
+	</target>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3814
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3814&view=rev
Author:   kappa1
Date:     2012-11-04 20:11:03 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Tiny Clean up and remove some more references to JNF

Modified Paths:
--------------
    branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-04 20:09:13 UTC (rev 3813)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml	2012-11-04 20:11:03 UTC (rev 3814)
@@ -3,7 +3,6 @@
 	<property name="native" location="../../src/native"/>
 
 	<target name="init">
-		<!--mkdir dir="ppc"/-->
 		<mkdir dir="i386"/>
 		<mkdir dir="x86_64"/>
 	</target>
@@ -12,7 +11,6 @@
 		<delete failonerror="false">
 			<fileset dir="i386"/>
 			<fileset dir="x86_64"/>
-			<!--fileset dir="ppc"/-->
 			<fileset dir="." includes="liblwjgl.jnilib"/>
 			<fileset dir="." includes="lwjgl.symbols"/>
 		</delete>
@@ -20,7 +18,7 @@
 
 	<target name="compile">
 		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
+			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx"/>
 			<!-- Map from *.m and *.c to .o -->
 			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
 			<fileset dir="${native}/macosx" includes="*.m"/>
@@ -35,7 +33,7 @@
 
 	<target name="link">
 		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
 			<fileset dir="${objdir}" includes="*.o"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
@@ -46,17 +44,9 @@
 
 	<target name="nativelibrary" depends="init">
 		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
-		<!--property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/-->
 		<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
 		<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
-		<!--property name="ppc_flags" value="-isysroot ${ppc_sdkroot}"/>
 		<antcall target="compile">
-			<param name="dstdir" location="ppc"/>
-			<param name="compiler" value="gcc-4.2"/>
-			<param name="sdkroot" location="${ppc_sdkroot}"/>
-			<param name="cflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
-		</antcall-->
-		<antcall target="compile">
 			<param name="dstdir" location="i386"/>
 			<param name="compiler" value="gcc-4.2"/>
 			<param name="sdkroot" location="${universal_sdkroot}"/>
@@ -72,17 +62,11 @@
 			<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
 			<arg path="i386"/>
 		</exec>
-		<!--antcall target="link">
-			<param name="objdir" location="ppc"/>
-			<param name="libname" value="liblwjgl-ppc.jnilib"/>
-			<param name="linker" value="gcc-4.2"/>
-			<param name="linkerflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/>
-		</antcall-->
 		<antcall target="link">
 			<param name="objdir" location="i386"/>
 			<param name="libname" value="liblwjgl-i386.jnilib"/>
 			<param name="linker" value="gcc-4.2"/>
-			<param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.4"/>
+			<param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.5"/>
 		</antcall>
 		<antcall target="link">
 			<param name="objdir" location="x86_64"/>
@@ -95,7 +79,6 @@
 			<srcfile/>
 			<arg value="-output"/>
 			<arg path="liblwjgl.jnilib"/>
-			<!--fileset file="ppc/liblwjgl-ppc.jnilib"/-->
 			<fileset file="i386/liblwjgl-i386.jnilib"/>
 			<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
 		</apply>

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-04 20:09:13 UTC (rev 3813)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-04 20:11:03 UTC (rev 3814)
@@ -317,20 +317,19 @@
 }
 
 - (void)scrollWheel:(NSEvent *)event {
-    /*JNIEnv *env = attachCurrentThread();
+    JNIEnv *env = attachCurrentThread();
     if (env == nil || event == nil || _parent == nil) {
         return;
     }
     long time = [event timestamp] * 1000000000;
-    float dz = [event scrollingDeltaY];
-    if (![event hasPreciseScrollingDeltas]) {
-        dz *= 12; // or so
-    }
-    jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
-    jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
-    NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
-    (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
-	 */
+    //float dz = [event scrollingDeltaY]; // An OS X 10.7+ API
+    //if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API
+	//    dz *= 12; // or so
+    //}
+    //jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
+    //jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
+    //NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
+    //(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time);
 }
 
 - (void)viewDidMoveToWindow

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

Revision: 3813
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3813&view=rev
Author:   matzon
Date:     2012-11-04 20:09:13 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
syncing www with online

Modified Paths:
--------------
    trunk/LWJGL/www/changelog.php
    trunk/LWJGL/www/changelogs/full-changelog.txt
    trunk/LWJGL/www/credits.php
    trunk/LWJGL/www/donations.php
    trunk/LWJGL/www/download.php
    trunk/LWJGL/www/index.php
    trunk/LWJGL/www/projects.php

Added Paths:
-----------
    trunk/LWJGL/www/changelogs/2.8.5-changelog.txt

Modified: trunk/LWJGL/www/changelog.php
===================================================================
--- trunk/LWJGL/www/changelog.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/changelog.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -17,7 +17,15 @@
 </p>
 <ul>
 	<li><a href="http://www.lwjgl.org/changelogs/full-changelog.txt" target="_blank">Full changelog</a></li>
-	<li><a href="#2.6">LWJGL 2.6</a></li>
+	<li><a href="#2.8.4">LWJGL 2.8.5</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.8.4-changelog.txt" target="_blank">LWJGL 2.8.4</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.8.3-changelog.txt" target="_blank">LWJGL 2.8.3</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.8.2-changelog.txt" target="_blank">LWJGL 2.8.2</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.8.1-changelog.txt" target="_blank">LWJGL 2.8.1</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.8.0-changelog.txt" target="_blank">LWJGL 2.8.0</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.7.1-changelog.txt" target="_blank">LWJGL 2.7.1</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.7-changelog.txt" target="_blank">LWJGL 2.7</a></li>
+	<li><a href="http://www.lwjgl.org/changelogs/2.6-changelog.txt" target="_blank">LWJGL 2.6</a></li>
 	<li><a href="http://www.lwjgl.org/changelogs/2.5-changelog.txt" target="_blank">LWJGL 2.5</a></li>
 	<li><a href="http://www.lwjgl.org/changelogs/2.4.2-changelog.txt" target="_blank">LWJGL 2.4.2</a></li>
 	<li><a href="http://www.lwjgl.org/changelogs/2.4.1-changelog.txt" target="_blank">LWJGL 2.4.1</a></li>
@@ -63,6 +71,6 @@
 </ul>
 
 <?
-displayChangelog('2.6');
+displayChangelog('2.8.5');
 require('_include/footer.php');
 ?>

Added: trunk/LWJGL/www/changelogs/2.8.5-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/2.8.5-changelog.txt	                        (rev 0)
+++ trunk/LWJGL/www/changelogs/2.8.5-changelog.txt	2012-11-04 20:09:13 UTC (rev 3813)
@@ -0,0 +1,313 @@
+2012-10-16 14:53  spasi
+
+	* platform_build/build-definitions.xml,
+	  src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java,
+	  src/templates/org/lwjgl/opengl/INTEL_map_texture.java,
+	  src/templates/org/lwjgl/opengl/NV_draw_texture.java,
+	  src/templates/org/lwjgl/opengles/NV_draw_texture.java: Added
+	  support for AMD_shader_trinary_minmax, INTEL_map_texture and
+	  NV_draw_texture.
+
+2012-09-30 09:48  spasi
+
+	* src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java:
+	  Added support for EXT_multiview_draw_buffers. [GLES]
+
+2012-09-29 11:48  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_sparse_texture.java: Added
+	  support for AMD_sparse_texture.
+
+2012-09-21 00:27  spasi
+
+	* src/templates/org/lwjgl/opengles/APPLE_sync.java,
+	  src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java,
+	  src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java,
+	  src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java:
+	  Added new GLES extensions.
+
+2012-09-12 21:00  kappa1
+
+	* src/java/org/lwjgl/opengl/Sync.java: Set a name for LWJGL's Sync
+	  class timer accuracy thread ("LWJGL Timer") for debugging
+	  purposes. RFE by NateS.
+
+2012-09-12 11:29  kappa1
+
+	* src/java/org/lwjgl/util/vector/Matrix2f.java,
+	  src/java/org/lwjgl/util/vector/Matrix3f.java,
+	  src/java/org/lwjgl/util/vector/Matrix4f.java: Fix
+	  Matrix*f.negate(Matrix*f dest) methods in Matrix2f, Matrix3f and
+	  Matrix4f classes. Thx to Jegorex for finding, reporting and
+	  providing fix on forum.
+
+2012-09-10 07:51  spasi
+
+	* src/java/org/lwjgl/input/Keyboard.java: Changed keyName array
+	  size to match KEYBOARD_SIZE.
+
+2012-09-06 07:11  spasi
+
+	* src/java/org/lwjgl/opengl/GLContext.java: Made
+	  GLContext.getCapabilities throw a RuntimeException instead of
+	  returning null when there's no GL context current in the current
+	  thread.
+
+2012-09-05 22:37  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  Fix NumberFormatException when parsing version string on an EA or
+	  beta JVM, thx to UltraMoogleMan for spotting and reporting
+
+2012-09-03 20:44  spasi
+
+	* src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java:
+	  Fixed test.
+
+2012-09-03 20:27  spasi
+
+	* src/templates/org/lwjgl/opengl/GL32.java: Removed GL_BGRA.
+
+2012-09-03 19:47  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_objects.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_rg.java,
+	  src/templates/org/lwjgl/opengl/ARB_vertex_shader.java,
+	  src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+	  src/templates/org/lwjgl/opengles/AMD_performance_monitor.java,
+	  src/templates/org/lwjgl/opengles/OES_texture_float.java: Removed
+	  some re-defined GL11 enums.
+
+2012-08-28 09:06  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java: Translate
+	  extended keys before the state check.
+
+2012-08-23 14:20  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+	  src/java/org/lwjgl/test/input/KeyboardTest.java: Let repeat
+	  events pass the same-state filter.
+
+2012-08-23 12:38  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java: Filter TAB key up
+	  event when we alt-tab focus the Display.
+
+2012-08-23 10:36  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java,
+	  src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+	  src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c: Attempt to
+	  fix lost key up events when Display is out of focus. (Windows)
+
+2012-08-19 06:56  spasi
+
+	* src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java,
+	  src/java/org/lwjgl/util/generator/Reuse.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_program.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java,
+	  src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengl/GL20.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL33.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/NV_program.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java,
+	  src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+	  Restored (most of) the removed methods from the previous commit
+	  and added deprecation warnings.
+
+2012-08-18 14:00  spasi
+
+	* src/java/org/lwjgl/opengl/GLChecks.java,
+	  src/java/org/lwjgl/opengles/GLChecks.java,
+	  src/java/org/lwjgl/test/opengl/SyncTest.java,
+	  src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java,
+	  src/java/org/lwjgl/test/opengles/util/Shader.java,
+	  src/java/org/lwjgl/test/opengles/util/ShaderProgram.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java: Fixes related to
+	  the new alternate signatures.
+
+2012-08-18 11:46  spasi
+
+	* src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+	  src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_program.java,
+	  src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java,
+	  src/templates/org/lwjgl/opengl/ARB_timer_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java,
+	  src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengl/GL20.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL33.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL41.java,
+	  src/templates/org/lwjgl/opengl/GL43.java,
+	  src/templates/org/lwjgl/opengl/NV_present_video.java,
+	  src/templates/org/lwjgl/opengl/NV_program.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java,
+	  src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java,
+	  src/templates/org/lwjgl/opengl/NV_video_capture.java,
+	  src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+	  src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java,
+	  src/templates/org/lwjgl/opengles/GLES30.java,
+	  src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+	  Keep type postfix on alternative functions that return primitive
+	  values.
+
+2012-08-16 18:58  spasi
+
+	* src/java/org/lwjgl/MemoryUtil.java,
+	  src/java/org/lwjgl/openal/ALC10.java,
+	  src/native/common/org_lwjgl_openal_ALC10.c,
+	  src/templates/org/lwjgl/opengl/NV_compute_program5.java,
+	  src/templates/org/lwjgl/opengl/NV_deep_texture3D.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java,
+	  src/templates/org/lwjgl/opengles/QCOM_binning_control.java:
+	  Changed ALC10's alcGetString and alcOpenDevice to use UTF8
+	  decoding/encoding.
+	  New GL extensions: NV_compute_program5,
+	  NV_shader_storage_buffer_object, NV_shader_atomic_counters,
+	  NV_deep_texture3D
+	  New GLES extension: QCOM_binning_control
+
+2012-08-14 12:53  spasi
+
+	* src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_output2.java: Removed
+	  ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're
+	  part of KHR_debug and weren't supposed to be posted in the GL
+	  registry.
+
+2012-08-07 15:14  spasi
+
+	* build.xml, platform_build/build-definitions.xml,
+	  platform_build/build-generator.xml,
+	  src/java/org/lwjgl/opengl/CallbackUtil.java,
+	  src/java/org/lwjgl/opengl/ContextAttribs.java,
+	  src/java/org/lwjgl/opengl/KHRDebugCallback.java,
+	  src/java/org/lwjgl/opengles/APIUtil.java,
+	  src/java/org/lwjgl/opengles/CallbackUtil.java,
+	  src/java/org/lwjgl/opengles/ContextAttribs.java,
+	  src/java/org/lwjgl/opengles/FastIntMap.java,
+	  src/java/org/lwjgl/opengles/GLChecks.java,
+	  src/java/org/lwjgl/opengles/GLContext.java,
+	  src/java/org/lwjgl/opengles/GLSync.java,
+	  src/java/org/lwjgl/opengles/KHRDebugCallback.java,
+	  src/java/org/lwjgl/opengles/StateTracker.java,
+	  src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java,
+	  src/java/org/lwjgl/util/generator/GeneratorVisitor.java,
+	  src/java/org/lwjgl/util/generator/NativeTypeTranslator.java,
+	  src/java/org/lwjgl/util/generator/SignatureTranslator.java,
+	  src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java,
+	  src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java,
+	  src/native/common/opengl/extgl.h,
+	  src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c,
+	  src/native/common/opengles/extgl.h,
+	  src/native/common/opengles/extgl_types.h,
+	  src/native/common/opengles/org_lwjgl_opengles_CallbackUtil.c,
+	  src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+	  src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_ES3_compatibility.java,
+	  src/templates/org/lwjgl/opengl/ARB_arrays_of_arrays.java,
+	  src/templates/org/lwjgl/opengl/ARB_clear_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_compute_shader.java,
+	  src/templates/org/lwjgl/opengl/ARB_copy_image.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_output2.java,
+	  src/templates/org/lwjgl/opengl/ARB_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_explicit_uniform_location.java,
+	  src/templates/org/lwjgl/opengl/ARB_fragment_layer_viewport.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+	  src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+	  src/templates/org/lwjgl/opengl/ARB_invalidate_subdata.java,
+	  src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_robust_buffer_access_behavior.java,
+	  src/templates/org/lwjgl/opengl/ARB_robustness_isolation.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_image_size.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_storage_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_stencil_texturing.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_buffer_range.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_query_levels.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_storage_multisample.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_view.java,
+	  src/templates/org/lwjgl/opengl/ARB_vertex_attrib_binding.java,
+	  src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL43.java,
+	  src/templates/org/lwjgl/opengl/KHR_debug.java,
+	  src/templates/org/lwjgl/opengl/KHR_texture_compression_astc_ldr.java,
+	  src/templates/org/lwjgl/opengles/GLES30.java,
+	  src/templates/org/lwjgl/opengles/KHR_debug.java,
+	  src/templates/org/lwjgl/opengles/KHR_texture_compression_astc_ldr.java,
+	  src/templates/org/lwjgl/opengles/OES_required_internalformat.java,
+	  src/templates/org/lwjgl/opengles/OES_surfaceless_context.java:
+	  Added support for OpenGL 4.3 and OpenGL ES 3.0.
+	  Modified the generator process to use relative paths. We were
+	  hitting the command line length limit on Windows.
+	  Some extension improvements, fixes and spec updates.
+
+2012-07-14 23:29  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java,
+	  src/native/windows/org_lwjgl_opengl_Display.c: fixed issue with
+	  win32 get x/y returning client-area coords
+
+2012-06-29 10:25  spasi
+
+	* src/templates/org/lwjgl/opengl/NV_path_rendering.java: Removed
+	  @Constant("0") from pathBase parameters.
+
+2012-06-19 10:44  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL30.java: Removed unnecessary
+	  GL_RED from GL30.
+	  Added AMD_query_buffer_object.
+
+2012-06-17 20:54  matzon
+
+	* libs/linux/libopenal.so, libs/linux/libopenal64.so,
+	  libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+	  libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: pushing
+	  latest openal (785f52aa29d...) with fix for float32
+
+2012-06-03 19:07  matzon
+
+	* platform_build/build-definitions.xml,
+	  src/java/org/lwjgl/Sys.java, www/changelogs/2.8.4-changelog.txt,
+	  www/changelogs/full-changelog.txt: bumping to 2.8.5, adding
+	  changelogs
\ No newline at end of file

Modified: trunk/LWJGL/www/changelogs/full-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/full-changelog.txt	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/changelogs/full-changelog.txt	2012-11-04 20:09:13 UTC (rev 3813)
@@ -1,3 +1,317 @@
+2012-10-16 14:53  spasi
+
+	* platform_build/build-definitions.xml,
+	  src/templates/org/lwjgl/opengl/AMD_shader_trinary_minmax.java,
+	  src/templates/org/lwjgl/opengl/INTEL_map_texture.java,
+	  src/templates/org/lwjgl/opengl/NV_draw_texture.java,
+	  src/templates/org/lwjgl/opengles/NV_draw_texture.java: Added
+	  support for AMD_shader_trinary_minmax, INTEL_map_texture and
+	  NV_draw_texture.
+
+2012-09-30 09:48  spasi
+
+	* src/templates/org/lwjgl/opengles/EXT_multiview_draw_buffers.java:
+	  Added support for EXT_multiview_draw_buffers. [GLES]
+
+2012-09-29 11:48  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_sparse_texture.java: Added
+	  support for AMD_sparse_texture.
+
+2012-09-21 00:27  spasi
+
+	* src/templates/org/lwjgl/opengles/APPLE_sync.java,
+	  src/templates/org/lwjgl/opengles/EXT_copy_texture_levels.java,
+	  src/templates/org/lwjgl/opengles/EXT_map_buffer_range.java,
+	  src/templates/org/lwjgl/opengles/EXT_shader_framebuffer_fetch.java:
+	  Added new GLES extensions.
+
+2012-09-12 21:00  kappa1
+
+	* src/java/org/lwjgl/opengl/Sync.java: Set a name for LWJGL's Sync
+	  class timer accuracy thread ("LWJGL Timer") for debugging
+	  purposes. RFE by NateS.
+
+2012-09-12 11:29  kappa1
+
+	* src/java/org/lwjgl/util/vector/Matrix2f.java,
+	  src/java/org/lwjgl/util/vector/Matrix3f.java,
+	  src/java/org/lwjgl/util/vector/Matrix4f.java: Fix
+	  Matrix*f.negate(Matrix*f dest) methods in Matrix2f, Matrix3f and
+	  Matrix4f classes. Thx to Jegorex for finding, reporting and
+	  providing fix on forum.
+
+2012-09-10 07:51  spasi
+
+	* src/java/org/lwjgl/input/Keyboard.java: Changed keyName array
+	  size to match KEYBOARD_SIZE.
+
+2012-09-06 07:11  spasi
+
+	* src/java/org/lwjgl/opengl/GLContext.java: Made
+	  GLContext.getCapabilities throw a RuntimeException instead of
+	  returning null when there's no GL context current in the current
+	  thread.
+
+2012-09-05 22:37  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  Fix NumberFormatException when parsing version string on an EA or
+	  beta JVM, thx to UltraMoogleMan for spotting and reporting
+
+2012-09-03 20:44  spasi
+
+	* src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java:
+	  Fixed test.
+
+2012-09-03 20:27  spasi
+
+	* src/templates/org/lwjgl/opengl/GL32.java: Removed GL_BGRA.
+
+2012-09-03 19:47  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_objects.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_rg.java,
+	  src/templates/org/lwjgl/opengl/ARB_vertex_shader.java,
+	  src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+	  src/templates/org/lwjgl/opengles/AMD_performance_monitor.java,
+	  src/templates/org/lwjgl/opengles/OES_texture_float.java: Removed
+	  some re-defined GL11 enums.
+
+2012-08-28 09:06  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java: Translate
+	  extended keys before the state check.
+
+2012-08-23 14:20  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+	  src/java/org/lwjgl/test/input/KeyboardTest.java: Let repeat
+	  events pass the same-state filter.
+
+2012-08-23 12:38  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsKeyboard.java: Filter TAB key up
+	  event when we alt-tab focus the Display.
+
+2012-08-23 10:36  spasi
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java,
+	  src/java/org/lwjgl/opengl/WindowsKeyboard.java,
+	  src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c: Attempt to
+	  fix lost key up events when Display is out of focus. (Windows)
+
+2012-08-19 06:56  spasi
+
+	* src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java,
+	  src/java/org/lwjgl/util/generator/Reuse.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_program.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java,
+	  src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengl/GL20.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL33.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/NV_program.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java,
+	  src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+	  Restored (most of) the removed methods from the previous commit
+	  and added deprecation warnings.
+
+2012-08-18 14:00  spasi
+
+	* src/java/org/lwjgl/opengl/GLChecks.java,
+	  src/java/org/lwjgl/opengles/GLChecks.java,
+	  src/java/org/lwjgl/test/opengl/SyncTest.java,
+	  src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java,
+	  src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java,
+	  src/java/org/lwjgl/test/opengles/util/Shader.java,
+	  src/java/org/lwjgl/test/opengles/util/ShaderProgram.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java: Fixes related to
+	  the new alternate signatures.
+
+2012-08-18 11:46  spasi
+
+	* src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+	  src/templates/org/lwjgl/opengl/ARB_occlusion_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_program.java,
+	  src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+	  src/templates/org/lwjgl/opengl/ARB_sync.java,
+	  src/templates/org/lwjgl/opengl/ARB_timer_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java,
+	  src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengl/GL20.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL33.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL41.java,
+	  src/templates/org/lwjgl/opengl/GL43.java,
+	  src/templates/org/lwjgl/opengl/NV_present_video.java,
+	  src/templates/org/lwjgl/opengl/NV_program.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java,
+	  src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java,
+	  src/templates/org/lwjgl/opengl/NV_video_capture.java,
+	  src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+	  src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java,
+	  src/templates/org/lwjgl/opengles/GLES30.java,
+	  src/templates/org/lwjgl/opengles/OES_framebuffer_object.java:
+	  Keep type postfix on alternative functions that return primitive
+	  values.
+
+2012-08-16 18:58  spasi
+
+	* src/java/org/lwjgl/MemoryUtil.java,
+	  src/java/org/lwjgl/openal/ALC10.java,
+	  src/native/common/org_lwjgl_openal_ALC10.c,
+	  src/templates/org/lwjgl/opengl/NV_compute_program5.java,
+	  src/templates/org/lwjgl/opengl/NV_deep_texture3D.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java,
+	  src/templates/org/lwjgl/opengles/QCOM_binning_control.java:
+	  Changed ALC10's alcGetString and alcOpenDevice to use UTF8
+	  decoding/encoding.
+	  New GL extensions: NV_compute_program5,
+	  NV_shader_storage_buffer_object, NV_shader_atomic_counters,
+	  NV_deep_texture3D
+	  New GLES extension: QCOM_binning_control
+
+2012-08-14 12:53  spasi
+
+	* src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_output2.java: Removed
+	  ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're
+	  part of KHR_debug and weren't supposed to be posted in the GL
+	  registry.
+
+2012-08-07 15:14  spasi
+
+	* build.xml, platform_build/build-definitions.xml,
+	  platform_build/build-generator.xml,
+	  src/java/org/lwjgl/opengl/CallbackUtil.java,
+	  src/java/org/lwjgl/opengl/ContextAttribs.java,
+	  src/java/org/lwjgl/opengl/KHRDebugCallback.java,
+	  src/java/org/lwjgl/opengles/APIUtil.java,
+	  src/java/org/lwjgl/opengles/CallbackUtil.java,
+	  src/java/org/lwjgl/opengles/ContextAttribs.java,
+	  src/java/org/lwjgl/opengles/FastIntMap.java,
+	  src/java/org/lwjgl/opengles/GLChecks.java,
+	  src/java/org/lwjgl/opengles/GLContext.java,
+	  src/java/org/lwjgl/opengles/GLSync.java,
+	  src/java/org/lwjgl/opengles/KHRDebugCallback.java,
+	  src/java/org/lwjgl/opengles/StateTracker.java,
+	  src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java,
+	  src/java/org/lwjgl/util/generator/GeneratorVisitor.java,
+	  src/java/org/lwjgl/util/generator/NativeTypeTranslator.java,
+	  src/java/org/lwjgl/util/generator/SignatureTranslator.java,
+	  src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java,
+	  src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java,
+	  src/native/common/opengl/extgl.h,
+	  src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c,
+	  src/native/common/opengles/extgl.h,
+	  src/native/common/opengles/extgl_types.h,
+	  src/native/common/opengles/org_lwjgl_opengles_CallbackUtil.c,
+	  src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+	  src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_ES3_compatibility.java,
+	  src/templates/org/lwjgl/opengl/ARB_arrays_of_arrays.java,
+	  src/templates/org/lwjgl/opengl/ARB_clear_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_compute_shader.java,
+	  src/templates/org/lwjgl/opengl/ARB_copy_image.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_group.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_label.java,
+	  src/templates/org/lwjgl/opengl/ARB_debug_output2.java,
+	  src/templates/org/lwjgl/opengl/ARB_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_explicit_uniform_location.java,
+	  src/templates/org/lwjgl/opengl/ARB_fragment_layer_viewport.java,
+	  src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java,
+	  src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java,
+	  src/templates/org/lwjgl/opengl/ARB_invalidate_subdata.java,
+	  src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java,
+	  src/templates/org/lwjgl/opengl/ARB_program_interface_query.java,
+	  src/templates/org/lwjgl/opengl/ARB_robust_buffer_access_behavior.java,
+	  src/templates/org/lwjgl/opengl/ARB_robustness_isolation.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_image_size.java,
+	  src/templates/org/lwjgl/opengl/ARB_shader_storage_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/ARB_stencil_texturing.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_buffer_range.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_query_levels.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_storage_multisample.java,
+	  src/templates/org/lwjgl/opengl/ARB_texture_view.java,
+	  src/templates/org/lwjgl/opengl/ARB_vertex_attrib_binding.java,
+	  src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java,
+	  src/templates/org/lwjgl/opengl/GL30.java,
+	  src/templates/org/lwjgl/opengl/GL32.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL43.java,
+	  src/templates/org/lwjgl/opengl/KHR_debug.java,
+	  src/templates/org/lwjgl/opengl/KHR_texture_compression_astc_ldr.java,
+	  src/templates/org/lwjgl/opengles/GLES30.java,
+	  src/templates/org/lwjgl/opengles/KHR_debug.java,
+	  src/templates/org/lwjgl/opengles/KHR_texture_compression_astc_ldr.java,
+	  src/templates/org/lwjgl/opengles/OES_required_internalformat.java,
+	  src/templates/org/lwjgl/opengles/OES_surfaceless_context.java:
+	  Added support for OpenGL 4.3 and OpenGL ES 3.0.
+	  Modified the generator process to use relative paths. We were
+	  hitting the command line length limit on Windows.
+	  Some extension improvements, fixes and spec updates.
+
+2012-07-14 23:29  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java,
+	  src/native/windows/org_lwjgl_opengl_Display.c: fixed issue with
+	  win32 get x/y returning client-area coords
+
+2012-06-29 10:25  spasi
+
+	* src/templates/org/lwjgl/opengl/NV_path_rendering.java: Removed
+	  @Constant("0") from pathBase parameters.
+
+2012-06-19 10:44  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/GL30.java: Removed unnecessary
+	  GL_RED from GL30.
+	  Added AMD_query_buffer_object.
+
+2012-06-17 20:54  matzon
+
+	* libs/linux/libopenal.so, libs/linux/libopenal64.so,
+	  libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+	  libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: pushing
+	  latest openal (785f52aa29d...) with fix for float32
+
+2012-06-03 19:07  matzon
+
+	* platform_build/build-definitions.xml,
+	  src/java/org/lwjgl/Sys.java, www/changelogs/2.8.4-changelog.txt,
+	  www/changelogs/full-changelog.txt: bumping to 2.8.5, adding
+	  changelogs
+
 2012-05-21 20:39  kappa1
 
 	* libs/macosx/openal.dylib: Add OpenAL-Soft 1.14 for OS X

Modified: trunk/LWJGL/www/credits.php
===================================================================
--- trunk/LWJGL/www/credits.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/credits.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -22,8 +22,8 @@
 	<li>Simon Felix</li>
 	<li>Ryan McNally</li>
 	<li>Ciardhubh</li>
-	<li>Pelle Johnsen</li>
-	<li>Jae Kwon</li>
+	<li>Jens von Pilgrim</li>
+	<li>Ruben Garat</li>
 </ul>
 <p>
 	<b>Additional credits goes to</b>
@@ -32,6 +32,7 @@
 	<li>Joseph I. Valenzuela [OpenAL stuff]</li>
 	<li>Lev Povalahev [OpenGL extensions]</li>
 	<li>Daniel Leinich [Website design & implementation]</li>
+	<li>Endolf [Nightly builds and JInput]</li>
 </ul>
 
 <? require('_include/footer.php'); ?>

Modified: trunk/LWJGL/www/donations.php
===================================================================
--- trunk/LWJGL/www/donations.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/donations.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -14,12 +14,15 @@
 <ul>
 	<?
     $donations[] = array("Andreas Wallberg");
+    $donations[] = array("Andreas Wiesbauer");
     $donations[] = array("Andrew Kelly");
     $donations[] = array("Anthony Lovell");
     $donations[] = array("Anthony Rogers");
     $donations[] = array("Apostolos Tsakpinis");
     $donations[] = array("Aviram Preshel");
-    $donations[] = array("Benjamin Bingham");
+    $donations[] = array("Bart Blokland");    
+    $donations[] = array("Benjamin Behrendt");
+    $donations[] = array("Benjamin Bingham");    
     $donations[] = array("Benoit Hambucken");
     $donations[] = array("Bernardo Ratto");
     $donations[] = array("Brian Matzon");
@@ -34,38 +37,49 @@
     $donations[] = array("Ewald Kicker");
     $donations[] = array("Filippo Cortigiani");
     $donations[] = array("Florian Priester");
+    $donations[] = array("Florian Sievert");    
     $donations[] = array("Franz Bartlechner - multiple donations");
     $donations[] = array("Gavia");
     $donations[] = array("Gregory Pierce");
     $donations[] = array("Ivan Lazarte");
+    $donations[] = array("Jens Hohmuth");
     $donations[] = array("Jesse Pavel");
     $donations[] = array("John Watson");
     $donations[] = array("John Yates");
+    $donations[] = array("Jonathan Lermitage");    
     $donations[] = array("J\xF6rg Jungh\xE4nel");
+    $donations[] = array("Lars Petter Mathiassen");    
     $donations[] = array("Marc Sachse");
+    $donations[] = array("Martin Gruscher");
     $donations[] = array("Michael Lundstr\xF6m");
     $donations[] = array("Mojang Specifications");
     $donations[] = array("Nathan Sweet");
     $donations[] = array("Oliver Due Billing");
     $donations[] = array("Paul Koch");
     $donations[] = array("Per Nyblom");
+    $donations[] = array("Peter Faber");    
     $donations[] = array("Peter Koeleman");
+    $donations[] = array("Peter Leikauf");    
+    $donations[] = array("Rob Mayhew");
     $donations[] = array("Ruben Steins");
     $donations[] = array("SEO Company");
     $donations[] = array("Scott Palmer");
     $donations[] = array("Shane Essary");
     $donations[] = array("Shannon Smith");
     $donations[] = array("Sharp Production");
+    $donations[] = array("Simon Felix");    
     $donations[] = array("So-Woo Lee");
     $donations[] = array("Steve Klouvi");
     $donations[] = array("Thomas Schuster");
-    $donations[] = array("Tiana Bruno Rakotoarimanana");
+    $donations[] = array("Thomas Trocha");
+    $donations[] = array("Tiana Bruno Rakotoarimanana - multiple donations");
     $donations[] = array("Tobias Fritz");
     $donations[] = array("Tomas Andrle - multiple donations");
     $donations[] = array("Tonny Espeset");
     $donations[] = array("Yinglai Yang");
-		$donations[] = array("Andreas Wiesbauer");
+    $donations[] = array("Jesse Krebs");
 		
+		
 		shuffle($donations);
 		
 		foreach($donations as $key => $value) {

Modified: trunk/LWJGL/www/download.php
===================================================================
--- trunk/LWJGL/www/download.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/download.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -2,12 +2,13 @@
 
 <h1>Download</h1>
 <p>
-	Latest stable release is 2.6 Please download it here:<br/>
-	<a href="https://sourceforge.net/projects/java-game-lib/files/Official%20Releases/LWJGL%202.6/" target="_blank">LWJGL 2.6</a>
+	Latest stable release is 2.8.5 Please download it here:<br/>
+	<a href="https://sourceforge.net/projects/java-game-lib/files/Official%20Releases/LWJGL%202.8.5/" target="_blank">LWJGL 2.8.5</a>
 </p>
 <p>
 	Nightly builds:<br/>
-	<a href="https://www.newdawnsoftware.com/hudson/view/LWJGL/" target="_blank">https://www.newdawnsoftware.com/hudson/view/LWJGL/</a>
+	<a href="http://www.newdawnsoftware.com/hudson/view/LWJGL/" target="_blank">http://www.newdawnsoftware.com/hudson/view/LWJGL/</a>
 </p>
+<p> Maven:<br/>Since version 2.8.0, LWJGL has been available in the central Maven repository. Seem more here: <a href="http://www.lwjgl.org/wiki/index.php?title=LWJGL_use_in_Maven" target="_blank">http://www.lwjgl.org/wiki/index.php?title=LWJGL_use_in_Maven</a>
 
 <? require('_include/footer.php'); ?>

Modified: trunk/LWJGL/www/index.php
===================================================================
--- trunk/LWJGL/www/index.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/index.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -1,43 +1,55 @@
 <? require('_include/header.php'); ?>
 
 <h1>Introduction</h1>
-<p>The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable <a href="projects.php">commercial quality games</a> to be written in Java. LWJGL provides developers access to high performance crossplatform libraries such as OpenGL (<a href="http://www.opengl.org/" target="_blank">Open Graphics Library</a>) and OpenAL (<a href="http://www.openal.org" target="_blank">Open Audio Library</a>) allowing for state of the art 3D games and 3D sound. Additionally LWJGL provides access to controllers such as Gamepads, Steering wheel and Joysticks. All in a simple and straight forward API.</p>
+<p>The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable <a href="projects.php">commercial quality games</a> to be written in Java. LWJGL provides developers access to high performance crossplatform libraries such as OpenGL (<a href="http://www.opengl.org/" target="_blank">Open Graphics Library</a>), OpenCL (<a href="http://www.khronos.org/opencl/" target="_blank">Open Computing Language</a>) and OpenAL (<a href="http://www.openal.org" target="_blank">Open Audio Library</a>) allowing for state of the art 3D games and 3D sound. Additionally LWJGL provides access to controllers such as Gamepads, Steering wheel and Joysticks. All in a simple and straight forward API.</p>
 <p>LWJGL is not meant to make writing games particularly easy; it is primarily an enabling technology which allows developers to get at resources that are simply otherwise unavailable or poorly implemented on the existing <a href="http://java.sun.com" target="_blank">Java platform</a>. We anticipate that the LWJGL will, through evolution and extension, become the foundation for more complete game libraries and "game engines" as they have popularly become known, and hide some of the new evils we have had to expose in the APIs.</p>
 <p>LWJGL is available under a <a href="license.php">BSD license</a>, which means it's open source and freely available at no charge.</p>
 <p>Please visit us on the Freenode IRC Network: <a href="irc://irc.freenode.net/lwjgl" target="_blank">#LWJGL</a>. Do idle if there is no one to answer any of your questions, we are on different timezones.</p>
 
 <h1>News</h1>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.6</b> <span class="newsdate">Monday, October 18th, 2010</span><br/>
-	On top of the world again! - fresh out with a new 2.6 build which includes lots of fixes and new stuff - including OpenCL support!<br/>
-	Please check <a href="/forum/index.php?topic=3512">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.5</b> <span class="newsdate">Sunday, November 4th, 2012</span><br/>
+	It's that time again. You know the drill!
+	Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4608">this thread</a> for more info regarding the release.<br/><br/>
 </p>
+
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.5</b> <span class="newsdate">Friday, July 16th, 2010</span><br/>
-	To hot outside? - get inside, switch on the AC unit - and start hacking away with the latest LWJGL release.<br/>
-	Please check <a href="/forum/index.php?topic=3398">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.4</b> <span class="newsdate">Sunday, June 3rd, 2012</span><br/>
+	Summer! - time for a new release! Now you have an excuse for staying inside from that pesky sun and code all day long ;)
+	Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4798">this thread</a> for more info regarding the release.<br/><br/>
 </p>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.4</b> <span class="newsdate">Sunday, April 11th, 2010</span><br/>
-	New release with a ton of fixes and support for OpenGL 3.3 and 4.0<br/>
-	Please check <a href=/forum/index.php?topic=3302">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.3</b> <span class="newsdate">Monday, January 23rd, 2012</span><br/>
+	First release in the new year. New OpenGL and OpenCL additions as well as some important MacOSX fixes. Please update ASAP. 
+	Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4409">this thread</a> for more info regarding the release.<br/><br/>
 </p>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.3</b> <span class="newsdate">Sunday, February 21st, 2010</span><br/>
-	Important release that fixes issues with ATI 10.x drivers. Consider upgrading ASAP.<br/>
-	Please check <a href="/forum/index.php?topic=3212">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.2</b> <span class="newsdate">Sunday, November 13th, 2011</span><br/>
+	Bugfix release + some minor features. Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4288">this thread</a> for more info regarding the release.<br/><br/>
 </p>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.2.2</b> <span class="newsdate">Tuesday, January 26th, 2010</span><br/>
-	First release in the new year. Mostly bugfixes.<br/>
-	Please check <a href="/forum/index.php?topic=3183">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.1</b> <span class="newsdate">Saturday, October 15th, 2011</span><br/>
+	Bugfix release + some minor features. Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4242">this thread</a> for more info regarding the release.<br/><br/>
 </p>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.2.1</b> <span class="newsdate">Sunday, November 15th, 2009</span><br/>
-	Please check <a href="/forum/index.php?topic=3111">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.8.0</b> <span class="newsdate">Sunday, October 9th, 2011</span><br/>
+	Finally a new release! This is a pretty big update with a slew of new features as well of bug fixes. Get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=4222">this thread</a> for more info regarding the release.<br/><br/>
 </p>
 <p style="border-bottom: 1px solid #cccccc;">
-	<b>LWJGL 2.1.0</b> <span class="newsdate">Monday, March 23rd, 2009</span><br/>
-	Please check <a href="/forum/index.php?topic=2856">this thread</a> for more info regarding the release.<br/><br/>
+	<b>LWJGL 2.7.1</b> <span class="newsdate">Thursday, February 10th, 2011</span><br/>
+	Minor update. Updated OpenAL-Soft libraries to fix an msvrt90.dll dependency - get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=3741">this thread</a> for more info regarding the release.<br/><br/>
 </p>
+<p style="border-bottom: 1px solid #cccccc;">
+	<b>LWJGL 2.7</b> <span class="newsdate">Monday, February 7th, 2011</span><br/>
+	2.7 has just been hatched - get it at the <a href="download.php">usual location</a><br/>
+	Please check <a href="/forum/index.php?topic=3741">this thread</a> for more info regarding the release.<br/><br/>
+</p>
+
 <? require('_include/footer.php'); ?>

Modified: trunk/LWJGL/www/projects.php
===================================================================
--- trunk/LWJGL/www/projects.php	2012-11-04 20:04:30 UTC (rev 3812)
+++ trunk/LWJGL/www/projects.php	2012-11-04 20:09:13 UTC (rev 3813)
@@ -110,6 +110,18 @@
 												  'big'   => 'cultris_2.jpg'),
 								       2 => array('small' => 'cultris_small_3.jpg',
 												  'big'   => 'cultris_3.jpg')));	
+												  
+$projects[] = array('name'    => 'Cultris II',
+					'url'     => 'http://gewaltig.net',
+					'type'    => 'Free game',
+					'desc'    => 'Cultris II is one of the fastest Tetris&reg;-clones ever! Train your reflexes in the single player challenge modes, enjoy a split-screen match with your friends or play over the Internet with the best of the best. Cultris II not only supports various game modes, but all of them with team-play. The exquisite graphics and stylish jungle music makes other clones strike with awe. This is not your grandmother\x92s Tetris&reg; anymore...',
+					'screens' => array(0 => array('small' => 'cultris2_small_1.gif',
+											      'big'   => 'cultris2_1.png'),
+								       1 => array('small' => 'cultris2_small_2.gif',
+												  'big'   => 'cultris2_2.png'),
+								       2 => array('small' => 'cultris2_small_3.gif',
+												  'big'   => 'cultris2_3.png')));	
+												  
                           
 $projects[] = array('name'    => 'Keith Goes Painting',
 					'url'     => 'http://www.wolfysgames.com/',
@@ -262,21 +274,21 @@
 								'small' => 'hz_small_3.jpg',
 								'big'   => 'hz_3.jpg')));
 
-$projects[] = array(
-						'name'    => 'Diamond Crush',
-						'url'     => 'http://www.diamondcrush.net/',
-						'type'    => 'Free, open source game',
-						'desc'    => 'Diamond Crush is a classic puzzle game, with both single player and multiplayer game modes. Players will control falling pairs of differently colored and shaped gems, and their purpose will be strategically placing them inside their own grid-based play fields, by matching their colors.',
-						'screens' => array(
-							0 => array(
-								'small' => 'diamond_crush_small_1.jpg',
-								'big'   => 'diamond_crush_1.jpg'),
-							1 => array(
-								'small' => 'diamond_crush_small_2.jpg',
-								'big'   => 'diamond_crush_2.jpg'),
-							2 => array(
-								'small' => 'diamond_crush_small_3.jpg',
-								'big'   => 'diamond_crush_3.jpg')));
+//$projects[] = array(
+//						'name'    => 'Diamond Crush',
+//						'url'     => 'http://www.diamondcrush.net/',
+//						'type'    => 'Free, open source game',
+//						'desc'    => 'Diamond Crush is a classic puzzle game, with both single player and multiplayer game modes. Players will control falling pairs of differently colored and shaped gems, and their purpose will be strategically placing them inside their own grid-based play fields, by matching their colors.',
+//						'screens' => array(
+//							0 => array(
+//								'small' => 'diamond_crush_small_1.jpg',
+//								'big'   => 'diamond_crush_1.jpg'),
+//							1 => array(
+//								'small' => 'diamond_crush_small_2.jpg',
+//								'big'   => 'diamond_crush_2.jpg'),
+//							2 => array(
+//								'small' => 'diamond_crush_small_3.jpg',
+//								'big'   => 'diamond_crush_3.jpg')));
 								
 $projects[] = array(
 						'name'    => 'Slam Soccer 2006',
@@ -629,6 +641,102 @@
 							2 => array(
 								'small' => 'grappling_hook_small_3.jpg',
 								'big'   => 'grappling_hook_3.jpg')));
+								
+$projects[] = array(
+						'name'    => 'TWL',
+						'url'     => 'http://twl.l33tlabs.org/',
+						'type'    => 'OpenGL UI library',
+						'desc'    => 'TWL is a graphical user interface library targeted at games and game editors. It provides a rich set of standard widgets including labels, edit fields, tables, popups, tooltips, frames and a lot more. Different layout container are available to create even the most advanced user interfaces. As games have a high demand on visual identity, TWL provides a very flexible theme manager. The theme manager decouples the visual representation of widgets from the code. Themes are specified in XML and PNG files with full alpha blending for effects such as glow or shadows.',
+						'screens' => array(
+							0 => array(
+								'small' => 'twl_small_1.jpg',
+								'big'   => 'twl_1.png'),
+							1 => array(
+								'small' => 'twl_small_2.jpg',
+								'big'   => 'twl_2.png'),
+							2 => array(
+								'small' => 'twl_small_3.jpg',
+								'big'   => 'twl_3.png')));								
+								
+$projects[] = array(
+						'name'    => 'Starfarer',
+						'url'     => 'http://fractalsoftworks.com',
+						'type'    => 'Commercial game',
+						'desc'    => 'Two hundred years ago, the galaxy was ravaged by war.  The story of Starfarer concerns a sector left largely untouched by the flames. Humanity has been slowly slipping into anarchy, and few outposts of civilization remain - it is a time of frequent conflict, rampant piracy and shifting allegiances. A time of great profit for the few traders able to ply the old trading routes. A time of great danger and greater opportunity.',
+						'screens' => array(
+							0 => array(
+								'small' => 'starfarer_small_1.jpg',
+								'big'   => 'starfarer_1.jpg'),
+							1 => array(
+								'small' => 'starfarer_small_2.jpg',
+								'big'   => 'starfarer_2.jpg'),
+							2 => array(
+								'small' => 'starfarer_small_3.jpg',
+								'big'   => 'starfarer_3.jpg')));					
+								
+$projects[] = array(
+						'name'    => 'Micron',
+						'url'     => 'http://play.minds-eye-games.com/micron/',
+						'type'    => 'Open Source game',
+						'desc'    => 'Micron is a randomly generated, 2D abstract shooter. Enter a world of scintillating shapes and colors as you are attacked on all sides. Fight a variety of enemies in an infinite, deadly universe.',
+						'screens' => array(
+							0 => array(
+								'small' => 'micron_small_1.png',
+								'big'   => 'micron_1.png'),
+							1 => array(
+								'small' => 'micron_small_2.png',
+								'big'   => 'micron_2.png'),
+							2 => array(
+								'small' => 'micron_small_3.png',
+								'big'   => 'micron_3.png')));
+
+$projects[] = array(
+						'name'    => 'Newton Adventure',
+						'url'     => 'http://bci.im',
+						'type'    => 'Open Source',
+						'desc'    => 'Newton Adventure is a free and open source 2D platform game. You play Newton, a very special hero who has the power to change gravity direction.',
+						'screens' => array(
+							0 => array(
+								'small' => 'newton_small_1.jpg',
+								'big'   => 'newton_1.jpg'),
+							1 => array(
+								'small' => 'newton_small_2.jpg',
+								'big'   => 'newton_2.jpg'),
+							2 => array(
+								'small' => 'newton_small_3.jpg',
+								'big'   => 'newton_3.jpg')));
+								
+$projects[] = array(
+						'name'    => 'Tropical Stormfront',
+						'url'     => 'http://www.operationstormfront.com',
+						'type'    => 'Commercial',
+						'desc'    => 'Tropical Stormfront is a real-time strategy (RTS) game played out over lush tropical archipelagos.',
+						'screens' => array(
+							0 => array(
+								'small' => 'tsf_small_1.png',
+								'big'   => 'tsf_1.png'),
+							1 => array(
+								'small' => 'tsf_small_2.png',
+								'big'   => 'tsf_2.png'),
+							2 => array(
+								'small' => 'tsf_small_3.png',
+								'big'   => 'tsf_3.png')));
+								
+$projects[] = array(
+						'name'    => 'ode4j',
+						'url'     => 'http://www.ode4j.org',
+						'type'    => 'Free open source physics engine',
+						'desc'    => 'ode4j is a Java library for 3D game physics. It is a port of the C/C++ Open Dynamics Engine (ODE: www.ode.org). It provides dozens of example applications that use lwjgl for visualizing different features of the library.',
+						'screens' => array(
+							0 => array(
+								'small' => 'ode4j_small_1.png',
+								'big'   => 'ode4j_1.png'),
+							1 => array(
+								'small' => 'ode4j_small_2.png',
+								'big'   => 'ode4j_2.png'),
+							2 => array(
+								'small' => 'ode4j_small_3.png',
+								'big'   => 'ode4j_3.png')));
 												  
 function displayProjects() {
 	

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

Revision: 3812
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3812&view=rev
Author:   kappa1
Date:     2012-11-04 20:04:30 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Remove unused dependency on JavaNativeFoundation

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2012-11-04 19:50:22 UTC (rev 3811)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2012-11-04 20:04:30 UTC (rev 3812)
@@ -39,7 +39,7 @@
  */
 
 #import <Cocoa/Cocoa.h>
-#import <JavaNativeFoundation.h>
+//#import <JavaNativeFoundation.h>
 
 #include <jni.h>
 #include "org_lwjgl_opengl_MacOSXCanvasPeerInfo.h"

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

Revision: 3811
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3811&view=rev
Author:   matzon
Date:     2012-11-04 19:50:22 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Bumping version number

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2012-11-04 18:39:35 UTC (rev 3810)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2012-11-04 19:50:22 UTC (rev 3811)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 				location="doc" />
 	<property name="lwjgl.temp" 				location="temp" />
 	<property name="lwjgl.res" 					location="res" />
-	<property name="lwjgl.version" 				value="2.8.5" />
+	<property name="lwjgl.version" 				value="2.9.0" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="lwjgl.src.templates.al" location="${lwjgl.src.templates}/org/lwjgl/openal"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2012-11-04 18:39:35 UTC (rev 3810)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2012-11-04 19:50:22 UTC (rev 3811)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.8.5";
+	private static final String VERSION = "2.9.0";
 
 	private static final String POSTFIX64BIT = "64";
 

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

Revision: 3810
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3810&view=rev
Author:   matzon
Date:     2012-11-04 18:39:35 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Tagging 2.8.5

Added Paths:
-----------
    tags/lwjgl2.8.5/

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

Revision: 3809
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3809&view=rev
Author:   kappa1
Date:     2012-11-03 18:06:08 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
Fix a native crash on startup of some applications

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-03 18:06:08 UTC (rev 3809)
@@ -497,7 +497,7 @@
     }
     
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
-    if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
+    //if(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) {
         /*NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
         if (hide == JNI_TRUE) {
             options = NSApplicationPresentationFullScreen; // this requires OS X 10.7+ to compile
@@ -509,11 +509,11 @@
         if (window_info->window != nil) {
             [[NSApplication sharedApplication] setPresentationOptions:options];
         }*/
-    } else {
+    //} else {
         if (hide == JNI_TRUE) {
             SetSystemUIMode(kUIModeContentSuppressed, 0);
         } else {
             SetSystemUIMode(kUIModeNormal, 0);
         }
-    }
+    //}
 }

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m	2012-11-01 22:39:22 UTC (rev 3808)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m	2012-11-03 18:06:08 UTC (rev 3809)
@@ -58,7 +58,7 @@
 	MacOSXContext *shared_context_info;
 	MacOSXContext *context_info;
     NSOpenGLContext *context;
-    NSOpenGLContext *shared_context;
+    NSOpenGLContext *shared_context = NULL;
       printf("nCreate\n");
 	jobject context_handle = newJavaManagedByteBuffer(env, sizeof(MacOSXContext));
 	if (context_handle == NULL) {

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

Revision: 3808
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3808&view=rev
Author:   kappa1
Date:     2012-11-01 22:39:22 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Fix memory leaks by adding an NSAutoreleasePool when creating a windows and draining it on window destroy

Modified Paths:
--------------
    branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m

Modified: branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m
===================================================================
--- branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-01 22:21:23 UTC (rev 3807)
+++ branches/osx-java7/LWJGL/src/native/macosx/org_lwjgl_opengl_Display.m	2012-11-01 22:39:22 UTC (rev 3808)
@@ -53,6 +53,8 @@
 
 static NSOpenGLPixelFormat *default_format = nil;
 
+static NSAutoreleasePool *pool;
+
 @implementation MacOSXKeyableWindow
 - (BOOL)canBecomeKeyWindow;
 {
@@ -390,21 +392,6 @@
     [window_info->window setStyleMask:style_mask];
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
-	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
-    
-    if (window_info->window != nil) {
-        [window_info->window close];
-    }
-    window_info->window = nil;
-    
-    if (window_info->view != nil) {
-        [window_info->view release];
-    }
-    window_info->view = nil;
-    //[window_info->window release];
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nSetTitle(JNIEnv *env, jobject this, jobject window_handle, jobject title_buffer) {
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
 	const char *title_cstr = (const char *)(*env)->GetDirectBufferAddress(env, title_buffer);
@@ -421,6 +408,8 @@
             return NULL;
         }
     }
+	
+	pool = [[NSAutoreleasePool alloc] init];
 
 	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
     MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
@@ -467,6 +456,22 @@
     return window_handle;
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXDisplay_nDestroyWindow(JNIEnv *env, jobject this, jobject window_handle) {
+	MacOSXWindowInfo *window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
+    
+    if (window_info->window != nil) {
+        [window_info->window close];
+    }
+    window_info->window = nil;
+    
+    if (window_info->view != nil) {
+        [window_info->view release];
+    }
+    window_info->view = nil;
+    //[window_info->window release];
+	[pool drain];
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_DefaultSysImplementation_getJNIVersion
   (JNIEnv *env, jobject ignored) {
 	return org_lwjgl_MacOSXSysImplementation_JNI_VERSION;

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