Merge pull request kwhat#12 from kwhat/hook_events

Merging hook events upstream changes.

Author: kwhat

src/java/org/jnativehook/GlobalScreen.java

@@ -525,6 +525,8 @@ private static void loadNativeLibrary() {
 					if (manInputStream != null) {
 						// Try and extract a version string from the Manifest.
 						Manifest manifest = new Manifest(manInputStream);
+
+						// FIXME More OS X JRE Bugs!  This returns NULL but only for Apple!
 						Attributes attributes = manifest.getAttributes(basePackage);
 
 						if (attributes != null) {

src/jni/jni_Converter.c

@@ -33,7 +33,7 @@ jint jni_ConvertToJavaType(event_type nativeType, jint *javaType) {
 	    case EVENT_KEY_TYPED:
 	    case EVENT_KEY_PRESSED:
 	    case EVENT_KEY_RELEASED:
-			*javaType = (nativeType + org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_FIRST) - 1;
+			*javaType = (nativeType + org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_FIRST) + 1;
 			break;
 
         case EVENT_MOUSE_CLICKED:
@@ -43,7 +43,7 @@ jint jni_ConvertToJavaType(event_type nativeType, jint *javaType) {
         case EVENT_MOUSE_DRAGGED:
         case EVENT_MOUSE_WHEEL:
         	*javaType = (nativeType + org_jnativehook_mouse_NativeMouseEvent_NATIVE_MOUSE_FIRST) -
-        			(org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_LAST - org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_FIRST) - 1;
+        			(org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_LAST - org_jnativehook_keyboard_NativeKeyEvent_NATIVE_KEY_FIRST) + 1;
        		break;
 
 		default:

src/jni/jni_Errors.c

@@ -22,48 +22,42 @@
 #include "jni_Errors.h"
 #include "jni_Globals.h"
 
-void ThrowFatalError(const char *message) {
+void jni_ThrowFatalError(JNIEnv *env, const char *message) {
 	#ifdef USE_DEBUG
 	fprintf(stderr, "Fatal Error: %s\n", message);
 	#endif
 
-	JNIEnv *env = NULL;
-	if ((*jvm)->GetEnv(jvm, (void **)(&env), jni_version) == JNI_OK) {
-		(*env)->FatalError(env, message);
-	}
+	(*env)->FatalError(env, message);
 
 	exit(EXIT_FAILURE);
 }
 
-void ThrowException(const char *classname, const char *message) {
-	JNIEnv *env = NULL;
-	if ((*jvm)->GetEnv(jvm, (void **)(&env), jni_version) == JNI_OK) {
-		// Locate our exception class.
-		// FIXME This needs to be relocated to a jni_Global.
-		jclass Exception_class = (*env)->FindClass(env, classname);
+void jni_ThrowException(JNIEnv *env, const char *classname, const char *message) {
+	// Locate our exception class.
+	// FIXME This needs to be relocated to a jni_Global.
+	jclass Exception_class = (*env)->FindClass(env, classname);
+
+	if (Exception_class != NULL) {
+		(*env)->ThrowNew(env, Exception_class, message);
+		#ifdef USE_DEBUG
+		fprintf(stderr, "%s: %s\n", classname, message);
+		#endif
+		(*env)->DeleteLocalRef(env, Exception_class);
+	}
+	else {
+		Exception_class = (*env)->FindClass(env, java_lang_NoClassDefFoundError);
 
 		if (Exception_class != NULL) {
-			(*env)->ThrowNew(env, Exception_class, message);
 			#ifdef USE_DEBUG
-			fprintf(stderr, "ThrowException(): %s: %s\n", classname, message);
+			fprintf(stderr, "%s: %s\n", java_lang_NoClassDefFoundError, classname);
 			#endif
+
+			(*env)->ThrowNew(env, Exception_class, classname);
 			(*env)->DeleteLocalRef(env, Exception_class);
 		}
 		else {
-			Exception_class = (*env)->FindClass(env, java_lang_NoClassDefFoundError);
-
-			if (Exception_class != NULL) {
-				#ifdef USE_DEBUG
-				fprintf(stderr, "ThrowException(): %s: %s\n", java_lang_NoClassDefFoundError, classname);
-				#endif
-
-				(*env)->ThrowNew(env, Exception_class, classname);
-				(*env)->DeleteLocalRef(env, Exception_class);
-			}
-			else {
-				// Unable to find exception class, Terminate with error.
-				ThrowFatalError("Unable to locate exception class.");
-			}
+			// Unable to find exception class, Terminate with error.
+			jni_ThrowFatalError(env, "Unable to locate exception class.");
 		}
 	}
 }

src/jni/jni_Errors.h

@@ -29,11 +29,11 @@
 /* Produces a hard error in the virtual machine.  This error is unrecoverable
  * and Program execution will terminate immediately.
  */
-extern void ThrowFatalError(const char *message);
+extern void jni_ThrowFatalError(JNIEnv *env, const char *message);
 
 /* Produces a recoverable error in the virtual machine.  This error should be
  * recoverable outside of the native library.
  */
-extern void ThrowException(const char *classname, const char *message);
+extern void jni_ThrowException(JNIEnv *env, const char *classname, const char *message);
 
 #endif