[Java-game-lib-cvs] LWJGL/src/native/linux org_lwjgl_input_Cursor.cpp,1.7,1.8 org_lwjgl_opengl_Windo

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

Modified Files:
	org_lwjgl_input_Cursor.cpp org_lwjgl_opengl_Window.cpp 
Log Message:
Cursor animation support regardless of platform features

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_opengl_Window.cpp	12 Mar 2004 07:12:34 -0000	1.22
+++ org_lwjgl_opengl_Window.cpp	21 Mar 2004 21:54:56 -0000	1.23
@@ -260,7 +260,7 @@
  * Method:    update
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nUpdate
   (JNIEnv *env, jclass clazz)
 {
 	handleMessages();

Index: org_lwjgl_input_Cursor.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_input_Cursor.cpp	14 Oct 2003 14:29:23 -0000	1.7
+++ org_lwjgl_input_Cursor.cpp	21 Mar 2004 21:54:56 -0000	1.8
@@ -50,11 +50,8 @@
  * Signature: (IIIIIII)I
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
-  (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jint images_offset, jobject delay_buffer, jint delays_offset)
+  (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jint images_offset)
 {
-	const int *delays = NULL;
-	if (delay_buffer != NULL)
-		delays = (const int *)env->GetDirectBufferAddress(delay_buffer) + delays_offset;
 	XcursorPixel *pixels = (XcursorPixel *)env->GetDirectBufferAddress(image_buffer) + images_offset;
 	int stride = width*height;
 	XcursorImages *cursor_images = XcursorImagesCreate(num_images);
@@ -66,8 +63,6 @@
 		cursor_image->xhot = x_hotspot;
 		cursor_image->yhot = y_hotspot;
 		cursor_image->pixels = &(pixels[stride*i]);
-		if (num_images > 1)
-			cursor_image->delay = delays[i];
 		cursor_images->images[i] = cursor_image;
 	}
 	Cursor cursor = XcursorImagesLoadCursor(getCurrentDisplay(), cursor_images);