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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1:/tmp/cvs-serv20458/java/org/lwjgl/input

Modified Files:
	Keyboard.java 
Log Message:
Added keyboard translation to linux and win32

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Keyboard.java	21 Dec 2002 12:37:18 -0000	1.15
+++ Keyboard.java	11 Jan 2003 23:09:38 -0000	1.16
@@ -33,6 +33,7 @@
 package org.lwjgl.input;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
 import org.lwjgl.Display;
 import org.lwjgl.Sys;
@@ -49,6 +50,18 @@
  * @version $Revision$
  */
 public class Keyboard {
+	/** 
+	 * The special character meaning that no
+	 * character was translated for the event.
+	 */
+	public static final char CHAR_NONE          = '\0';
+
+	/** 
+	 * The special keycode meaning that only the 
+	 * translated character is valid.
+	 */
+	public static final int KEY_NONE            = 0x00;
+
 	public static final int KEY_ESCAPE          = 0x01;
 	public static final int KEY_1               = 0x02;
 	public static final int KEY_2               = 0x03;
@@ -173,132 +186,6 @@
 	public static final int KEY_POWER           = 0xDE;
 	public static final int KEY_SLEEP           = 0xDF;
 
-	// Maps keycodes to ascii characters
-	private static final char map[] =
-		{
-			0,
-			0,
-			'1',
-			'2',
-			'3',
-			'4',
-			'5',
-			'6',
-			'7',
-			'8',
-			'9',
-			'0',
-			'-',
-			'=',
-			0,
-			'\t',
-			'q',
-			'w',
-			'e',
-			'r',
-			't',
-			'y',
-			'u',
-			'i',
-			'o',
-			'p',
-			'[',
-			']',
-			'\n',
-			0,
-			'a',
-			's',
-			'd',
-			'f',
-			'g',
-			'h',
-			'j',
-			'k',
-			'l',
-			';',
-			'\'',
-			'#',
-			0,
-			'\\',
-			'z',
-			'x',
-			'c',
-			'v',
-			'b',
-			'n',
-			'm',
-			',',
-			'.',
-			'/',
-			0,
-			0,
-			0,
-			' ' };
-	private static final char shiftMap[] =
-		{
-			0,
-			0,
-			'!',
-			'"',
-			'*',
-			'$',
-			'%',
-			'^',
-			'&',
-			'*',
-			'(',
-			')',
-			'_',
-			'+',
-			0,
-			'\t',
-			'Q',
-			'W',
-			'E',
-			'R',
-			'T',
-			'Y',
-			'U',
-			'I',
-			'O',
-			'P',
-			'{',
-			'}',
-			'\n',
-			0,
-			'A',
-			'S',
-			'D',
-			'F',
-			'G',
-			'H',
-			'J',
-			'K',
-			'L',
-			':',
-			'@',
-			'~',
-			0,
-			'|',
-			'Z',
-			'X',
-			'C',
-			'V',
-			'B',
-			'N',
-			'M',
-			'<',
-			'>',
-			'?',
-			0,
-			0,
-			0,
-			' ' };
-			
-	static {
-		initialize();
-	}
-	
 	/** Has the keyboard been created? */
 	private static boolean created;
 	
@@ -310,12 +197,19 @@
 	
 	/**
 	 * The key events from the last read: a sequence of pairs of key number,
-	 * followed by state.
+	 * followed by state. If translation is enabled, the state is followed by
+	 * a 2 byte java char representing the translated character.
 	 */
 	private static ByteBuffer readBuffer;
-	
-	/** Address of the read buffer */
-	private static int readBufferAddress;
+
+	/** True if translation is enabled */
+	private static boolean translationEnabled;
+
+	/** The number of events read in the last read() */
+	private static int numEvents;
+
+	/** The current keyboard character being examined */
+	public static char character;
 	
 	/** The current keyboard event key being examined */
 	public static int key;
@@ -323,8 +217,12 @@
 	/** The current state of the key being examined in the event queue */
 	public static boolean state;
 	
+	static {
+		initialize();
+	}
+	
 	/**
-	 * Mouse cannot be constructed.
+	 * Keyboard cannot be constructed.
 	 */
 	private Keyboard() {
 	}
@@ -376,7 +274,7 @@
 	}
 	
 	/**
-	 * Native method the destroy the keyboard
+	 * Native method to destroy the keyboard
 	 */
 	private static native void nDestroy();
 
@@ -402,17 +300,35 @@
 	public static void read() {
 		assert created : "The keyboard has not been created.";
 		assert readBuffer != null : "Keyboard buffering has not been enabled.";
+		numEvents = nRead();
 		readBuffer.clear();
-		readBuffer.limit(nRead(readBufferAddress) << 1);
+		if (translationEnabled)
+			readBuffer.limit(numEvents << 2);
+		else
+			readBuffer.limit(numEvents << 1);
 	}
 	
 	/**
 	 * Native method to read the keyboard buffer
-	 * 
-	 * @param readBufferAddress the address of the keyboard buffer
-	 * @return the number of keyboard events read
+	 * @return the total number of events read.
 	 */
