From eca0d6e557f2cba64821001c619fdd26dda4c643 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 30 May 2010 21:54:53 +0200 Subject: Fix blur mode The ButtonRelease check only knew pan mode, so releasing the blur key changed to the next image. --- ChangeLog | 1 + src/events.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a92bee..3bbdd8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ git HEAD * Patch by aaptel: Support numpad keys for actions + * Fix blur mode (Ctrl + left mouse key) Thu May 6 08:34:39 CEST 2010 Daniel Friesel diff --git a/src/events.c b/src/events.c index b634e6f..b850497 100644 --- a/src/events.c +++ b/src/events.c @@ -166,7 +166,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev) && (winwid->type == WIN_TYPE_SLIDESHOW)) slideshow_change_image(winwid, SLIDE_PREV); } else if (ev->xbutton.button == opt.next_button) { - D(3, ("Next Button 5 Press event\n")); + D(3, ("Next Button Press event\n")); if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW)) slideshow_change_image(winwid, SLIDE_NEXT); @@ -220,7 +220,7 @@ static void feh_event_handle_ButtonRelease(XEvent * ev) winwidget_sanitise_offsets(winwid); winwidget_render_image(winwid, 0, 1); } - } else { + } else if (opt.mode == MODE_NEXT) { opt.mode = MODE_NORMAL; if (winwid != NULL) winwid->mode = MODE_NORMAL; @@ -260,6 +260,11 @@ static void feh_event_handle_ButtonRelease(XEvent * ev) } } } + } else { + if (winwid != NULL) { + opt.mode = MODE_NORMAL; + winwid->mode = MODE_NORMAL; + } } } else if ((ev->xbutton.button == opt.rotate_button) || (ev->xbutton.button == opt.zoom_button)) { -- cgit v1.2.3