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

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

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_input_Keyboard.cpp 
Log Message:
Moved disabling of repeat rate to Display

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_Display.cpp	3 Mar 2003 21:49:46 -0000	1.22
+++ org_lwjgl_Display.cpp	8 Mar 2003 22:14:17 -0000	1.23
@@ -203,15 +203,31 @@
 	} while ((event.type != MapNotify) || (event.xmap.event != win));
 }
 
+static void setRepeatMode(int mode) {
+	XKeyboardControl repeat_mode;
+	repeat_mode.auto_repeat_mode = mode;
+	XChangeKeyboardControl(disp, KBAutoRepeatMode, &repeat_mode);
+}
+
 bool releaseInput(void) {
 	if (current_fullscreen)
 		return false;
 	releaseKeyboard();
 	releasePointer();
 	input_released = true;
+	setRepeatMode(AutoRepeatModeDefault);
 	return true;
 }
 
+static void acquireInput(void) {
+	if (input_released) {
+		setRepeatMode(AutoRepeatModeOff);
+		acquireKeyboard();
+		acquirePointer();
+		input_released = false;
+	}
+}
+
 void handleMessages(void) {
 	XEvent event;
 	while (XPending(disp) > 0) {
@@ -222,10 +238,7 @@
 					saved_env->SetStaticBooleanField(saved_clazz, fid_close, JNI_TRUE);
 				break;
 			case FocusIn:
-				if (input_released) {
-					acquireKeyboard();
-					acquirePointer();
-				}
+				acquireInput();
 				break;
 			case MapNotify:
 				current_minimized = false;
@@ -410,11 +423,13 @@
 		XF86VidModeSetViewPort(disp, screen, 0, 0);
 	}
 	XClearWindow(disp, win);
+	setRepeatMode(AutoRepeatModeOff);
 	XSync(disp, True);
 	return JNI_TRUE;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_Display_nDestroy(JNIEnv * env, jclass clazz) {
+	setRepeatMode(AutoRepeatModeDefault);
 	XDestroyWindow(disp, win);
 	if (current_fullscreen) {
 		if (!XF86VidModeSwitchToMode(disp, screen, avail_modes[0])) {

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- org_lwjgl_input_Keyboard.cpp	8 Mar 2003 18:47:34 -0000	1.16
+++ org_lwjgl_input_Keyboard.cpp	8 Mar 2003 22:14:17 -0000	1.17
@@ -123,11 +123,6 @@
 	}
 }
 
-static void setRepeatMode(int mode) {
-	XKeyboardControl repeat_mode;
-	repeat_mode.auto_repeat_mode = mode;
-	XChangeKeyboardControl(disp, KBAutoRepeatMode, &repeat_mode);
-}
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nCreate
@@ -164,7 +159,6 @@
 	
 	memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char));
 	created = true;
-	setRepeatMode(AutoRepeatModeOff);
 	return JNI_TRUE;
 }
 
@@ -179,7 +173,6 @@
 	if (keyboard_grabbed)
 		ungrabKeyboard();
 	created = false;
-	setRepeatMode(AutoRepeatModeDefault);
 }
 
 static XKeyEvent *nextEventElement(void) {

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Disable linux key repeat while Keyboard is created - match win32 behavior

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_input_Keyboard.cpp	14 Feb 2003 11:23:01 -0000	1.15
+++ org_lwjgl_input_Keyboard.cpp	8 Mar 2003 18:47:34 -0000	1.16
@@ -123,6 +123,11 @@
 	}
 }
 
+static void setRepeatMode(int mode) {
+	XKeyboardControl repeat_mode;
+	repeat_mode.auto_repeat_mode = mode;
+	XChangeKeyboardControl(disp, KBAutoRepeatMode, &repeat_mode);
+}
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nCreate
@@ -159,6 +164,7 @@
 	
 	memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char));
 	created = true;
+	setRepeatMode(AutoRepeatModeOff);
 	return JNI_TRUE;
 }
 
@@ -173,6 +179,7 @@
 	if (keyboard_grabbed)
 		ungrabKeyboard();
 	created = false;
+	setRepeatMode(AutoRepeatModeDefault);
 }
 
 static XKeyEvent *nextEventElement(void) {