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

Revision: 2579
          http://svn.sourceforge.net/java-game-lib/?rev=2579&view=rev
Author:   elias_naur
Date:     2006-09-28 14:53:18 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Linux: Fix crash when LinuxCanvasImplementation.getScreenFromDevice fails

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c	2006-09-21 14:39:10 UTC (rev 2578)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c	2006-09-28 21:53:18 UTC (rev 2579)
@@ -65,7 +65,7 @@
 		int num_infos;
 		template.visualid = dsi_x11->visualID;
 		template.depth = dsi_x11->depth;
-		XVisualInfo *vis_info = XGetVisualInfo(peer_info->display, VisualIDMask | VisualDepthMask, &template, &num_infos);
+		XVisualInfo *vis_info = XGetVisualInfo(dsi_x11->display, VisualIDMask | VisualDepthMask, &template, &num_infos);
 		if (vis_info == NULL) {
 			throwException(env, "Could not determine screen");
 			return;


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

Revision: 2578
          http://svn.sourceforge.net/java-game-lib/?rev=2578&view=rev
Author:   elias_naur
Date:     2006-09-21 07:39:10 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Bumped JNI library version

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

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-09-21 13:49:49 UTC (rev 2577)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-09-21 14:39:10 UTC (rev 2578)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.0beta3";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 3;
+	static final int JNI_VERSION = 4;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


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

Revision: 2577
          http://svn.sourceforge.net/java-game-lib/?rev=2577&view=rev
Author:   elias_naur
Date:     2006-09-21 06:49:49 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Windows: Don't ignore errors from CoInitialize

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-09-20 11:49:14 UTC (rev 2576)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-09-21 13:49:49 UTC (rev 2577)
@@ -49,9 +49,9 @@
 	LPDIRECTINPUT8 lpdi;
 	HRESULT ret;
 
-	ret = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if (ret != S_OK && ret != S_FALSE && ret != RPC_E_CHANGED_MODE) {
-		throwFormattedException(env, "CoInitializeEx failed (%x)", ret);
+	ret = CoInitialize(NULL);
+	if (ret != S_OK && ret != S_FALSE) {
+		throwFormattedException(env, "CoInitialize failed (%x)", ret);
 		return (LONG_PTR)NULL;
 	}
 	ret = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8, (void *)&lpdi);
@@ -97,4 +97,5 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDirectInput8_release(JNIEnv *env, jobject unused, jlong di_interface) {
 	LPDIRECTINPUT8 lpdi = (LPDIRECTINPUT8)(LONG_PTR)di_interface;
 	IDirectInput8_Release(lpdi);
+	CoUninitialize();
 }


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

Revision: 2576
          http://svn.sourceforge.net/java-game-lib/?rev=2576&view=rev
Author:   elias_naur
Date:     2006-09-20 04:49:14 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Added 'res' to runtest ant target classpath

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

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-09-19 14:17:13 UTC (rev 2575)
+++ trunk/LWJGL/build.xml	2006-09-20 11:49:14 UTC (rev 2576)
@@ -359,7 +359,7 @@
 		<condition property="native_path" value="libs/macosx">
 			<os name="Mac OS X" />
 		</condition>
-		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
+		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
 			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
 			<jvmarg value="-Djava.library.path=${native_path}"/>
 		</java>


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

Revision: 2575
          http://svn.sourceforge.net/java-game-lib/?rev=2575&view=rev
Author:   elias_naur
Date:     2006-09-19 07:17:13 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Windows: Got rid of dummy window in WindowsDisplayPeerInfo

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
    trunk/LWJGL/src/native/windows/context.h
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java	2006-09-19 14:17:13 UTC (rev 2575)
@@ -42,30 +42,19 @@
  * $Id$
  */
 final class WindowsDisplayPeerInfo extends WindowsPeerInfo {
+	private final PixelFormat pixel_format;
+	
 	public WindowsDisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException {
+		this.pixel_format = pixel_format;
 		GLContext.loadOpenGLLibrary();
-		try {
-			createDummyDC(getHandle());
-			try {
-				choosePixelFormat(0, 0, pixel_format, null, true, true, false, true);
-			} catch (LWJGLException e) {
-				nDestroy(getHandle());
-				throw e;
-			}
-		} catch (LWJGLException e) {
-			GLContext.unloadOpenGLLibrary();
-			throw e;
-		}
 	}
-	private static native void createDummyDC(ByteBuffer peer_info_handle) throws LWJGLException;
 
-	void initDC() {
+	void initDC() throws LWJGLException {
 		nInitDC(getHandle());
+		choosePixelFormat(0, 0, pixel_format, null, true, true, false, true);
 	}
 	private static native void nInitDC(ByteBuffer peer_info_handle);
 
-	private static native void nDestroy(ByteBuffer peer_info_handle);
-	
 	protected void doLockAndInitHandle() throws LWJGLException {
 		// NO-OP
 	}
@@ -76,7 +65,6 @@
 
 	public void destroy() {
 		super.destroy();
-		nDestroy(getHandle());
 		GLContext.unloadOpenGLLibrary();
 	}
 }

Modified: trunk/LWJGL/src/native/windows/context.h
===================================================================
--- trunk/LWJGL/src/native/windows/context.h	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/context.h	2006-09-19 14:17:13 UTC (rev 2575)
@@ -47,16 +47,12 @@
 #include "extgl_wgl.h"
 
 typedef struct {
-	union {
-		HWND format_hwnd;
-		struct {
-			HPBUFFERARB pbuffer;
-			// Contains the function pointers that
-			// created the pbuffer
-			WGLExtensions extensions;
-		} pbuffer;
-	} u;
-	HDC format_hdc;
+	struct {
+		HPBUFFERARB pbuffer;
+		// Contains the function pointers that
+		// created the pbuffer
+		WGLExtensions extensions;
+	} pbuffer;
 	HDC drawable_hdc;
 } WindowsPeerInfo;
 

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-09-19 14:17:13 UTC (rev 2575)
@@ -165,24 +165,23 @@
 		throwException(env, "Could not get Pbuffer DC");
 		return;
 	}
-	peer_info->format_hdc = Pbuffer_dc;
-	peer_info->u.pbuffer.extensions = extensions;
-	peer_info->u.pbuffer.pbuffer = Pbuffer;
+	peer_info->pbuffer.extensions = extensions;
+	peer_info->pbuffer.pbuffer = Pbuffer;
 	peer_info->drawable_hdc = Pbuffer_dc;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nDestroy
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->u.pbuffer.extensions.wglReleasePbufferDCARB(peer_info->u.pbuffer.pbuffer, peer_info->drawable_hdc);
-	peer_info->u.pbuffer.extensions.wglDestroyPbufferARB(peer_info->u.pbuffer.pbuffer);
+	peer_info->pbuffer.extensions.wglReleasePbufferDCARB(peer_info->pbuffer.pbuffer, peer_info->drawable_hdc);
+	peer_info->pbuffer.extensions.wglDestroyPbufferARB(peer_info->pbuffer.pbuffer);
 }
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nIsBufferLost
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	BOOL buffer_lost;
-	peer_info->u.pbuffer.extensions.wglQueryPbufferARB(peer_info->u.pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost);
+	peer_info->pbuffer.extensions.wglQueryPbufferARB(peer_info->pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost);
 	return buffer_lost ? JNI_TRUE : JNI_FALSE;
 }
 
