Removed extra link flags.

Fixed runtime error in the hook callback log statement.
Fixed function definitions for dlsym().

Author: kwhat

configure.ac

@@ -191,13 +191,13 @@ AS_IF(
 		PKG_PROG_PKG_CONFIG
 
 		PKG_CHECK_MODULES([X11], [x11])
-		LIBS="$X11_LIBS $LIBS"
-		CFLAGS="$X11_CFLAGS $CFLAGS"
+		#LIBS="$X11_LIBS $LIBS"
+		#CFLAGS="$X11_CFLAGS $CFLAGS"
 		REQUIRE="$REQUIRE x11"
 
 		PKG_CHECK_MODULES([XTST], [xtst])
-		LIBS="$XTST_LIBS $LIBS"
-		CFLAGS="$XTST_CFLAGS $CFLAGS"
+		#LIBS="$XTST_LIBS $LIBS"
+		#CFLAGS="$XTST_CFLAGS $CFLAGS"
 		REQUIRE="$REQUIRE xtst"
 
 		# Check for XRecord.
@@ -216,16 +216,16 @@ AS_IF(
 		AS_IF([test "x$enable_xt" = "xyes"], [
 			AC_DEFINE([USE_XT], 1, [Enable X Toolkit Intrinsics])
 			PKG_CHECK_MODULES([XT], [xt])
-			LIBS="$XT_LIBS $LIBS"
-			CFLAGS="$XT_CFLAGS $CFLAGS"
+			#LIBS="$XT_LIBS $LIBS"
+			#CFLAGS="$XT_CFLAGS $CFLAGS"
 			REQUIRE="$REQUIRE xt"
 		])
 
 		AS_IF([test "x$enable_xf86misc" = "xyes"], [
 			AC_DEFINE([USE_XF86MISC], 1, [Enable XFree86-Misc X Extension])
 			PKG_CHECK_MODULES([XF86MISC], [xxf86misc])
-			LIBS="$XF86MISC_LIBS $LIBS"
-			CFLAGS="$XF86MISC_CFLAGS $CFLAGS"
+			#LIBS="$XF86MISC_LIBS $LIBS"
+			#CFLAGS="$XF86MISC_CFLAGS $CFLAGS"
 			REQUIRE="$REQUIRE xxf86misc"
 		])
 

darwin/hook_callback.c

@@ -222,15 +222,15 @@ CGEventRef hook_event_proc(CGEventTapProxy tap_proxy, CGEventType type_ref, CGEv
 			if (pthread_mutex_lock(&hook_control_mutex) == 0) {
 				pthread_mutex_unlock(&hook_control_mutex);
 			}
-
+			
 			if (info->length == 1) {
 				// Fire key typed event.
 				event.type = EVENT_KEY_TYPED;
 
 				event.data.keyboard.keycode = VC_UNDEFINED;
 				event.data.keyboard.keychar = info->buffer[0];
 
-				logger(LOG_LEVEL_INFO,	"%s [%u]: Key %#X typed. (%ls)\n",
+				logger(LOG_LEVEL_INFO,	"%s [%u]: Key %#X typed. (%lc)\n", 
 					__FUNCTION__, __LINE__, event.data.keyboard.keycode, event.data.keyboard.keychar);
 				dispatch_event(&event);
 			}

darwin/hook_thread.c

@@ -49,8 +49,8 @@ static pthread_attr_t hook_thread_attr;
 extern Boolean AXIsProcessTrustedWithOptions(CFDictionaryRef options) __attribute__((weak_import));
 extern CFStringRef kAXTrustedCheckOptionPrompt __attribute__((weak_import));
 #else
-typedef Boolean (*AXIsProcessTrustedWithOptions_t)(CFDictionaryRef options);
-typedef Boolean (*AXAPIEnabled_t)(void);
+Boolean (*AXIsProcessTrustedWithOptions_t)(CFDictionaryRef);
+Boolean (*AXAPIEnabled_t)(void);
 #endif
 
 static void *hook_thread_proc(void *arg) {
@@ -87,11 +87,11 @@ static void *hook_thread_proc(void *arg) {
 	dlError = dlerror();
 	if (libApplicaitonServices != NULL && dlError == NULL) {
 		// Check for the new function AXIsProcessTrustedWithOptions().
-		AXIsProcessTrustedWithOptions_t fpAXIsProcessTrustedWithOptions = (AXIsProcessTrustedWithOptions_t) dlsym(libApplicaitonServices, "AXIsProcessTrustedWithOptions");
+		*(void **) (&AXIsProcessTrustedWithOptions_t) = dlsym(libApplicaitonServices, "AXIsProcessTrustedWithOptions");
 		dlError = dlerror();
-		if (fpAXIsProcessTrustedWithOptions != NULL && dlError == NULL) {
+		if (AXIsProcessTrustedWithOptions_t != NULL && dlError == NULL) {
 			// New accessibility API 10.9 and later.
-			const void * keys[] = { kAXTrustedCheckOptionPrompt };
+			const void * keys[] = { dlsym(libApplicaitonServices, "kAXTrustedCheckOptionPrompt") };
 			const void * values[] = { kCFBooleanTrue };
 
 			CFDictionaryRef options = CFDictionaryCreate(
@@ -102,18 +102,18 @@ static void *hook_thread_proc(void *arg) {
 					&kCFCopyStringDictionaryKeyCallBacks,
 					&kCFTypeDictionaryValueCallBacks);
 
-			accessibilityEnabled = (*fpAXIsProcessTrustedWithOptions)(options);
+			accessibilityEnabled = (*AXIsProcessTrustedWithOptions_t)(options);
 		}
 		else {
 			logger(LOG_LEVEL_DEBUG,	"%s [%u]: Failed to locate AXIsProcessTrustedWithOptions(). (%s)\n",
 					__FUNCTION__, __LINE__, dlError);
 
 			// Check for the fallback function AXAPIEnabled().
-			AXAPIEnabled_t fpAXAPIEnabled = (AXAPIEnabled_t) dlsym(libApplicaitonServices, "AXAPIEnabled");
+			*(void **) (&AXAPIEnabled_t) = dlsym(libApplicaitonServices, "AXAPIEnabled");
 			dlError = dlerror();
-			if (fpAXAPIEnabled != NULL && dlError == NULL) {
+			if (AXAPIEnabled_t != NULL && dlError == NULL) {
 				// Old accessibility check 10.8 and older.
-				accessibilityEnabled = (*fpAXAPIEnabled)();
+				accessibilityEnabled = (*AXAPIEnabled_t)();
 			}
 			else {
 				// Could not load the AXAPIEnabled function!