diff --git a/TODO b/TODO index f7cae0e52342a97eb26e2d037b0e189e496d0939..56633c2682db8bb8caf8049f81c7b1be7d8f7e36 100644 --- a/TODO +++ b/TODO @@ -23,3 +23,5 @@ KeyRelease event. --thumb-title covers a very specific case, would be cool to make this more general (usable in index mode, as image info in thumbnail mode, etc.) + +--reload-button might be useless (wtf is button 0) diff --git a/feh.1 b/feh.1 index b694ec50a714491c26ea422310d4476ebe52c475..f61850018b9c020ac725c6904e1d18f2b4d0b16b 100644 --- a/feh.1 +++ b/feh.1 @@ -319,6 +319,9 @@ Accepted values: white, black, default. .B -^, --title TITLE Use TITLE as window title in slideshow mode. .TP 5 +.B -0, --reload-button B +Use button B to reload the current image (default: 0) +.TP 5 .B -1, --next-button B Use button B to advance to the next image in slideshow mode (defaults to 1, usually the left button). diff --git a/src/options.c b/src/options.c index 58f1e5c3c736c61bf47dc730881cda5e96c2d509..3955ef978aa401364ebe170642641cc70c2b80a2 100644 --- a/src/options.c +++ b/src/options.c @@ -380,12 +380,12 @@ feh_parse_option_array(int argc, char **argv) {"fontpath", 1, 0, 'C'}, {"menu-bg", 1, 0, ')'}, {"image-bg", 1, 0, 'B'}, + {"reload-button", 1, 0, '0'}, {"next-button", 1, 0, '1'}, {"zoom-button", 1, 0, '2'}, {"menu-button", 1, 0, '4'}, {"rotate-button", 1, 0, '6'}, {"blur-button", 1, 0, '8'}, - {"reload-button", 1, 0, '0'}, {"start-at", 1, 0, '|'}, {"rcfile", 1, 0, '_'}, {"debug-level", 1, 0, '+'}, @@ -626,6 +626,9 @@ feh_parse_option_array(int argc, char **argv) case 'f': opt.filelistfile = estrdup(optarg); break; + case '0': + opt.reload_button = atoi(optarg); + break; case '1': opt.next_button = atoi(optarg); break; @@ -653,9 +656,6 @@ feh_parse_option_array(int argc, char **argv) case '|': opt.start_list_at = atoi(optarg); break; - case '0': - opt.reload_button = atoi(optarg); - break; case 't': opt.thumbs = 1; opt.index_show_name = 1; @@ -1016,6 +1016,7 @@ show_usage(void) " -B, --image-bg STYLE Set background for transparent images and the like.\n" " Accepted values: white, black, default\n" " -N, --no-menus Don't load or show any menus.\n" +" -0, --reload-button B Use button B to reload the image (defaults to 0)\n" " -1, --next-button B Use button B to advance to the next image in any\n" " mode (defaults to 1, usually the left button).\n" " -2, --zoom-button B Use button B to zoom the current image in any\n"