Merge pull request #2 from kwhat/master

Merging 12th of January 2015
kwhat · Jan 12, 2015 · 943bc2a · 943bc2a
2 parents 92635ce + 6836a65
commit 943bc2a
Show file tree

Hide file tree

Showing 32 changed files with 169 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,13 @@
-/nbproject/
+/nbproject/
+/build/
+/autom4te.cache/
+/config/
+/include/config.h.in*
+/m4/ltoptions.m4
+/m4/ltversion.m4
+/m4/libtool.m4
+/m4/ltsugar.m4
+/m4/lt~obsolete.m4
+/Makefile.in
+/configure
+/aclocal.m4
diff --git a/README.md b/README.md
@@ -1,4 +1,19 @@
 libuiohook
 ==========
 
-A C library to provide global keyboard and mouse hooks.
+A multi-platform C library to provide global input/ouput hooking from userland.
+
+## Compiling
+Prerequisites: pkg-config, libtool, gcc/clang/msys2-mingw32
+
+    ./bootstrap.sh
+    ./configure
+    make && make install
+
+## Useage
+* [Hook Demo](https://github.com/kwhat/libuiohook/blob/master/src/demo_hook.c)
+* [Async Hook Demo](https://github.com/kwhat/libuiohook/blob/master/src/demo_hook_async.c)
+* [Event Post Demo](https://github.com/kwhat/libuiohook/blob/master/src/demo_post.c)
+* [Properties Demo](https://github.com/kwhat/libuiohook/blob/master/src/demo_properties.c)
+* [Public Interface](https://github.com/kwhat/libuiohook/blob/master/include/uiohook.h)
+* Please see the man pages for function documentation.
diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,7 @@
 m4_define([UIOHOOK_MAJOR],	[1])
 m4_define([UIOHOOK_MINOR],	[0])
 m4_define([UIOHOOK_PATCH],	[0])
-m4_define([UIOHOOK_RC],		[_RC5])
+m4_define([UIOHOOK_RC],		[])
 m4_define([UIOHOOK_BUGS],	[alex@1stleg.com])
 m4_define([UIOHOOK_VERSION_STRING], UIOHOOK_MAJOR[.]UIOHOOK_MINOR[.]UIOHOOK_PATCH[]UIOHOOK_RC)
 

diff --git a/include/uiohook.h b/include/uiohook.h
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify
@@ -50,14 +50,17 @@
 #define UIOHOOK_ERROR_CREATE_OBSERVER			0x44
 /* End Error Codes */
 
+/* Begin Log Levels and Function Prototype */
 typedef enum _log_level {
 	LOG_LEVEL_DEBUG = 1,
 	LOG_LEVEL_INFO,
 	LOG_LEVEL_WARN,
 	LOG_LEVEL_ERROR
 } log_level;
 
+// Logger callback function prototype.
 typedef bool (*logger_t)(unsigned int, const char *, ...);
+/* End Log Levels and Function Prototype */
 
 /* Begin Virtual Event Types and Data Structures */
 typedef enum _event_type {

diff --git a/man/hook_get_auto_repeat_rate.man b/man/hook_get_auto_repeat_rate.man
@@ -1,4 +1,4 @@
-.\" Copyright 2006-2014 Alexander Barker (alex@1stleg.com)
+.\" Copyright 2006-2015 Alexander Barker (alex@1stleg.com)
 .\"
 .\" %%%LICENSE_START(VERBATIM)
 .\" libUIOHook is free software: you can redistribute it and/or modify

diff --git a/man/hook_run.man b/man/hook_run.man
@@ -1,4 +1,4 @@
-.\" Copyright 2006-2014 Alexander Barker (alex@1stleg.com)
+.\" Copyright 2006-2015 Alexander Barker (alex@1stleg.com)
 .\"
 .\" %%%LICENSE_START(VERBATIM)
 .\" libUIOHook is free software: you can redistribute it and/or modify

diff --git a/man/hook_set_dispatch_proc.man b/man/hook_set_dispatch_proc.man
@@ -1,4 +1,4 @@
-.\" Copyright 2006-2014 Alexander Barker (alex@1stleg.com)
+.\" Copyright 2006-2015 Alexander Barker (alex@1stleg.com)
 .\"
 .\" %%%LICENSE_START(VERBATIM)
 .\" libUIOHook is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .\" %%%LICENSE_END
 .\"
-.TH hook_get_auto_repeat_rate 3 "07 July 2014" "Version 1.0" "libUIOHook Programmer's Manual"
+.TH hook_set_dispatch_proc 3 "07 July 2014" "Version 1.0" "libUIOHook Programmer's Manual"
 .SH NAME
 hook_set_dispatch_proc \- Set the event callback function
 .SH SYNTAX

diff --git a/src/copyright.h b/src/copyright.h
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #define COPYRIGHT()	fprintf(stdout, \
 		"libUIOHook: Cross-platfrom userland keyboard and mouse hooking.\n" \
-		"Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.\n" \
+		"Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.\n" \
 		"https://github.com/kwhat/libuiohook/\n" \
 		"\n" \
 		"libUIOHook is free software: you can redistribute it and/or modify\n" \

diff --git a/src/darwin/input_helper.c b/src/darwin/input_helper.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/darwin/input_helper.h b/src/darwin/input_helper.h
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/darwin/input_hook.c b/src/darwin/input_hook.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/darwin/post_event.c b/src/darwin/post_event.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/darwin/system_properties.c b/src/darwin/system_properties.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify
@@ -37,6 +37,7 @@
 #include "logger.h"
 #include "input_helper.h"
 
+// FIXME Implement properly for multihead setup.
 UIOHOOK_API screen_data* hook_get_screen_info(uint8_t *count) {
 	// FIXME This needs to be implemented correctly for Multi-Head!
 	*count = 0;

diff --git a/src/demo_hook.c b/src/demo_hook.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/demo_hook_async.c b/src/demo_hook_async.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/demo_post.c b/src/demo_post.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/demo_properties.c b/src/demo_properties.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/logger.c b/src/logger.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/logger.h b/src/logger.h
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/windows/input_helper.c b/src/windows/input_helper.c
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify

diff --git a/src/windows/input_helper.h b/src/windows/input_helper.h
@@ -1,5 +1,5 @@
 /* libUIOHook: Cross-platfrom userland keyboard and mouse hooking.
- * Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.
+ * Copyright (C) 2006-2015 Alexander Barker.  All Rights Received.
  * https://github.com/kwhat/libuiohook/
  *
  * libUIOHook is free software: you can redistribute it and/or modify