Long standing bug fixes and comment updates.

README.md

@@ -21,6 +21,14 @@ The following events are available via their respective listeners.
 
 In addition to global event listners, this library has the ability to post native events back to the native operating 
 system.
+
+## Licensing
+JNativeHook is covered under *both* the [GNU General Public](LESSER.md) *and* 
+[GNU Lesser General Public](COPYING.LESSER.md) Licenses as the latter is an extension of the former granting you 
+additional distribution rights.  As I understand it, you may use this library in proprietary projects so long as it 
+remains an external library with the same binary interface.  You may modify the source code of this library to fulfill 
+a propritary need, so long as that source code is made public under the aforementioned terms.  Please consult with a 
+licenced attorney if you have licence compatibility questions or concerns.
 
 ## Download
 Binary distribution for JNativeHook can be found at the 
@@ -79,7 +87,7 @@ application simply execute the jar file provided. Source code available at
 * [Global Keyboard Listener](https://github.com/kwhat/jnativehook/wiki/Keyboard)
 * [Global Mouse Listener](https://github.com/kwhat/jnativehook/wiki/Mouse)
 * [Global Mouse Wheel Listener](https://github.com/kwhat/jnativehook/wiki/MouseWheel)
-* [Working with Swing](https://github.com/kwhat/jnativehook/wiki/Swing)
+* [Thread Safety for AWT, Swing and JavaFX](https://github.com/kwhat/jnativehook/wiki/ThreadSafety)
 * [Logging and Console Output](https://github.com/kwhat/jnativehook/wiki/ConsoleOutput)
 * [Advanced Library Loading](https://github.com/kwhat/jnativehook/wiki/LibraryLoading)
 * [Consuming Events (Unsupported)](https://github.com/kwhat/jnativehook/wiki/ConsoleOutput)

build.xml

@@ -32,12 +32,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<property environment="env" />
 
 	<!-- Path Settings -->
-	<property name="dir.src"		value="${basedir}/src" />
-	<property name="dir.doc"		value="${basedir}/doc" />
-	<property name="dir.dist"		value="${basedir}/dist" />
-	<property name="dir.lib"		value="${basedir}/lib" />
-	<property name="dir.jar"		value="${basedir}/jar" />
-	<property name="dir.bin"		value="${basedir}/bin" />
+	<property name="dir.src" value="${basedir}/src" />
+	<property name="dir.doc" value="${basedir}/doc" />
+	<property name="dir.dist" value="${basedir}/dist" />
+	<property name="dir.lib" value="${basedir}/lib" />
+	<property name="dir.jar" value="${basedir}/jar" />
+	<property name="dir.bin" value="${basedir}/bin" />
 
 	<!-- Class Path Settings -->
 	<!-- NOTE Gentoo requires `CLASSPATH="$(java-config -p hamcrest-core-1.3,ant-junit,junit-4)" ant test` -->
@@ -311,7 +311,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 		<!-- Create property file for the descovered values -->
 		<propertyfile file="build.properties" comment="auto-generated by ant configure">
-			<entry key="ant.build.debug"			value="${ant.build.debug}" />
+			<entry key="ant.build.debug"				value="${ant.build.debug}" />
 
 			<entry key="ant.build.javac.compiler"		value="${ant.build.javac.compiler}" />
 			<entry key="ant.build.javac.source"			value="${ant.build.javac.source}" />
@@ -520,7 +520,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 			<manifest>
 				<attribute name="Main-Class" value="org.jnativehook.example.NativeHookDemo" />
-				<section name="org/jnativehook/">
+				<section name="org/jnativehook">
 					<attribute name="Specification-Title" value="${ant.project.name} Library" />
 					<attribute name="Specification-Version" value="${ant.build.major}.${ant.build.minor}" />
 					<attribute name="Specification-Vendor" value="${ant.project.vendor}" />

cross.build.xml

@@ -141,9 +141,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		<echo>Downloading JNITasks source...</echo>
 		<mkdir dir="${basedir}/jnitasks" />
 
-		<get src="https://github.com/kwhat/jnitasks/archive/0.2.zip" dest="jnitasks-0.2.zip" verbose="true" />
+		<get src="https://github.com/kwhat/jnitasks/archive/0.3.zip" dest="jnitasks-0.3.zip" verbose="true" />
 
-		<unzip src="jnitasks-0.2.zip" dest="${basedir}/jnitasks">
+		<unzip src="jnitasks-0.3.zip" dest="${basedir}/jnitasks">
 			<mapper type="glob" from="jnitasks-0.2/*" to="*"/>
 		</unzip>
 

src/java/org/jnativehook/AbstractSwingInputAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/DefaultLibraryLocator.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify
@@ -127,6 +127,11 @@ public Iterator<File> getLibraries() {
 				if (libFile.exists()) {
 					// Add the native library to the list.
 					libraries.add(libFile);
+
+					// Set the library version property.
+					System.setProperty("jnativehook.lib.version", libNativeVersion);
+
+					logger.info("Found existing library: " + libFile.getPath() + " (" + libNativeVersion + ").\n");
 				}
 			}
 
@@ -171,14 +176,14 @@ public Iterator<File> getLibraries() {
 						}
 					}
 
-					// Set the library version property.
-					System.setProperty("jnativehook.lib.version", libNativeVersion);
-
 					// Add the native library to the list.
 					libraries.add(libFile);
 
+					// Set the library version property.
+					System.setProperty("jnativehook.lib.version", libNativeVersion);
+
 					// Log the file path and checksum.
-					logger.info("Library extracted successfully: " + libFile.getPath() + " (0x" + sha1Sum + ").\n");
+					logger.info("Library extracted successfully: " + libFile.getPath() + " (0X" + sha1Sum + ").\n");
 				}
 				catch (IOException e) {
 					throw new IllegalStateException(e.getMessage(), e);

src/java/org/jnativehook/GlobalScreen.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  * 
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/NativeHookException.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * http://code.google.com/p/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/NativeInputEvent.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/NativeLibraryLocator.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/NativeMonitorInfo.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/NativeSystem.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/dispatcher/DefaultDispatchService.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/dispatcher/SwingDispatchService.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/example/NativeHookDemo.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify
@@ -177,7 +177,7 @@ public NativeHookDemo() {
 		// Add our custom formatter to a console handler.
 		ConsoleHandler handler = new ConsoleHandler();
 		handler.setFormatter(new LogFormatter());
-		handler.setLevel(Level.WARNING);
+		handler.setLevel(Level.ALL);
 		logger.addHandler(handler);
 
 		/* Note: JNativeHook does *NOT* operate on the event dispatching thread.
@@ -449,7 +449,7 @@ public void windowClosed(WindowEvent e) {
 	public static void main(String[] args) {
 		StringBuffer copyright = new StringBuffer("\n")
 				.append("JNativeHook: Global keyboard and mouse hooking for Java.\n")
-				.append("Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.\n")
+				.append("Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.\n")
 				.append("https://github.com/kwhat/jnativehook/\n")
 				.append("\n")
 				.append("JNativeHook is free software: you can redistribute it and/or modify\n")

src/java/org/jnativehook/keyboard/NativeKeyAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/keyboard/NativeKeyEvent.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/keyboard/NativeKeyListener.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/keyboard/SwingKeyAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseEvent.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseInputAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseInputListener.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseListener.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseMotionAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseMotionListener.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseWheelAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseWheelEvent.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/NativeMouseWheelListener.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/SwingMouseAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/java/org/jnativehook/mouse/SwingMouseWheelAdapter.java

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/include/org_jnativehook_NativeInputEvent.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/include/org_jnativehook_keyboard_NativeKeyEvent.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/include/org_jnativehook_mouse_NativeMouseEvent.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/include/org_jnativehook_mouse_NativeMouseWheelEvent.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/jni_Converter.c

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify
@@ -117,6 +117,7 @@ jint jni_ConvertToJavaLocation(unsigned short int *nativeKeyCode, jint *javaKeyL
 
 			case VC_KP_COMMA:
 				*nativeKeyCode = VC_COMMA;
+				/* fall-thru */
 
 			case VC_NUM_LOCK:
 			case VC_KP_SEPARATOR:
@@ -147,11 +148,15 @@ jint jni_ConvertToJavaLocation(unsigned short int *nativeKeyCode, jint *javaKeyL
 			case VC_KP_2:
 			case VC_KP_3:
 				*nativeKeyCode -= ((VC_KP_1 - VC_1) - (VC_KP_4 - VC_4) ); // 0x4D - 0x46
+				// FIXME Should this fall though?
+				/* fall-thru */
 
 			case VC_KP_4:
 			case VC_KP_5:
 			case VC_KP_6:
 				*nativeKeyCode -= ((VC_KP_4 - VC_4) - (VC_KP_7 - VC_7) ); // 0x46 - 0x3F
+				// FIXME Should this fall though?
+				/* fall-thru */
 
 			case VC_KP_7:
 			case VC_KP_8:

src/jni/jni_Converter.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/jni_Errors.c

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/jni_Errors.h

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify

src/jni/jni_EventDispatcher.c

@@ -1,5 +1,5 @@
 /* JNativeHook: Global keyboard and mouse hooking for Java.
- * Copyright (C) 2006-2017 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2018 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/jnativehook/
  *
  * JNativeHook is free software: you can redistribute it and/or modify