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

Revision: 2468
Author:   elias_naur
Date:     2006-07-10 15:26:39 -0700 (Mon, 10 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2468&view=rev

Log Message:
-----------
Windows: Use standard environment variables for build paths

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-10 18:03:38 UTC (rev 2467)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-10 22:26:39 UTC (rev 2468)
@@ -2,18 +2,23 @@
 
 <project name="lwjgl native code, native code" basedir="../../bin" default="compile">
 	<property name="native" location="../src/native"/>
+	<property environment="env"/>
+	<property name="dxhome" location="${env.DXSDK_DIR}"/>
+	<property name="sdkhome" location="${env.MSSDk}"/>
+	<property name="program_files" location="${env.ProgramFiles}"/>
+	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
+	<property name="dllname" value="lwjgl.dll"/>
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
 			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${toolkithome}\include"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${alhome}\include"/>
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}/common"/>
-			<arg value="/I${native}/win32"/>
+			<arg value="/I${native}\common"/>
+			<arg value="/I${native}\win32"/>
 			<srcfile/>
 			<fileset dir="${native}/win32" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
@@ -31,7 +36,6 @@
 			<arg value="/LIBPATH:${dxhome}\lib\x86"/>
 			<arg value="/LIBPATH:${sdkhome}\lib"/>
 			<arg value="/LIBPATH:${alhome}\libs"/>
-			<arg value="/LIBPATH:${toolkithome}\lib"/>
 			<arg value="/OPT:REF"/>
 			<arg value="/OPT:ICF"/>
 			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@@ -47,12 +51,6 @@
 	</target>
 
 	<target name="compile">
-		<property name="program_files" location="c:\Program Files"/>
-		<property name="dxhome" location="${program_files}\Microsoft DirectX SDK (February 2006)"/>
-		<property name="toolkithome" location="${program_files}\Microsoft Visual C++ Toolkit 2003"/>
-		<property name="sdkhome" location="${program_files}\Microsoft Platform SDK"/>
-		<property name="alhome" location="${program_files}\OpenAL 1.0 Software Development Kit"/>
-		<property name="dllname" value="lwjgl.dll"/>
 		<property name="libs" value="Kernel32.lib ole32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>


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

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

Log Message:
-----------
Windows: Add System.loadLibrary("jawt") again, since it seems that Toolkit.getDefaultToolkit() is not always enough.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-07-10 15:46:21 UTC (rev 2466)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-07-10 18:03:38 UTC (rev 2467)
@@ -38,6 +38,7 @@
 import java.security.AccessController;
 
 import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
 
 /**
  *
@@ -49,6 +50,19 @@
 	static {
 		// Make sure the awt stuff is properly initialised (the jawt library in particular)
 		Toolkit.getDefaultToolkit();
+		AccessController.doPrivileged(new PrivilegedAction() {
+			public Object run() {
+				try {
+					System.loadLibrary("jawt");
+				} catch (UnsatisfiedLinkError e) {
+					/* It is probably already loaded, potentially by a different ClassLoader
+					 * so just log the exception and continue
+					 */
+					LWJGLUtil.log("Failed to load jawt: " + e.getMessage());
+				}
+				return null;
+			}
+		});
 	}
 
 	public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {


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

Revision: 2466
Author:   elias_naur
Date:     2006-07-10 08:46:21 -0700 (Mon, 10 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2466&view=rev

Log Message:
-----------
Windows: Pass correct class reference to CallStaticVoidMethod JNI

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-10 15:32:14 UTC (rev 2465)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-10 15:46:21 UTC (rev 2466)
@@ -119,7 +119,7 @@
 			message_time = GetMessageTime();
 			handleMessage_method = (*env)->GetStaticMethodID(env, display_class_global, "handleMessage", "(JIJJJ)Z");
 			if (handleMessage_method != NULL)
-				if ((*env)->CallStaticBooleanMethod(env, NULL, handleMessage_method, (jlong)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time))
+				if ((*env)->CallStaticBooleanMethod(env, display_class_global, handleMessage_method, (jlong)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time))
 					return 0;
 		}
 	}


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

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

Log Message:
-----------
Windows: Fixed fetches of a boolean field with GetIntField JNI

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.c
    trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.c	2006-07-10 15:29:29 UTC (rev 2464)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.c	2006-07-10 15:32:14 UTC (rev 2465)
