1 files changed, 22 insertions, 9 deletions

diff --git a/src/events.c b/src/events.c
index 5bb2ecf..de9e7b3 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,7 +1,7 @@
 /* events.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -85,6 +85,15 @@ static void feh_set_parse_bb_partial(fehkey *button, char *binding)
 
 	button->button = atoi(cur);
 	button->state  = mod;
+
+	if (button->button == 0) {
+		/*
+		 * Mod3 is unused on today's keyboards. If Mod3 is unset and button==0,
+		 * we are dealing with an uninitialized or unset binding. If Mod3 is set
+		 * and button==0, it refers to mouse movement.
+		 */
+		button->state |= Mod3Mask;
+	}
 }
 
 /*
@@ -672,14 +681,18 @@ static void feh_event_handle_MotionNotify(XEvent * ev)
 	} else {
 		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
 		winwid = winwidget_get_from_window(ev->xmotion.window);
-		if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL)) {
-			feh_thumbnail *thumbnail;
-			int x, y;
-
-			x = (ev->xbutton.x - winwid->im_x) / winwid->zoom;
-			y = (ev->xbutton.y - winwid->im_y) / winwid->zoom;
-			thumbnail = feh_thumbnail_get_thumbnail_from_coords(x, y);
-			feh_thumbnail_select(winwid, thumbnail);
+		if (winwid != NULL) {
+			if (winwid->type == WIN_TYPE_THUMBNAIL) {
+				feh_thumbnail *thumbnail;
+				int x, y;
+
+				x = (ev->xbutton.x - winwid->im_x) / winwid->zoom;
+				y = (ev->xbutton.y - winwid->im_y) / winwid->zoom;
+				thumbnail = feh_thumbnail_get_thumbnail_from_coords(x, y);
+				feh_thumbnail_select(winwid, thumbnail);
+			} else {
+				feh_event_handle_generic(winwid, ev->xmotion.state | Mod3Mask, NoSymbol, 0);
+			}
 		}
 	}
 	return;