summaryrefslogtreecommitdiff
path: root/src/events.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-02-13 13:49:25 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2010-02-13 13:49:25 +0100
commit85821865c9cc3824469d96a34f29b0983f8cfdc7 (patch)
treebe76afdb848914a373d83ca3b9aa12cd8fc2a429 /src/events.c
parent5297ab5b519c09e5ca115955037664acd5eb164e (diff)
Rework button options
Diffstat (limited to 'src/events.c')
-rw-r--r--src/events.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/events.c b/src/events.c
index ad78fbe..610178c 100644
--- a/src/events.c
+++ b/src/events.c
@@ -117,9 +117,9 @@ feh_event_handle_ButtonPress(XEvent * ev)
D(3, ("blur starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
}
}
- else if (ev->xbutton.button == opt.next_button)
+ else if (ev->xbutton.button == opt.pan_button)
{
- D(3, ("Next Button Press event\n"));
+ D(3, ("Pan Button Press event\n"));
if (winwid != NULL)
{
D(3, ("Next button, but could be pan mode\n"));
@@ -189,15 +189,15 @@ feh_event_handle_ButtonPress(XEvent * ev)
if (winwid != NULL)
feh_reload_image(winwid, 0, 0);
}
- else if (ev->xbutton.button == 4 /* this is bad */ )
+ else if (ev->xbutton.button == opt.prev_button )
{
- D(3, ("Button 4 Press event\n"));
+ D(3, ("Prev Button Press event\n"));
if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW))
slideshow_change_image(winwid, SLIDE_PREV);
}
- else if (ev->xbutton.button == 5 /* this is bad */ )
+ else if (ev->xbutton.button == opt.next_button )
{
- D(3, ("Button 5 Press event\n"));
+ D(3, ("Next Button 5 Press event\n"));
if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW))
slideshow_change_image(winwid, SLIDE_NEXT);
}
@@ -246,7 +246,7 @@ feh_event_handle_ButtonRelease(XEvent * ev)
|| ((ev->xbutton.state & ControlMask) && (opt.menu_ctrl_mask)))))
&& (opt.no_menus))
winwidget_destroy_all();
- else if (ev->xbutton.button == opt.next_button)
+ else if (ev->xbutton.button == opt.pan_button)
{
if (opt.mode == MODE_PAN)
{