Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib: [2345] trunk/LWJGL/src/native/win32/org_lwjgl_input_M

Revision: 2345
Author:   elias_naur
Date:     2006-05-30 01:48:16 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2345&view=rev

Log Message:
-----------
Win32: Track directinput mouse buttons in the windows message state array. This should avoid some problems when switching from grabbed to non-grabbed

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-05-29 19:03:02 UTC (rev 2344)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-05-30 08:48:16 UTC (rev 2345)
@@ -506,6 +506,9 @@
 		}
 		for (j = 0; j < num_buttons; j++) {
 			buttons_buffer[j] = diMouseState.rgbButtons[j] != 0 ? JNI_TRUE : JNI_FALSE;
+			// track the button state in the windows message buffer state array
+			// to get accurate button information when releasing a grab
+			win32_message_button_states[j] = buttons_buffer[j];
 		}
 	} else {
 		coords[2] = accum_dwheel;


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

Revision: 2379
Author:   elias_naur
Date:     2006-06-18 01:51:03 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2379&view=rev

Log Message:
-----------
Windows: Fixed spurious mouse button events after a Mouse.setGrabbed(true)

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-06-17 23:46:59 UTC (rev 2378)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-06-18 08:51:03 UTC (rev 2379)
@@ -247,10 +247,10 @@
 static void copyDXEvents(int num_di_events, DIDEVICEOBJECTDATA *di_buffer) {
 	int buffer_index = 0;
 	int dx = 0, dy = 0, dwheel = 0;
-        int button_state;
-        int i;
-        for (i = 0; i < num_di_events; i++) {
-                button_state = (di_buffer[i].dwData & 0x80) != 0 ? 1 : 0;
+	int button_state;
+	int i;
+	for (i = 0; i < num_di_events; i++) {
+		button_state = (di_buffer[i].dwData & 0x80) != 0 ? 1 : 0;
 		switch (di_buffer[i].dwOfs) {
 			case DIMOFS_BUTTON0:
 				putMouseEventWithCoords(0, button_state, dx, -dy, dwheel);
@@ -300,7 +300,8 @@
 			0); 
 
 	if (ret == DI_OK) {
-		copyDXEvents(num_di_events, rgdod);
+		if (mouse_grabbed)
+			copyDXEvents(num_di_events, rgdod);
 	} else if (ret == DI_BUFFEROVERFLOW) { 
 		printfDebugJava(env, "Buffer overflowed");
 	} else if (ret == DIERR_INPUTLOST) {
@@ -314,7 +315,7 @@
 	} else if (ret == DIERR_NOTINITIALIZED) {
 		printfDebugJava(env, "not inited");
 	} else {
-		printfDebugJava(env, "unknown keyboard error");
+		printfDebugJava(env, "unknown mouse error (%d)", ret);
 	}
 }
 
@@ -323,9 +324,7 @@
 {
 	jint* buffer_ptr = (jint *)(*env)->GetDirectBufferAddress(env, buffer_obj) + buffer_position;
 	int buffer_size = ((*env)->GetDirectBufferCapacity(env, buffer_obj))/sizeof(jint) - buffer_position;
-	if (mouse_grabbed) {
 		readDXBuffer(env);
-	}
 	return copyEvents(&event_queue, buffer_ptr, buffer_size);
 }
 


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

Revision: 2380
Author:   elias_naur
Date:     2006-06-18 02:08:55 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2380&view=rev

Log Message:
-----------
Windows: Make sure the DirectInput even buffer is properly flushed before switching to grabbed state.

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-06-18 08:51:03 UTC (rev 2379)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-06-18 09:08:55 UTC (rev 2380)
@@ -324,7 +324,7 @@
 {
 	jint* buffer_ptr = (jint *)(*env)->GetDirectBufferAddress(env, buffer_obj) + buffer_position;
 	int buffer_size = ((*env)->GetDirectBufferCapacity(env, buffer_obj))/sizeof(jint) - buffer_position;
-		readDXBuffer(env);
+	readDXBuffer(env);
 	return copyEvents(&event_queue, buffer_ptr, buffer_size);
 }
 
@@ -393,6 +393,8 @@
 	HRESULT di_res;
 	if(grab) {
 		if (!mouse_grabbed) {
+			// flush DX event buffer
+			readDXBuffer(env);
 			mouse_grabbed = true;
 			IDirectInputDevice_Unacquire(mDIDevice);
 			if (!acquireMouse(DISCL_EXCLUSIVE | DISCL_FOREGROUND))


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