summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-05-30 23:53:04 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-05-30 23:53:04 +0200
commitf44207093fdd02efc3e6e03054775514787b108e (patch)
tree6b2f1da449d35b630c8c6a4e217a7c03fdb849a0
parent17e2a29a5509939e6d2732d8b3d369b286f758b8 (diff)
Make --cache-thumbnails adhere more to the standard
-rw-r--r--ChangeLog1
-rw-r--r--man/feh.16
-rw-r--r--src/options.c4
-rw-r--r--src/thumbnail.c2
4 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e0ad43..4935b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ git HEAD
* Patch by aaptel: Support numpad keys for actions
* Fix blur mode (Ctrl + left mouse key)
* Center images in index/thumbnail mode relative to the text below them
+ * Various thumbnail caching improvements, better standard implementation
Thu May 6 08:34:39 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
diff --git a/man/feh.1 b/man/feh.1
index 7ee2d47..9dd2933 100644
--- a/man/feh.1
+++ b/man/feh.1
@@ -134,9 +134,9 @@ Create borderless windows.
Use builtin HTTP client to grab remote files instead of
.Xr wget 1 .
.It Cm --cache-thumbnails
-Enable thumbnail caching in
-.Pa ~/.thumbnails
-(rather experimental).
+Enable (experimental) thumbnail caching in
+.Pa ~/.thumbnails .
+Only works with thumbnails <= 128x128 pixels.
.It Cm --caption-path Ar path
Path to directory containing image captions. This turns on caption viewing,
and if captions are found in
diff --git a/src/options.c b/src/options.c
index a8f3791..56bfea8 100644
--- a/src/options.c
+++ b/src/options.c
@@ -797,6 +797,7 @@ static void check_options(void)
free(opt.thumb_title);
opt.thumb_title = NULL;
}
+
D_RETURN_(4);
}
@@ -960,7 +961,8 @@ void show_usage(void)
" OPTIONS\n"
" -t, --thumbnails As --index, but clicking an image will open it in\n"
" a new viewing window\n"
-" --cache-thumbnails Enable thumbnail caching\n"
+" --cache-thumbnails Enable thumbnail caching for thumbnail mode.\n"
+" Only works with thumbnails <= 128x128 pixels\n"
" -~, --thumb-title STRING Set window title for images opened from thumbnail mode.\n"
" Supports format specifiers, see there.\n"
" -I, --fullindex Same as index mode, but below each thumbnail you\n"
diff --git a/src/thumbnail.c b/src/thumbnail.c
index f4304af..ece4853 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -717,7 +717,7 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file)
if (!status)
status = feh_thumbnail_generate(image, file, thumb_file, uri);
- printf("uri is %s, thumb_file is %s\n", uri, thumb_file);
+ D(1, ("uri is %s, thumb_file is %s\n", uri, thumb_file));
free(uri);
free(thumb_file);
} else