summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-05-30 21:54:53 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-05-30 21:56:24 +0200
commiteca0d6e557f2cba64821001c619fdd26dda4c643 (patch)
tree9d9a9051e1e620685bca82f8d85803ea08846284 /src
parent75dc10d7319a9ef4638aaa10ecf3b49cfac9a0da (diff)
Fix blur mode
The ButtonRelease check only knew pan mode, so releasing the blur key changed to the next image.
Diffstat (limited to 'src')
-rw-r--r--src/events.c9
1 files changed, 7 insertions, 2 deletions
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)) {