Merged several fixes from the mac_capslock branch. Should at least fix capslock release on darwin.

Author: kwhat

src/darwin/input_hook.c

@@ -31,6 +31,7 @@
 // Virtual event pointers
 static uiohook_event *event = NULL;
 
+// TODO Implement CLI options.
 //int main(int argc, char *argv[]) {
 int main() {
 	// Allocate memory for the virtual events only once.

src/demo_post.c

@@ -25,10 +25,13 @@
 #include <stdlib.h>
 #include <uiohook.h>
 
+bool logger_proc(unsigned int level, const char *format, ...) {
+	return false;
+}
+
 int main() {
 	// Disable the logger.
-	// FIXME This doesn't appear to do what it should...
-	hook_set_logger_proc(NULL);
+	hook_set_logger_proc(&logger_proc);
 
 	// Retrieves an array of screen data for each available monitor.
 	uint8_t count = 0;

src/demo_properties.c

@@ -56,6 +56,7 @@ static bool default_logger(unsigned int level, const char *format, ...) {
 }
 
 // Current logger function pointer, this should never be null.
+// FIXME This should be static and wrapped with a public facing function.
 logger_t logger = &default_logger;
 
 

src/logger.c

@@ -403,9 +403,8 @@ static inline void process_mouse_moved(uint64_t timestamp, MSLLHOOKSTRUCT *mshoo
 
 		event.mask = get_modifiers();
 
-		// Check the upper half of the current modifiers for non zero
-		// value.  This indicates the presence of a button down mask.
-		bool mouse_dragged = (event.mask >> 8 > 0);
+		// Check the modifier mask range for MASK_BUTTON1 - 5.
+		bool mouse_dragged = event.mask & (MASK_BUTTON1 | MASK_BUTTON2 | MASK_BUTTON3 | MASK_BUTTON4 | MASK_BUTTON5);
 		if (mouse_dragged) {
 			// Create Mouse Dragged event.
 			event.type = EVENT_MOUSE_DRAGGED;
@@ -450,10 +449,10 @@ static inline void process_mouse_wheel(uint64_t timestamp, MSLLHOOKSTRUCT *mshoo
 	event.data.wheel.amount = get_scroll_wheel_amount();
 
 	/* Delta HIWORD(mshook->mouseData)
-	* A positive value indicates that the wheel was rotated
-	* forward, away from the user; a negative value indicates that
-	* the wheel was rotated backward, toward the user. One wheel
-	* click is defined as WHEEL_DELTA, which is 120. */
+	 * A positive value indicates that the wheel was rotated
+	 * forward, away from the user; a negative value indicates that
+	 * the wheel was rotated backward, toward the user. One wheel
+	 * click is defined as WHEEL_DELTA, which is 120. */
 	event.data.wheel.rotation = ((int16_t) HIWORD(mshook->mouseData) / WHEEL_DELTA) * -1;
 
 	logger(LOG_LEVEL_INFO, "%s [%u]: Mouse wheel type %u, rotated %i units at %u, %u.\n",
@@ -499,8 +498,12 @@ LRESULT CALLBACK mouse_hook_event_proc(int nCode, WPARAM wParam, LPARAM lParam)
 				// Extra mouse buttons.
 				uint16_t button = HIWORD(mshook->mouseData);
 
-				if (button + 7 < 16) {
-					set_modifier_mask(1 << (button + 7));
+				// Add support for mouse 4 & 5.
+				if (button == 4) {
+					set_modifier_mask(MOUSE_BUTTON4);
+				}
+				else if (button == 5) {
+					set_modifier_mask(MOUSE_BUTTON5);
 				}
 
 				process_button_pressed(timestamp, mshook, button);
@@ -537,8 +540,12 @@ LRESULT CALLBACK mouse_hook_event_proc(int nCode, WPARAM wParam, LPARAM lParam)
 				// Extra mouse buttons.
 				uint16_t button = HIWORD(mshook->mouseData);
 
-				if (button + 7 < 16) {
-					unset_modifier_mask(1 << (button + 7));
+				// Add support for mouse 4 & 5.
+				if (button == 4) {
+					unset_modifier_mask(MOUSE_BUTTON4);
+				}
+				else if (button == 5) {
+					unset_modifier_mask(MOUSE_BUTTON5);
 				}
 
 				process_button_released(timestamp, mshook, MOUSE_BUTTON5);
@@ -688,8 +695,7 @@ UIOHOOK_API int hook_run() {
 
 		// Block until the thread receives an WM_QUIT request.
 		MSG message;
-		//while (GetMessage(&message, (HWND) -1, 0, 0) > 0) {
-		while (GetMessage(&message, (HWND) 0, 0, 0) > 0) {
+		while (GetMessage(&message, (HWND) NULL, 0, 0) > 0) {
 			TranslateMessage(&message);
 			DispatchMessage(&message);
 		}

src/windows/input_hook.c

@@ -1812,22 +1812,18 @@ void load_input_helper(Display *disp) {
 		const char *prefix_evdev = "evdev_";
 		if (strncmp(layout_name, prefix_evdev, strlen(prefix_evdev)) == 0) {
 			is_evdev = true;
-		}
-		else {
+		} else
 		#endif
-			if (strncmp(layout_name, prefix_xfree86, strlen(prefix_xfree86)) != 0) {
-				logger(LOG_LEVEL_ERROR,
-						"%s [%u]: Unknown keycode name '%s', please file a bug report!\n",
-						__FUNCTION__, __LINE__, layout_name);
-			}
-			else if (layout_name == NULL) {
-				logger(LOG_LEVEL_ERROR,
-						"%s [%u]: X atom name failure for desc->names->keycodes!\n",
-						__FUNCTION__, __LINE__);
-			}
-		#if defined(USE_EVDEV) && defined(USE_XKB)
+		if (strncmp(layout_name, prefix_xfree86, strlen(prefix_xfree86)) != 0) {
+			logger(LOG_LEVEL_ERROR,
+					"%s [%u]: Unknown keycode name '%s', please file a bug report!\n",
+					__FUNCTION__, __LINE__, layout_name);
+		}
+		else if (layout_name == NULL) {
+			logger(LOG_LEVEL_ERROR,
+					"%s [%u]: X atom name failure for desc->names->keycodes!\n",
+					__FUNCTION__, __LINE__);
 		}
-		#endif
 
 		XkbFreeClientMap(desc, XkbGBN_AllComponentsMask, True);
 	}

src/x11/input_helper.c

@@ -267,7 +267,6 @@ void hook_event_proc(XPointer closeure, XRecordInterceptData *recorded_data) {
 			else if (scancode == VC_META_L)		{ unset_modifier_mask(MASK_META_L);		}
 			else if (scancode == VC_META_R)		{ unset_modifier_mask(MASK_META_R);		}
 
-
 			// Populate key released event.
 			event.time = timestamp;
 			event.reserved = 0x00;
@@ -333,8 +332,6 @@ void hook_event_proc(XPointer closeure, XRecordInterceptData *recorded_data) {
 				 */
 				event.data.wheel.amount = 3;
 
-				// MS assumption is more natural (follows the cartesian coordinate system)
-				// FIXME I don't understand the above adjustment and comment...
 				if (data->event.u.u.detail == WheelUp) {
 					// Wheel Rotated Up and Away.
 					event.data.wheel.rotation = -1;
@@ -385,14 +382,7 @@ void hook_event_proc(XPointer closeure, XRecordInterceptData *recorded_data) {
 						break;
 
 					default:
-						// Extra buttons are at # - 4 starting after WheelUp and WheelDown.
-						if (data->event.u.u.detail - 4 <= UINT16_MAX) {
-							button = data->event.u.u.detail - 4;
-							
-							if (button + 7 < 16) {
-								set_modifier_mask(1 << (button + 7));
-							}
-						}
+						// Do not set modifier masks past button MASK_BUTTON5.
 						break;
 				}
 
@@ -483,14 +473,7 @@ void hook_event_proc(XPointer closeure, XRecordInterceptData *recorded_data) {
 						break;
 
 					default:
-						// Extra buttons are at # - 4 starting after WheelUp and WheelDown.
-						if (data->event.u.u.detail - 4 <= UINT16_MAX) {
-							button = data->event.u.u.detail - 4;
-							
-							if (button + 7 < 16) {
-								unset_modifier_mask(1 << (button + 7));
-							}
-						}
+						// Do not set modifier masks past button MASK_BUTTON5.
 						break;
 				}
 

src/x11/input_hook.c

@@ -61,7 +61,7 @@ static unsigned int btnmask_lookup[5] = {
 static unsigned int convert_to_native_mask(unsigned int mask) {
 	unsigned int native_mask = 0x00;
 
-	if (mask & (MASK_SHIFT))		{ native_mask |= ShiftMask;		}
+	if (mask & (MASK_SHIFT))	{ native_mask |= ShiftMask;		}
 	if (mask & (MASK_CTRL))		{ native_mask |= ControlMask;	}
 	if (mask & (MASK_META))		{ native_mask |= Mod4Mask;		}
 	if (mask & (MASK_ALT))		{ native_mask |= Mod1Mask;		}