@@ -195,17 +194,17 @@
 	attribs[1] = value;
 	attribs[2] = 0;
 
-	peer_info->u.pbuffer.extensions.wglSetPbufferAttribARB(peer_info->u.pbuffer.pbuffer, attribs);
+	peer_info->pbuffer.extensions.wglSetPbufferAttribARB(peer_info->pbuffer.pbuffer, attribs);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nBindTexImageToPbuffer
   (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->u.pbuffer.extensions.wglBindTexImageARB(peer_info->u.pbuffer.pbuffer, buffer);
+	peer_info->pbuffer.extensions.wglBindTexImageARB(peer_info->pbuffer.pbuffer, buffer);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nReleaseTexImageFromPbuffer
   (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->u.pbuffer.extensions.wglReleaseTexImageARB(peer_info->u.pbuffer.pbuffer, buffer);
+	peer_info->pbuffer.extensions.wglReleaseTexImageARB(peer_info->pbuffer.pbuffer, buffer);
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c	2006-09-19 14:17:13 UTC (rev 2575)
@@ -50,7 +50,5 @@
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	AWTSurfaceLock *surface = (AWTSurfaceLock *)(*env)->GetDirectBufferAddress(env, lock_buffer_handle);
 	JAWT_Win32DrawingSurfaceInfo *win32_dsi = (JAWT_Win32DrawingSurfaceInfo *)surface->dsi->platformInfo;
-	peer_info->u.format_hwnd = win32_dsi->hwnd;
-	peer_info->format_hdc = win32_dsi->hdc;
 	peer_info->drawable_hdc = win32_dsi->hdc;
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c	2006-09-19 14:17:13 UTC (rev 2575)
@@ -63,7 +63,7 @@
 		return NULL;
 	}
 	peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	context = wglCreateContext(peer_info->format_hdc);
+	context = wglCreateContext(peer_info->drawable_hdc);
 	if (context == NULL) {
 		throwException(env, "Could not create context");
 		return NULL;
@@ -79,7 +79,7 @@
 	}
 	saved_hdc = wglGetCurrentDC();
 	saved_context = wglGetCurrentContext();
-	if (!wglMakeCurrent(peer_info->format_hdc, context)) {
+	if (!wglMakeCurrent(peer_info->drawable_hdc, context)) {
 		wglMakeCurrent(saved_hdc, saved_context);
 		wglDeleteContext(context);
 		throwException(env, "Could not make context current");

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c	2006-09-19 14:17:13 UTC (rev 2575)
@@ -43,36 +43,8 @@
 #include "context.h"
 #include "common_tools.h"
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_createDummyDC
-  (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
-	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	HWND dummy_hwnd = createDummyWindow(0, 0);
-	HDC dummy_hdc;
-	if (dummy_hwnd == NULL) {
-		throwException(env, "Failed to create a dummy window.");
-		return;
-	}
-	dummy_hdc = GetDC(dummy_hwnd);
-	peer_info->u.format_hwnd = dummy_hwnd;
-	peer_info->format_hdc = dummy_hdc;
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nDestroy
-  (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
-	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	closeWindow(&peer_info->u.format_hwnd, &peer_info->format_hdc);
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nInitDC
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	int pixel_format;
 	peer_info->drawable_hdc = getCurrentHDC();
-	pixel_format = GetPixelFormat(peer_info->format_hdc);
-	if (pixel_format == 0) {
-		throwException(env, "Could not get pixel format from dummy hdc");
-		return;
-	}
-	// If applyPixelFormat fails, just let it throw
-	applyPixelFormat(env, peer_info->drawable_hdc, pixel_format);
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c	2006-09-19 13:41:18 UTC (rev 2574)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c	2006-09-19 14:17:13 UTC (rev 2575)
@@ -56,5 +56,5 @@
 	if (pixel_format_id == -1)
 		return;
 	// Let it throw
-	applyPixelFormat(env, peer_info->format_hdc, pixel_format_id);
+	applyPixelFormat(env, peer_info->drawable_hdc, pixel_format_id);
 }


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

Revision: 2574
          http://svn.sourceforge.net/java-game-lib/?rev=2574&view=rev
Author:   elias_naur
Date:     2006-09-19 06:41:18 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Display.java: Moved Context creation to after createWindow to relax the requirement that the Display PeerInfo must be valid before createWindow(). This will help Windows get rid of a dummy window.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-09-19 13:18:05 UTC (rev 2573)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-09-19 13:41:18 UTC (rev 2574)
@@ -123,7 +123,7 @@
 	/**
 	 * Fetch the Drawable from the Display.
 	 *
-	 * @return the Drawable corresponding to the Display context, or null it display is
+	 * @return the Drawable corresponding to the Display context, or null if display is
 	 *			not created.
 	 */
 	public static Drawable getDrawable() {
@@ -230,8 +230,10 @@
 				if (fullscreen)
 					switchDisplayMode();
 				createWindow();
+				makeCurrent();
 			} catch (LWJGLException e) {
 				destroyContext();
+				destroyPeerInfo();
 				display_impl.resetDisplayMode();
 				throw e;
 			}
@@ -262,12 +264,10 @@
 			window_y = 0;
 		}
 		display_impl.createWindow(current_mode, fullscreen, window_x, window_y);
-		makeCurrent();
+		window_created = true;
 		
 		setTitle(title);
 		initControls();
-		setSwapInterval(swap_interval);
-		window_created = true;
 		
 		// set cached window icon if exists
 		if(cached_icons != null) {
@@ -468,8 +468,10 @@
 					display_impl.resetDisplayMode();
 				}
 				createWindow();
+				makeCurrent();
 			} catch (LWJGLException e) {
 				destroyContext();
+				destroyPeerInfo();
 				display_impl.resetDisplayMode();
 				throw e;
 			}
@@ -679,12 +681,23 @@
 			switchDisplayMode();
 		try {
 			peer_info = display_impl.createPeerInfo(pixel_format);
-			context = new Context(peer_info, shared_drawable != null ? shared_drawable.getContext() : null);
 			try {
 				createWindow();
-				initContext();
+				try {
+					context = new Context(peer_info, shared_drawable != null ? shared_drawable.getContext() : null);
+					try {
+						makeCurrent();
+						initContext();
+					} catch (LWJGLException e) {
+						destroyContext();
+						throw e;
+					}
+				} catch (LWJGLException e) {
+					destroyWindow();
+					throw e;
+				}
 			} catch (LWJGLException e) {
-				destroyContext();
+				destroyPeerInfo();
 				throw e;
 			}
 		} catch (LWJGLException e) {
@@ -694,6 +707,7 @@
 	}
 
 	private static void initContext() {
+		setSwapInterval(swap_interval);
 		// Put the window into orthographic projection mode with 1:1 pixel ratio.
 		// We haven't used GLU here to do this to avoid an unnecessary dependency.
 		GL11.glMatrixMode(GL11.GL_PROJECTION);
@@ -759,15 +773,20 @@
 
 		destroyWindow();
 		destroyContext();
+		destroyPeerInfo();
 		x = y = -1;
 		cached_icons = null;
 		reset();
 	}
 
+	private static void destroyPeerInfo() {
+		peer_info.destroy();
+		peer_info = null;
+	}
+
 	private static void destroyContext() {
 		try {
 			context.forceDestroy();
-			peer_info.destroy();
 		} catch (LWJGLException e) {
 			throw new RuntimeException(e);
 		} finally {
@@ -795,7 +814,7 @@
 	 * @return true if the window's native peer has been created
 	 */
 	public static boolean isCreated() {
-		return context != null;
+		return window_created;
 	}
 
 	/**


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

Revision: 2573
          http://svn.sourceforge.net/java-game-lib/?rev=2573&view=rev
Author:   elias_naur
Date:     2006-09-19 06:18:05 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Windows: Removed unused method in WindowsDisplayPeerInfo

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java	2006-09-19 11:06:02 UTC (rev 2572)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java	2006-09-19 13:18:05 UTC (rev 2573)
@@ -70,8 +70,6 @@
 		// NO-OP
 	}
 
-	private static native void setPixelFormat(ByteBuffer peer_info_handle);
-	
 	protected void doUnlock() throws LWJGLException {
 		// NO-OP
 	}


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

Revision: 2572
          http://svn.sourceforge.net/java-game-lib/?rev=2572&view=rev
Author:   elias_naur
Date:     2006-09-19 04:06:02 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Windows: Don't discard messages from other windows in the message handler

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-09-18 15:03:44 UTC (rev 2571)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-09-19 11:06:02 UTC (rev 2572)
@@ -147,15 +147,7 @@
 					PM_REMOVE      // removal options
 					))
 		{
-			/*
-			 * It would be better to filter messages
-			 * to display_hwnd by specifying that to
-			 * PeekMessage instead of this check. However,
-			 * Windows will then mark LWJGL apps as "not
-			 * responding".
-			 */
-			if (msg.hwnd == display_hwnd)
-				DispatchMessage(&msg);
+			DispatchMessage(&msg);
 		}
 	}
 }


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

Revision: 2571
          http://svn.sourceforge.net/java-game-lib/?rev=2571&view=rev
Author:   elias_naur
Date:     2006-09-18 08:03:44 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
Linux: Map alt-gr to RMENU

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeycodes.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeycodes.java	2006-09-08 10:01:06 UTC (rev 2570)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeycodes.java	2006-09-18 15:03:44 UTC (rev 2571)
@@ -431,6 +431,8 @@
 	public final static int XK_thorn                         = 0x00fe;
 	public final static int XK_ydiaeresis                    = 0x00ff;
 
+	public final static int XK_ISO_Level3_Shift              = 0xfe03;
+
 	public static int mapKeySymToLWJGLKeyCode(long keysym) {
 		switch ((int)keysym) {
 			case XK_BackSpace:
@@ -608,6 +610,7 @@
 
 			case XK_Meta_L:
 				return Keyboard.KEY_LMENU;
+			case XK_ISO_Level3_Shift:
 			case XK_Meta_R:
 				return Keyboard.KEY_RMENU;
 			case XK_Alt_L:


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

Revision: 2570
          http://svn.sourceforge.net/java-game-lib/?rev=2570&view=rev
Author:   elias_naur
Date:     2006-09-08 03:01:06 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
Linux: changed uname -i to uname -m to improve 64 bit detection in build script

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
    trunk/LWJGL/platform_build/linux_ant/build_devil.xml
    trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml

Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-09-08 08:29:16 UTC (rev 2569)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-09-08 10:01:06 UTC (rev 2570)
@@ -17,7 +17,7 @@
 	
     <target name="compile">
 		<exec executable="uname" outputproperty="hwplatform">
-			<arg value="-i"/>
+			<arg value="-m"/>
 		</exec>
 		<condition property="libs" value="${libs64}" else="${libs32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>

Modified: trunk/LWJGL/platform_build/linux_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_devil.xml	2006-09-08 08:29:16 UTC (rev 2569)
+++ trunk/LWJGL/platform_build/linux_ant/build_devil.xml	2006-09-08 10:01:06 UTC (rev 2570)
@@ -17,7 +17,7 @@
 	
     <target name="compile">
 		<exec executable="uname" outputproperty="hwplatform">
-			<arg value="-i"/>
+			<arg value="-m"/>
 		</exec>
 		<condition property="libs" value="${libs64}" else="${libs32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>

Modified: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-09-08 08:29:16 UTC (rev 2569)
+++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml	2006-09-08 10:01:06 UTC (rev 2570)
@@ -21,7 +21,7 @@
 	
     <target name="compile">
 		<exec executable="uname" outputproperty="hwplatform">
-			<arg value="-i"/>
+			<arg value="-m"/>
 		</exec>
 		<condition property="libs" value="${libs64}" else="${libs32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>


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

Revision: 2569
          http://svn.sourceforge.net/java-game-lib/?rev=2569&view=rev
Author:   elias_naur
Date:     2006-09-08 01:29:16 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
Windows: Fixed NPE in Display.getVersion()

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-09-01 20:15:05 UTC (rev 2568)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-09-08 08:29:16 UTC (rev 2569)
@@ -250,9 +250,10 @@
 		String driver = getAdapter();
 		if (driver != null) {
 			WindowsFileVersion version = nGetVersion(driver + ".dll");
-			return version.toString();
-		} else
-			return null;
+			if (version != null)
+				return version.toString();
+		}
+		return null;
 	}
 	private native WindowsFileVersion nGetVersion(String driver);
 


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

Revision: 2568
          http://svn.sourceforge.net/java-game-lib/?rev=2568&view=rev
Author:   spasi
Date:     2006-09-01 13:15:05 -0700 (Fri, 01 Sep 2006)

Log Message:
-----------
Added INVALID_FRAMEBUFFER_OPERATION_EXT in GLU.gluErrorString

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java	2006-08-31 16:40:53 UTC (rev 2567)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java	2006-09-01 20:15:05 UTC (rev 2568)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2004 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * 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 
+ * * 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 
+ * 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 
+ * 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.
  */
@@ -35,6 +35,7 @@
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
+import org.lwjgl.opengl.EXTFramebufferObject;
 
 /**
  * GLU.java
@@ -51,53 +52,53 @@
 	public static final int GLU_INVALID_VALUE       = 100901;
 	public static final int GLU_OUT_OF_MEMORY       = 100902;
 	public static final int GLU_INCOMPATIBLE_GL_VERSION     = 100903;
-	
+
 	/* StringName */
 	public static final int GLU_VERSION             = 100800;
 	public static final int GLU_EXTENSIONS          = 100801;
-	
+
 	/* Boolean */
 	public static final boolean GLU_TRUE                = true;
 	public static final boolean GLU_FALSE               = false;
-	
-	
+
+
 	/****           Quadric constants               ****/
-	
+
 	/* QuadricNormal */
 	public static final int GLU_SMOOTH              = 100000;
 	public static final int GLU_FLAT                = 100001;
 	public static final int GLU_NONE                = 100002;
-	
+
 	/* QuadricDrawStyle */
 	public static final int GLU_POINT               = 100010;
 	public static final int GLU_LINE                = 100011;
 	public static final int GLU_FILL                = 100012;
 	public static final int GLU_SILHOUETTE          = 100013;
-	
+
 	/* QuadricOrientation */
 	public static final int GLU_OUTSIDE             = 100020;
 	public static final int GLU_INSIDE              = 100021;
-	
+
 	/* Callback types: */
 	/*      ERROR               = 100103 */
-	
-	
+
+
 	/****           Tesselation constants           ****/
-	
+
 	public static final double TESS_MAX_COORD              = 1.0e150;
-	
+
 	/* TessProperty */
 	public static final int GLU_TESS_WINDING_RULE           = 100140;
 	public static final int GLU_TESS_BOUNDARY_ONLY          = 100141;
 	public static final int GLU_TESS_TOLERANCE              = 100142;
-	
+
 	/* TessWinding */
 	public static final int GLU_TESS_WINDING_ODD            = 100130;
 	public static final int GLU_TESS_WINDING_NONZERO        = 100131;
 	public static final int GLU_TESS_WINDING_POSITIVE       = 100132;
 	public static final int GLU_TESS_WINDING_NEGATIVE       = 100133;
 	public static final int GLU_TESS_WINDING_ABS_GEQ_TWO    = 100134;
-	
+
 	/* TessCallback */
 	public static final int GLU_TESS_BEGIN          = 100100;  /* void (CALLBACK*)(GLenum    type)  */
 	public static final int GLU_TESS_VERTEX         = 100101;  /* void (CALLBACK*)(void      *data) */
@@ -108,12 +109,12 @@
 	                                                            void      *data[4],
 	                                                            GLfloat   weight[4],
 	                                                            void      **dataOut)     */
