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

Update of /cvsroot/java-game-lib/Puppygames GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26779

Added Files:
	.classpath .cvsignore .project 
Log Message:


--- NEW FILE: .cvsignore ---
bin

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>Puppygames GUI</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="src" path="/Shaven Puppy Game Library"/>
	<classpathentry kind="src" path="/LWJGL"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

Update of /cvsroot/java-game-lib/Puppygames GUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26713/src

Log Message:
Directory /cvsroot/java-game-lib/Puppygames GUI/src added to the repository

Update of /cvsroot/java-game-lib/Puppygames GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26428/Puppygames GUI

Log Message:
Directory /cvsroot/java-game-lib/Puppygames GUI added to the repository

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

Modified Files:
	org_lwjgl_opengl_EXTPalettedTexture.c 
Log Message:
Linux: fix compilation

Index: org_lwjgl_opengl_EXTPalettedTexture.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_EXTPalettedTexture.c	9 Nov 2004 21:27:18 -0000	1.1
+++ org_lwjgl_opengl_EXTPalettedTexture.c	14 Nov 2004 11:39:54 -0000	1.2
@@ -120,4 +120,5 @@
 }
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
+

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

Modified Files:
	org_lwjgl_Sys.c 
Log Message:
Linux: fix compilation

Index: org_lwjgl_Sys.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_Sys.c	13 Nov 2004 21:06:36 -0000	1.7
+++ org_lwjgl_Sys.c	14 Nov 2004 11:39:54 -0000	1.8
@@ -142,7 +142,6 @@
 {
 	char * eMessageText = GetStringNativeChars(env, message);
 	char * cTitleBarText = GetStringNativeChars(env, title);
-	MessageBox(getCurrentHWND(), eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
 
 	printfDebug("*** Alert ***%s\n%s\n", cTitleBarText, eMessageText);
 	

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

Modified Files:
	org_lwjgl_opengl_ARBColorBufferFloat.c 
Log Message:
Linux: fix compilation

Index: org_lwjgl_opengl_ARBColorBufferFloat.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_ARBColorBufferFloat.c	28 Oct 2004 17:12:52 -0000	1.1
+++ org_lwjgl_opengl_ARBColorBufferFloat.c	14 Nov 2004 11:39:53 -0000	1.2
@@ -63,4 +63,5 @@
 }
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
+

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

Modified Files:
	common_tools.h 
Log Message:
Linux: fix compilation

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- common_tools.h	14 Nov 2004 10:42:16 -0000	1.30
+++ common_tools.h	14 Nov 2004 11:39:53 -0000	1.31
@@ -41,6 +41,8 @@
 #define _COMMON_TOOLS_H
 
 #include <jni.h>
+#include <string.h>
+#include <stdlib.h>
 #include "org_lwjgl_Sys.h"
 
 #define EVENT_BUFFER_SIZE 256

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

Modified Files:
	common_tools.c common_tools.h org_lwjgl_openal_AL10.c 
	org_lwjgl_openal_ALC.c org_lwjgl_opengl_GL11.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_openal_AL10.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_openal_AL10.c	13 Nov 2004 21:06:34 -0000	1.3
+++ org_lwjgl_openal_AL10.c	14 Nov 2004 10:42:16 -0000	1.4
@@ -268,7 +268,7 @@
  * ALubyte * alGetString(ALenum pname);
  */
 static jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, jclass clazz, jint param) {
-  jstring string = (*env)->NewStringUTF(env, (char*) alGetString(param));
+  jstring string = NewStringNative(env, (char*) alGetString(param));
 	CHECK_AL_ERROR
 	return string;
 }

