michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Elias Naur 2003-10-07 10:04:38 +00:00
parent e62178a8df
commit 0e799f0972
5 changed files with 177 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/native/linux/org_lwjgl_input_Keyboard.cpp
View File

@ -161,6 +161,8 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
translation_enabled = false;
buffer_enabled = false;
should_grab = true;
list_start = 0;
list_end = 0;
updateGrab();
}

173
src/native/macosx/org_lwjgl_input_Keyboard.cpp
View File

@ -46,9 +46,30 @@
#define KEYBOARD_BUFFER_SIZE 50
#define KEYBOARD_SIZE 256
#define KEY_EVENT_BACKLOG 40
#define UNICODE_BUFFER_SIZE 10
static unsigned char key_buf[KEYBOARD_SIZE];
static unsigned char key_map[KEYBOARD_SIZE];
static unsigned char input_event_buffer[KEYBOARD_SIZE*2];
static unsigned char output_event_buffer[KEYBOARD_SIZE*2];
static int list_start;
static int list_end;
static bool buffer_enabled;
static void handleMappedKey(unsigned char mapped_code, unsigned char state) {
lock();
unsigned char old_state = key_buf[mapped_code];
if (old_state != state) {
if (state == 1)
printf("key down, %x\n", mapped_code);
else
printf("key up, %x\n", mapped_code);
key_buf[mapped_code] = state;
}
unlock();
}
static void handleKey(UInt32 key_code, unsigned char state) {
if (key_code >= KEYBOARD_SIZE) {
@ -57,17 +78,48 @@ static void handleKey(UInt32 key_code, unsigned char state) {
#endif
return;
}
lock();
unsigned char mapped_code = key_map[key_code];
unsigned char old_state = key_buf[mapped_code];
if (old_state != state) {
if (state == 1)
printf("key down, key %x\n", key_code);
else
printf("key up, key %x\n", key_code);
key_buf[mapped_code] = state;
if (mapped_code == 0) {
#ifdef _DEBUG
printf("unknown key code: %x\n", (unsigned int)key_code);
#endif
return;
}
unlock();
handleMappedKey(mapped_code, state);
}
static void writeChars(int num_chars, UniChar *buffer) {
}
static OSStatus handleUnicode(EventRef event) {
UniChar unicode_buffer[UNICODE_BUFFER_SIZE];
UInt32 data_size;
int num_chars;
OSStatus err = GetEventParameter(event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0, &data_size, NULL);
if (err != noErr) {
#ifdef _DEBUG
printf("Could not get unicode char count\n");
#endif
return eventNotHandledErr;
}
num_chars = data_size/sizeof(UniChar);
if (num_chars >= UNICODE_BUFFER_SIZE) {
#ifdef _DEBUG
printf("Unicode chars could not fit in buffer\n");
#endif
return eventNotHandledErr;
}
err = GetEventParameter(event, kEventParamKeyUnicodes, typeUnicodeText, NULL, data_size, NULL, unicode_buffer);
if (err != noErr) {
#ifdef _DEBUG
printf("Could not get unicode chars\n");
#endif
return eventNotHandledErr;
}
if (buffer_enabled)
writeChars(num_chars, unicode_buffer);
return noErr;
}
static pascal OSStatus doKeyDown(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
@ -80,7 +132,7 @@ static pascal OSStatus doKeyDown(EventHandlerCallRef next_handler, EventRef even
return eventNotHandledErr;
}
handleKey(key_code, 1);
return noErr;
return handleUnicode(event);
}
static pascal OSStatus doKeyUp(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
@ -99,7 +151,7 @@ static pascal OSStatus doKeyUp(EventHandlerCallRef next_handler, EventRef event,
static void handleModifier(UInt32 modifier_bit_mask, UInt32 modifier_bit, unsigned char key_code) {
bool key_down = (modifier_bit_mask & modifier_bit) == modifier_bit;
unsigned char key_state = key_down ? 1 : 0;
handleKey(key_code, key_state);
handleMappedKey(key_code, key_state);
}
static pascal OSStatus doKeyModifier(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
@ -145,11 +197,105 @@ bool registerKeyboardHandler(JNIEnv* env, WindowRef win_ref) {
return !error;
}
static void setupMappings(void) {
memset(key_map, 0, KEYBOARD_SIZE*sizeof(unsigned char));
key_map[0x35] = org_lwjgl_input_Keyboard_KEY_ESCAPE;
key_map[0x12] = org_lwjgl_input_Keyboard_KEY_1;
key_map[0x13] = org_lwjgl_input_Keyboard_KEY_2;
key_map[0x14] = org_lwjgl_input_Keyboard_KEY_3;
key_map[0x15] = org_lwjgl_input_Keyboard_KEY_4;
key_map[0x17] = org_lwjgl_input_Keyboard_KEY_5;
key_map[0x16] = org_lwjgl_input_Keyboard_KEY_6;
key_map[0x1a] = org_lwjgl_input_Keyboard_KEY_7;
key_map[0x1c] = org_lwjgl_input_Keyboard_KEY_8;
key_map[0x19] = org_lwjgl_input_Keyboard_KEY_9;
key_map[0x1d] = org_lwjgl_input_Keyboard_KEY_0;
key_map[0x1b] = org_lwjgl_input_Keyboard_KEY_MINUS;
key_map[0x18] = org_lwjgl_input_Keyboard_KEY_EQUALS;
key_map[0x33] = org_lwjgl_input_Keyboard_KEY_BACK;
key_map[0x30] = org_lwjgl_input_Keyboard_KEY_TAB;
key_map[0x0c] = org_lwjgl_input_Keyboard_KEY_Q;
key_map[0x0d] = org_lwjgl_input_Keyboard_KEY_W;
key_map[0x0e] = org_lwjgl_input_Keyboard_KEY_E;
key_map[0x0f] = org_lwjgl_input_Keyboard_KEY_R;
key_map[0x11] = org_lwjgl_input_Keyboard_KEY_T;
key_map[0x10] = org_lwjgl_input_Keyboard_KEY_Y;
key_map[0x20] = org_lwjgl_input_Keyboard_KEY_U;
key_map[0x22] = org_lwjgl_input_Keyboard_KEY_I;
key_map[0x1f] = org_lwjgl_input_Keyboard_KEY_O;
key_map[0x23] = org_lwjgl_input_Keyboard_KEY_P;
key_map[0x21] = org_lwjgl_input_Keyboard_KEY_LBRACKET;
key_map[0x1e] = org_lwjgl_input_Keyboard_KEY_RBRACKET;
key_map[0x24] = org_lwjgl_input_Keyboard_KEY_RETURN;
key_map[0x00] = org_lwjgl_input_Keyboard_KEY_A;
key_map[0x01] = org_lwjgl_input_Keyboard_KEY_S;
key_map[0x02] = org_lwjgl_input_Keyboard_KEY_D;
key_map[0x03] = org_lwjgl_input_Keyboard_KEY_F;
key_map[0x05] = org_lwjgl_input_Keyboard_KEY_G;
key_map[0x04] = org_lwjgl_input_Keyboard_KEY_H;
key_map[0x26] = org_lwjgl_input_Keyboard_KEY_J;
key_map[0x28] = org_lwjgl_input_Keyboard_KEY_K;
key_map[0x25] = org_lwjgl_input_Keyboard_KEY_L;
key_map[0x29] = org_lwjgl_input_Keyboard_KEY_SEMICOLON;
key_map[0x27] = org_lwjgl_input_Keyboard_KEY_APOSTROPHE;
key_map[0x2a] = org_lwjgl_input_Keyboard_KEY_GRAVE;
key_map[0x32] = org_lwjgl_input_Keyboard_KEY_BACKSLASH;
key_map[0x06] = org_lwjgl_input_Keyboard_KEY_Z;
key_map[0x07] = org_lwjgl_input_Keyboard_KEY_X;
key_map[0x08] = org_lwjgl_input_Keyboard_KEY_C;
key_map[0x09] = org_lwjgl_input_Keyboard_KEY_V;
key_map[0x0b] = org_lwjgl_input_Keyboard_KEY_B;
key_map[0x2d] = org_lwjgl_input_Keyboard_KEY_N;
key_map[0x2e] = org_lwjgl_input_Keyboard_KEY_M;
key_map[0x2b] = org_lwjgl_input_Keyboard_KEY_COMMA;
key_map[0x2f] = org_lwjgl_input_Keyboard_KEY_PERIOD;
key_map[0x2c] = org_lwjgl_input_Keyboard_KEY_SLASH;
key_map[0x43] = org_lwjgl_input_Keyboard_KEY_MULTIPLY;
key_map[0x31] = org_lwjgl_input_Keyboard_KEY_SPACE;
key_map[0x7a] = org_lwjgl_input_Keyboard_KEY_F1;
key_map[0x78] = org_lwjgl_input_Keyboard_KEY_F2;
key_map[0x63] = org_lwjgl_input_Keyboard_KEY_F3;
key_map[0x76] = org_lwjgl_input_Keyboard_KEY_F4;
key_map[0x60] = org_lwjgl_input_Keyboard_KEY_F5;
key_map[0x61] = org_lwjgl_input_Keyboard_KEY_F6;
key_map[0x62] = org_lwjgl_input_Keyboard_KEY_F7;
key_map[0x64] = org_lwjgl_input_Keyboard_KEY_F8;
key_map[0x65] = org_lwjgl_input_Keyboard_KEY_F9;
key_map[0x6d] = org_lwjgl_input_Keyboard_KEY_F10;
key_map[0x59] = org_lwjgl_input_Keyboard_KEY_NUMPAD7;
key_map[0x5b] = org_lwjgl_input_Keyboard_KEY_NUMPAD8;
key_map[0x5c] = org_lwjgl_input_Keyboard_KEY_NUMPAD9;
key_map[0x4e] = org_lwjgl_input_Keyboard_KEY_SUBTRACT;
key_map[0x56] = org_lwjgl_input_Keyboard_KEY_NUMPAD4;
key_map[0x57] = org_lwjgl_input_Keyboard_KEY_NUMPAD5;
key_map[0x58] = org_lwjgl_input_Keyboard_KEY_NUMPAD6;
key_map[0x45] = org_lwjgl_input_Keyboard_KEY_ADD;
key_map[0x53] = org_lwjgl_input_Keyboard_KEY_NUMPAD1;
key_map[0x54] = org_lwjgl_input_Keyboard_KEY_NUMPAD2;
key_map[0x55] = org_lwjgl_input_Keyboard_KEY_NUMPAD3;
key_map[0x52] = org_lwjgl_input_Keyboard_KEY_NUMPAD0;
key_map[0x41] = org_lwjgl_input_Keyboard_KEY_DECIMAL;
key_map[0x67] = org_lwjgl_input_Keyboard_KEY_F11;
key_map[0x6f] = org_lwjgl_input_Keyboard_KEY_F12;
key_map[0x51] = org_lwjgl_input_Keyboard_KEY_NUMPADEQUALS;
key_map[0x4c] = org_lwjgl_input_Keyboard_KEY_NUMPADENTER;
key_map[0x4b] = org_lwjgl_input_Keyboard_KEY_DIVIDE;
key_map[0x73] = org_lwjgl_input_Keyboard_KEY_HOME;
key_map[0x7e] = org_lwjgl_input_Keyboard_KEY_UP;
key_map[0x74] = org_lwjgl_input_Keyboard_KEY_PRIOR;
key_map[0x7b] = org_lwjgl_input_Keyboard_KEY_LEFT;
key_map[0x7c] = org_lwjgl_input_Keyboard_KEY_RIGHT;
key_map[0x7d] = org_lwjgl_input_Keyboard_KEY_DOWN;
key_map[0x79] = org_lwjgl_input_Keyboard_KEY_NEXT;
}
JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_initIDs(JNIEnv * env, jclass clazz) {
}
JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate(JNIEnv * env, jclass clazz) {
buffer_enabled = false;
memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char));
setupMappings();
}
JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nDestroy(JNIEnv * env, jclass clazz) {
@ -169,6 +315,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation(JNIEnv *
}
JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer(JNIEnv * env, jclass clazz) {
jfieldID fid_readBuffer = env->GetStaticFieldID(clazz, "readBuffer", "Ljava/nio/ByteBuffer;");
jobject new_buffer = env->NewDirectByteBuffer(&output_event_buffer, KEYBOARD_BUFFER_SIZE * 2);
env->SetStaticObjectField(clazz, fid_readBuffer, new_buffer);
buffer_enabled = true;
return KEYBOARD_BUFFER_SIZE;
}
JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key) {

9
src/native/macosx/org_lwjgl_opengl_Window.cpp
View File

@ -188,8 +188,9 @@ static bool createContext(JNIEnv *env, jint bpp, jint alpha, jint depth, jint st
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsCloseRequested(JNIEnv *, jclass) {
bool saved;
lock();
const bool saved = close_requested;
saved = close_requested;
close_requested = false;
unlock();
return saved;
@ -273,8 +274,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nDestroy(JNIEnv *env, jclass
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsFocused(JNIEnv *env, jclass clazz) {
bool result;
lock();
bool result = activated;
result = activated;
unlock();
return result;
}
@ -284,8 +286,9 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsDirty(JNIEnv *env, jc
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsMinimized(JNIEnv *env, jclass clazz) {
bool result;
lock();
bool result = miniaturized;
result = miniaturized;
unlock();
return result;
}

4
src/native/macosx/tools.cpp
View File

@ -26,7 +26,7 @@ void destroyLock(void) {
}
}
void lock(void) {
void lockLWJGL(void) {
OSStatus err = MPEnterCriticalRegion(critical_region, kDurationForever);
if (err != noErr) {
#ifdef _DEBUG
@ -35,7 +35,7 @@ void lock(void) {
}
}
void unlock(void) {
void unlockLWJGL(void) {
OSStatus err = MPExitCriticalRegion(critical_region);
if (err != noErr) {
#ifdef _DEBUG

7
src/native/macosx/tools.h
View File

@ -3,10 +3,13 @@
#include <JavaVM/jni.h>
#define lock() {lockLWJGL();
#define unlock() unlockLWJGL();}
extern void throwException(JNIEnv* env, const char* msg);
extern bool initLock(JNIEnv* env);
extern void destroyLock(void);
extern void lock(void);
extern void unlock(void);
extern void lockLWJGL(void);
extern void unlockLWJGL(void);
#endif