-	public static final int GLU_TESS_BEGIN_DATA     = 100106;  /* void (CALLBACK*)(GLenum    type,  
+	public static final int GLU_TESS_BEGIN_DATA     = 100106;  /* void (CALLBACK*)(GLenum    type,
 	                                                            void      *polygon_data) */
-	public static final int GLU_TESS_VERTEX_DATA    = 100107;  /* void (CALLBACK*)(void      *data, 
+	public static final int GLU_TESS_VERTEX_DATA    = 100107;  /* void (CALLBACK*)(void      *data,
 	                                                            void      *polygon_data) */
 	public static final int GLU_TESS_END_DATA       = 100108;  /* void (CALLBACK*)(void      *polygon_data) */
-	public static final int GLU_TESS_ERROR_DATA     = 100109;  /* void (CALLBACK*)(GLenum    errno, 
+	public static final int GLU_TESS_ERROR_DATA     = 100109;  /* void (CALLBACK*)(GLenum    errno,
 	                                                            void      *polygon_data) */
 	public static final int GLU_TESS_EDGE_FLAG_DATA = 100110;  /* void (CALLBACK*)(GLboolean boundaryEdge,
 	                                                            void      *polygon_data) */
@@ -122,7 +123,7 @@
 	                                                            GLfloat   weight[4],
 	                                                            void      **dataOut,
 	                                                            void      *polygon_data) */
