summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--AUTHORS2
-rw-r--r--COPYING2
-rw-r--r--ChangeLog243
-rw-r--r--Makefile2
-rw-r--r--README.md125
-rw-r--r--man/feh.pre63
-rwxr-xr-xscripts/checkkeys.pl2
-rwxr-xr-xscripts/checkopts.pl2
-rw-r--r--src/debug.h2
-rw-r--r--src/events.c2
-rw-r--r--src/exif.c2
-rw-r--r--src/feh.h4
-rw-r--r--src/filelist.c8
-rw-r--r--src/filelist.h2
-rw-r--r--src/gib_hash.c2
-rw-r--r--src/gib_hash.h2
-rw-r--r--src/gib_imlib.c3
-rw-r--r--src/gib_imlib.h2
-rw-r--r--src/help.raw4
-rw-r--r--src/imlib.c11
-rw-r--r--src/index.c2
-rw-r--r--src/index.h2
-rw-r--r--src/keyevents.c8
-rw-r--r--src/list.c2
-rw-r--r--src/main.c36
-rw-r--r--src/menu.c20
-rw-r--r--src/menu.h2
-rw-r--r--src/options.c4
-rw-r--r--src/options.h2
-rw-r--r--src/signals.c26
-rw-r--r--src/signals.h5
-rw-r--r--src/slideshow.c8
-rw-r--r--src/structs.h2
-rw-r--r--src/strverscmp.c6
-rw-r--r--src/thumbnail.c8
-rw-r--r--src/thumbnail.h6
-rw-r--r--src/timers.c2
-rw-r--r--src/wallpaper.c2
-rw-r--r--src/wallpaper.h2
-rw-r--r--src/winwidget.c4
-rw-r--r--src/winwidget.h2
-rw-r--r--test/feh.t5
43 files changed, 371 insertions, 274 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..888b47c
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Birte Kristina Friesel <derf@finalrewind.org>
+Birte Kristina Friesel <derf@chaosdorf.de>
+Birte Kristina Friesel <ghub@derf.homelinux.org>
+Birte Kristina Friesel <derf@derf.homelinux.org>
diff --git a/AUTHORS b/AUTHORS
index ede7d47..ad85f15 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,7 +50,7 @@ Yu-Jie Lin
Dennis Real
- patch for builtin exif support (exif=1)
-Daniel Friesel - derf (at) finalrewind (dot) org
+Birte Kristina Friesel - derf (at) finalrewind (dot) org
- Maintenance since 2010
Thanks to:
diff --git a/COPYING b/COPYING
index bac6a11..dc7abbd 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
Copyright (C) 1999,2000 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2023 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/ChangeLog b/ChangeLog
index 8af1dee..a8f84c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
-Sun, 12 Jun 2022 13:12:00 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 04 Dec 2023 21:25:49 +0100 Birte Friesel <derf+feh@finalrewind.org>
+
+* Release v3.10.2
+ * Fix crash in right-click / menu rendering code on some distributions
+ (patch by Ametov Imil)
+
+Mon, 02 Oct 2023 04:27:56 +0200 Birte Friesel <derf+feh@finalrewind.org>
+
+* Release v3.10.1
+ * Do not call signal-unsafe functions within signal handlers
+
+Thu, 06 Apr 2023 16:19:16 +0200 Birte Friesel <derf+feh@finalrewind.org>
+
+* Release v3.10
+ * Add --sort=none option to un-set sort modes specified earlier
+ * Improve error messages for Imlib2 ≥ 1.8
+ * Fix build with clang 16. (Patch by orbea)
+ * Fix tests when building with magic=1
+
+Mon, 22 Aug 2022 17:49:11 +0200 Birte Friesel <derf+feh@finalrewind.org>
+
+* Release v3.9.1
+ * Set libcurl user agent to "feh/3.9.1". Previously, feh did not send a
+ user agent.
+
+Sun, 12 Jun 2022 13:12:00 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.9
* Fix compilation on macOS by defining _DARWIN_C_SOURCE for
@@ -18,7 +43,7 @@ Sun, 12 Jun 2022 13:12:00 +0200 Daniel Friesel <derf+feh@finalrewind.org>
getopt_long is provided by a wide range of libc implementations, so
there is no need for feh to duplicate it. (Patch by Guilherme Janczak)
-Mon, 03 Jan 2022 11:29:03 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 03 Jan 2022 11:29:03 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.8
* Add button ID "0" to cursor bindings. This pseudo-button is triggered
@@ -31,19 +56,19 @@ Mon, 03 Jan 2022 11:29:03 +0100 Daniel Friesel <derf+feh@finalrewind.org>
mis-orientation of images, as Imlib2 has already adjusted the
orientation).
-Sat, 25 Sep 2021 09:21:25 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 25 Sep 2021 09:21:25 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.7.2
* Fix crash when running feh without stdin file descriptor
-Sat, 24 Jul 2021 22:30:12 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 24 Jul 2021 22:30:12 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.7.1
* Support JPEG XL files when using imlib2-jxl (patch by Alistair)
* Fix support for images smaller than 16 bytes (patch by David Buchanan)
* Fix some out of bounds reads (patches by Tobias Stoeckmann)
-Sun, 09 May 2021 11:31:55 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 09 May 2021 11:31:55 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.7
* Use compact representation instead of key-value pairs for common EXIF data
@@ -57,21 +82,21 @@ Sun, 09 May 2021 11:31:55 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix Ctrl+key causing unintended behaviour when controlling feh via stdin
* Fix high CPU usage when closing stdin after starting feh from a terminal
-Mon, 25 Jan 2021 17:46:57 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 25 Jan 2021 17:46:57 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.6.3
* Fix --start-at not handling URL-encoded file:/// paths properly. Notably,
this also fixes feh not displaying images with spaces or unicode
elements in their path when opened from a file manager.
-Sat, 09 Jan 2021 12:28:06 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 09 Jan 2021 12:28:06 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.6.2
* Fix save_filelist not respecting --output-dir
* Fix file descriptor leak when attempting to load truncated image files.
The issue was introduced in v3.6.
-Sun, 06 Dec 2020 08:34:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 06 Dec 2020 08:34:15 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.6.1
* Fix excessive memory consumption when showing long-running slideshows
@@ -84,7 +109,7 @@ Sun, 06 Dec 2020 08:34:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Fix memory leak in --draw-exif
* Fix memory leak when reloading HTTP files with --no-conversion-cache
-Mon, 30 Nov 2020 19:44:47 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 30 Nov 2020 19:44:47 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.6
* Add flip and rotate options to the menu
@@ -97,7 +122,7 @@ Mon, 30 Nov 2020 19:44:47 +0100 Daniel Friesel <derf+feh@finalrewind.org>
<https://github.com/derf/feh/issues/505> for details.
-Sat, 29 Aug 2020 08:49:08 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 29 Aug 2020 08:49:08 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.5
* Enable --version-sort on systems without strverscmp support. This
@@ -107,13 +132,13 @@ Sat, 29 Aug 2020 08:49:08 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Add %a format specifier (slideshow state: "playing" / "paused")
* Fix crashes when combining --reload and --multiwindow
-Fri, 29 May 2020 23:52:35 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 29 May 2020 23:52:35 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.4.1
* Fix lossless rotate not being lossless when using feh with Imlib2 v1.6
or later
-Sat, 11 Apr 2020 09:51:01 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 11 Apr 2020 09:51:01 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.4
* Images loaded via HTTPS/curl, ImageMagick, and dcraw are now cached
@@ -131,7 +156,7 @@ Sat, 11 Apr 2020 09:51:01 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix a memory leak when repeatedly cycling through slideshows containing
images loaded via libcurl, ImageMagick or dcraw.
-Tue, 03 Dec 2019 17:27:46 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 03 Dec 2019 17:27:46 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.3
* New option --class allows setting the X11 class hint per feh instance
@@ -139,7 +164,7 @@ Tue, 03 Dec 2019 17:27:46 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Improve handling of NULL returns from Imlib2 calls (patch by Ben Boeckel)
* Fix compilation with libcurl < v7.32
-Mon, 22 Jul 2019 20:17:03 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 22 Jul 2019 20:17:03 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.2.1
* Use --no-fehbg option in ~/.fehbg. This fixes cases where an X11
@@ -150,7 +175,7 @@ Mon, 22 Jul 2019 20:17:03 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix TOCTTOU when setting the file mode of ~/.fehbg
(patch by Tobias Stoeckmann)
-Wed, 10 Jul 2019 17:40:29 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 10 Jul 2019 17:40:29 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.2
* Build feh with inotify=1 to automatically reload changed files in
@@ -159,13 +184,13 @@ Wed, 10 Jul 2019 17:40:29 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Reload current image(s) when receiving SIGUSR1 or SIGUSR2 in single-image
slideshows or in multiwindow mode
-Sun, 17 Feb 2019 08:41:53 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 17 Feb 2019 08:41:53 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Releasev v3.1.3
* Fix missing filename in ~/.fehbg when using --no-xinerama on a feh
binary compiled with xinerama=1. This issue was introduced in v3.1.2.
-Mon, 11 Feb 2019 17:24:13 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 11 Feb 2019 17:24:13 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.1.2
* Fix missing filenames in ~/.fehbg when using --bg-* on directories and/or
@@ -174,7 +199,7 @@ Mon, 11 Feb 2019 17:24:13 +0100 Daniel Friesel <derf+feh@finalrewind.org>
'start paused' flag
* Fix repeated --info option not properly overriding the 'draw info' flag
-Fri, 07 Dec 2018 22:51:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 07 Dec 2018 22:51:15 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.1.1
* Decrease libcurl timeout from indefinite to 30 minutes. This should
@@ -186,7 +211,7 @@ Fri, 07 Dec 2018 22:51:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
Previously, signals were ignored during a (possibly slow) libcurl
network transfer, which was not intended behaviour.
-Wed, 21 Nov 2018 19:37:34 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 21 Nov 2018 19:37:34 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.1
* Running "feh --start-at .../file.jpg" without specifying images,
@@ -202,7 +227,7 @@ Wed, 21 Nov 2018 19:37:34 +0100 Daniel Friesel <derf+feh@finalrewind.org>
error in previous versions.
* Respect -j / --output-dir when using save_image or save_filelist actions.
-Fri, 09 Nov 2018 17:17:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 09 Nov 2018 17:17:15 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v3.0
* Remove deprecated webcam scripts (feh-cam and gen-cam-menu)
@@ -219,7 +244,7 @@ Fri, 09 Nov 2018 17:17:15 +0100 Daniel Friesel <derf+feh@finalrewind.org>
file as well as the displayed image. This was the default behaviour in
feh 1.x and 2.x
-Sat, 27 Oct 2018 19:46:48 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 27 Oct 2018 19:46:48 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.28.1
* Do not ignore quit signals (SIGTERM, SIGINT, SIGQUIT) during preload
@@ -227,7 +252,7 @@ Sat, 27 Oct 2018 19:46:48 +0200 Daniel Friesel <derf+feh@finalrewind.org>
patch by Olof-Joachim Frahm)
* Improve randomness on non-glibc systems
-Mon, 17 Sep 2018 21:17:04 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 17 Sep 2018 21:17:04 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.28
* Decrease loading time for RAW images by utilizing dcraw to display the
@@ -241,7 +266,7 @@ Mon, 17 Sep 2018 21:17:04 +0200 Daniel Friesel <derf+feh@finalrewind.org>
<https://github.com/ulteq>), quit replaces --cycle-once (which is now
deprecated), and resume is the default (continue at the first image).
-Tue, 17 Jul 2018 17:33:10 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 17 Jul 2018 17:33:10 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.27.1
* Fix feh occasionally becoming unresponsive when asked to terminate
@@ -250,7 +275,7 @@ Tue, 17 Jul 2018 17:33:10 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix --keep-zoom-vp issues introduced in 2.27
(patch by <https://github.com/ulteq>)
-Thu, 28 Jun 2018 17:26:54 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 28 Jun 2018 17:26:54 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.27
* Fix size_to_image ("w") command when both --scale-down and --keep-zoom-vp
@@ -267,17 +292,17 @@ Thu, 28 Jun 2018 17:26:54 +0200 Daniel Friesel <derf+feh@finalrewind.org>
is enabled
* All patches provided by <https://github.com/ulteq>. Thanks a lot!
-Tue, 26 Jun 2018 10:33:04 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 26 Jun 2018 10:33:04 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.26.4
* Correctly save --bg-max in ~/.fehbg (patch by Sebastian Bickerle)
-Fri, 18 May 2018 22:58:02 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 18 May 2018 22:58:02 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.26.3
* Properly escape --image-bg argument in ~/.fehbg (broken in 2.26.1)
-Sat, 12 May 2018 16:33:56 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 12 May 2018 16:33:56 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.26.2
* Show correct filelist position in windows opened from thumbnail mode.
@@ -285,7 +310,7 @@ Sat, 12 May 2018 16:33:56 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Improve support for key input from stdin
* Do not push menus off the screen when hitting screen limits
-Fri, 11 May 2018 15:11:17 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 11 May 2018 15:11:17 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.26.1
* Restore pre-2.21 ~/.fehbg behaviour. This fixes nondeterministic
@@ -295,7 +320,7 @@ Fri, 11 May 2018 15:11:17 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix /tmp being cluttered with temporary ImageMagick files when using
--magick-timeout and a conversion takes longer than allowed
-Thu, 19 Apr 2018 21:43:12 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 19 Apr 2018 21:43:12 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.26
* Save absolute file paths in ~/.fehbg, similar to the behaviour prior to
@@ -303,13 +328,13 @@ Thu, 19 Apr 2018 21:43:12 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Add %g (window dimensions) and %Z (precise zoom level) format specifiers
* Improve -z/--randomize randomness
-Wed, 07 Mar 2018 17:49:52 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 07 Mar 2018 17:49:52 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.25.1
* Fix compilation issues when using CFLAGS=-m64 on some gcc versions
* Re-render current image when toggle_fixed_geometry is input
-Sun, 04 Mar 2018 08:53:50 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 04 Mar 2018 08:53:50 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.25
* Add --version-sort option to enable natural sorting of file and directory
@@ -324,7 +349,7 @@ Sun, 04 Mar 2018 08:53:50 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Fix filelists specified by -f/--filelist not being reloaded when using
--reload
-Mon, 26 Feb 2018 21:41:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 26 Feb 2018 21:41:38 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.24
* Improve performance when using --{max,min}-dimension in slideshow mode
@@ -333,12 +358,12 @@ Mon, 26 Feb 2018 21:41:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
(introduced in feh 2.23.1)
-Mon, 12 Feb 2018 22:11:55 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 12 Feb 2018 22:11:55 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.23.2
* Fix support for nested quotes in .confeg/feh/themes
-Wed, 31 Jan 2018 17:38:25 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 31 Jan 2018 17:38:25 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.23.1
* The Makefile no longer honors CPPFLAGS and instead consistently uses
@@ -347,7 +372,7 @@ Wed, 31 Jan 2018 17:38:25 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Minor performance improvements (patches by ulteq)
* Stability improvements when using --magick-timeout (patch by ulteq)
-Thu, 28 Dec 2017 19:26:29 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 28 Dec 2017 19:26:29 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.23
* Fix broken thumbnail/index windows when using --scale-down
@@ -355,18 +380,18 @@ Thu, 28 Dec 2017 19:26:29 +0100 Daniel Friesel <derf+feh@finalrewind.org>
for significant performance improvements especially in small slideshows
* Add --cache-size option to set Imlib2 image cache size
-Tue, 07 Nov 2017 17:36:26 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 07 Nov 2017 17:36:26 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.22.2
* Fix HTTPS certificate errors on some systems (broken in 2.22)
-Tue, 07 Nov 2017 07:51:48 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 07 Nov 2017 07:51:48 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.22.1
* Allow ~/.fehbg to be sourced (instead of executed) from other shell
scripts again (broken in 2.22)
-Sat, 04 Nov 2017 14:55:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 04 Nov 2017 14:55:38 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.22
* Add support for CURL_CA_BUNDLE environment variable when loading images
@@ -374,7 +399,7 @@ Sat, 04 Nov 2017 14:55:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Fix ~/.fehbg not being updated when setting a wallpaper via menu
(broken in 2.21)
-Sat, 07 Oct 2017 12:14:17 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 07 Oct 2017 12:14:17 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.21
* Add toggle_fixed_geometry ('g') key binding to toggle window auto-resize
@@ -383,7 +408,7 @@ Sat, 07 Oct 2017 12:14:17 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix --force-aliasing (and possibly other options) missing from ~/.fehbg
when using them for background setting
-Thu, 07 Sep 2017 20:20:11 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 07 Sep 2017 20:20:11 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.20
* Fix clang/gcc warnings (Patches by orbea)
@@ -396,27 +421,27 @@ Thu, 07 Sep 2017 20:20:11 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Remove images from the filelist if they were removed by executing a
user-defined action <https://github.com/derf/feh/issues/322>
-Mon, 21 Aug 2017 19:04:00 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 21 Aug 2017 19:04:00 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.19.3
* Save geometry data in .fehbg when setting a wallpaper with --geometry
* Fix Imlib2 developer warning and improve out-of-memory error message
when using --thumbnails / --index on large directories
-Sat, 12 Aug 2017 05:05:24 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 12 Aug 2017 05:05:24 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.19.2
* Show ImageMagick loader errors unless --quiet is specified
* Fix crash when handling certain media keys (introduced in 2.19.1)
-Tue, 25 Jul 2017 18:40:33 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 25 Jul 2017 18:40:33 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.19.1
* Fix Shift modifier not being recognized for tab, space and similar keys.
This lead to keybindings like Shift+Tab or Shift+Space being parsed as if
the Shift modifier had not been specified
-Tue, 06 Jun 2017 20:40:00 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 06 Jun 2017 20:40:00 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.19
* Follow the freedesktop.org Thumbnail Managing Standard by saving
@@ -426,7 +451,7 @@ Tue, 06 Jun 2017 20:40:00 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Install app icons with the correct permissions of 644
* Documentation improvements
-Tue, 04 Apr 2017 21:22:16 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 04 Apr 2017 21:22:16 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.18.3
* Fix double-free/OOB-write in E17 IPC. This only affects the
@@ -443,19 +468,19 @@ Tue, 04 Apr 2017 21:22:16 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix memory leak when saving a filelist or image whose target filename
already exists. (patch by Tobias Stoeckmann)
-Thu, 16 Feb 2017 23:05:39 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 16 Feb 2017 23:05:39 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.18.2
* Fix crash when using both --thumbnails and --title. This bug was
introduced in v2.18.1.
-Sun, 22 Jan 2017 19:11:32 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 22 Jan 2017 19:11:32 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.18.1
* Fix image-specific format specifiers not being updated correctly
(e.g. %z not displaying the correct zoom value after zooming in / out)
-Tue, 01 Nov 2016 10:55:04 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 01 Nov 2016 10:55:04 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.18
* Move README to README.md
@@ -464,13 +489,13 @@ Tue, 01 Nov 2016 10:55:04 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Only for builds with exif=1: Disable EXIF-based auto rotation by
default, add --auto-rotate option to enable it (Patch by Elliot Wolk)
-Wed, 31 Aug 2016 20:27:20 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 31 Aug 2016 20:27:20 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.17.1
* Fix compilation on systems where HOST_NAME_MAX is not defined, such as
FreeBSD (patch by Niclas Zeising)
-Sun, 28 Aug 2016 21:26:54 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 28 Aug 2016 21:26:54 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.17
* Install feh icon (both 48x48 and scalable SVG) to /usr/share/icons
@@ -486,20 +511,20 @@ Sun, 28 Aug 2016 21:26:54 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* feh now also sets the X11 _NET_WM_PID and WM_CLIENT_MACHINE window
properties
-Sun, 31 Jul 2016 16:59:07 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 31 Jul 2016 16:59:07 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.16.2
* Also support in-place editing for images loaded via libcurl or
imagemagick. Results will not be written back to disk in this case.
-Fri, 24 Jun 2016 00:31:56 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 24 Jun 2016 00:31:56 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.16.1
* Fix crash when trying to rotate a JPEG image without having
jpegtran / jpegexiforient installed
* Handle failing fork() calls gracefully
-Thu, 09 Jun 2016 08:59:35 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 09 Jun 2016 08:59:35 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.16
* Fix invalid key/button definitions mis-assigning keys/buttons to other
@@ -512,13 +537,13 @@ Thu, 09 Jun 2016 08:59:35 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Add navigation keys next_dir (]) and prev_dir ([) to jump to the first
image of the nex/previous directory (Patch by Sung Pae)
-Fri, 27 May 2016 13:15:49 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 27 May 2016 13:15:49 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.15.4
* Fix toggle_filenames key displaying wrong file numbers in multiwindow
mode
-Thu, 28 Apr 2016 11:41:04 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 28 Apr 2016 11:41:04 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.15.3
* Rescale image when resizing a window and --scale-down or --geometry is
@@ -527,18 +552,18 @@ Thu, 28 Apr 2016 11:41:04 +0200 Daniel Friesel <derf+feh@finalrewind.org>
size which will not be updated when changing images (as was the case in
feh < 2.15). This may or may not be fixed in the future.
-Sat, 16 Apr 2016 18:32:38 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 16 Apr 2016 18:32:38 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.15.2
* Fix --keep-zoom-vp not keeping the viewport x/y offsets (broken by 2.15)
-Fri, 15 Apr 2016 10:18:37 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 15 Apr 2016 10:18:37 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.15.1
* Fix w (size_to_image) key not updating window size when --scale-down
or --geometry is active
-Sat, 09 Apr 2016 20:42:23 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sat, 09 Apr 2016 20:42:23 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.15
* Patch by William Woodruff: Add --insecure option to disable HTTPS
@@ -557,7 +582,7 @@ Sat, 09 Apr 2016 20:42:23 +0200 Daniel Friesel <derf+feh@finalrewind.org>
start with a space. Titles starting with a space are treated as part of
of the command so that actions like '[ -L %F ] && foo' still work
-Thu, 18 Feb 2016 20:40:19 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 18 Feb 2016 20:40:19 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.14.2
* make test: Ignore results on arm and mips since they expose a bug in
@@ -570,7 +595,7 @@ Thu, 18 Feb 2016 20:40:19 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* -f / --filelist: Fix bug in "-" / "/dev/stdin" handling affecting feh
running in ksh and possibly other environments
-Thu, 04 Feb 2016 20:31:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 04 Feb 2016 20:31:38 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.14.1
* Skip a small set of build tests on Debian and derivatives, since they
@@ -579,7 +604,7 @@ Thu, 04 Feb 2016 20:31:38 +0100 Daniel Friesel <derf+feh@finalrewind.org>
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729> for more
information
-Sun, 04 Oct 2015 10:01:20 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 04 Oct 2015 10:01:20 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.14
* Add --xinerama-index option for background setting
@@ -596,12 +621,12 @@ Sun, 04 Oct 2015 10:01:20 +0200 Daniel Friesel <derf+feh@finalrewind.org>
active xinerama screen by setting the XINERAMA_SCREEN environment
variable
-Sun, 24 May 2015 11:45:18 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 24 May 2015 11:45:18 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.13.1
* Fix --scale-down breaking image centering in fullscreen mode
-Sun, 17 May 2015 20:40:36 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 17 May 2015 20:40:36 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.13
* print --verbose output to stderr
@@ -614,14 +639,14 @@ Sun, 17 May 2015 20:40:36 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix potential out of bounds array access in EXIF code
(when built with exif=1)
-Wed, 08 Apr 2015 11:18:41 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 08 Apr 2015 11:18:41 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.12.1
* Handle missing HOME in environment
* Fix memory leak when a slideshow contains many unloadable images
* Fix memory leak when --prelaod removes files from the filelist
-Thu, 15 May 2014 23:41:07 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 15 May 2014 23:41:07 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.12
* feh-cam and gen-cam-menu are no longer installed by default. Use
@@ -639,7 +664,7 @@ Thu, 15 May 2014 23:41:07 +0200 Daniel Friesel <derf+feh@finalrewind.org>
--thumb-title and --title)
* Update help (when built with help=1)
-Sun, 27 Apr 2014 20:28:02 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Sun, 27 Apr 2014 20:28:02 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.11
* Patch by Michael Vorburger: Fix erroneous free() in case of failed
@@ -655,7 +680,7 @@ Sun, 27 Apr 2014 20:28:02 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Respect --image-bg=checks in fullscreen mode (default remains black)
(closes #156)
-Fri, 28 Feb 2014 18:20:25 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 28 Feb 2014 18:20:25 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.10
* Allow non-centered wallpapers using the --geometry option
@@ -671,7 +696,7 @@ Fri, 28 Feb 2014 18:20:25 +0100 Daniel Friesel <derf+feh@finalrewind.org>
(Patch by Brian Mattern)
* Always use absolute paths in .fehbg
-Tue, 11 Jun 2013 08:27:24 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 11 Jun 2013 08:27:24 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.9.3
* Patch by David Gowers: Add %L format code (temporary copy of filelist)
@@ -679,20 +704,20 @@ Tue, 11 Jun 2013 08:27:24 +0200 Daniel Friesel <derf+feh@finalrewind.org>
--customlist, --index-info, --info, --thumb-title, --title)
* Fix tests failing when compiled with help=1
-Fri, 03 May 2013 21:16:59 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Fri, 03 May 2013 21:16:59 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.9.2
* Fix -F --zoom 100 not working in Gnome+Unity when compiling feh with
gcc and enabled optimizations (not -O0)
* EXIF updates by Dennis Real
-Thu, 14 Feb 2013 12:52:02 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 14 Feb 2013 12:52:02 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.9.1
* Set correct window dimensions on any Xinerama screen, not just the
first one (active screen is determined by current pointer location)
-Wed, 13 Feb 2013 01:46:56 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 13 Feb 2013 01:46:56 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.9
* Add --keep-zoom-vp option to keep zoom and offsets when switching
@@ -704,7 +729,7 @@ Wed, 13 Feb 2013 01:46:56 +0100 Daniel Friesel <derf+feh@finalrewind.org>
error
* Add button bindings to zoom in / out (patch by sdaau)
-Mon, 24 Dec 2012 15:45:54 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+Mon, 24 Dec 2012 15:45:54 +0100 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.8
* Do not apply --scale-down to the thumbnail window. It will be applied
@@ -725,19 +750,19 @@ Mon, 24 Dec 2012 15:45:54 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Make 'z' (jump_random) work in thumbnail mode as well, fix thumbnail
selection roll-over <https://github.com/derf/feh/issues/115>
-Tue, 16 Oct 2012 06:29:58 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 16 Oct 2012 06:29:58 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.7
* Add --min-dim and --max-dim options to only process images with certain
dimensions
-Thu, 27 Sep 2012 16:48:48 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 27 Sep 2012 16:48:48 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.6.3
* Fix segfault when doing lossless mirror/rotate and jpegexiforient is
not present <https://github.com/derf/feh/issues/100>
-Wed, 26 Sep 2012 17:06:50 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Wed, 26 Sep 2012 17:06:50 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.6.2
* Set EXIF orientation tag to 1 ("0,0 is top left" aka normal) after
@@ -747,7 +772,7 @@ Wed, 26 Sep 2012 17:06:50 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Fix spelling in feh(1)
* Compile debug builds with -O0
-Thu, 13 Sep 2012 12:00:06 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Thu, 13 Sep 2012 12:00:06 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.6.1
* Fix freedesktop.org Thumbnail Managing Standard implementation:
@@ -759,7 +784,7 @@ Thu, 13 Sep 2012 12:00:06 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Show error message if load failed and magick is disabled (was broken
by feh 2.4)
-Tue, 28 Aug 2012 11:46:19 +0200 Daniel Friesel <derf+feh@finalrewind.org>
+Tue, 28 Aug 2012 11:46:19 +0200 Birte Friesel <derf+feh@finalrewind.org>
* Release v2.6
* Dennis Real: EXIF mode fixes, support for more camera models
@@ -780,7 +805,7 @@ Tue, 28 Aug 2012 11:46:19 +0200 Daniel Friesel <derf+feh@finalrewind.org>
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>
+Sun, 25 Mar 2012 13:13:26 +0200 Birte Friesel <derf@finalrewind.org>
* Release v2.5
* Add R, * and / bindings for <keypad begin>, <keypad *> and <keypad />
@@ -791,7 +816,7 @@ Sun, 25 Mar 2012 13:13:26 +0200 Daniel Friesel <derf@finalrewind.org>
* Do not scroll past image borders when using key bindings
* --loadable / --unloadable: indicate result in exit status
-Tue, 06 Mar 2012 13:13:35 +0100 Daniel Friesel <derf@finalrewind.org>
+Tue, 06 Mar 2012 13:13:35 +0100 Birte Friesel <derf@finalrewind.org>
* Release v2.4
* exif-support fixes by Dennis Real
@@ -803,7 +828,7 @@ Tue, 06 Mar 2012 13:13:35 +0100 Daniel Friesel <derf@finalrewind.org>
ignore out of memory errors
* Use ImageMagick (convert) as loader for unsupported file formats
-Thu, 02 Feb 2012 21:04:06 +0100 Daniel Friesel <derf@finalrewind.org>
+Thu, 02 Feb 2012 21:04:06 +0100 Birte Friesel <derf@finalrewind.org>
* Release v2.3
* Add %F and %N format specifiers, containing an escaped version of %f/%n.
@@ -820,7 +845,7 @@ Thu, 02 Feb 2012 21:04:06 +0100 Daniel Friesel <derf@finalrewind.org>
* Accept offset-only arguments for --geometry
<https://github.com/derf/feh/issues/73>
-Mon, 02 Jan 2012 11:54:01 +0100 Daniel Friesel <derf@finalrewind.org>
+Mon, 02 Jan 2012 11:54:01 +0100 Birte Friesel <derf@finalrewind.org>
* Release v2.2
* Add --no-fehbg option to disable ~/.fehbg creation (patch by Felix Crux)
@@ -832,7 +857,7 @@ Mon, 02 Jan 2012 11:54:01 +0100 Daniel Friesel <derf@finalrewind.org>
* Follow HTTP redirects
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653689>
-Wed, 02 Nov 2011 10:56:10 +0100 Daniel Friesel <derf@finalrewind.org>
+Wed, 02 Nov 2011 10:56:10 +0100 Birte Friesel <derf@finalrewind.org>
* Release v2.1
* Experimental --scale-down and --auto-zoom tiling support
@@ -841,7 +866,7 @@ Wed, 02 Nov 2011 10:56:10 +0100 Daniel Friesel <derf@finalrewind.org>
* Fix http image load for long image names
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646421>
-Mon, 10 Oct 2011 12:25:00 +0200 Daniel Friesel <derf@finalrewind.org>
+Mon, 10 Oct 2011 12:25:00 +0200 Birte Friesel <derf@finalrewind.org>
* Release v2.0
* The --bg-options now accept multiple filenames, one per Xinerama screen
@@ -857,7 +882,7 @@ Mon, 10 Oct 2011 12:25:00 +0200 Daniel Friesel <derf@finalrewind.org>
hosts if the local system is 32bit (for 32<->32 and 64<->64, this works
anyways)
-Mon, 26 Sep 2011 09:35:41 +0200 Daniel Friesel <derf@finalrewind.org>
+Mon, 26 Sep 2011 09:35:41 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.16.2
* Fix useless memory use when using feh --reload on HTTP URLs
@@ -867,13 +892,13 @@ Mon, 26 Sep 2011 09:35:41 +0200 Daniel Friesel <derf@finalrewind.org>
* Fix --title-font fallback behaviour
* Fix delayed title display when using --title-font
-Sun, 11 Sep 2011 12:46:50 +0200 Daniel Friesel <derf@finalrewind.org>
+Sun, 11 Sep 2011 12:46:50 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.16.1
* Fix reload after image rotation and similar (broken by 1.16)
<https://github.com/derf/feh/issues/63>
-Mon, 05 Sep 2011 10:56:58 +0200 Daniel Friesel <derf@finalrewind.org>
+Mon, 05 Sep 2011 10:56:58 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.16
* Reload image after executing an action with the hold-action flag set
@@ -896,14 +921,14 @@ Mon, 05 Sep 2011 10:56:58 +0200 Daniel Friesel <derf@finalrewind.org>
* When using --no-menus and clicking the menu button, feh will now ignore
it instead of quitting (which was undocumented behaviour anyways)
-Tue, 16 Aug 2011 22:48:06 +0200 Daniel Friesel <derf@finalrewind.org>
+Tue, 16 Aug 2011 22:48:06 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.15.1
* Fix segfault when selecting menu items (broken by 1.15)
<https://github.com/derf/feh/issues/58>,
<https://bugs.archlinux.org/task/25612>
-Mon, 15 Aug 2011 11:12:34 +0200 Daniel Friesel <derf@finalrewind.org>
+Mon, 15 Aug 2011 11:12:34 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.15
* Respect --image-bg option in full-screen mode
@@ -928,7 +953,7 @@ Mon, 15 Aug 2011 11:12:34 +0200 Daniel Friesel <derf@finalrewind.org>
* Add experimental reload functionality for directories
<https://github.com/derf/feh/issues/14>
-Mon, 04 Jul 2011 14:46:36 +0200 Daniel Friesel <derf@finalrewind.org>
+Mon, 04 Jul 2011 14:46:36 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.14.2
* Fix --draw-filename "x of y" being cut off by short filenames
@@ -940,13 +965,13 @@ Mon, 04 Jul 2011 14:46:36 +0200 Daniel Friesel <derf@finalrewind.org>
* Fix minor documentation bugs
* Fix minor memleak in the recursive file loader for directories
-Thu, 19 May 2011 22:32:42 +0200 Daniel Friesel <derf@finalrewind.org>
+Thu, 19 May 2011 22:32:42 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.14.1
* Fix compilation with curl=0
* Make zoom_default key work properly with --geometry
-Wed, 11 May 2011 11:37:32 +0200 Daniel Friesel <derf@finalrewind.org>
+Wed, 11 May 2011 11:37:32 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.14
* Only create caption directory when actually writing out a caption.
@@ -984,7 +1009,7 @@ Wed, 11 May 2011 11:37:32 +0200 Daniel Friesel <derf@finalrewind.org>
theme definition handling. Having a theme line with just one
option/value pair used to produce undefined behaviour
-Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel <derf@finalrewind.org>
+Sat, 23 Apr 2011 22:00:27 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.13
* Fix segfault upon unloadable images when image-related format specifiers
@@ -998,7 +1023,7 @@ Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel <derf@finalrewind.org>
the respective mode (scale/fill/max/center) on each Xinerama screen. Use
--no-xinerama to disable this.
-Sat, 12 Mar 2011 22:49:53 +0100 Daniel Friesel <derf@finalrewind.org>
+Sat, 12 Mar 2011 22:49:53 +0100 Birte Friesel <derf@finalrewind.org>
* Release v1.12
* Add --zoom fill as equivalent for --auto-zoom
@@ -1012,7 +1037,7 @@ Sat, 12 Mar 2011 22:49:53 +0100 Daniel Friesel <derf@finalrewind.org>
* Remove builtin http client (--builtin)
* Fix compilation issues with libpng 1.5.1
-Wed, 09 Feb 2011 20:11:26 +0100 Daniel Friesel <derf@finalrewind.org>
+Wed, 09 Feb 2011 20:11:26 +0100 Birte Friesel <derf@finalrewind.org>
* Release v1.11.2
* Use wget --no-clobber to prevent TOCTTOU-based hole allowing a
@@ -1021,7 +1046,7 @@ Wed, 09 Feb 2011 20:11:26 +0100 Daniel Friesel <derf@finalrewind.org>
It is still possible for an attacker to _create_ arbitrary files via the
same hole.
-Wed, 26 Jan 2011 21:07:19 +0100 Daniel Friesel <derf@finalrewind.org>
+Wed, 26 Jan 2011 21:07:19 +0100 Birte Friesel <derf@finalrewind.org>
* Release v1.11.1
* Show correct image dimensions in for cached thumbnails
@@ -1029,7 +1054,7 @@ Wed, 26 Jan 2011 21:07:19 +0100 Daniel Friesel <derf@finalrewind.org>
* Remove support for FEH_OPTIONS (was deprecated >5 years ago)
* Restrict available modifiers to Control/Mod1/Mod4
-Sat, 22 Jan 2011 11:48:33 +0100 Daniel Friesel <derf@finalrewind.org>
+Sat, 22 Jan 2011 11:48:33 +0100 Birte Friesel <derf@finalrewind.org>
* Release v1.11
* Patch by Pascal Bleser: Use getaddrinfo for builtin http client,
@@ -1041,7 +1066,7 @@ Sat, 22 Jan 2011 11:48:33 +0100 Daniel Friesel <derf@finalrewind.org>
* Increase movement steps for Ctrl+Left etc.
* Make in/out zoom use equal zoom ratio
-Fri, 03 Dec 2010 19:41:45 +0100 Daniel Friesel <derf@finalrewind.org>
+Fri, 03 Dec 2010 19:41:45 +0100 Birte Friesel <derf@finalrewind.org>
* Release v1.10.1
* Partially fix --scale-down behaviour (zooming is still broken)
@@ -1049,7 +1074,7 @@ Fri, 03 Dec 2010 19:41:45 +0100 Daniel Friesel <derf@finalrewind.org>
* Fix segfaults after trying to load several unloadable images
* Fix fehrc created by feh (contined escape errors)
-Thu, 07 Oct 2010 20:15:12 +0200 Daniel Friesel <derf@finalrewind.org>
+Thu, 07 Oct 2010 20:15:12 +0200 Birte Friesel <derf@finalrewind.org>
* Release v1.10 (aka "2.0 will come real soon now")
* Patch by Stefan Mark: Add --bg-max (scaled with borders)
@@ -1065,7 +1090,7 @@ Thu, 07 Oct 2010 20:15:12 +0200 Daniel Friesel <derf@finalrewind.org>
* Zoom button: Zoom to 100% on button release, not button click
* --draw-filename: Always show position in filelist
-Tue, 24 Aug 2010 19:23:36 +0200 Daniel Friesel <derf@chaosdorf.de>
+Tue, 24 Aug 2010 19:23:36 +0200 Birte Friesel <derf@chaosdorf.de>
* Release v1.9
* Add --fullscreen option, --full-screen is now deprecated
@@ -1080,7 +1105,7 @@ Tue, 24 Aug 2010 19:23:36 +0200 Daniel Friesel <derf@chaosdorf.de>
* When zooming via keyboard: Always zoom around the center of the window
* The image can now be panned with Ctrl + arrow keys
-Fri, 25 Jun 2010 16:07:20 +0200 Daniel Friesel <derf@chaosdorf.de>
+Fri, 25 Jun 2010 16:07:20 +0200 Birte Friesel <derf@chaosdorf.de>
* Release v1.8
* support LDLIBS in Makefile/config.mk
@@ -1101,7 +1126,7 @@ Fri, 25 Jun 2010 16:07:20 +0200 Daniel Friesel <derf@chaosdorf.de>
* Don't add ?randomnumber to URLs when downloading them, it confuses some
servers and is not really necessary in general
-Thu Jun 10 12:12:04 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
+Thu Jun 10 12:12:04 CEST 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.7
* Fix segfault in Thumbnail mode when trying to open a no longer
@@ -1119,14 +1144,14 @@ Thu Jun 10 12:12:04 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* caption mode: Automatically create caption directory if it doesn't exist
* Slideshow mode: SIGUSR1 = next image, SIGUSR2 = previous image
-Sat Jun 5 21:35:25 CEST 2010 Daniel Friesel <derf@chaosdorf.de
+Sat Jun 5 21:35:25 CEST 2010 Birte Friesel <derf@chaosdorf.de
* Release v1.6.1
* Fix omitted image borders at high zoom levels
* Re-add getopt_long files (possibly relevant for non-glibc systems)
* Do not require a running X server for -L, -u, -U options
-Tue Jun 1 10:21:19 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
+Tue Jun 1 10:21:19 CEST 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.6
* Patch by aaptel: Support numpad keys for actions
@@ -1142,7 +1167,7 @@ Tue Jun 1 10:21:19 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Fix "make uninstall". You do NOT want to call this for feh versions
1.4.2 to 1.5
-Thu May 6 08:34:39 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
+Thu May 6 08:34:39 CEST 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.5
* Rewrite parts of the menu code & fix a memory leak while there
@@ -1150,7 +1175,7 @@ Thu May 6 08:34:39 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Add keybinding to toggle pointer visibility (see --hide-pointer)
* Sort manual a bit
-Thu Apr 22 22:28:09 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
+Thu Apr 22 22:28:09 CEST 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.4.3
* Warp the pointer when reaching a window border in pan mode
@@ -1160,7 +1185,7 @@ Thu Apr 22 22:28:09 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
is. The zoom happen around at that pixel.
* Manpage review
-Fri Apr 2 16:20:55 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
+Fri Apr 2 16:20:55 CEST 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.4.2
* Replace autoconf by config.mk
@@ -1169,7 +1194,7 @@ Fri Apr 2 16:20:55 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* patch by dylan: Remove temporary files if url opening fails
* Fix problems with unexpectedly empty filelists
-Tue Mar 16 07:56:36 CET 2010 Daniel Friesel <derf@chaosdorf.de>
+Tue Mar 16 07:56:36 CET 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.4.1
* Fix chrome theme in the default .fehrc
@@ -1177,7 +1202,7 @@ Tue Mar 16 07:56:36 CET 2010 Daniel Friesel <derf@chaosdorf.de>
* Add manual for feh-cam and gen-cam-menu (from Debian)
* Fix lossless rotate for filenames with spaces etc.
-Thu Mar 4 14:55:02 CET 2010 Daniel Friesel <derf@chaosdorf.de>
+Thu Mar 4 14:55:02 CET 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.4
* Lots of documentation fixes/improvements
@@ -1191,7 +1216,7 @@ Thu Mar 4 14:55:02 CET 2010 Daniel Friesel <derf@chaosdorf.de>
* Use jpegtran binary instead of libjpeg for lossless rotation
* Add --bg-fill option (patch by Anonymous)
-Mon Feb 8 21:47:56 CET 2010 Daniel Friesel <derf@chaosdorf.de>
+Mon Feb 8 21:47:56 CET 2010 Birte Friesel <derf@chaosdorf.de>
* Release v1.3.5
* Import various Debian patches
diff --git a/Makefile b/Makefile
index b232574..1e7e4e5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build-applications:
@${MAKE} -C share/applications
test: all
- @if ! uname -m | fgrep -q -e arm -e mips; then \
+ @if ! uname -m | grep -q -e arm -e mips; then \
PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t; \
else \
PACKAGE=${PACKAGE} prove test/feh.t test/mandoc.t || cat test/imlib2-bug-notice; \
diff --git a/README.md b/README.md
index 6828a19..4bf404f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
-[![build status](https://travis-ci.org/derf/feh.svg?branch=master)](https://travis-ci.org/derf/feh)
+# feh - Image Viewer and Cataloguer
-Feh – Image viewer and Cataloguer
----
-
-feh is a light-weight, configurable and versatile image viewer.
+**feh** is a light-weight, configurable and versatile image viewer.
It is aimed at command line users, but can also be started from graphical file
managers. Apart from viewing images, it can compile text and thumbnail
listings, show (un)loadable files, set X11 backgrounds, and more.
@@ -13,74 +10,54 @@ and image captions. feh can be controlled by configurable keyboard and mouse
shortcuts, terminal input and signals. When no file arguments or filelists are
specified, feh displays all files in the current directory.
-For more information, please refer to the [feh
-website](https://feh.finalrewind.org/) or read the [feh
-manual](https://man.finalrewind.org/1/feh/).
+This README focuses on installation and contribution instructions. See the
+[feh homepage](https://feh.finalrewind.org/) and the
+[feh(1) manual](https://man.finalrewind.org/1/feh/) for other details.
-Dependencies
----
+## Dependencies
* Imlib2
- * libcurl (disable with make curl=0)
+ * libcurl (disable with `curl=0`)
* libpng
* libX11
- * libXinerama (disable with make xinerama=0)
+ * libXt
+ * libXinerama (disable with `xinerama=0`)
-If built with exif=1:
+Only when building with `exif=1`:
* libexif-dev
* libexif12
-If built with magic=1:
+Only when building with `magic=1`:
* libmagic
-Recommended Binaries
----
-
- * convert (supplied by ImageMagick, can be used to load image formats not supported by Imlib2)
-
-Installation
----
-
-**For end users:**
-```bash
-$ make
-$ sudo make install app=1
-```
-
-**For package maintainers and users who do not want feh to install its
-icons into /usr/share:**
-```bash
-$ make
-$ sudo make install
-```
-
-**Explanation:** feh ships some icons and an X11 desktop entry, which allow it to
-be used from file managers, desktop menus and similar. However, installing
-icons to /usr/local/share/... does not seem to work reliably.
-Because of this, when using "make install app=1", feh will install its icons
-to /usr/share/..., even though they technically belong into /usr/local.
+## Build Process
-[ZSH completion for
-feh](https://git.finalrewind.org/zsh/plain/etc/completions/_feh) is also
-available.
+feh has been packaged for a variety of distributions, including
+[Arch Linux](https://archlinux.org/packages/extra/x86_64/feh/),
+[Debian](https://packages.debian.org/search?keywords=feh&exact=1),
+[FreeBSD](https://www.freshports.org/graphics/feh), and
+[Ubuntu](https://packages.ubuntu.com/search?keywords=feh&exact=1).
+You can configure, compile and install a custom version as follows.
-Make flags
-----------
+### Configuration
feh's build process uses make flags to enable/disable optional features and
-fine-tune the build and installation process. They can be passed as **make**
-arguments or set as environment variables, like so:
+fine-tune the build and installation process. It uses (hopefully) reasonable
+defaults, so you can skip this section if you like.
+
+Make flags can be passed as **make** arguments or set as environment variables,
+like so:
```bash
-make flag=bool
-make install flag=bool
+$ make flag=bool
+$ make install flag=bool
```
or
```bash
-export flag=bool
-make && make install
+$ export flag=bool
+$ make && make install
```
The following flags are respected by the makefile. A default value of **1**
@@ -103,7 +80,8 @@ indicates that the corresponding feature is enabled by default.
For example, `make xinerama=0 debug=1` will disable Xinerama support and
produce a debug build; libcurl and natural sorting support will remain enabled.
-Additionally, the standard variables `PREFIX` and `DESTDIR` are supported.
+Additionally, it supports the standard variables `CFLAGS`, `LDLIBS`, `PREFIX`,
+and `DESTDIR`.
**PREFIX _(default: /usr/local)_** controls where the application and its data files
will be installed. It must be set both during `make` and `make install`.
@@ -115,18 +93,43 @@ is mostly useful for package maintainers.
cases, you can set environment variables instead of editing it. E.g.:
```bash
-CFLAGS='-g -Os' make
+$ CFLAGS='-g -Os' make
```
```bash
-export DESTDIR=/tmp/feh PREFIX=/usr
-make && make install
+$ export DESTDIR=/tmp/feh PREFIX=/usr
+$ make && make install
```
Builtin EXIF support is maintained by Dennis Real, [here](https://github.com/reald/feh).
+### Installation
-Testing (non-X)
----------------
+Add your own make flags to the following examples as needed.
+
+**For end users:**
+```bash
+$ make
+$ sudo make install app=1
+```
+
+**For package maintainers and users who do not want feh to install its
+icons into /usr/share:**
+```bash
+$ make
+$ sudo make install
+```
+
+**Explanation:** feh ships some icons and an X11 desktop entry, which allow it to
+be used from file managers, desktop menus and similar. However, installing
+icons to /usr/local/share/... does not seem to work reliably.
+Because of this, when using "make install app=1", feh will install its icons
+to /usr/share/..., even though they technically belong into /usr/local.
+
+[ZSH completion for
+feh](https://git.finalrewind.org/zsh/plain/etc/completions/_feh) is also
+available.
+
+## Testing (non-X11)
The non-X11 parts of feh can be automatically tested by running
@@ -137,16 +140,16 @@ This requires **perl >= 5.10** and the perl module `Test::Command`. Tests are
non-interactive and do not require a running X11, so they can safely be run on
a headless buildserver.
-
-Contributing
----
+## Contributing
Bugfixes are always welcome, just open a pull request :)
Before proposing a new feature, please consider the scope of feh: It is an
image viewer and cataloguer, not an image editor or similar. Also, its option
list is already pretty long. Please discuss your ideas in a feature request
-before opening a pull request in this case.
+before opening a pull request in this case. Also, keep in mind that feh is
+developed as a hobby project and that there is absolutely no obligation for
+anyone to implement requested features or review merge requests.
Please keep in mind that feh's options, key bindings and format specifiers are
documented in two different places: The manual (man/feh.pre) and the help text
diff --git a/man/feh.pre b/man/feh.pre
index 1899800..cd65b83 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -154,24 +154,31 @@ pnm, tiff, and bmp.
The gif format is also supported, but only for static images.
In case of animations, only the first frame will be shown.
.
-If the convert binary
-.Pq supplied by ImageMagick
-is available, it also has limited support for many other file types, such as
-svg, xcf and otf.
-If dcraw is available,
-.Nm
-also supports RAW files provided by cameras and will display the embedded
-thumbnails.
-Use
+.Pp
+.
+When invoked with
.Cm --conversion-timeout Ar timeout
-with a non-negative value to enable support for these formats.
+.Po
+and a non-negative
+.Ar timeout
+value
+.Pc ,
+.Nm
+also has limited support for various other file types by means of external
+conversion programs.
+If the dcraw binary is available,
+.Nm
+will use it to display the thumbnails embedded into RAW files provided by
+digital cameras and similar.
+If the ImageMagick convert binary is available,
+.Nm
+will use it to load file types such as svg, xcf, and otf.
.
.Pp
.
.Pq optional feature, $MAN_MAGIC$ in this build
.Nm
can use libmagic to only pass image files to Imlib2.
-This feature is $MAN_MAGIC$ in this build.
When using
.Nm
with lots of non-image files
@@ -568,6 +575,9 @@ Useful in scripts to hunt out images of a certain size/resolution/type etc.
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.
+When combined with
+.Cm --action ,
+the specified action will be run for each loadable image.
.
.It Cm --max-dimension Ar width No x Ar height
.
@@ -664,7 +674,10 @@ and next image.
.Cm quit
will cause
.Nm
-to quit when trying to advance past the last image in the slide show.
+to quit when trying to advance past the last image in the slide show. This is
+the behavior of the obsolete
+.Cm --cycle-once
+option.
.
.Pp
.
@@ -792,9 +805,9 @@ in paused mode.
.
Sort file list according to image parameters.
Allowed sort types are:
-.Cm name , filename , dirname , mtime , width , height , pixels , size , format .
+.Cm name , none , filename , dirname , mtime , width , height , pixels , size , format .
For sort modes other than
-.Cm name , filename , dirname ,
+.Cm name , none , filename , dirname ,
or
.Cm mtime ,
a preload run is
@@ -822,6 +835,11 @@ you can use
.Cm --version-sort
to sort numbers naturally, so that e.g. 10.jpg comes after 2.jpg.
.
+.Pp
+.
+.Cm none
+is the default; you can specify it explicitly to discard a sort mode that has
+been specified at an earlier point in the command line arguments.
.It Cm -| , --start-at Ar filename
.
Start the filelist at
@@ -908,6 +926,9 @@ See
Don't display images.
Just print out their names if imlib2 can NOT successfully load them.
Returns false if at least one image was loadable.
+When combined with
+.Cm --action ,
+the specified action will be run for each unloadable file.
.
.It Cm -V , --verbose
.
@@ -973,7 +994,7 @@ when setting the wallpaper.
.Pp
.
Use
-.Cm xrandr --listmonitor
+.Cm xrandr --listmonitors
to determine how Xinerama monitor IDs map to screens/monitors in your setup.
.
.
@@ -1345,6 +1366,14 @@ Number of current file
.
Image width
.
+.\" .It %W
+.\" .
+.\" Window dimensions and offset as WxH+x+y
+.\" .Pq X11 geometry format .
+.\" Note that this is currently only properly updated when changing images;
+.\" offsets for the first image after starting feh and after changing window
+.\" geometry may be bogus.
+.
.It %v
.
.Nm
@@ -2210,7 +2239,7 @@ is a hobby project, so bug reports may be addressed with significant delays.
.
Copyright (C) 1999, 2000 by Paul Duncan.
Copyright (C) 1999, 2000 by Tom Gilbert and contributors.
-Copyright (C) 2010-2020 by Daniel Friesel and contributors.
+Copyright (C) 2010-2023 by Birte Kristina Friesel and contributors.
.
.Pp
.
@@ -2240,7 +2269,7 @@ SOFTWARE.
.
.Pp
.
-Current developer: Daniel Friesel
+Current developer: Birte Friesel
.Aq derf@finalrewind.org
.
.Pp
diff --git a/scripts/checkkeys.pl b/scripts/checkkeys.pl
index 54978c5..ecf01e0 100755
--- a/scripts/checkkeys.pl
+++ b/scripts/checkkeys.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-## Copyright © 2011 by Daniel Friesel <derf@finalrewind.org>
+## Copyright © 2011 by Birte Kristina Friesel <derf@finalrewind.org>
## License: WTFPL:
## 0. You just DO WHAT THE FUCK YOU WANT TO.
use strict;
diff --git a/scripts/checkopts.pl b/scripts/checkopts.pl
index 3a4b884..e5779ca 100755
--- a/scripts/checkopts.pl
+++ b/scripts/checkopts.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-## Copyright © 2010 by Daniel Friesel <derf@finalrewind.org>
+## Copyright © 2010 by Birte Kristina Friesel <derf@finalrewind.org>
## License: WTFPL <http://sam.zoy.org/wtfpl>
use strict;
use warnings;
diff --git a/src/debug.h b/src/debug.h
index 569637e..0ff1447 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,7 +1,7 @@
/* debug.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/events.c b/src/events.c
index 524ccad..de9e7b3 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,7 +1,7 @@
/* events.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/exif.c b/src/exif.c
index 457af4c..6b0719d 100644
--- a/src/exif.c
+++ b/src/exif.c
@@ -1,7 +1,7 @@
/* exif.c
Copyright (C) 2012 Dennis Real.
-Copyright (C) 2021 Daniel Friesel.
+Copyright (C) 2021 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/feh.h b/src/feh.h
index 9afe238..54e78ea 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -1,7 +1,7 @@
/* feh.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -160,7 +160,7 @@ void init_buttonbindings(void);
void setup_stdin(void);
void restore_stdin(void);
void feh_event_handle_keypress(XEvent * ev);
-void feh_event_handle_stdin();
+void feh_event_handle_stdin(void);
void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysym, unsigned int button);
fehkey *feh_str_to_kb(char * action);
void feh_action_run(feh_file * file, char *action, winwidget winwid);
diff --git a/src/filelist.c b/src/filelist.c
index 811151e..f1e820c 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -1,7 +1,7 @@
/* filelist.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -37,7 +37,6 @@ gib_list *filelist = NULL;
gib_list *original_file_items = NULL; /* original file items from argv */
int filelist_len = 0;
gib_list *current_file = NULL;
-extern int errno;
static gib_list *rm_filelist = NULL;
@@ -156,7 +155,7 @@ static void feh_print_stat_error(char *path)
}
}
-static void add_stdin_to_filelist()
+static void add_stdin_to_filelist(void)
{
char buf[1024];
size_t readsize;
@@ -181,6 +180,7 @@ static void add_stdin_to_filelist()
while ((readsize = fread(buf, sizeof(char), sizeof(buf), stdin)) > 0) {
if (fwrite(buf, sizeof(char), readsize, outfile) < readsize) {
free(sfn);
+ fclose(outfile);
return;
}
}
@@ -657,7 +657,7 @@ char *feh_absolute_path(char *path)
return(ret);
}
-void feh_save_filelist()
+void feh_save_filelist(void)
{
char *tmpname;
char *base_dir = "";
diff --git a/src/filelist.h b/src/filelist.h
index ff0645e..7f263dc 100644
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -96,7 +96,7 @@ int feh_write_filelist(gib_list * list, char *filename);
gib_list *feh_read_filelist(char *filename);
char *feh_absolute_path(char *path);
gib_list *feh_file_remove_from_list(gib_list * list, gib_list * l);
-void feh_save_filelist();
+void feh_save_filelist(void);
char *feh_http_unescape(char * url);
int feh_cmp_name(void *file1, void *file2);
diff --git a/src/gib_hash.c b/src/gib_hash.c
index 127946a..9497d04 100644
--- a/src/gib_hash.c
+++ b/src/gib_hash.c
@@ -53,7 +53,7 @@ void gib_hash_node_free_and_data(gib_hash_node *node)
return;
}
-gib_hash *gib_hash_new()
+gib_hash *gib_hash_new(void)
{
gib_hash *hash = emalloc(sizeof(gib_hash));
hash->base = gib_hash_node_new("__gib_hash_new",NULL);
diff --git a/src/gib_hash.h b/src/gib_hash.h
index 58506c8..125e280 100644
--- a/src/gib_hash.h
+++ b/src/gib_hash.h
@@ -55,7 +55,7 @@ gib_hash_node *gib_hash_node_new(char *key, void *data);
void gib_hash_node_free(gib_hash_node *node);
void gib_hash_node_free_and_data(gib_hash_node *node);
-gib_hash *gib_hash_new();
+gib_hash *gib_hash_new(void);
void gib_hash_free(gib_hash *hash);
void gib_hash_free_and_data(gib_hash *hash);
diff --git a/src/gib_imlib.c b/src/gib_imlib.c
index be3b427..39d0081 100644
--- a/src/gib_imlib.c
+++ b/src/gib_imlib.c
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "utils.h"
#include "debug.h"
+/*
int
gib_imlib_load_image(Imlib_Image * im, char *filename)
{
@@ -38,7 +39,6 @@ gib_imlib_load_image(Imlib_Image * im, char *filename)
*im = imlib_load_image_with_error_return(filename, &err);
if ((err) || (!im))
{
- /* Check error code */
switch (err)
{
case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
@@ -91,6 +91,7 @@ gib_imlib_load_image(Imlib_Image * im, char *filename)
}
return (1);
}
+*/
int
gib_imlib_image_get_width(Imlib_Image im)
diff --git a/src/gib_imlib.h b/src/gib_imlib.h
index 07daabe..6a35e7e 100644
--- a/src/gib_imlib.h
+++ b/src/gib_imlib.h
@@ -47,7 +47,9 @@ extern "C"
{
#endif
+/*
int gib_imlib_load_image(Imlib_Image * im, char *filename);
+*/
int gib_imlib_image_get_width(Imlib_Image im);
int gib_imlib_image_get_height(Imlib_Image im);
int gib_imlib_image_has_alpha(Imlib_Image im);
diff --git a/src/help.raw b/src/help.raw
index 3c65fcc..e218e78 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -41,7 +41,7 @@ OPTIONS
--auto-rotate Rotate images according to Exif info (if compiled with exif=1)
-^, --title TITLE Set window title (see FORMAT SPECIFIERS)
-D, --slideshow-delay NUM Set delay between automatically changing slides
- --on-last-slide quit Exit after one loop through the slide show
+ --on-last-slide quit Exit after one loop through the slide show (old --cycle-once)
--on-last-slide hold Stop at both ends of the filelist
-R, --reload NUM Reload images after NUM seconds
-k, --keep-http Keep local copies when viewing HTTP/FTP files
@@ -204,7 +204,7 @@ DEFAULT KEYS
This program is free software, see the file COPYING for licensing info.
Copyright Tom Gilbert (and various contributors) 1999-2003.
-Copyright Daniel Friesel (and various contributors) 2010-2020.
+Copyright Birte Kristina Friesel (and various contributors) 2010-2020.
Homepage: http://feh.finalrewind.org
Report bugs to <derf+feh@finalrewind.org> or #feh on irc.oftc.net.
diff --git a/src/imlib.c b/src/imlib.c
index 0accbdc..143807d 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1,7 +1,7 @@
/* imlib.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -233,6 +233,14 @@ void feh_print_load_error(char *file, winwidget w, Imlib_Load_Error err, enum fe
case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
im_weprintf(w, "%s - Cannot write - out of disk space", file);
break;
+#if defined(IMLIB2_VERSION_MAJOR) && defined(IMLIB2_VERSION_MINOR) && (IMLIB2_VERSION_MAJOR > 1 || IMLIB2_VERSION_MINOR > 7)
+ case IMLIB_LOAD_ERROR_IMAGE_READ:
+ im_weprintf(w, "%s - Invalid image file", file);
+ break;
+ case IMLIB_LOAD_ERROR_IMAGE_FRAME:
+ im_weprintf(w, "%s - Requested frame not in image", file);
+ break;
+#endif
default:
im_weprintf(w, "While loading %s - Unknown error (%d)",
file, err);
@@ -895,6 +903,7 @@ static char *feh_http_load_image(char *url)
curl_easy_setopt(curl, CURLOPT_WRITEDATA, sfp);
ebuff = emalloc(CURL_ERROR_SIZE);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ebuff);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, PACKAGE "/" VERSION);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
#if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */
diff --git a/src/index.c b/src/index.c
index 4c00321..b0b6923 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1,7 +1,7 @@
/* index.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/index.h b/src/index.h
index b022f1a..b805cc0 100644
--- a/src/index.h
+++ b/src/index.h
@@ -1,6 +1,6 @@
/* index.h
-Copyright (C) 2018 Daniel Friesel.
+Copyright (C) 2018 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/keyevents.c b/src/keyevents.c
index 4d6759a..2f9b1d6 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -1,7 +1,7 @@
/* keyevents.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -35,7 +35,7 @@ struct __fehkey keys[EVENT_LIST_END];
struct termios old_term_settings;
unsigned char control_via_stdin = 0;
-void setup_stdin() {
+void setup_stdin(void) {
struct termios ctrl;
control_via_stdin = 1;
@@ -55,7 +55,7 @@ void setup_stdin() {
eprintf("tcsetattr failed");
}
-void restore_stdin() {
+void restore_stdin(void) {
if (tcsetattr(STDIN_FILENO, TCSANOW, &old_term_settings) == -1)
eprintf("tcsetattr failed");
}
@@ -314,7 +314,7 @@ void feh_event_invoke_action(winwidget winwid, unsigned char action)
return;
}
-void feh_event_handle_stdin()
+void feh_event_handle_stdin(void)
{
char stdin_buf[2];
static char is_esc = 0;
diff --git a/src/list.c b/src/list.c
index 83df407..f293af3 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,7 +1,7 @@
/* list.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/main.c b/src/main.c
index 85e0504..78ee616 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
/* main.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -107,6 +107,28 @@ int main(int argc, char **argv)
return(sig_exit);
}
+static void feh_process_signal(void)
+{
+ winwidget winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW);
+ int i;
+ int signo = sig_received;
+ sig_received = 0;
+
+ if (winwid) {
+ if (filelist_len > 1) {
+ if (signo == SIGUSR1)
+ slideshow_change_image(winwid, SLIDE_NEXT, 1);
+ else if (signo == SIGUSR2)
+ slideshow_change_image(winwid, SLIDE_PREV, 1);
+ } else {
+ feh_reload_image(winwid, 0, 0);
+ }
+ } else if (opt.multiwindow) {
+ for (i = window_num - 1; i >= 0; i--)
+ feh_reload_image(windows[i], 0, 0);
+ }
+}
+
/* Return 0 to stop iterating, 1 if ok to continue. */
int feh_main_iteration(int block)
{
@@ -124,6 +146,10 @@ int feh_main_iteration(int block)
if (window_num == 0 || sig_exit != 0)
return(0);
+ if (sig_received) {
+ feh_process_signal();
+ }
+
if (first) {
/* Only need to set these up the first time */
xfd = ConnectionNumber(disp);
@@ -156,6 +182,10 @@ int feh_main_iteration(int block)
if (window_num == 0 || sig_exit != 0)
return(0);
+
+ if (sig_received) {
+ feh_process_signal();
+ }
}
XFlush(disp);
@@ -249,6 +279,10 @@ int feh_main_iteration(int block)
if (window_num == 0 || sig_exit != 0)
return(0);
+ if (sig_received) {
+ feh_process_signal();
+ }
+
return(1);
}
diff --git a/src/menu.c b/src/menu.c
index b1deedb..b1ef61d 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,7 +1,7 @@
/* menu.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -825,21 +825,17 @@ void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox
void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy)
{
- ImlibPolygon poly;
-
- x -= ox;
+ // Draw filled triangle
+ x -= ox;
y -= oy;
imlib_context_set_image(dst);
-
- poly = imlib_polygon_new();
- imlib_polygon_add_point(poly, x, y + 3);
- imlib_polygon_add_point(poly, x + 3, y + 6);
- imlib_polygon_add_point(poly, x, y + 9);
imlib_context_set_color(0, 0, 0, 255);
- imlib_image_fill_polygon(poly);
- imlib_polygon_free(poly);
+ for (int i= 0; i <= 3; i++) {
+ imlib_image_draw_line(x+i, y+3+i, x+i, y+9-i, 0);
+ }
+
return;
}
@@ -936,7 +932,7 @@ void feh_menu_init_main(void)
return;
}
-void feh_menu_init_common()
+void feh_menu_init_common(void)
{
int num_desks, i;
char buf[30];
diff --git a/src/menu.h b/src/menu.h
index 3ab29bc..5bad00c 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,7 +1,7 @@
/* menu.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/options.c b/src/options.c
index d3524f7..0fc656d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,7 +1,7 @@
/* options.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -537,6 +537,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
case OPTION_sort:
if (!strcasecmp(optarg, "name"))
opt.sort = SORT_NAME;
+ else if (!strcasecmp(optarg, "none"))
+ opt.sort = SORT_NONE;
else if (!strcasecmp(optarg, "filename"))
opt.sort = SORT_FILENAME;
else if (!strcasecmp(optarg, "dirname"))
diff --git a/src/options.h b/src/options.h
index 6441e8b..aa3cd91 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,7 +1,7 @@
/* options.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/signals.c b/src/signals.c
index a64f935..5a64883 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -1,6 +1,6 @@
/* signals.c
-Copyright (C) 2010-2020 by Daniel Friesel
+Copyright (C) 2010-2020 by Birte Kristina Friesel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -29,9 +29,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "options.h"
void feh_handle_signal(int);
+volatile int sig_received = 0;
volatile int sig_exit = 0;
-void setup_signal_handlers()
+void setup_signal_handlers(void)
{
struct sigaction feh_sh;
sigset_t feh_ss;
@@ -71,9 +72,6 @@ void setup_signal_handlers()
void feh_handle_signal(int signo)
{
- winwidget winwid;
- int i;
-
switch (signo) {
case SIGALRM:
if (childpid)
@@ -92,21 +90,5 @@ void feh_handle_signal(int signo)
return;
}
- winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW);
-
- if (winwid) {
- if (filelist_len > 1) {
- if (signo == SIGUSR1)
- slideshow_change_image(winwid, SLIDE_NEXT, 1);
- else if (signo == SIGUSR2)
- slideshow_change_image(winwid, SLIDE_PREV, 1);
- } else {
- feh_reload_image(winwid, 0, 0);
- }
- } else if (opt.multiwindow) {
- for (i = window_num - 1; i >= 0; i--)
- feh_reload_image(windows[i], 0, 0);
- }
-
- return;
+ sig_received = signo;
}
diff --git a/src/signals.h b/src/signals.h
index bff737e..505a071 100644
--- a/src/signals.h
+++ b/src/signals.h
@@ -1,6 +1,6 @@
/* signals.h
-Copyright (C) 2010 by Daniel Friesel
+Copyright (C) 2010 by Birte Kristina Friesel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef SIGNALS_H
#define SIGNALS_H
-void setup_signal_handlers();
+void setup_signal_handlers(void);
extern volatile int sig_exit;
+extern volatile int sig_received;
#endif
diff --git a/src/slideshow.c b/src/slideshow.c
index 80bd476..a53749e 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -1,7 +1,7 @@
/* slideshow.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -529,6 +529,12 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid)
strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
}
break;
+ case 'W':
+ if (winwid) {
+ snprintf(buf, sizeof(buf), "%dx%d+%d+%d", winwid->w, winwid->h, winwid->x, winwid->y);
+ strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+ }
+ break;
case 'z':
if (winwid) {
snprintf(buf, sizeof(buf), "%.2f", winwid->zoom);
diff --git a/src/structs.h b/src/structs.h
index 3e2a1aa..8438930 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,7 @@
/* structs.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/strverscmp.c b/src/strverscmp.c
index 92cd877..ddc6b6d 100644
--- a/src/strverscmp.c
+++ b/src/strverscmp.c
@@ -41,9 +41,9 @@ int strverscmp(const char *l0, const char *r0)
else if (c!='0') z=0;
}
- if (l[dp]!='0' && r[dp]!='0') {
- /* If we're not looking at a digit sequence that began
- * with a zero, longest digit string is greater. */
+ if (l[dp]-'1'<9U && r[dp]-'1'<9U) {
+ /* If we're looking at non-degenerate digit sequences starting
+ * with nonzero digits, longest digit string is greater. */
for (j=i; isdigit(l[j]); j++)
if (!isdigit(r[j])) return 1;
if (isdigit(r[j])) return -1;
diff --git a/src/thumbnail.c b/src/thumbnail.c
index e4a5f60..77c0acd 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -1,7 +1,7 @@
/* thumbnail.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -593,7 +593,7 @@ int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file,
return status;
}
-static char *feh_thumbnail_get_prefix()
+static char *feh_thumbnail_get_prefix(void)
{
char *dir = NULL, *home, *xdg_cache_home;
@@ -882,13 +882,13 @@ void feh_thumbnail_select_prev(winwidget winwid, int jump)
}
}
-void feh_thumbnail_show_selected()
+void feh_thumbnail_show_selected(void)
{
if (td.selected && td.selected->file)
feh_thumbnail_show_fullsize(td.selected->file);
}
-feh_file* feh_thumbnail_get_selected_file()
+feh_file* feh_thumbnail_get_selected_file(void)
{
if (td.selected)
return td.selected->file;
diff --git a/src/thumbnail.h b/src/thumbnail.h
index 61d3053..e69759f 100644
--- a/src/thumbnail.h
+++ b/src/thumbnail.h
@@ -1,7 +1,7 @@
/* thumbnail.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -83,8 +83,8 @@ void feh_thumbnail_show_fullsize(feh_file *thumbfile);
void feh_thumbnail_select(winwidget winwid, feh_thumbnail *thumbnail);
void feh_thumbnail_select_next(winwidget winwid, int jump);
void feh_thumbnail_select_prev(winwidget winwid, int jump);
-void feh_thumbnail_show_selected();
-feh_file *feh_thumbnail_get_selected_file();
+void feh_thumbnail_show_selected(void);
+feh_file *feh_thumbnail_get_selected_file(void);
int feh_thumbnail_setup_thumbnail_dir(void);
diff --git a/src/timers.c b/src/timers.c
index b2cdbc7..8e42050 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,7 +1,7 @@
/* timers.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/wallpaper.c b/src/wallpaper.c
index 71cee29..e2fa67e 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -1,7 +1,7 @@
/* wallpaper.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/wallpaper.h b/src/wallpaper.h
index 77769f8..c836c0f 100644
--- a/src/wallpaper.h
+++ b/src/wallpaper.h
@@ -1,7 +1,7 @@
/* wallpaper.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/src/winwidget.c b/src/winwidget.c
index 9f61ba6..b98cbef 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -1,7 +1,7 @@
/* winwidget.c
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -739,7 +739,7 @@ void winwidget_inotify_remove(winwidget winwid)
#ifdef HAVE_INOTIFY
void winwidget_inotify_add(winwidget winwid, feh_file * file)
{
- if (opt.auto_reload) {
+ if (opt.auto_reload && !path_is_url(file->filename)) {
D(("Adding inotify watch for %s\n", file->filename));
char dir[PATH_MAX];
feh_file_dirname(dir, file, PATH_MAX);
diff --git a/src/winwidget.h b/src/winwidget.h
index 9d74286..0894b5a 100644
--- a/src/winwidget.h
+++ b/src/winwidget.h
@@ -1,7 +1,7 @@
/* winwidget.h
Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2020 Daniel Friesel.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
diff --git a/test/feh.t b/test/feh.t
index 3ce8f9f..b9025b4 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -46,8 +46,11 @@ if ( $version =~ m{ Compile-time \s switches : \s .* help }ox ) {
$has_help = 1;
}
+# Imlib2 1.8+ returns "Invalid image file" rather than "No Imlib2 loader".
+# feh compiled with magic=1 returns "Does not look like an image (magic bytes missing)"
+# Here, we accept all three.
my $re_warning
- = qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};
+ = qr{${feh_name} WARNING: test/fail/... \- (Invalid image file|No Imlib2 loader for that file format|Does not look like an image \(magic bytes missing\))\n};
my $re_loadable = qr{test/ok/...};
my $re_unloadable = qr{test/fail/...};
my $re_list_action = qr{test/ok/... 16x16};