Thread: [Java-game-lib-cvs] LWJGL/src/native/win32 Window.h,1.25,1.26 org_lwjgl_input_Keyboard.c,1.4,1.5 org

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

Modified Files:
	Window.h org_lwjgl_input_Keyboard.c org_lwjgl_input_Mouse.c 
Log Message:
Win32: Moved handleMessages to java side (update())

Index: org_lwjgl_input_Keyboard.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_input_Keyboard.c	12 May 2005 07:47:07 -0000	1.4
+++ org_lwjgl_input_Keyboard.c	27 Dec 2005 13:40:21 -0000	1.5
@@ -137,7 +137,7 @@
  * Method:    nPoll
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_pollKeyboard
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nPollKeyboard
   (JNIEnv * env, jobject self, jobject buffer)
 {
 	HRESULT ret;
@@ -171,7 +171,7 @@
         IDirectInputDevice_GetDeviceState(lpdiKeyboard, (DWORD)buffer_size, keyboardBuffer);
 }
 
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_readKeyboard
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_nReadKeyboard
   (JNIEnv * env, jobject self, jobject buffer_obj, jint buffer_position)
 {
         UINT scan_code;

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Window.h	29 Apr 2005 15:20:19 -0000	1.25
+++ Window.h	27 Dec 2005 13:40:21 -0000	1.26
@@ -66,8 +66,6 @@
 
 	WINDOW_H_API void handleMouseButton(int button, int state);
 
-	WINDOW_H_API void handleMessages(void);
-
 	WINDOW_H_API bool getCurrentFullscreen();
 	/*
 	 * Handle native Win32 messages

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_input_Mouse.c	12 May 2005 07:47:07 -0000	1.15
+++ org_lwjgl_input_Mouse.c	27 Dec 2005 13:40:21 -0000	1.16
@@ -315,15 +315,13 @@
 	}
 }
 
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_readMouse
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_nReadMouse
 	(JNIEnv * env, jobject self, jobject buffer_obj, jint buffer_position)
 {
 	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);
-	} else {
-		handleMessages();
 	}
 	return copyEvents(&event_queue, buffer_ptr, buffer_size);
 }
@@ -348,7 +346,7 @@
 	ShutdownMouse(env);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_pollMouse(JNIEnv * env, jobject self, jobject coord_buffer_obj, jobject button_buffer_obj) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nPollMouse(JNIEnv * env, jobject self, jobject coord_buffer_obj, jobject button_buffer_obj) {
 	UpdateMouseFields(env, coord_buffer_obj, button_buffer_obj);
 }
 
@@ -469,8 +467,6 @@
 		return;
 	}
 
-	handleMessages();
-
 	if (mouse_grabbed) {
 		hRes = IDirectInputDevice_GetDeviceState(mDIDevice, sizeof(DIMOUSESTATE), &diMouseState);
 		if (hRes != DI_OK) {