-	private static native int nRead(int readBufferAddress);
+	private static native int nRead();
+	
+	/**
+	 * Enable keyboard translation. Must be called after the keyboard is created,
+	 * and keyboard buffering must be enabled.
+	 */
+	public static void enableTranslation() {
+		assert created : "The keyboard has not been created.";
+		assert readBuffer != null : "Keyboard buffering has not been enabled.";
+                nEnableTranslation();
+		translationEnabled = true;
+	}
+	
+	/**
+	 * Native method to enable the translation buffer
+	 */
+	private static native void nEnableTranslation();
 	
 	/**
 	 * Enable keyboard buffering. Must be called after the keyboard is created.
@@ -421,7 +337,10 @@
 	 */
 	public static int enableBuffer() {
 		assert created : "The keyboard has not been created.";
-		return nEnableBuffer();
+		int buf_len = nEnableBuffer();
+		if (readBuffer != null)
+			readBuffer.order(ByteOrder.nativeOrder());
+		return buf_len;
 	}
 	
 	/**
@@ -446,7 +365,10 @@
 	 * @return the number of keyboard events
 	 */
 	public static int getNumKeyboardEvents() {
-		return readBuffer.limit() >> 1;
+		assert created : "The keyboard has not been created.";
+		assert readBuffer != null : "Keyboard buffering has not been enabled.";
+
+		return numEvents;
 	}
 	
 	/**
@@ -461,27 +383,10 @@
 		if (readBuffer.hasRemaining()) {
 			key = readBuffer.get() & 0xFF;
 			state = readBuffer.get() != 0;
+			if (translationEnabled)
+				character = readBuffer.getChar();
 			return true;
 		} else
 			return false;
-		
-	}
-	
-	/**
-	 * Maps a keycode to a character.
-	 * @param keyCode The keycode
-	 * @return the corresponding ASCII character or 0 if no mapping is possible
-	 */
-	public static char map(int keyCode) {
-		char c;
-
-		if (keyCode < 0 || keyCode >= map.length)
-			return 0;
-		else if (isKeyDown(KEY_LSHIFT) || isKeyDown(KEY_RSHIFT)) {
-			c = shiftMap[keyCode];
-		} else {
-			c = map[keyCode];
-		}
-		return c;
 	}
 }

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Added keyboard translation to linux and win32

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_input_Keyboard.cpp	19 Dec 2002 16:35:35 -0000	1.5
+++ org_lwjgl_input_Keyboard.cpp	11 Jan 2003 23:09:08 -0000	1.6
@@ -49,8 +49,8 @@
 #define KEYBOARD_BUFFER_SIZE 50
 BYTE readBuffer[KEYBOARD_BUFFER_SIZE];
 LPDIRECTINPUTDEVICE lpdiKeyboard		= NULL;
-jfieldID fid_readBuffer;
-jfieldID fid_readBufferAddress;
+jfieldID fid_readBuffer;
+bool translationEnabled;
 extern LPDIRECTINPUT lpdi;
 extern HWND hwnd;
 
@@ -70,7 +70,6 @@
 	}
 
 	fid_readBuffer = env->GetStaticFieldID(clazz, "readBuffer", "Ljava/nio/ByteBuffer;");
-	fid_readBufferAddress = env->GetStaticFieldID(clazz, "readBufferAddress", "I");
 }
 
 /*
@@ -80,7 +79,8 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
-{
+{
+	translationEnabled = false;
 	// Check to see if we're already initialized
 	if (lpdiKeyboard != NULL) {
 		printf("Keyboard already created.\n");
@@ -180,13 +180,20 @@
  * Signature: (I)V
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
-  (JNIEnv * env, jclass clazz, jint keys)
+  (JNIEnv * env, jclass clazz)
 {
 	
-	static DIDEVICEOBJECTDATA rgdod[KEYBOARD_BUFFER_SIZE];
+	static DIDEVICEOBJECTDATA rgdod[KEYBOARD_BUFFER_SIZE];
+	wchar_t transBuf[KEYBOARD_BUFFER_SIZE];
+	MSG msg;
+
+	BYTE state[256];
 	DWORD bufsize = KEYBOARD_BUFFER_SIZE;
 
-	HRESULT ret;
+	HRESULT ret;
+	int num_chars;
+	int num_events = 0;
+
 	do {
 		ret = lpdiKeyboard->Acquire();
 	} while (ret != DI_OK && ret != S_FALSE);
@@ -198,13 +205,47 @@
 		0); 
 
 	if (ret == DI_OK) {
-		unsigned char * buf = (unsigned char *) keys;
-		for (unsigned int i = 0; i < bufsize; i ++) {
+		unsigned char * buf = readBuffer;
+		for (unsigned int i = 0; i < bufsize; i ++) {
+			num_events++;
 			*buf++ = (unsigned char) rgdod[i].dwOfs;
-			*buf++ = (unsigned char) rgdod[i].dwData;
+			*buf++ = (unsigned char) rgdod[i].dwData;
+			if (translationEnabled) {
+				while (PeekMessage(&msg, hwnd, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) != 0)
+					; // Flush keyboard messages to update keyboard state
+				UINT virt_key = MapVirtualKey(rgdod[i].dwOfs, 1);
+				if (virt_key != 0) {
+					if (!GetKeyboardState(state))
+						return -1;
+					num_chars = ToUnicode(virt_key, 
+										  rgdod[i].dwOfs,
+										  state,
+										  transBuf,
+										  KEYBOARD_BUFFER_SIZE, 0);
+					if (num_chars > 0) {
+						wchar_t ch = transBuf[0];
+						*buf++ = (unsigned char) (ch & 0xff);
+						*buf++ = (unsigned char) ((ch & 0xff00) >> 8);
+						for (int i = 1; i < num_chars; i++) {
+							num_events++;
+							ch = transBuf[i];
+							*buf++ = 0;
+							*buf++ = 0;
+							*buf++ = (unsigned char) (ch & 0xff);
+							*buf++ = (unsigned char) ((ch & 0xff00) >> 8);
+						}
+					} else {
+						*buf++ = 0;
+						*buf++ = 0;
+					}
+				} else {
+					*buf++ = 0;
+					*buf++ = 0;
+				}
+			}
 		}
-		return bufsize;
-	} if (ret == DI_BUFFEROVERFLOW) { 
+		return num_events;
+	} else if (ret == DI_BUFFEROVERFLOW) { 
 #ifdef _DEBUG
 		printf("Keyboard buffer overflowed\n");
 #endif
@@ -242,6 +283,17 @@
 	}
 }
 
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nEnableTranslation
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+  (JNIEnv *, jclass)
+{
+	translationEnabled = true;
+}
+
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nEnableBuffer
@@ -252,6 +304,5 @@
 {
 	jobject newBuffer = env->NewDirectByteBuffer(&readBuffer, KEYBOARD_BUFFER_SIZE);
 	env->SetStaticObjectField(clazz, fid_readBuffer, newBuffer);
-	env->SetStaticIntField(clazz, fid_readBufferAddress, (jint) (&readBuffer));
 	return KEYBOARD_BUFFER_SIZE;
 }

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

Modified Files:
	org_lwjgl_input_Keyboard.h 
Log Message:
Added keyboard translation to linux and win32

Index: org_lwjgl_input_Keyboard.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- org_lwjgl_input_Keyboard.h	11 Aug 2002 11:49:33 -0000	1.1.1.1
+++ org_lwjgl_input_Keyboard.h	11 Jan 2003 23:09:08 -0000	1.2
@@ -8,12 +8,266 @@
 extern "C" {
 #endif
 /* Inaccessible static: _00024assertionsDisabled */