Index: org_lwjgl_opengl_GL11.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GL11.c	5 Nov 2004 10:30:03 -0000	1.2
+++ org_lwjgl_opengl_GL11.c	14 Nov 2004 10:42:16 -0000	1.3
@@ -1449,7 +1449,7 @@
 static jstring JNICALL Java_org_lwjgl_opengl_GL11_glGetString(JNIEnv * env, jclass clazz, jint p0)
 {
 	const GLubyte * string = glGetString((GLenum) p0);
-	return (*env)->NewStringUTF(env, (const char *) string);
+	return NewStringNative(env, (const char *) string);
 }
 
 /*

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- common_tools.h	13 Nov 2004 21:06:33 -0000	1.29
+++ common_tools.h	14 Nov 2004 10:42:16 -0000	1.30
@@ -131,6 +131,7 @@
 extern void printfDebug(const char *format, ...);
 extern bool getBooleanProperty(JNIEnv *env, const char* propertyName);
 extern char * GetStringNativeChars(JNIEnv *env, jstring jstr);
+extern jstring NewStringNative(JNIEnv *env, const char *str);
 
 extern void ext_InitializeClass(JNIEnv *env, jclass clazz, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions);
 extern bool ext_InitializeFunctions(ExtGetProcAddressPROC gpa, int num_functions, ExtFunction *functions);

Index: common_tools.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common_tools.c	13 Nov 2004 21:06:33 -0000	1.7
+++ common_tools.c	14 Nov 2004 10:42:16 -0000	1.8
@@ -59,7 +59,7 @@
 }
 
 jstring getVersionString(JNIEnv *env) {
-	return (*env)->NewStringUTF(env, VERSION);
+	return NewStringNative(env, VERSION);
 }
 
 bool isDebugEnabled(void) {
@@ -200,6 +200,36 @@
   return (char*) result;
 }
 
+// creates locale specific string
+jstring NewStringNative(JNIEnv *env, const char *str) { 
+  jclass jcls_str;
+  jmethodID jmethod_str;
+  jstring result; 
+  jbyteArray bytes;
+  int len; 
+  if (str==NULL) { 
+    return NULL; 
+  } 
+  
+  jcls_str = (*env)->FindClass(env,"java/lang/String"); 
+  jmethod_str = (*env)->GetMethodID(env,jcls_str, "<init>", "([B)V"); 
+
+  bytes = 0; 
+
+  if ((*env)->EnsureLocalCapacity(env,2) < 0) { 
+    return NULL; /* out of memory error */ 
+  } 
+  len = strlen(str); 
+  bytes = (*env)->NewByteArray(env,len); 
+  if (bytes != NULL) { 
+    (*env)->SetByteArrayRegion(env,bytes, 0, len, (jbyte *)str); 
+    result = (jstring)(*env)->NewObject(env,jcls_str, jmethod_str, bytes); 
+    (*env)->DeleteLocalRef(env,bytes); 
+    return result; 
+  } /* else fall through */ 
+  return NULL; 
+}
+
 bool ext_InitializeFunctions(ExtGetProcAddressPROC gpa, int num_functions, ExtFunction *functions) {
 	int i;
 	void **ext_function_pointer_pointer;
@@ -250,7 +280,7 @@
 }
 
 bool getBooleanProperty(JNIEnv *env, const char* propertyName) {
-  jstring property = (*env)->NewStringUTF(env, propertyName);
+  jstring property = NewStringNative(env, propertyName);
   jclass booleanClass = (*env)->FindClass(env, "java/lang/Boolean");
   jmethodID getBoolean = (*env)->GetStaticMethodID(env, booleanClass, "getBoolean", "(Ljava/lang/String;)Z");
   return (*env)->CallStaticBooleanMethod(env, booleanClass, getBoolean, property) ? true : false;

Index: org_lwjgl_openal_ALC.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_openal_ALC.c	13 Nov 2004 21:06:34 -0000	1.4
+++ org_lwjgl_openal_ALC.c	14 Nov 2004 10:42:16 -0000	1.5
@@ -89,7 +89,7 @@
 		return NULL;
 	}
 
-	string = (*env)->NewStringUTF(env, alcString);
+	string = NewStringNative(env, alcString);
 
 	CHECK_ALC_ERROR
 	return string;

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

Modified Files:
	org_lwjgl_fmod3_FMOD.c org_lwjgl_fmod3_FMusic.c 
	org_lwjgl_fmod3_FSound.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_fmod3_FMusic.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_fmod3_FMusic.c	13 Nov 2004 21:06:35 -0000	1.4
