summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-02-28 17:24:20 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-02-28 17:24:20 +0100
commitac3356c15f2160d1b252ae6afe50a328cebc9ee7 (patch)
tree9c36b944b2f3c8503991e427a1dce16c3a77d185 /src
parent8eaa39234a54fcdd3c9050a01790b152598af80d (diff)
parent7acf83ea6d6f36e418f43a3408632944fbb7bcde (diff)
Merge branch 'natural-sort' of https://github.com/ulteq/feh into ulteq-natural-sort
Diffstat (limited to 'src')
-rw-r--r--src/feh.h1
-rw-r--r--src/filelist.c19
-rw-r--r--src/help.raw1
-rw-r--r--src/options.c4
-rw-r--r--src/options.h1
5 files changed, 22 insertions, 4 deletions
diff --git a/src/feh.h b/src/feh.h
index 63771b6..4e7a3ff 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef FEH_H
#define FEH_H
+#define _GNU_SOURCE
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
diff --git a/src/filelist.c b/src/filelist.c
index 9a4af27..159491a 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -399,12 +399,18 @@ void feh_file_dirname(char *dst, feh_file * f, int maxlen)
int feh_cmp_filename(void *file1, void *file2)
{
- return(strcmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
+ if (!opt.version_sort)
+ return(strcmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
+ else
+ return(strverscmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
}
int feh_cmp_name(void *file1, void *file2)
{
- return(strcmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
+ if (!opt.version_sort)
+ return(strcmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
+ else
+ return(strverscmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
}
int feh_cmp_dirname(void *file1, void *file2)
@@ -413,8 +419,13 @@ int feh_cmp_dirname(void *file1, void *file2)
int cmp;
feh_file_dirname(dir1, FEH_FILE(file1), PATH_MAX);
feh_file_dirname(dir2, FEH_FILE(file2), PATH_MAX);
- if ((cmp = strcmp(dir1, dir2)) != 0)
- return(cmp);
+ if (!opt.version_sort) {
+ if ((cmp = strcmp(dir1, dir2)) != 0)
+ return(cmp);
+ } else {
+ if ((cmp = strverscmp(dir1, dir2)) != 0)
+ return(cmp);
+ }
return(feh_cmp_name(file1, file2));
}
diff --git a/src/help.raw b/src/help.raw
index 8b244c1..86bb617 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -52,6 +52,7 @@ OPTIONS
name, filename, mtime, width, height, pixels, size,
or format
-n, --reverse Reverse sort order
+ --version-sort Natural sort of (version) numbers within text
-A, --action [;]ACTION Specify action to perform when pressing <return>.
Executed by /bin/sh, may contain FORMAT SPECIFIERS
reloads image with \";\", switches to next otherwise
diff --git a/src/options.c b/src/options.c
index 0ad7c74..3d11482 100644
--- a/src/options.c
+++ b/src/options.c
@@ -415,6 +415,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"insecure" , 0, 0, 240},
{"no-recursive" , 0, 0, 241},
{"cache-size" , 1, 0, 243},
+ {"version-sort" , 0, 0, 246},
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
@@ -780,6 +781,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
if (opt.cache_size > 2048)
opt.cache_size = 2048;
break;
+ case 246:
+ opt.version_sort = 1;
+ break;
default:
break;
}
diff --git a/src/options.h b/src/options.h
index 33b2bd3..c6b4e0e 100644
--- a/src/options.h
+++ b/src/options.h
@@ -104,6 +104,7 @@ struct __fehoptions {
unsigned int thumb_redraw;
double reload;
int sort;
+ int version_sort;
int debug;
int geom_flags;
int geom_x;