+#undef org_lwjgl_input_Keyboard_CHAR_NONE
+#define org_lwjgl_input_Keyboard_CHAR_NONE 0L
+#undef org_lwjgl_input_Keyboard_KEY_NONE
+#define org_lwjgl_input_Keyboard_KEY_NONE 0L
+#undef org_lwjgl_input_Keyboard_KEY_ESCAPE
+#define org_lwjgl_input_Keyboard_KEY_ESCAPE 1L
+#undef org_lwjgl_input_Keyboard_KEY_1
+#define org_lwjgl_input_Keyboard_KEY_1 2L
+#undef org_lwjgl_input_Keyboard_KEY_2
+#define org_lwjgl_input_Keyboard_KEY_2 3L
+#undef org_lwjgl_input_Keyboard_KEY_3
+#define org_lwjgl_input_Keyboard_KEY_3 4L
+#undef org_lwjgl_input_Keyboard_KEY_4
+#define org_lwjgl_input_Keyboard_KEY_4 5L
+#undef org_lwjgl_input_Keyboard_KEY_5
+#define org_lwjgl_input_Keyboard_KEY_5 6L
+#undef org_lwjgl_input_Keyboard_KEY_6
+#define org_lwjgl_input_Keyboard_KEY_6 7L
+#undef org_lwjgl_input_Keyboard_KEY_7
+#define org_lwjgl_input_Keyboard_KEY_7 8L
+#undef org_lwjgl_input_Keyboard_KEY_8
+#define org_lwjgl_input_Keyboard_KEY_8 9L
+#undef org_lwjgl_input_Keyboard_KEY_9
+#define org_lwjgl_input_Keyboard_KEY_9 10L
+#undef org_lwjgl_input_Keyboard_KEY_0
+#define org_lwjgl_input_Keyboard_KEY_0 11L
+#undef org_lwjgl_input_Keyboard_KEY_MINUS
+#define org_lwjgl_input_Keyboard_KEY_MINUS 12L
+#undef org_lwjgl_input_Keyboard_KEY_EQUALS
+#define org_lwjgl_input_Keyboard_KEY_EQUALS 13L
+#undef org_lwjgl_input_Keyboard_KEY_BACK
+#define org_lwjgl_input_Keyboard_KEY_BACK 14L
+#undef org_lwjgl_input_Keyboard_KEY_TAB
+#define org_lwjgl_input_Keyboard_KEY_TAB 15L
+#undef org_lwjgl_input_Keyboard_KEY_Q
+#define org_lwjgl_input_Keyboard_KEY_Q 16L
+#undef org_lwjgl_input_Keyboard_KEY_W
+#define org_lwjgl_input_Keyboard_KEY_W 17L
+#undef org_lwjgl_input_Keyboard_KEY_E
+#define org_lwjgl_input_Keyboard_KEY_E 18L
+#undef org_lwjgl_input_Keyboard_KEY_R
+#define org_lwjgl_input_Keyboard_KEY_R 19L
+#undef org_lwjgl_input_Keyboard_KEY_T
+#define org_lwjgl_input_Keyboard_KEY_T 20L
+#undef org_lwjgl_input_Keyboard_KEY_Y
+#define org_lwjgl_input_Keyboard_KEY_Y 21L
+#undef org_lwjgl_input_Keyboard_KEY_U
+#define org_lwjgl_input_Keyboard_KEY_U 22L
+#undef org_lwjgl_input_Keyboard_KEY_I
+#define org_lwjgl_input_Keyboard_KEY_I 23L
+#undef org_lwjgl_input_Keyboard_KEY_O
+#define org_lwjgl_input_Keyboard_KEY_O 24L
+#undef org_lwjgl_input_Keyboard_KEY_P
+#define org_lwjgl_input_Keyboard_KEY_P 25L
+#undef org_lwjgl_input_Keyboard_KEY_LBRACKET
+#define org_lwjgl_input_Keyboard_KEY_LBRACKET 26L
+#undef org_lwjgl_input_Keyboard_KEY_RBRACKET
+#define org_lwjgl_input_Keyboard_KEY_RBRACKET 27L
+#undef org_lwjgl_input_Keyboard_KEY_RETURN
+#define org_lwjgl_input_Keyboard_KEY_RETURN 28L
+#undef org_lwjgl_input_Keyboard_KEY_LCONTROL
+#define org_lwjgl_input_Keyboard_KEY_LCONTROL 29L
+#undef org_lwjgl_input_Keyboard_KEY_A
+#define org_lwjgl_input_Keyboard_KEY_A 30L
+#undef org_lwjgl_input_Keyboard_KEY_S
+#define org_lwjgl_input_Keyboard_KEY_S 31L
+#undef org_lwjgl_input_Keyboard_KEY_D
+#define org_lwjgl_input_Keyboard_KEY_D 32L
+#undef org_lwjgl_input_Keyboard_KEY_F
+#define org_lwjgl_input_Keyboard_KEY_F 33L
+#undef org_lwjgl_input_Keyboard_KEY_G
+#define org_lwjgl_input_Keyboard_KEY_G 34L
+#undef org_lwjgl_input_Keyboard_KEY_H
+#define org_lwjgl_input_Keyboard_KEY_H 35L
+#undef org_lwjgl_input_Keyboard_KEY_J
+#define org_lwjgl_input_Keyboard_KEY_J 36L
+#undef org_lwjgl_input_Keyboard_KEY_K
+#define org_lwjgl_input_Keyboard_KEY_K 37L
+#undef org_lwjgl_input_Keyboard_KEY_L
+#define org_lwjgl_input_Keyboard_KEY_L 38L
+#undef org_lwjgl_input_Keyboard_KEY_SEMICOLON
+#define org_lwjgl_input_Keyboard_KEY_SEMICOLON 39L
+#undef org_lwjgl_input_Keyboard_KEY_APOSTROPHE
+#define org_lwjgl_input_Keyboard_KEY_APOSTROPHE 40L
+#undef org_lwjgl_input_Keyboard_KEY_GRAVE
+#define org_lwjgl_input_Keyboard_KEY_GRAVE 41L
+#undef org_lwjgl_input_Keyboard_KEY_LSHIFT
+#define org_lwjgl_input_Keyboard_KEY_LSHIFT 42L
+#undef org_lwjgl_input_Keyboard_KEY_BACKSLASH
+#define org_lwjgl_input_Keyboard_KEY_BACKSLASH 43L
+#undef org_lwjgl_input_Keyboard_KEY_Z
+#define org_lwjgl_input_Keyboard_KEY_Z 44L
+#undef org_lwjgl_input_Keyboard_KEY_X
+#define org_lwjgl_input_Keyboard_KEY_X 45L
+#undef org_lwjgl_input_Keyboard_KEY_C
+#define org_lwjgl_input_Keyboard_KEY_C 46L
+#undef org_lwjgl_input_Keyboard_KEY_V
+#define org_lwjgl_input_Keyboard_KEY_V 47L
+#undef org_lwjgl_input_Keyboard_KEY_B
+#define org_lwjgl_input_Keyboard_KEY_B 48L
+#undef org_lwjgl_input_Keyboard_KEY_N
+#define org_lwjgl_input_Keyboard_KEY_N 49L
+#undef org_lwjgl_input_Keyboard_KEY_M
+#define org_lwjgl_input_Keyboard_KEY_M 50L
+#undef org_lwjgl_input_Keyboard_KEY_COMMA
+#define org_lwjgl_input_Keyboard_KEY_COMMA 51L
+#undef org_lwjgl_input_Keyboard_KEY_PERIOD
+#define org_lwjgl_input_Keyboard_KEY_PERIOD 52L
+#undef org_lwjgl_input_Keyboard_KEY_SLASH
+#define org_lwjgl_input_Keyboard_KEY_SLASH 53L
+#undef org_lwjgl_input_Keyboard_KEY_RSHIFT
+#define org_lwjgl_input_Keyboard_KEY_RSHIFT 54L
+#undef org_lwjgl_input_Keyboard_KEY_MULTIPLY
+#define org_lwjgl_input_Keyboard_KEY_MULTIPLY 55L
+#undef org_lwjgl_input_Keyboard_KEY_LMENU
+#define org_lwjgl_input_Keyboard_KEY_LMENU 56L
+#undef org_lwjgl_input_Keyboard_KEY_SPACE
+#define org_lwjgl_input_Keyboard_KEY_SPACE 57L
+#undef org_lwjgl_input_Keyboard_KEY_CAPITAL
+#define org_lwjgl_input_Keyboard_KEY_CAPITAL 58L
+#undef org_lwjgl_input_Keyboard_KEY_F1
+#define org_lwjgl_input_Keyboard_KEY_F1 59L
+#undef org_lwjgl_input_Keyboard_KEY_F2
+#define org_lwjgl_input_Keyboard_KEY_F2 60L
+#undef org_lwjgl_input_Keyboard_KEY_F3
+#define org_lwjgl_input_Keyboard_KEY_F3 61L
+#undef org_lwjgl_input_Keyboard_KEY_F4
+#define org_lwjgl_input_Keyboard_KEY_F4 62L
+#undef org_lwjgl_input_Keyboard_KEY_F5
+#define org_lwjgl_input_Keyboard_KEY_F5 63L
+#undef org_lwjgl_input_Keyboard_KEY_F6
+#define org_lwjgl_input_Keyboard_KEY_F6 64L
+#undef org_lwjgl_input_Keyboard_KEY_F7
+#define org_lwjgl_input_Keyboard_KEY_F7 65L
+#undef org_lwjgl_input_Keyboard_KEY_F8
+#define org_lwjgl_input_Keyboard_KEY_F8 66L
+#undef org_lwjgl_input_Keyboard_KEY_F9
+#define org_lwjgl_input_Keyboard_KEY_F9 67L
+#undef org_lwjgl_input_Keyboard_KEY_F10
+#define org_lwjgl_input_Keyboard_KEY_F10 68L
+#undef org_lwjgl_input_Keyboard_KEY_NUMLOCK
+#define org_lwjgl_input_Keyboard_KEY_NUMLOCK 69L
+#undef org_lwjgl_input_Keyboard_KEY_SCROLL
+#define org_lwjgl_input_Keyboard_KEY_SCROLL 70L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD7
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD7 71L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD8
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD8 72L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD9
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD9 73L
+#undef org_lwjgl_input_Keyboard_KEY_SUBTRACT
+#define org_lwjgl_input_Keyboard_KEY_SUBTRACT 74L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD4
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD4 75L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD5
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD5 76L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD6
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD6 77L
+#undef org_lwjgl_input_Keyboard_KEY_ADD
+#define org_lwjgl_input_Keyboard_KEY_ADD 78L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD1
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD1 79L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD2
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD2 80L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD3
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD3 81L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPAD0
+#define org_lwjgl_input_Keyboard_KEY_NUMPAD0 82L
+#undef org_lwjgl_input_Keyboard_KEY_DECIMAL
+#define org_lwjgl_input_Keyboard_KEY_DECIMAL 83L
+#undef org_lwjgl_input_Keyboard_KEY_F11
+#define org_lwjgl_input_Keyboard_KEY_F11 87L
+#undef org_lwjgl_input_Keyboard_KEY_F12
+#define org_lwjgl_input_Keyboard_KEY_F12 88L
+#undef org_lwjgl_input_Keyboard_KEY_F13
+#define org_lwjgl_input_Keyboard_KEY_F13 100L
+#undef org_lwjgl_input_Keyboard_KEY_F14
+#define org_lwjgl_input_Keyboard_KEY_F14 101L
+#undef org_lwjgl_input_Keyboard_KEY_F15
+#define org_lwjgl_input_Keyboard_KEY_F15 102L
+#undef org_lwjgl_input_Keyboard_KEY_KANA
+#define org_lwjgl_input_Keyboard_KEY_KANA 112L
+#undef org_lwjgl_input_Keyboard_KEY_CONVERT
+#define org_lwjgl_input_Keyboard_KEY_CONVERT 121L
+#undef org_lwjgl_input_Keyboard_KEY_NOCONVERT
+#define org_lwjgl_input_Keyboard_KEY_NOCONVERT 123L
+#undef org_lwjgl_input_Keyboard_KEY_YEN
+#define org_lwjgl_input_Keyboard_KEY_YEN 125L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPADEQUALS
+#define org_lwjgl_input_Keyboard_KEY_NUMPADEQUALS 141L
+#undef org_lwjgl_input_Keyboard_KEY_CIRCUMFLEX
+#define org_lwjgl_input_Keyboard_KEY_CIRCUMFLEX 144L
+#undef org_lwjgl_input_Keyboard_KEY_AT
+#define org_lwjgl_input_Keyboard_KEY_AT 145L
+#undef org_lwjgl_input_Keyboard_KEY_COLON
+#define org_lwjgl_input_Keyboard_KEY_COLON 146L
+#undef org_lwjgl_input_Keyboard_KEY_UNDERLINE
+#define org_lwjgl_input_Keyboard_KEY_UNDERLINE 147L
+#undef org_lwjgl_input_Keyboard_KEY_KANJI
+#define org_lwjgl_input_Keyboard_KEY_KANJI 148L
+#undef org_lwjgl_input_Keyboard_KEY_STOP
+#define org_lwjgl_input_Keyboard_KEY_STOP 149L
+#undef org_lwjgl_input_Keyboard_KEY_AX
+#define org_lwjgl_input_Keyboard_KEY_AX 150L
+#undef org_lwjgl_input_Keyboard_KEY_UNLABELED
+#define org_lwjgl_input_Keyboard_KEY_UNLABELED 151L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPADENTER
+#define org_lwjgl_input_Keyboard_KEY_NUMPADENTER 156L
+#undef org_lwjgl_input_Keyboard_KEY_RCONTROL
+#define org_lwjgl_input_Keyboard_KEY_RCONTROL 157L
+#undef org_lwjgl_input_Keyboard_KEY_NUMPADCOMMA
+#define org_lwjgl_input_Keyboard_KEY_NUMPADCOMMA 179L
+#undef org_lwjgl_input_Keyboard_KEY_DIVIDE
+#define org_lwjgl_input_Keyboard_KEY_DIVIDE 181L
+#undef org_lwjgl_input_Keyboard_KEY_SYSRQ
+#define org_lwjgl_input_Keyboard_KEY_SYSRQ 183L
+#undef org_lwjgl_input_Keyboard_KEY_RMENU
+#define org_lwjgl_input_Keyboard_KEY_RMENU 184L
+#undef org_lwjgl_input_Keyboard_KEY_PAUSE
+#define org_lwjgl_input_Keyboard_KEY_PAUSE 197L
+#undef org_lwjgl_input_Keyboard_KEY_HOME
+#define org_lwjgl_input_Keyboard_KEY_HOME 199L
+#undef org_lwjgl_input_Keyboard_KEY_UP
+#define org_lwjgl_input_Keyboard_KEY_UP 200L
+#undef org_lwjgl_input_Keyboard_KEY_PRIOR
+#define org_lwjgl_input_Keyboard_KEY_PRIOR 201L
+#undef org_lwjgl_input_Keyboard_KEY_LEFT
+#define org_lwjgl_input_Keyboard_KEY_LEFT 203L
+#undef org_lwjgl_input_Keyboard_KEY_RIGHT
+#define org_lwjgl_input_Keyboard_KEY_RIGHT 205L
+#undef org_lwjgl_input_Keyboard_KEY_END
+#define org_lwjgl_input_Keyboard_KEY_END 207L
+#undef org_lwjgl_input_Keyboard_KEY_DOWN
+#define org_lwjgl_input_Keyboard_KEY_DOWN 208L
+#undef org_lwjgl_input_Keyboard_KEY_NEXT
+#define org_lwjgl_input_Keyboard_KEY_NEXT 209L
+#undef org_lwjgl_input_Keyboard_KEY_INSERT
+#define org_lwjgl_input_Keyboard_KEY_INSERT 210L
+#undef org_lwjgl_input_Keyboard_KEY_DELETE
+#define org_lwjgl_input_Keyboard_KEY_DELETE 211L
+#undef org_lwjgl_input_Keyboard_KEY_LWIN
+#define org_lwjgl_input_Keyboard_KEY_LWIN 219L
+#undef org_lwjgl_input_Keyboard_KEY_RWIN
+#define org_lwjgl_input_Keyboard_KEY_RWIN 220L
+#undef org_lwjgl_input_Keyboard_KEY_APPS
+#define org_lwjgl_input_Keyboard_KEY_APPS 221L
+#undef org_lwjgl_input_Keyboard_KEY_POWER
+#define org_lwjgl_input_Keyboard_KEY_POWER 222L
+#undef org_lwjgl_input_Keyboard_KEY_SLEEP
+#define org_lwjgl_input_Keyboard_KEY_SLEEP 223L
 /* Inaccessible static: created */
 /* Inaccessible static: keyDownBuffer */
 /* Inaccessible static: keyDownAddress */
 /* Inaccessible static: readBuffer */