+++ org_lwjgl_fmod3_FMusic.c	14 Nov 2004 10:42:18 -0000	1.5
@@ -281,7 +281,7 @@
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetName
   (JNIEnv *env, jclass clazz, jlong module) {
     const char * name = fmod_instance->FMUSIC_GetName((FMUSIC_MODULE *) module);
-    return (*env)->NewStringUTF(env, name);
+    return NewStringNative(env, name);
   }
 
 /*

Index: org_lwjgl_fmod3_FSound.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_fmod3_FSound.c	13 Nov 2004 21:06:35 -0000	1.6
+++ org_lwjgl_fmod3_FSound.c	14 Nov 2004 10:42:18 -0000	1.7
@@ -230,7 +230,7 @@
 * Signature: (I)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1GetDriverName(JNIEnv * env, jclass clazz, jint id) { 
-  return (*env)->NewStringUTF(env, (const char *) fmod_instance->FSOUND_GetDriverName(id));
+  return NewStringNative(env, (const char *) fmod_instance->FSOUND_GetDriverName(id));
 }
 
 /*
@@ -430,7 +430,7 @@
 * Signature: (J)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1GetName(JNIEnv * env, jclass clazz, jlong sptr) { 
-  return (*env)->NewStringUTF(env, fmod_instance->FSOUND_Sample_GetName((FSOUND_SAMPLE *) sptr));
+  return NewStringNative(env, fmod_instance->FSOUND_Sample_GetName((FSOUND_SAMPLE *) sptr));
 }
 
 /*
@@ -1203,7 +1203,7 @@
 	unsigned int * nPcmOffset = pcmOffsetPosition + (unsigned int *) (*env)->GetDirectBufferAddress(env, pcmOffset);
 	char * result = fmod_instance->FSOUND_Stream_GetSyncPointInfo(nPoint, nPcmOffset);
 	if(result != NULL) {
-		return (*env)->NewStringUTF(env, result);
+		return NewStringNative(env, result);
 	}
 	return NULL;
 }
@@ -1221,7 +1221,7 @@
 
 	if(fmod_instance->FSOUND_Stream_GetTagField((FSOUND_STREAM*) stream, num, &type, &name, &value, &length)) {
 		// create string instance of name
-		jstring nName = (*env)->NewStringUTF(env, name);
+		jstring nName = NewStringNative(env, name);
 
 		// get set method and call it
 		jclass cls = (*env)->GetObjectClass(env, tagField);
@@ -1257,7 +1257,7 @@
 * Signature: ()Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Stream_1Net_1GetLastServerStatus(JNIEnv * env, jclass clazz) {
-  return (*env)->NewStringUTF(env, fmod_instance->FSOUND_Stream_Net_GetLastServerStatus());
+  return NewStringNative(env, fmod_instance->FSOUND_Stream_Net_GetLastServerStatus());
 }
 
 /*
@@ -1773,7 +1773,7 @@
 * Signature: (I)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Record_1GetDriverName(JNIEnv * env, jclass clazz, jint driver) {
-  return (*env)->NewStringUTF(env, (const char *)fmod_instance->FSOUND_Record_GetDriverName(driver));
+  return NewStringNative(env, (const char *)fmod_instance->FSOUND_Record_GetDriverName(driver));
 }
 
 /*

Index: org_lwjgl_fmod3_FMOD.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_fmod3_FMOD.c	13 Nov 2004 21:06:35 -0000	1.5
+++ org_lwjgl_fmod3_FMOD.c	14 Nov 2004 10:42:17 -0000	1.6
@@ -53,7 +53,7 @@
  * Signature: ()Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
-  return (*env)->NewStringUTF(env, VERSION);
+  return NewStringNative(env, VERSION);
 }
 
 /*
@@ -107,5 +107,5 @@
  * Signature: (I)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) {
-  return (*env)->NewStringUTF(env, FMOD_ErrorString(errorcode));  
+  return NewStringNative(env, FMOD_ErrorString(errorcode));  
 }

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

Modified Files:
	display.cpp org_lwjgl_Sys.cpp 
Log Message:
changed String handling to use proper localizing method

Index: display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- display.cpp	13 Nov 2004 22:27:19 -0000	1.7
+++ display.cpp	14 Nov 2004 10:42:19 -0000	1.8
@@ -394,9 +394,7 @@
 	if (driver == NULL) {
 		return NULL;
 	}
-	ret = env->NewStringUTF(
-		driver
-	);
+	ret = NewStringNative(env, driver);
 	return ret;
 }
 
@@ -429,9 +427,7 @@
 			sprintf(ms, "%d.%d\0", fxdFileInfo->dwProductVersionMS >> 16, fxdFileInfo->dwProductVersionMS & 0xFFFF);
 			sprintf(ls, "%d.%d\0", fxdFileInfo->dwProductVersionLS >> 16, fxdFileInfo->dwProductVersionLS & 0xFFFF);
 			sprintf(version, "%s.%s\0", ms, ls);
-			ret = env->NewStringUTF(
-				version
-			);
+			ret = NewStringNative(env, version);
 		}
 	}
 

Index: org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- org_lwjgl_Sys.cpp	13 Nov 2004 21:06:37 -0000	1.36
+++ org_lwjgl_Sys.cpp	14 Nov 2004 10:42:19 -0000	1.37
@@ -212,7 +212,7 @@
 		const wchar_t * str = (const wchar_t *) getClipboard(CF_UNICODETEXT);
 		return env->NewString(str, wcslen(str));
 	} else if (textAvailable) {
-		return env->NewStringUTF((const char *) getClipboard(CF_TEXT));
+		return NewStringNative(env, (const char *) getClipboard(CF_TEXT));
 	} else {
 		return NULL;
 	}

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

Modified Files:
	org_lwjgl_devil_IL.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_devil_IL.c	13 Nov 2004 21:12:09 -0000	1.7
+++ org_lwjgl_devil_IL.c	14 Nov 2004 10:42:16 -0000	1.8
@@ -324,7 +324,7 @@
  * Signature: (I)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_IL_ilGetString(JNIEnv *env, jclass clazz, jint stringName) {
-	return (*env)->NewStringUTF(env, ilGetString((ILenum)stringName));
+	return NewStringNative(env, ilGetString((ILenum)stringName));
 }
 
 /*

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

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Win32: Make isFocused false at window creation to stop the message loop from running appActivate(false) when the window is being initially activated

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- org_lwjgl_opengl_Display.cpp	13 Nov 2004 21:06:38 -0000	1.34
+++ org_lwjgl_opengl_Display.cpp	14 Nov 2004 01:18:56 -0000	1.35
@@ -631,7 +631,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_createWindow(JNIEnv *env, jobject self, jobject mode, jboolean fullscreen, jint x, jint y) {
 	closerequested = false;
 	isMinimized = false;
-	isFocused = true;
+	isFocused = false;
 	isDirty = true;
 	isFullScreen = fullscreen == JNI_TRUE;
 	isUndecorated = getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated");