summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2023-02-15 21:25:37 +0100
committerDaniel Friesel <derf@finalrewind.org>2023-02-15 21:25:37 +0100
commit421273de0c33da276dd8c1bfb19fe902e999521d (patch)
treece219e453f78550ac05f1de67c80cc2386d7db17
parent62cd7faa910cce5194b62aefb2ee933809940fc6 (diff)
Add --sort=none
-rw-r--r--man/feh.pre9
-rw-r--r--src/options.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/man/feh.pre b/man/feh.pre
index 1899800..af1def1 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -792,9 +792,9 @@ in paused mode.
.
Sort file list according to image parameters.
Allowed sort types are:
-.Cm name , filename , dirname , mtime , width , height , pixels , size , format .
+.Cm name , none , filename , dirname , mtime , width , height , pixels , size , format .
For sort modes other than
-.Cm name , filename , dirname ,
+.Cm name , none , filename , dirname ,
or
.Cm mtime ,
a preload run is
@@ -822,6 +822,11 @@ you can use
.Cm --version-sort
to sort numbers naturally, so that e.g. 10.jpg comes after 2.jpg.
.
+.Pp
+.
+.Cm none
+is the default; you can specify it explicitly to discard a sort mode that has
+been specified at an earlier point in the command line arguments.
.It Cm -| , --start-at Ar filename
.
Start the filelist at
diff --git a/src/options.c b/src/options.c
index d3524f7..80f13b6 100644
--- a/src/options.c
+++ b/src/options.c
@@ -537,6 +537,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
case OPTION_sort:
if (!strcasecmp(optarg, "name"))
opt.sort = SORT_NAME;
+ else if (!strcasecmp(optarg, "none"))
+ opt.sort = SORT_NONE;
else if (!strcasecmp(optarg, "filename"))
opt.sort = SORT_FILENAME;
else if (!strcasecmp(optarg, "dirname"))