@@ -138,7 +138,7 @@
 	Win32PeerInfo *peer_info = (Win32PeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	int pixel_format_id;
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
-	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
+	bool floating_point = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
 	
 	if ( pBufferAttribs != NULL ) {
 		pBufferAttribs_ptr = (const int *)(*env)->GetDirectBufferAddress(env, pBufferAttribs);

Modified: trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c	2006-07-10 15:29:29 UTC (rev 2464)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Win32PeerInfo.c	2006-07-10 15:32:14 UTC (rev 2465)
@@ -51,7 +51,7 @@
   (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint origin_x, jint origin_y, jobject pixel_format, jobject pixel_format_caps, jboolean use_hdc_bpp, jboolean window, jboolean pbuffer, jboolean double_buffer) {
 	Win32PeerInfo *peer_info = (Win32PeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
-	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
+	bool floating_point = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
 	int pixel_format_id = findPixelFormat(env, origin_x, origin_y, pixel_format, pixel_format_caps, use_hdc_bpp, window, pbuffer, double_buffer, floating_point);
 	if (pixel_format_id == -1)
 		return;


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

Revision: 2464
Author:   elias_naur
Date:     2006-07-10 08:29:29 -0700 (Mon, 10 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2464&view=rev

Log Message:
-----------
Linux: Fixed fetch of a boolean field with GetIntField JNI

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/context.c
Modified: trunk/LWJGL/src/native/linux/context.c
===================================================================
--- trunk/LWJGL/src/native/linux/context.c	2006-07-10 00:47:32 UTC (rev 2463)
+++ trunk/LWJGL/src/native/linux/context.c	2006-07-10 15:29:29 UTC (rev 2464)
@@ -271,7 +271,7 @@
 		throwException(env, "Samples > 0 specified but there's no support for GLX_ARB_multisample");
 		return false;
 	}
-	bool floating_point = (bool)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
+	bool floating_point = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
 	if (floating_point && !extension_flags.GLX_ARB_fbconfig_float) {
 		throwException(env, "Floating point specified but there's no support for GLX_ARB_fbconfig_float");
 		return false;


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

Revision: 2463
Author:   elias_naur
Date:     2006-07-09 17:47:32 -0700 (Sun, 09 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2463&view=rev

Log Message:
-----------
Add correct timestamps to jinput controller environment for LWJGL input Mouse and Keyboard

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLKeyboard.java
    trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLMouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLKeyboard.java	2006-07-10 00:44:49 UTC (rev 2462)
+++ trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLKeyboard.java	2006-07-10 00:47:32 UTC (rev 2463)
@@ -91,7 +91,7 @@
 		if (key == null)
 			return false;
 		float value = org.lwjgl.input.Keyboard.getEventKeyState() ? 1 : 0;
-		event.set(key, value, System.currentTimeMillis()*1000000);
+		event.set(key, value, org.lwjgl.input.Keyboard.getEventNanoseconds());
 		return true;
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLMouse.java	2006-07-10 00:44:49 UTC (rev 2462)
+++ trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLMouse.java	2006-07-10 00:47:32 UTC (rev 2463)
@@ -89,8 +89,8 @@
 	protected final synchronized boolean getNextDeviceEvent(Event event) throws IOException {
 		if (!org.lwjgl.input.Mouse.isCreated())
 			return false;
-		long nanos = System.currentTimeMillis()*1000000;
 		while (true) {
+			long nanos = org.lwjgl.input.Mouse.getEventNanoseconds();
 			switch (event_state) {
 				case EVENT_X:
 					event_state = EVENT_Y;


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

Revision: 2462
Author:   elias_naur
Date:     2006-07-09 17:44:49 -0700 (Sun, 09 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2462&view=rev

Log Message:
-----------
Fix compile warning

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/common_tools.c
Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-10 00:34:28 UTC (rev 2461)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-10 00:44:49 UTC (rev 2462)
@@ -303,7 +303,7 @@
 
 JNIEnv *getThreadEnv() {
 	JNIEnv *env;
-	(*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_4);
+	(*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_4);
 	return env;
 }
 


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

Revision: 2461
Author:   elias_naur
Date:     2006-07-09 17:34:28 -0700 (Sun, 09 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2461&view=rev

Log Message:
-----------
Windows: Fix issue when AWT core classes invoke the LWJGL message handler through a synchronous SendMessage. Bug triggered by jmetest.awt.swingui.TestJMEDesktop.

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-09 08:31:49 UTC (rev 2460)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-10 00:34:28 UTC (rev 2461)
@@ -88,14 +88,36 @@
 							     LPARAM lParam)
 {
 	jclass display_class;
+	jclass display_class_global;
 	jmethodID handleMessage_method;
 	LONG message_time;
 	JNIEnv *env = getThreadEnv();
 	if (env != NULL && !(*env)->ExceptionOccurred(env)) {
-		display_class = (*env)->FindClass(env, "org/lwjgl/opengl/Win32Display");
-		if (display_class != NULL) {
+		/*
+		 * We'll cache a global reference to the Win32Display class in the window's user data.
+		 * This is not so much to avoid lookup overhead as it is to avoid problems
+		 * with AWT. Specifically, awt code can indirectly call this message handler
+		 * when it does a SendMessage on the main thread to the currently focused window,
+		 * which could be a LWJGL window. The FindClass will then fail because the calling
+		 * internal awt class is using the system class loader, not the application loader
+		 * where lwjgl is found.
+		 *
+		 * The very first message sent to this handler is sent when
+		 * a window is created, where we are sure that the calling class' classloader has
+		 * LWJGL classes in it.
+		 */
+		display_class_global = (jclass)(LONG_PTR)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+		if (display_class_global == NULL) {
+			display_class = (*env)->FindClass(env, "org/lwjgl/opengl/Win32Display");
+			if (display_class != NULL) {
+				display_class_global = (*env)->NewGlobalRef(env, display_class);
+				if (display_class_global != NULL)
+					SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)display_class_global);
+			}
+		}
+		if (display_class_global != NULL) {
 			message_time = GetMessageTime();
-			handleMessage_method = (*env)->GetStaticMethodID(env, display_class, "handleMessage", "(JIJJJ)Z");
+			handleMessage_method = (*env)->GetStaticMethodID(env, display_class_global, "handleMessage", "(JIJJJ)Z");
 			if (handleMessage_method != NULL)
 				if ((*env)->CallStaticBooleanMethod(env, NULL, handleMessage_method, (jlong)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time))
 					return 0;
@@ -193,7 +215,10 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nDestroyWindow(JNIEnv *env, jclass clazz) {
+	jclass display_class_global = (jclass)(LONG_PTR)GetWindowLongPtr(display_hwnd, GWLP_USERDATA);
 	closeWindow(&display_hwnd, &display_hdc);
+	if (display_class_global != NULL)
+		(*env)->DeleteGlobalRef(env, display_class_global);
 	freeLargeIcon();
 	freeSmallIcon();
 }


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