Commit a1001232 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

document --magick-timeout

parent 29cd8688
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
git HEAD

    * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
    * Try to convert unloadable files with imagemagick for up to 6 seconds
    * Try to convert unloadable files with imagemagick for up to 5 seconds
    * Add --magick-timeout option to set imagemagick conversion timeout or
      disable it altogether
    * Clean up temporary / to-delete files when receiveng SIG{INT,TERM,QUIT}
+9 −0
Original line number Diff line number Diff line
@@ -385,6 +385,15 @@ Don't display images. Just print out their names if imlib2 can successfully
load them.
Returns false if at least one image failed to load.
.
.It Cm --magick-timeout Ar timeout
.
Stop trying to convert unloadable files after
.Ar timeout
seconds. A negative value disables covert / magick support altogether, a value
of zero causes
.Nm
to try indefinitely. Default timeout is 5 seconds.
.
.It Cm -M , --menu-font Ar font
.
Use
+1 −1
Original line number Diff line number Diff line
@@ -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 = 10;
	opt.magick_timeout = 5;
	opt.thumb_w = 60;
	opt.thumb_h = 60;
	opt.thumb_redraw = 10;