-	
+
 	/* TessError */
 	public static final int GLU_TESS_ERROR1     = 100151;
 	public static final int GLU_TESS_ERROR2     = 100152;
@@ -132,16 +133,16 @@
 	public static final int GLU_TESS_ERROR6     = 100156;
 	public static final int GLU_TESS_ERROR7     = 100157;
 	public static final int GLU_TESS_ERROR8     = 100158;
-	
+
 	public static final int GLU_TESS_MISSING_BEGIN_POLYGON  = GLU_TESS_ERROR1;
 	public static final int GLU_TESS_MISSING_BEGIN_CONTOUR  = GLU_TESS_ERROR2;
 	public static final int GLU_TESS_MISSING_END_POLYGON    = GLU_TESS_ERROR3;
 	public static final int GLU_TESS_MISSING_END_CONTOUR    = GLU_TESS_ERROR4;
 	public static final int GLU_TESS_COORD_TOO_LARGE        = GLU_TESS_ERROR5;
 	public static final int GLU_TESS_NEED_COMBINE_CALLBACK  = GLU_TESS_ERROR6;
-	
+
 	/****           NURBS constants                 ****/
-	
+
 	/* NurbsProperty */
 	public static final int GLU_AUTO_LOAD_MATRIX    = 100200;
 	public static final int GLU_CULLING             = 100201;
