Merge branch 'master' of git://github.com/derf/feh

7 files changed, 23 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 9cc7838..10d855c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-git HEAD
+Tue, 28 Aug 2012 11:46:19 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
+* Release v2.6
     * Dennis Real: EXIF mode fixes, support for more camera models
     * feh(1): Document behaviour for duplicate key bindings
       <https://github.com/derf/feh/issues/91>
@@ -10,11 +11,17 @@ git HEAD
     ** %o    x,y image offset relative to top-left window corner
     ** %r    image rotation
     ** %z    image zoom
+    * Always use file URL as filename when opening http files.
+      (consequence: lossless rotate no longer works for such files)
+    * --reload now accepts non-decimal values
+    * Fix --filelist trying to load .txt files with imagemagick
+    * imagemagick support is now disabled by default, to make feh behaviour
+      less confusing. Set --magick-timeout to a non-negative value to enable
+      it (--magick-timeout 5 for feh-2.5 behaviour)
 
 Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
 * Release v2.5
-
     * Add R, * and / bindings for <keypad begin>, <keypad *> and <keypad />
     * Try to convert unloadable files with imagemagick for up to 5 seconds
     * Add --magick-timeout option to set imagemagick conversion timeout or
diff --git a/man/feh.pre b/man/feh.pre
index a50a66a..e047286 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -118,18 +118,12 @@ can open any format supported by Imlib2, most notably jpeg and png.
 If the convert binary
 .Pq supplied by ImageMagick
 is available, it also has limited support for many other filetypes, such as
-svg, xcf and otf.
+svg, xcf and otf. Use
+.Cm --magick-timeout Ar num
+with a non-negative value to enable it.
 .
 For animated images, only the first frame is shown.
 .
-.Pp
-.
-If you don't like the results produced by convert, disable it with
-.Qq --magick-timeout -1 .
-Also, note that
-.Nm
-will only try to convert a file for up to five seconds by default.
-.
 .
 .Sh OPTIONS
 .
@@ -401,7 +395,7 @@ Stop trying to convert unloadable files after
 seconds. A negative value disables covert / magick support altogether, a value
 of zero causes
 .Nm
-to try indefinitely. Default timeout is 5 seconds.
+to try indefinitely. By default, magick support is disabled.
 .
 .It Cm -M , --menu-font Ar font
 .
@@ -1527,7 +1521,7 @@ window slightly too large.
 .Ss REPORTING BUGS
 .
 If you find a bug, please report it to
-.Aq derf@finalrewind.org
+.Aq derf+feh@finalrewind.org
 or via
 .Aq http://github.com/derf/feh/issues .
 You are also welcome to direct any feh-related comments/questions/... to #feh
diff --git a/src/filelist.c b/src/filelist.c
index 34df6cf..920a5ef 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -456,6 +456,7 @@ gib_list *feh_read_filelist(char *filename)
 	char s[1024], s1[1024];
 	Imlib_Image tmp_im;
 	struct stat st;
+	signed short tmp_magick_timeout;
 
 	if (!filename)
 		return(NULL);
@@ -463,6 +464,8 @@ gib_list *feh_read_filelist(char *filename)
 	/*
 	 * feh_load_image will fail horribly if filename is not seekable
 	 */
+	tmp_magick_timeout = opt.magick_timeout;
+	opt.magick_timeout = -1;
 	if (!stat(filename, &st) && S_ISREG(st.st_mode) &&
 			feh_load_image_char(&tmp_im, filename)) {
 		weprintf("Filelist file %s is an image, refusing to use it.\n"
@@ -470,6 +473,7 @@ gib_list *feh_read_filelist(char *filename)
 		opt.filelistfile = NULL;
 		return NULL;
 	}
+	opt.magick_timeout = tmp_magick_timeout;
 
 	errno = 0;
 	if ((fp = fopen(filename, "r")) == NULL) {
diff --git a/src/imlib.c b/src/imlib.c
index e7dcaeb..af7acdd 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -171,14 +171,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
 			file->ed = exif_get_data(tmpname);
 #endif
 		}
-		if ((opt.slideshow) && (opt.reload == 0) && (image_source != SRC_MAGICK)) {
-			free(file->filename);
-			file->filename = estrdup(tmpname);
-
-			if (!opt.keep_http)
-				add_file_to_rm_filelist(tmpname);
-		}
-		else if ((image_source == SRC_MAGICK) || !opt.keep_http)
+		if ((image_source == SRC_MAGICK) || !opt.keep_http)
 			unlink(tmpname);
 
 		free(tmpname);
diff --git a/src/keyevents.c b/src/keyevents.c
index 343b5d1..18853ed 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -750,7 +750,7 @@ void feh_event_handle_keypress(XEvent * ev)
 		if (opt.reload < SLIDESHOW_RELOAD_MAX)
 			opt.reload++;
 		else if (opt.verbose)
-			weprintf("Cannot set RELOAD higher than %d seconds.", opt.reload);
+			weprintf("Cannot set RELOAD higher than %f seconds.", opt.reload);
 	}
 	else if (feh_is_kp(&keys.reload_minus, keysym, state)) {
 		if (opt.reload > 1)
diff --git a/src/options.c b/src/options.c
index c27e11e..09ae5cc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -53,7 +53,7 @@ void init_parse_options(int argc, char **argv)
 	opt.display = 1;
 	opt.aspect = 1;
 	opt.slideshow_delay = 0.0;
-	opt.magick_timeout = 5;
+	opt.magick_timeout = -1;
 	opt.thumb_w = 60;
 	opt.thumb_h = 60;
 	opt.thumb_redraw = 10;
@@ -590,7 +590,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 			}
 			break;
 		case 'R':
-			opt.reload = atoi(optarg);
+			opt.reload = atof(optarg);
 			break;
 		case 'a':
 			opt.alpha = 1;
diff --git a/src/options.h b/src/options.h
index cef4215..a763642 100644
--- a/src/options.h
+++ b/src/options.h
@@ -97,7 +97,7 @@ struct __fehoptions {
 	int limit_w;
 	int limit_h;
 	unsigned int thumb_redraw;
-	int reload;
+	double reload;
 	int sort;
 	int debug;
 	int geom_flags;