diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 17 | ||||
| -rw-r--r-- | src/navigator.c | 37 | ||||
| -rw-r--r-- | src/navigator.h | 11 |
3 files changed, 31 insertions, 34 deletions
@@ -348,17 +348,13 @@ int main(int argc, char** argv) break; case SDLK_LEFTBRACKET: case SDLK_LEFT: - if(!imv_navigator_select_rel(&nav, -1, g_options.cycle)) { - quit = 1; - } + imv_navigator_select_rel(&nav, -1); /* reset slideshow delay */ delay_msec = 0; break; case SDLK_RIGHTBRACKET: case SDLK_RIGHT: - if(!imv_navigator_select_rel(&nav, 1, g_options.cycle)) { - quit = 1; - } + imv_navigator_select_rel(&nav, 1); /* reset slideshow delay */ delay_msec = 0; break; @@ -486,6 +482,11 @@ int main(int argc, char** argv) free(err_path); } + /* Check if navigator wrapped around paths lists */ + if(!g_options.cycle && imv_navigator_wrapped(&nav)) { + break; + } + /* if the user has changed image, start loading the new one */ if(imv_navigator_poll_changed(&nav, poll_countdown--)) { const char *current_path = imv_navigator_selection(&nav); @@ -549,9 +550,7 @@ int main(int argc, char** argv) delay_msec += dt; need_redraw = 1; if(delay_msec >= g_options.delay) { - if(!imv_navigator_select_rel(&nav, 1, g_options.cycle)) { - quit = 1; - } + imv_navigator_select_rel(&nav, 1); delay_msec = 0; } } diff --git a/src/navigator.c b/src/navigator.c index b4e65fb..2756134 100644 --- a/src/navigator.c +++ b/src/navigator.c @@ -42,6 +42,7 @@ void imv_navigator_init(struct imv_navigator *nav) nav->cur_path = 0; nav->last_move_direction = 1; nav->changed = 0; + nav->wrapped = 0; } void imv_navigator_destroy(struct imv_navigator *nav) @@ -126,12 +127,11 @@ const char *imv_navigator_selection(struct imv_navigator *nav) return nav->paths[nav->cur_path]; } -int imv_navigator_select_rel(struct imv_navigator *nav, int direction, - const int cycle) +void imv_navigator_select_rel(struct imv_navigator *nav, int direction) { int prev_path = nav->cur_path; if(nav->num_paths == 0) { - return 0; + return; } if(direction > 1) { @@ -139,30 +139,22 @@ int imv_navigator_select_rel(struct imv_navigator *nav, int direction, } else if(direction < -1) { direction = -1; } else if(direction == 0) { - return 0; + return; } nav->cur_path += direction; if(nav->cur_path == nav->num_paths) { - /* end of list reached */ - if(!cycle) { - /* undo move */ - nav->cur_path -= direction; - return 0; - } + /* Wrap after the end of the list */ nav->cur_path = 0; + nav->wrapped = 1; } else if(nav->cur_path < 0) { - /* going backwards at the beginning of the list */ - if(!cycle) { - /* undo move */ - nav->cur_path -= direction; - return 0; - } + /* Wrap before the start of the list */ nav->cur_path = nav->num_paths - 1; + nav->wrapped = 1; } nav->last_move_direction = direction; nav->changed = prev_path != nav->cur_path; - return 1; + return; } void imv_navigator_remove(struct imv_navigator *nav, const char *path) @@ -189,13 +181,13 @@ void imv_navigator_remove(struct imv_navigator *nav, const char *path) if(nav->cur_path == removed) { /* We just removed the current path */ if(nav->last_move_direction < 0) { - /* Move left - * the cycle parameter does not matter here */ - imv_navigator_select_rel(nav, -1, 0); + /* Move left */ + imv_navigator_select_rel(nav, -1); } else { /* Try to stay where we are, unless we ran out of room */ if(nav->cur_path == nav->num_paths) { nav->cur_path = 0; + nav->wrapped = 1; } } } @@ -253,5 +245,10 @@ int imv_navigator_poll_changed(struct imv_navigator *nav, const int nopoll) return 0; } +int imv_navigator_wrapped(struct imv_navigator *nav) +{ + return nav->wrapped; +} + /* vim:set ts=2 sts=2 sw=2 et: */ diff --git a/src/navigator.h b/src/navigator.h index 1645cae..b539e8b 100644 --- a/src/navigator.h +++ b/src/navigator.h @@ -28,6 +28,7 @@ struct imv_navigator { time_t *mtimes; int last_move_direction; int changed; + int wrapped; }; /* Initialises an instance of imv_navigator */ @@ -47,11 +48,8 @@ void imv_navigator_add(struct imv_navigator *nav, const char *path, * guaranteed to be valid until the next call to an imv_navigator method. */ const char *imv_navigator_selection(struct imv_navigator *nav); -/* Change the currently selected path. dir = -1 for previous, 1 for next - * cycle = 1 to go to the beginning of the file list if end is reached - * cycle = 0 to return error instead - * Returns 1 on success, 0 otherwise */ -int imv_navigator_select_rel(struct imv_navigator *nav, int dir, int cycle); +/* Change the currently selected path. dir = -1 for previous, 1 for next. */ +void imv_navigator_select_rel(struct imv_navigator *nav, int dir); /* Removes the given path. The current selection is updated if necessary, * based on the last direction the selection moved. */ @@ -67,6 +65,9 @@ int imv_navigator_find_path(struct imv_navigator *nav, const char *path); * changed since last called */ int imv_navigator_poll_changed(struct imv_navigator *nav, const int nopoll); +/* Check whether navigator wrapped around paths list */ +int imv_navigator_wrapped(struct imv_navigator *nav); + #endif |