Commit f7168c86 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

events.c: Make pointer warping work for zoomed images

parent 1657b7ce

ChangeLog

+3 −0
Changes for ChangeLog: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
* git HEAD

     * Warp the pointer when reaching a window border in pan mode



Fri Apr  2 16:20:55 CEST 2010  Daniel Friesel <derf@chaosdorf.de>



* Release v1.4.2

TODO

+0 −2
Changes for TODO: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -23,5 +23,3 @@ On screen 1, it will work if fullscreen is turned off, the window is rendered 
and moved so that its top corner is only on screen 1, and then fullscreen is

turned on (after that, it'll work for all images in the slideshow).

Maybe I'll someday find out how to fix that :>
 


In zoom / pan mode: Warp the mouse when reaching a screen corner.

src/events.c

+2 −2
Changes for src/events.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void feh_event_handle_MotionNotify(XEvent * ev) 
				winwid->click_offset_x -= winwid->w - 4;

			}

			else if ((ev->xmotion.x <= 1) && (winwid->click_offset_x

					<= winwid->im_w - winwid->w - 3))

					<= (winwid->im_w * winwid->zoom) - winwid->w - 3))

			{

				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0,

					winwid->w - 4, ev->xmotion.y);
@@ -487,7 +487,7 @@ static void feh_event_handle_MotionNotify(XEvent * ev) 
				winwid->click_offset_y -= winwid->h - 4;

			}

			else if ((ev->xmotion.y <= 1) && (winwid->click_offset_y

					<= winwid->im_h - winwid->h - 3))

					<= (winwid->im_h * winwid->zoom) - winwid->h - 3))

			{

				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0,

					ev->xmotion.x, winwid->h - 4);

src/winwidget.h

+1 −1
Changes for src/winwidget.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct __winwidget { 
	/* New stuff */

	int im_x;		/* image offset from window top left */

	int im_y;		/* image offset from window top left */

	double zoom;		/* From 0 (not visible) to 100 (actual size)

	double zoom;		/* From 0 (not visible) to 1.00 (actual size)

				   all the way up to INT_MAX (ouch) */

	int click_offset_x;

	int click_offset_y;