diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-08-29 19:32:59 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-08-29 19:32:59 +0200 |
| commit | 115a74b6c17d4b9dd61a7509d963c4f64e2e25c7 (patch) | |
| tree | d788d0852638283c304129735151e41e73b72df9 /src/slideshow.c | |
| parent | bcefd10220b7da136ccff57b37d47e7ae7337013 (diff) | |
| parent | 3ed38d4b8180f8763c4115ff2a27b0d032530f9e (diff) | |
Merge branch 'ulteq-no-cycle'
Diffstat (limited to 'src/slideshow.c')
| -rw-r--r-- | src/slideshow.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/slideshow.c b/src/slideshow.c index e87d1b9..6a4f4d1 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -215,6 +215,7 @@ void feh_reload_image(winwidget w, int resize, int force_new) void slideshow_change_image(winwidget winwid, int change, int render) { gib_list *last = NULL; + gib_list *previous_file = current_file; int i = 0; int jmp = 1; /* We can't use filelist_len in the for loop, since that changes when we @@ -227,7 +228,7 @@ void slideshow_change_image(winwidget winwid, int change, int render) /* Without this, clicking a one-image slideshow reloads it. Not very * intelligent behaviour :-) */ - if (filelist_len < 2 && opt.cycle_once == 0) + if (filelist_len < 2 && opt.on_last_slide != ON_LAST_SLIDE_QUIT) return; /* Ok. I do this in such an odd way to ensure that if the last or first * @@ -335,6 +336,12 @@ void slideshow_change_image(winwidget winwid, int change, int render) last = NULL; } + if (opt.on_last_slide == ON_LAST_SLIDE_HOLD && + ((current_file == filelist && change == SLIDE_NEXT) || + (previous_file == filelist && change == SLIDE_PREV))) { + current_file = previous_file; + } + if (winwidget_loadimage(winwid, FEH_FILE(current_file->data))) { int w = gib_imlib_image_get_width(winwid->im); int h = gib_imlib_image_get_height(winwid->im); @@ -568,10 +575,10 @@ void feh_filelist_image_remove(winwidget winwid, char do_delete) doomed = current_file; /* - * work around feh_list_jump exiting if cycle_once is enabled + * work around feh_list_jump exiting if ON_LAST_SLIDE_QUIT is set * and no further files are left (we need to delete first) */ - if (opt.cycle_once && ! doomed->next && do_delete) { + if (opt.on_last_slide == ON_LAST_SLIDE_QUIT && ! doomed->next && do_delete) { feh_file_rm_and_free(filelist, doomed); exit(0); } @@ -647,7 +654,7 @@ gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num) if (ret->next) { ret = ret->next; } else { - if (opt.cycle_once) { + if (opt.on_last_slide == ON_LAST_SLIDE_QUIT) { exit(0); } if (opt.randomize) { |