From 64e9c952f0bbd5c23fd775620f3df1c261799ed6 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 11 Aug 2011 20:30:06 +0200 Subject: Show correct file number after deleting image In the image_remove function, slideshow_change_image needs to be called before removing the image from the filelist. Because of this, the "x of y" displayed by --draw-filename is wrong (y is 1 too high). This commit introduces a new 'render' argument to slideshow_chingae_image. The image_remove function calls it with render=0, edits the filelist and then runs by winwidget_render_image itself. Patch by Yu-Jie Lin. --- src/keyevents.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/keyevents.c') diff --git a/src/keyevents.c b/src/keyevents.c index 0d68f02..7299fa8 100644 --- a/src/keyevents.c +++ b/src/keyevents.c @@ -334,7 +334,7 @@ void feh_event_invoke_action(winwidget winwid, unsigned char action) winwidget_update_caption(winwid); if (! opt.hold_actions[action]) - slideshow_change_image(winwid, SLIDE_NEXT); + slideshow_change_image(winwid, SLIDE_NEXT, 1); } else if ((winwid->type == WIN_TYPE_SINGLE) || (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)) { @@ -448,13 +448,13 @@ void feh_event_handle_keypress(XEvent * ev) if (feh_is_kp(&keys.next_img, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_NEXT); + slideshow_change_image(winwid, SLIDE_NEXT, 1); else if (winwid->type == WIN_TYPE_THUMBNAIL) feh_thumbnail_select_next(winwid, 1); } else if (feh_is_kp(&keys.prev_img, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_PREV); + slideshow_change_image(winwid, SLIDE_PREV, 1); else if (winwid->type == WIN_TYPE_THUMBNAIL) feh_thumbnail_select_prev(winwid, 1); } @@ -492,13 +492,13 @@ void feh_event_handle_keypress(XEvent * ev) } else if (feh_is_kp(&keys.jump_back, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_JUMP_BACK); + slideshow_change_image(winwid, SLIDE_JUMP_BACK, 1); else if (winwid->type == WIN_TYPE_THUMBNAIL) feh_thumbnail_select_prev(winwid, 10); } else if (feh_is_kp(&keys.jump_fwd, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_JUMP_FWD); + slideshow_change_image(winwid, SLIDE_JUMP_FWD, 1); else if (winwid->type == WIN_TYPE_THUMBNAIL) feh_thumbnail_select_next(winwid, 10); } @@ -517,11 +517,11 @@ void feh_event_handle_keypress(XEvent * ev) } else if (feh_is_kp(&keys.jump_first, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_FIRST); + slideshow_change_image(winwid, SLIDE_FIRST, 1); } else if (feh_is_kp(&keys.jump_last, keysym, state)) { if (opt.slideshow) - slideshow_change_image(winwid, SLIDE_LAST); + slideshow_change_image(winwid, SLIDE_LAST, 1); } else if (feh_is_kp(&keys.action_0, keysym, state)) { feh_event_invoke_action(winwid, 0); @@ -617,7 +617,7 @@ void feh_event_handle_keypress(XEvent * ev) opt.hide_pointer = !opt.hide_pointer; } else if (feh_is_kp(&keys.jump_random, keysym, state)) { - slideshow_change_image(winwid, SLIDE_RAND); + slideshow_change_image(winwid, SLIDE_RAND, 1); } else if (feh_is_kp(&keys.toggle_caption, keysym, state)) { if (opt.caption_path) -- cgit v1.2.3