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

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv17211/macosx

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Added created to mac Mouse.cpp

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- org_lwjgl_input_Mouse.cpp	25 Oct 2003 21:27:54 -0000	1.20
+++ org_lwjgl_input_Mouse.cpp	26 Oct 2003 08:44:19 -0000	1.21
@@ -66,6 +66,7 @@
 static int last_dx;
 static int last_dy;
 static int last_dz;
+static bool created;
 
 static void handleButton(unsigned char button_index, jbyte state) {
 	if (button_index >= NUM_BUTTONS) {
@@ -232,31 +233,24 @@
 	}*/
 	CGAssociateMouseAndMouseCursorPosition(FALSE);
 	CGDisplayHideCursor(CGMainDisplayID());
+	created = true;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy(JNIEnv * env, jclass clazz) {
 	//shutdownDevice(&hid_dev);
-//	if (!native_cursor) {
+	if (created) {
+		created = false;
 		CGDisplayShowCursor(CGMainDisplayID());
 		CGAssociateMouseAndMouseCursorPosition(TRUE);
-//	}
+	}
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz) {
 	int dx, dy, dz;
 	//pollMouseDevice();
 	dz = last_dz*WHEEL_SCALE;
-	//if (!native_cursor) {
-		dx = last_dx;
-		dy = -last_dy;
-	/*} else {
-		Point cursor_pos;
-		GetMouse(&cursor_pos);
-		dx = cursor_pos.v - last_x;
-		dy = cursor_pos.h - last_y;
-		last_x += dx;
-		last_y += dy;
-	}*/
+	dx = last_dx;
+	dy = -last_dy;
 	env->SetStaticIntField(clazz, fid_dx, (jint)dx);
 	env->SetStaticIntField(clazz, fid_dy, (jint)dy);
 	env->SetStaticIntField(clazz, fid_dwheel, (jint)dz);