-/* Inaccessible static: readBufferAddress */
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: translationEnabled */
+/* Inaccessible static: numEvents */
+/* Inaccessible static: character */
+/* Inaccessible static: key */
+/* Inaccessible static: state */
+/* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Keyboard */
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    initIDs
@@ -49,10 +303,18 @@
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nRead
- * Signature: (I)V
+ * Signature: ()I
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
-  (JNIEnv *, jclass, jint);
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nEnableTranslation
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+  (JNIEnv *, jclass);
 
 /*
  * Class:     org_lwjgl_input_Keyboard

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

Modified Files:
	Makefile.am org_lwjgl_input_Keyboard.cpp 
Removed Files:
	org_lwjgl_input_GamePad.cpp org_lwjgl_input_Joystick.cpp 
Log Message:
Fixed linux compile

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	28 Nov 2002 22:40:06 -0000	1.1
+++ Makefile.am	11 Jan 2003 21:03:22 -0000	1.2
@@ -6,8 +6,7 @@
 NATIVE = \
   org_lwjgl_Display.cpp \
   org_lwjgl_Sys.cpp \
-  org_lwjgl_input_GamePad.cpp \
-  org_lwjgl_input_Joystick.cpp \
+  org_lwjgl_input_Controller.cpp \
   org_lwjgl_input_Keyboard.cpp \
   org_lwjgl_input_Mouse.cpp \
   org_lwjgl_opengl_BaseGL.cpp

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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_input_Keyboard.cpp	26 Nov 2002 20:07:49 -0000	1.9
+++ org_lwjgl_input_Keyboard.cpp	11 Jan 2003 21:03:22 -0000	1.10
@@ -41,6 +41,7 @@
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <string.h>
 #include <assert.h>
 #include "org_lwjgl_input_Keyboard.h"
@@ -51,20 +52,16 @@
 
 unsigned char readBuffer[KEYBOARD_BUFFER_SIZE * 2];
 jfieldID fid_readBuffer;
-jfieldID fid_readBufferAddress;
 unsigned char key_buf[KEYBOARD_SIZE];
 unsigned char key_map[KEYBOARD_SIZE];
 
-typedef struct {
-	unsigned char keycode;
-	unsigned char state;
-} input_event;
-
-input_event saved_key_events[KEY_EVENT_BACKLOG];
+XKeyEvent saved_key_events[KEY_EVENT_BACKLOG];
 int list_start = 0;
 int list_end = 0;
 
 bool keyboard_grabbed;
+bool buffer_enabled;
+bool translation_enabled;
 
 extern Display *disp;
 extern Window win;
@@ -88,7 +85,6 @@
 	}
 
 	fid_readBuffer = env->GetStaticFieldID(clazz, "readBuffer", "Ljava/nio/ByteBuffer;");
-	fid_readBufferAddress = env->GetStaticFieldID(clazz, "readBufferAddress", "I");
 }
 
 int grabKeyboard(void) {
@@ -127,7 +123,10 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
 {
-	keyboard_grabbed = 0;
+	keyboard_grabbed = false;
+	translation_enabled = false;
+	buffer_enabled = false;
+
 	if (updateKeyboardGrab() != GrabSuccess) {
 #ifdef _DEBUG
 		printf("Could not grab keyboard\n");
@@ -170,29 +169,68 @@
 		ungrabKeyboard();
 }
 
-input_event *nextEventElement(void) {
+XKeyEvent *nextEventElement(void) {
 	if (list_start == list_end)
 		return NULL;
-	input_event *result = &(saved_key_events[list_start]);
+	XKeyEvent *result = &(saved_key_events[list_start]);
 	list_start = (list_start + 1)%KEY_EVENT_BACKLOG;
 	return result;
 }
 
-void putEventElement(unsigned char keycode, unsigned char state) {
+void putEventElement(XKeyEvent *event) {
 	int next_index = (list_end + 1)%KEY_EVENT_BACKLOG;
 	if (next_index == list_start)
 		return;
-	saved_key_events[list_end].keycode = keycode;
-	saved_key_events[list_end].state = state;
+	saved_key_events[list_end] = *event;
 	list_end = next_index;
 }
 
-unsigned char getKeycode(XEvent *event) {
-	unsigned char keycode = (unsigned char)((event->xkey.keycode - 8) & 0xff);
+unsigned char getKeycode(XKeyEvent *event) {
+	unsigned char keycode = (unsigned char)((event->keycode - 8) & 0xff);
 	keycode = key_map[keycode];
 	return keycode;
 }
 
+int translateEvent(int *position, XKeyEvent *event) {
+	static char temp_translation_buffer[KEYBOARD_BUFFER_SIZE];
+	static XComposeStatus status;
+        int num_chars, i;
+
+	if (*position >= KEYBOARD_BUFFER_SIZE * 2)
+		return 0;
+       	if (event->type == KeyRelease) {
+		readBuffer[(*position)++] = 0;
+                readBuffer[(*position)++] = 0;
+		return 0;
+	}
+	num_chars = XLookupString(event, temp_translation_buffer, KEYBOARD_BUFFER_SIZE, NULL, &status);
+	if (num_chars > 0) {
+		num_chars--;
+		/* Assume little endian byte order */
+		readBuffer[(*position)++] = temp_translation_buffer[0];
+		readBuffer[(*position)++] = 0;
+		for (i = 0; i < num_chars; i++) {
+			readBuffer[(*position)++] = 0;
+			readBuffer[(*position)++] = 0;
+	                readBuffer[(*position)++] = temp_translation_buffer[i + 1];
+			readBuffer[(*position)++] = 0;
+		}
+	} else {
+		readBuffer[(*position)++] = 0;
+                readBuffer[(*position)++] = 0;
+	}
+	return num_chars;
+}
+
+unsigned char eventState(XKeyEvent *event) {
+	if (event->type == KeyPress) {
+		return 1;
+	} else if (event->type == KeyRelease) {
+		return 0;
+	} else
+		assert(0);
+}
+
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nPoll
@@ -202,20 +240,16 @@
   (JNIEnv * env, jclass clazz, jint buf)
 {
 	XEvent event;
-	int state;
+	unsigned char state;
 	
 	updateKeyboardGrab();
 
 	while (XCheckMaskEvent(disp, KeyPressMask | KeyReleaseMask, &event)) {
-		unsigned char keycode = getKeycode(&event);
-		if (event.type == KeyPress) {
-			state = 1;
-		} else if (event.type == KeyRelease) {
-			state = 0;
-		} else
-			assert(0);
+		unsigned char keycode = getKeycode(&(event.xkey));
+		state = eventState(&(event.xkey));
 		key_buf[keycode] = state;
-		putEventElement(keycode, state);
+		if (buffer_enabled)
+			putEventElement(&(event.xkey));
 	}
 	memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
 }