@@ -151,25 +152,25 @@
 	public static final int GLU_SAMPLING_METHOD             = 100205;
 	public static final int GLU_U_STEP                      = 100206;
 	public static final int GLU_V_STEP                      = 100207;
-	
+
 	/* NurbsSampling */
 	public static final int GLU_PATH_LENGTH                 = 100215;
 	public static final int GLU_PARAMETRIC_ERROR            = 100216;
 	public static final int GLU_DOMAIN_DISTANCE             = 100217;
-	
-	
+
+
 	/* NurbsTrim */
 	public static final int GLU_MAP1_TRIM_2         = 100210;
 	public static final int GLU_MAP1_TRIM_3         = 100211;
-	
+
 	/* NurbsDisplay */
 	/*      FILL                = 100012 */
 	public static final int GLU_OUTLINE_POLYGON     = 100240;
 	public static final int GLU_OUTLINE_PATCH       = 100241;
-	
+
 	/* NurbsCallback */
 	/*      ERROR               = 100103 */
-	
+
 	/* NurbsErrors */
 	public static final int GLU_NURBS_ERROR1        = 100251;
 	public static final int GLU_NURBS_ERROR2        = 100252;
@@ -208,14 +209,14 @@
 	public static final int GLU_NURBS_ERROR35       = 100285;
 	public static final int GLU_NURBS_ERROR36       = 100286;
 	public static final int GLU_NURBS_ERROR37       = 100287;
-	
+
 	/* Contours types -- obsolete! */
 	public static final int GLU_CW          = 100120;
 	public static final int GLU_CCW         = 100121;
 	public static final int GLU_INTERIOR    = 100122;
 	public static final int GLU_EXTERIOR    = 100123;
 	public static final int GLU_UNKNOWN     = 100124;
-	
+
 	/* Names without "TESS_" prefix */
 	public static final int GLU_BEGIN       = GLU_TESS_BEGIN;
 	public static final int GLU_VERTEX      = GLU_TESS_VERTEX;
@@ -426,6 +427,8 @@
 				return "Out of memory";
 			case GL12.GL_TABLE_TOO_LARGE:
 				return "Table too large";
+			case EXTFramebufferObject.GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+				return "Invalid framebuffer operation";
 			case GLU.GLU_INVALID_ENUM:
 				return "Invalid enum (glu)";
 			case GLU.GLU_INVALID_VALUE:


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