Merge branch 'master' into thumbs

Conflicts:
	main.c

main.c

@@ -368,8 +368,8 @@ void on_keypress(XKeyEvent *kev) {
 
 			/* control window */
 			case XK_W:
-				x = win.x + img.x;
-				y = win.y + img.y;
+				x = MAX(0, win.x + img.x);
+				y = MAX(0, win.y + img.y);
 				w = img.w * img.zoom;
 				h = img.h * img.zoom;
 				if ((changed = win_moveresize(&win, x, y, w, h))) {