Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native/macosx hid.cpp,1.4,1.5 org_lwjgl_Sys.cpp,1.11,1.12 org_lwjgl_input_Keyboard.cpp,1.20,1.21 org_lwjgl_input_Mouse.cpp,1.23,1.24
|
From: Elias N. <eli...@us...> - 2003-12-20 22:03:28
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx In directory sc8-pr-cvs1:/tmp/cvs-serv27059/src/native/macosx Modified Files: hid.cpp org_lwjgl_Sys.cpp org_lwjgl_input_Keyboard.cpp org_lwjgl_input_Mouse.cpp Log Message: Reduced Sys.debug from bool -> int Index: hid.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/hid.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/hid.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hid.cpp 20 Dec 2003 14:01:30 -0000 1.4 +++ hid.cpp 20 Dec 2003 22:03:25 -0000 1.5 @@ -123,7 +123,7 @@ static void addToDeviceQueue(hid_device_t *hid_dev, IOHIDElementCookie cookie, int index) { HRESULT result = (*hid_dev->device_queue)->addElement(hid_dev->device_queue, cookie, 0); if (result != S_OK) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not add cookie to queue\n"); + printfDebug("Could not add cookie to queue\n"); return; } CFDictionaryAddValue(hid_dev->cookie_map, cookie, (void *)index); @@ -191,7 +191,7 @@ CFDictionaryRef matching_dic = IOServiceMatching(kIOHIDDeviceKey); IOReturn err = IOServiceGetMatchingServices(kIOMasterPortDefault, matching_dic, &device_iterator); if (err != kIOReturnSuccess) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not find matching devices\n"); + printfDebug("Could not find matching devices\n"); return false; } while (!success && (hid_device = IOIteratorNext(device_iterator)) != NULL) { @@ -201,7 +201,7 @@ long usage_page; if (getDictLong(dev_props, CFSTR(kIOHIDPrimaryUsageKey), &usage) && getDictLong(dev_props, CFSTR(kIOHIDPrimaryUsagePageKey), &usage_page)) { - if (ATDEBUGLEVEL(org_lwjgl_Sys_DEBUG)) { + if (ISDEBUGENABLED()) { printf("Considering device '"); printProperty(dev_props, CFSTR(kIOHIDProductKey)); printf("', usage page %ld usage %ld\n", usage_page, usage); Index: org_lwjgl_Sys.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Sys.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Sys.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- org_lwjgl_Sys.cpp 20 Dec 2003 14:01:30 -0000 1.11 +++ org_lwjgl_Sys.cpp 20 Dec 2003 22:03:25 -0000 1.12 @@ -64,15 +64,15 @@ static long queryTime(void) { struct timeval tv; if (gettimeofday(&tv, NULL) == -1) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not read current time\n"); + printfDebug("Could not read current time\n"); } long result = tv.tv_sec * 1000000l + tv.tv_usec; return result; } -JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setDebugLevel(JNIEnv *env, jclass clazz, jint debug_level) { - setDebugLevel(debug_level); +JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setDebugEnabled(JNIEnv *env, jclass clazz, jboolean enabled) { + setDebugEnabled(enabled == JNI_TRUE ? true : false); } /* @@ -110,7 +110,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setProcessPriority (JNIEnv * env, jclass clazz, jint priority) { - printfDebug(org_lwjgl_Sys_DEBUG, "WARNING: setProcessPriority unsupported\n"); + printfDebug("WARNING: setProcessPriority unsupported\n"); } /* Index: org_lwjgl_input_Keyboard.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- org_lwjgl_input_Keyboard.cpp 20 Dec 2003 14:01:30 -0000 1.20 +++ org_lwjgl_input_Keyboard.cpp 20 Dec 2003 22:03:25 -0000 1.21 @@ -70,12 +70,12 @@ static bool handleKey(UInt32 key_code, unsigned char state) { if (key_code >= KEYBOARD_SIZE) { - printfDebug(org_lwjgl_Sys_DEBUG, "Key code >= %d %x\n", KEYBOARD_SIZE, (unsigned int)key_code); + printfDebug("Key code >= %d %x\n", KEYBOARD_SIZE, (unsigned int)key_code); return false; } unsigned char mapped_code = key_map[key_code]; if (mapped_code == 0) { - printfDebug(org_lwjgl_Sys_DEBUG, "unknown key code: %x\n", (unsigned int)key_code); + printfDebug("unknown key code: %x\n", (unsigned int)key_code); return false; } return handleMappedKey(mapped_code, state); @@ -129,7 +129,7 @@ KeyboardLayoutRef layout; OSStatus err = KLGetCurrentKeyboardLayout(&layout); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get current keyboard layout\n"); + printfDebug("Could not get current keyboard layout\n"); return false; } @@ -143,7 +143,7 @@ success = success && GetEventParameter(event, kEventParamKeyboardType, typeUInt32, NULL, sizeof(keyboardType), NULL, &keyboardType) == noErr; success = success && GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifierKeyState), NULL, &modifierKeyState) == noErr; if (!success) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get event parameters for character translation\n"); + printfDebug("Could not get event parameters for character translation\n"); return false; } err = KLGetKeyboardLayoutProperty(layout, kKLuchrData, (const void **)&uchrHandle); @@ -175,7 +175,7 @@ if (state) return writeAsciiChars(count, ascii_buffer); } else { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not translate key\n"); + printfDebug("Could not translate key\n"); return false; } } @@ -186,7 +186,7 @@ UInt32 key_code; OSStatus err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(key_code), NULL, &key_code); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get event key code\n"); + printfDebug("Could not get event key code\n"); return; } if (handleKey(key_code, 1) && !handleTranslation(event, true)) { @@ -199,7 +199,7 @@ UInt32 key_code; OSStatus err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(key_code), NULL, &key_code); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get event key code\n"); + printfDebug("Could not get event key code\n"); return; } if (handleKey(key_code, 0) && !handleTranslation(event, false)) { @@ -222,7 +222,7 @@ UInt32 modifier_bits; OSStatus err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifier_bits), NULL, &modifier_bits); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get event key code\n"); + printfDebug("Could not get event key code\n"); return; } handleModifier(modifier_bits, controlKey, 0x1d); Index: org_lwjgl_input_Mouse.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- org_lwjgl_input_Mouse.cpp 20 Dec 2003 14:01:30 -0000 1.23 +++ org_lwjgl_input_Mouse.cpp 20 Dec 2003 22:03:25 -0000 1.24 @@ -70,7 +70,7 @@ static void handleButton(unsigned char button_index, jbyte state) { if (button_index >= NUM_BUTTONS) { - printfDebug(org_lwjgl_Sys_DEBUG, "Button index %d out of range [0..%d]\n", button_index, NUM_BUTTONS); + printfDebug("Button index %d out of range [0..%d]\n", button_index, NUM_BUTTONS); return; } button_states[button_index] = state; @@ -106,7 +106,7 @@ } } } - printfDebug(org_lwjgl_Sys_DEBUG, "Recieved an unknown HID device event\n"); + printfDebug("Recieved an unknown HID device event\n"); } } */ @@ -120,7 +120,7 @@ EventMouseButton button; OSStatus err = GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not get button parameter from event\n"); + printfDebug("Could not get button parameter from event\n"); return; } handleButton(button - 1, state); @@ -130,7 +130,7 @@ HIPoint delta; OSStatus err = GetEventParameter(event, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(delta), NULL, &delta); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not delta parameter from event\n"); + printfDebug("Could not delta parameter from event\n"); return; } last_dx += (int)delta.x; @@ -141,7 +141,7 @@ long delta; OSStatus err = GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger, NULL, sizeof(delta), NULL, &delta); if (err != noErr) { - printfDebug(org_lwjgl_Sys_DEBUG, "Could not delta parameter from event\n"); + printfDebug("Could not delta parameter from event\n"); return; } last_dz += (int)delta; |