@@ -225,43 +259,51 @@
  * Method:    nRead
  * Signature: (I)V
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
-  (JNIEnv * env, jclass clazz, jint keys)
+JNIEXPORT int JNICALL Java_org_lwjgl_input_Keyboard_nRead
+  (JNIEnv * env, jclass clazz)
 {
 	XEvent event;
-	int count = 0;
+	XKeyEvent *key_event;
 	int buf_count = 0;
 	int state;
-	input_event *input_ev;
-	unsigned char *result_buf = (unsigned char *)keys;
+	int num_events = 0;
 
 	updateKeyboardGrab();
 
-	while ((input_ev = nextEventElement()) != NULL) {
-		count++;
-//		printf("Reading a key %d %d count %d\n", (int)input_ev->keycode, (int)input_ev->state, count);
-		result_buf[buf_count++] = input_ev->keycode;
-		result_buf[buf_count++] = input_ev->state;
-		if (buf_count >= KEYBOARD_BUFFER_SIZE * 2)
-			return count;
+	while (buf_count < KEYBOARD_BUFFER_SIZE * 2 && (key_event = nextEventElement()) != NULL) {
+		num_events++;
+		unsigned char keycode = getKeycode(key_event);
+		unsigned char state = eventState(key_event);
+//		printf("Reading a key %d %d count %d\n", (int)keycode, (int)state, num_events);
+		readBuffer[buf_count++] = keycode;
+		readBuffer[buf_count++] = state;
+		if (translation_enabled)
+			num_events += translateEvent(&buf_count, key_event);
 	}
 
-	while (XCheckMaskEvent(disp, KeyPressMask | KeyReleaseMask, &event)) {
-		count++;
-		unsigned char keycode = getKeycode(&event);
-		if (event.type == KeyPress) {
-			state = 1;
-		} else if (event.type == KeyRelease) {
-			state = 0;
-		} else
-			assert(0);
+	while (buf_count < KEYBOARD_BUFFER_SIZE * 2 && XCheckMaskEvent(disp, KeyPressMask | KeyReleaseMask, &event)) {
+		num_events++;
+		unsigned char keycode = getKeycode(&(event.xkey));
+		unsigned char state = eventState(&(event.xkey));
+//		printf("Reading a key %d %d count %d\n", (int)keycode, (int)state, num_events);
 		key_buf[keycode] = state;
-		result_buf[buf_count++] = keycode;
-		result_buf[buf_count++] = state;
-		if (buf_count >= KEYBOARD_BUFFER_SIZE * 2)
-			return count;
+		readBuffer[buf_count++] = keycode;
+		readBuffer[buf_count++] = state;
+		if (translation_enabled)
+			num_events += translateEvent(&buf_count, &(event.xkey));
 	}
-	return count;
+	return num_events;
+}
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nEnableTranslation
+ * Signature: ()I
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+  (JNIEnv *env, jclass clazz)
+{
+	translation_enabled = true;
 }
 
 /*
@@ -274,6 +316,6 @@
 {
 	jobject newBuffer = env->NewDirectByteBuffer(&readBuffer, KEYBOARD_BUFFER_SIZE * 2);
 	env->SetStaticObjectField(clazz, fid_readBuffer, newBuffer);
-	env->SetStaticIntField(clazz, fid_readBufferAddress, (jint) (&readBuffer));
+	buffer_enabled = true;
 	return KEYBOARD_BUFFER_SIZE;
 }

--- org_lwjgl_input_GamePad.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_GamePad.cpp

--- org_lwjgl_input_Joystick.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Joystick.cpp

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

Added Files:
	org_lwjgl_input_Controller.cpp 
Log Message:
Fixed linux compile

--- NEW FILE: org_lwjgl_input_Controller.cpp ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Controller.cpp
/*
 * Copyright (c) 2002 Lightweight Java Game Library Project
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Light Weight Java Game Library' nor the names of 
 *   its contributors may be used to endorse or promote products derived 
 *   from this software without specific prior written permission.
 * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
/**
 * $Id: org_lwjgl_input_Controller.cpp,v 1.1 2003/01/11 21:02:54 elias_naur Exp $
 *
 * Win32 controller handling.
 *
 * @author Brian Matzon <br...@ma...>
 * @version $Revision: 1.1 $
 */
#include <jni.h>

/**
 * Initializes any field ids
 */
JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_initIDs(JNIEnv * env, jclass clazz) {
}

/**
 * Called when the Controller instance is to be created
 */
JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
  return JNI_FALSE;
}

/*
 * Class:     org_lwjgl_input_Controller
 * Method:    nDestroy
 * Signature: ()V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nDestroy(JNIEnv *env, jclass clazz) {
}

/*
 * Class:     org_lwjgl_input_Controller
 * Method:    nPoll
 * Signature: ()V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nPoll(JNIEnv * env, jclass clazz) {
}

Update of /cvsroot/java-game-lib/LWJGL/website/documents
In directory sc8-pr-cvs1:/tmp/cvs-serv12689

Modified Files:
	links.html 
Log Message:
add: link to chman's nehe ports added

Index: links.html
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/website/documents/links.html
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/website/documents/links.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- links.html	20 Dec 2002 21:23:30 -0000	1.1
+++ links.html	11 Jan 2003 13:56:51 -0000	1.2
@@ -39,6 +39,10 @@
    More feature complete input support for java
     <br>
     <br>
+ - <a href="http://chman-area.tuxfamily.org/" target="blank">http://chman-area.tuxfamily.org/</a><br>
+ &nbsp;&nbsp;Chman's Java & OpenGL webpage - Nehe ports
+    <br>
+    <br>
 </font>
 </body>
 </html>