Commit 0f6d9518 authored by Dennis Real's avatar Dennis Real
Browse files

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

parents 840474a2 25d2a1c0

ChangeLog

+9 −2
Original line number Diff line number Diff line 
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

man/feh.pre

+5 −11
Original line number Diff line number Diff line
@@ -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

src/filelist.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {

src/imlib.c

+1 −8
Original line number Diff line number Diff line
@@ -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);

src/keyevents.c

+1 −1
Original line number Diff line number Diff line
@@ -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)