summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorLines
2020-03-29Merge branch 'patch-3' of https://github.com/GreenLunar/feh into ↵Daniel Friesel-1/+1
GreenLunar-patch-3
2020-03-26Merge branch 'c99pedant-curl-legacy-callback-patch-1'Daniel Friesel-0/+6
2020-03-26Add WebP image formatGreenLunar-1/+1
2020-03-26Quit curl cleanly even if libcurl is old.c99pedant-0/+6
Building feh 3.3 on CentOS 7 x86_64 warns `curl_quit_function` in `imlib.c` is unused: ``` cc -g -O2 -Wall -Wextra -pedantic -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DHAVE_LIBCURL -DHAVE_VERSCMP -DHAVE_LIBXINERAMA -DHAVE_LIBEXIF -DPREFIX=\"/usr/local\" -DPACKAGE=\"feh\" -DVERSION=\"3.3\" -c -o imlib.o imlib.c imlib.c:545:12: warning: ‘curl_quit_function’ defined but not used [-Wunused-function] static int curl_quit_function(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) ^ ``` The `curl_quit_function` code was added in response to pull [#435](https://github.com/derf/feh/pull/435) In issue [#485](https://github.com/derf/feh/issues/485) a fellow CentOS 7 user had an error building feh because CentOS 7 is locked into an old version of libcurl. In the fix, a version guard was wrapped around the `curl_easy_setopt` call, but the rest of the code was unchanged. Since I don't want to maintain a local build of libcurl, I looked at the curl docs and noticed there is an older callback which serves the same purpose: https://curl.haxx.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html The difference between `PROGRESS` and `XFERINFO` is the callback's argument types, with `PROGRESS` using `double` and `XFERINFO` using `curl_off_t`: https://curl.haxx.se/libcurl/c/CURLOPT_XFERINFOFUNCTION.html The callback's return value logic and use of `CURLOPT_NOPROGRESS` is the same. For context, the latest libcurl RPM I'm getting from yum updates is `libcurl-7.29.0-54.el7_7.2.x86_64`. The "stable" versions of other distros may encounter similar issues. The CentOS 7 "End of Life" date is 2024-06-30 so you should hear the end of this by then, at least from us pesky CentOS users.
2020-02-01--image-bg: Note that # may need to be escaped in some shellsDaniel Friesel-0/+2
Closes #506
2019-12-03Release v3.33.3Daniel Friesel-0/+8
2019-12-02Adjust tests for Imlib2 1.6+ ("jpeg" format is now "jpg")Daniel Friesel-9/+48
Closes #497
2019-11-07Guard CURLOPT_XFERINFOFUNCTION usage with LIBCURL_VERSION_NUM checkDaniel Friesel-0/+2
Closes #485
2019-11-07Merge branch 'Ferada-x11-properties'Daniel Friesel-3/+15
2019-11-07Merge branch 'x11-properties' of https://github.com/Ferada/feh into ↵Daniel Friesel-3/+15
Ferada-x11-properties
2019-10-31Merge branch 'mathstuf-bad-image-rotate-blur'Daniel Friesel-17/+21
2019-10-29events: guard against NULL returns from imlib callsBen Boeckel-17/+21
This can happen with images that have ridiculous dimensions.
2019-10-11Allow setting the X11 class hint as an option.Olof-Joachim Frahm-3/+15
2019-07-22Release v3.2.13.2.1Daniel Friesel-0/+11
2019-07-22Use --no-fehbg in .fehbg commandlineDaniel Friesel-1/+7
This ensures that X11 layout or other changes do not affect the .fehbg contents, which are meant to only be updated when a --bg-option is used manually. Closes #482
2019-07-13Merge branch 'stoeckmann-fchmod'Daniel Friesel-3/+4
2019-07-12Check stat for error before setting permissions.Tobias Stoeckmann-3/+4
When setting wallpapers without --no-fehbg option, a ~/.fehbg file is created. This file is set to be an executable for later re-use. Calling stat() without checking the return value can lead to issues. If the call fails, then s.st_mode is undefined and excessive permissions could be set to .fehbg, at worst even setuid/setgid bits for a world writable file. While adjusting this, I changed the code to use fstat() and fchmod() to avoid a further -- but very unlikely -- issue: race condition in form of TOCTOU. If the file ~/.fehsetbg is replaced by a symlink right before the chmod call, then a different file would be set executable + the default mode of the (newly created) file. I don't expect this to be a real world issue but changed this part "while at it" anyway for more robust code and a good example on how to handle files. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
2019-07-10Release v3.23.2Daniel Friesel-0/+9
2019-07-08Merge branch 'CrackedP0t-geometry'Daniel Friesel-1/+8
2019-07-08Merge branch 'geometry' of https://github.com/CrackedP0t/feh into ↵Daniel Friesel-1/+8
CrackedP0t-geometry
2019-07-08Fix lockup when receiving a signal and inotify is enabledDaniel Friesel-2/+2
That part slipped through while reviewing the PR...
2019-04-18inotify: Support files in current working directoryDaniel Friesel-0/+9
2019-04-18Gracefully handle inotify failuresDaniel Friesel-3/+4
2019-04-18print error string if an inotify operation failsDaniel Friesel-3/+3
2019-04-18feh(1): Distinguish between enabled/disabled features more clearlyDaniel Friesel-13/+31
2019-04-12run mandoc linterDaniel Friesel-7/+9
2019-04-12re-add --auto-reload to manualDaniel Friesel-1/+18
2019-04-12Enable auto-reload by default (when compiled with inotify=1)Daniel Friesel-0/+6
2019-04-12Merge branch 'swillner-master'Daniel Friesel-7/+167
2019-04-12Handle no-longer-valid files in inotify-based auto-reloadDaniel Friesel-2/+2
2019-04-12Merge branch 'master' of https://github.com/swillner/feh into swillner-masterDaniel Friesel-6/+166
2019-04-05Merge pull request #452 from guraga/patch-3Daniel Friesel-7/+10
Update "examples/find-lowres"
2019-04-05Correctly round human-readable file sizeDaniel Friesel-3/+3
Closes #463
2019-04-01Merge remote-tracking branch 'original/master'Sven Willner-894/+591
2019-03-26Make SIGUSR1 / SIGUSR2 relaod the current image in single-file slideshowsDaniel Friesel-7/+16
2019-03-14Get geometry after mappingElaina Martineau-0/+2
2019-03-14Get actual geometry from Xlib after resizeElaina Martineau-1/+6
2019-02-17Release v3.1.33.1.3Daniel Friesel-0/+6
Closes #456
2019-02-16feh(1): Add example for showing only landscape-mode picturesDaniel Friesel-0/+6
2019-02-14Do not omit filenames in ~/.fehbg when using --no-xinerama (#456)Daniel Friesel-1/+1
2019-02-11remove debug printf3.1.2Daniel Friesel-1/+0
2019-02-11Release v3.1.2Daniel Friesel-0/+9
2019-02-11Unset "draw info" flag when encountering --info ';whatever'Daniel Friesel-2/+4
Otherwise, several --info switches will not properly override each other
2019-02-11Unset "start paused" flag on positive slideshow delayDaniel Friesel-0/+2
This fixes "feh -D -1 -D 1" and similar starting the slideshow in paused mode even though the last -D option specifies autostart.
2019-02-08Fix ~/.fehbg creation when using --randomize or directory argumentsDaniel Friesel-9/+10
Closes #456 Note that --randomize and directory names are not saved in fehbg. It only contains the command line needed to recreate the wallpaper setup which resulted from its invocation, i.e., after randomization etc. have been applied. This is intentional.
2019-02-01Remove dead codeDaniel Friesel-2/+0
closes #458
2019-01-26Merge pull request #454 from guraga/patch-5Daniel Friesel-1/+1
Update "src/signals.h"
2019-01-26Merge pull request #450 from guraga/patch-1Daniel Friesel-1/+1
Update "share/applications/feh.pre"
2019-01-25Merge pull request #451 from guraga/patch-2Daniel Friesel-24/+28
Update "man/feh.pre"
2019-01-21Update "src/signals.h"guraga-1/+1
Use "extern volatile" instead of "volatile extern" to avoid "gcc" warning "'extern' is not at beginning of declaration [-Wold-style-declaration]".
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 10:54:17 +0000