|
From: Elias N. <eli...@us...> - 2005-11-23 17:08:35
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26126 Modified Files: org_lwjgl_input_Keyboard.c Log Message: Linux: use the correct KEYBOARD_SIZE Index: org_lwjgl_input_Keyboard.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- org_lwjgl_input_Keyboard.c 21 Nov 2005 13:22:52 -0000 1.22 +++ org_lwjgl_input_Keyboard.c 23 Nov 2005 17:08:17 -0000 1.23 @@ -53,10 +53,9 @@ #include "org_lwjgl_opengl_LinuxDisplay.h" #define KEYBOARD_BUFFER_SIZE 50 -#define KEYBOARD_SIZE 256 #define KEY_EVENT_BACKLOG 40 -static unsigned char key_buf[KEYBOARD_SIZE]; +static jbyte key_buf[org_lwjgl_input_Keyboard_KEYBOARD_SIZE]; static int numlock_mask; static int modeswitch_mask; static int caps_lock_mask; @@ -125,7 +124,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateKeyboard (JNIEnv * env, jclass clazz, jint window_mode) { - memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char)); + memset(key_buf, 0, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte)); created = true; keyboard_grabbed = false; initEventQueue(&event_queue, 3); @@ -660,7 +659,7 @@ } } -static unsigned char eventState(XKeyEvent *event) { +static jbyte eventState(XKeyEvent *event) { if (event->type == KeyPress) { return 1; } else if (event->type == KeyRelease) { @@ -677,14 +676,14 @@ void handleKeyEvent(XKeyEvent *event) { unsigned char keycode = getKeycode(event); - unsigned char state = eventState(event); + jbyte state = eventState(event); key_buf[keycode] = state; bufferEvent(event); } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollKeyboard(JNIEnv * env, jclass clazz, jobject buffer) { - unsigned char *new_keyboard_buffer = (unsigned char *)(*env)->GetDirectBufferAddress(env, buffer); - memcpy(new_keyboard_buffer, key_buf, KEYBOARD_SIZE*sizeof(unsigned char)); + jbyte *new_keyboard_buffer = (jbyte *)(*env)->GetDirectBufferAddress(env, buffer); + memcpy(new_keyboard_buffer, key_buf, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte)); } JNIEXPORT int JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReadKeyboard(JNIEnv * env, jclass clazz, jobject buffer, jint buffer_position) { |