Commit a9ffd5d2 authored by Sven Willner's avatar Sven Willner
Browse files

Merge remote-tracking branch 'original/master'

parents 1d3d1259 18dd1c5e
Loading
Loading
Loading
Loading
+82 −0
Original line number Diff line number Diff line
Sun, 17 Feb 2019 08:41:53 +0100  Daniel 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>

* Release v3.1.2
    * Fix missing filenames in ~/.fehbg when using --bg-* on directories and/or
      with --randomize
    * Fix repeated --slideshow-delay/-D option not properly overriding the
      '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>

* Release v3.1.1
    * Decrease libcurl timeout from indefinite to 30 minutes. This should
      be sufficient even for use cases with unusually high timeouts (just in
      case anyone wants to do interplanetary slideshows), while at the same
      time avoiding stalls in unattended slideshows when encountering
      temporary network issues.
    * Handle SIGINT/SIGTERM/SIGQUIT signals while loading images using libcurl.
      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>

* Release v3.1
    * Running "feh --start-at .../file.jpg" without specifying images,
      directories or filelists to load is now equivalent to running
      "feh --start-at .../file.jpg $(dirname .../file.jpg)". This way, it is
      possible to view a specific file and browse all other files in the
      corresponding directory. This is especially useful when starting feh
      from file managers.
    * Introduce fuzzy matching in --start-at: If the specified path is not
      found in the file list, feh now resorts to comparing basenames (i.e.,
      file names without the directory components). This allows calls
      like "feh --start-at cat.jpg ~/Pictures", which led to a file not found
      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>

* Release v3.0
    * Remove deprecated webcam scripts (feh-cam and gen-cam-menu)
    * Remove deprecated collage mode (-c/--collage)
    * Remove deprecated option --cycle-once (use --on-last-slide=quit instead)
    * Remove deprecated option --menu-bg
    * Change default save_filelist key from "f" to "L" (mnemonic: fileList)
    * Change default toggle_fullscreen key from "v" to "f" as this is also
      used by mplayer, mpv and similar
    * flip and rotation (keys "<", ">", "|", and "_") no longer change the
      underlying file. This leaves delete ("Ctrl+Delete") as the only
      destructive action which is enabled by default
    * Add option --edit, which makes flip and rotation change the underlying
      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>

* Release v2.28.1
    * Do not ignore quit signals (SIGTERM, SIGINT, SIGQUIT) during preload
    * Add missing EXIF orientations 2, 4, 5, and 7 (when built with exif=1,
      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>

* Release v2.28
    * Decrease loading time for RAW images by utilizing dcraw to display the
      embedded JPEG preview (patch by <https://github.com/ulteq>)
    * Rename --magick-timeout to --conversion-timeout. --magick-timeout is
      now deprecated and will be removed in a future release
    * Fix unintened aliasing in rotated images whose rotation is not a
      multiple of 90 degrees (patch by <https://github.com/ulteq>)
    * New option: --on-last-slide=hold|quit|resume.
      hold will cause feh to stop advancing beyond the last slide (patch by
      <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>

* Release v2.27.1
+0 −17
Original line number Diff line number Diff line
@@ -25,23 +25,6 @@ test-x11: all
install: install-man install-doc install-bin install-font install-img
install: install-icon install-examples install-applications

ifeq (${cam},1)
install: install-cam
uninstall: uninstall-cam
endif

install-cam:
	@echo installing fe-cam and gen-cam-menu
	@cp man/feh-cam.1 man/gen-cam-menu.1 ${man_dir}/man1
	@chmod 644 ${man_dir}/man1/feh-cam.1 ${man_dir}/man1/gen-cam-menu.1
	@cp cam/feh-cam cam/gen-cam-menu ${bin_dir}
	@chmod 755 ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu

uninstall-cam:
	rm -f ${man_dir}/man1/feh-cam.1
	rm -f ${man_dir}/man1/gen-cam-menu.1
	rm -f ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu

install-man:
	@echo installing manuals to ${man_dir}
	@mkdir -p ${man_dir}/man1
+50 −41
Original line number Diff line number Diff line
[![build status](https://travis-ci.org/derf/feh.svg?branch=master)](https://travis-ci.org/derf/feh)

# feh
Imlib2 based image viewer
Feh – Image viewer and Cataloguer
---

 * http://feh.finalrewind.org/
 * http://linuxbrit.co.uk/feh/
 * #feh on irc.oftc.net
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.

Features include filelists, various image sorting modes, custom action scripts,
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/).

Dependencies
---
@@ -22,11 +31,10 @@ If built with exif=1:
 * libexif-dev
 * libexif12

Recommended
Recommended Binaries
---

 * jpegtran  (supplied by the jpeg library, for lossless image rotation)
 * convert  (supplied by ImageMagick, can be used to load unsupported formats)
 * convert  (supplied by ImageMagick, can be used to load image formats not supported by Imlib2)

Installation
---
@@ -46,24 +54,23 @@ $ 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 reliable in all cases.
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 is available [here](http://git.finalrewind.org/zsh/plain/etc/completions/_feh)
[ZSH completion for
feh](https://git.finalrewind.org/zsh/plain/etc/completions/_feh) is also
available.

Make flags
----------

Flags can be used to control the build and installation process.

e.g.
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:

```bash
make flag=bool
```
```bash
make install flag=bool
```
or
@@ -72,15 +79,13 @@ export flag=bool
make && make install
```

For example, `make xinerama=0 debug=1` will disable Xinerama support and produce a debug build.

Available flags are:
The following flags are respected by the makefile. A default value of **1**
indicates that the corresponding feature is enabled by default.

| Flag | Default value | Description |
| :--- | :---: | :--- |
| app  | 0 | install icons to /usr/share, regardless of `DESTDIR` and `PREFIX, and call gtk-update-icon-cache afterwards |
| cam  | 0 | install deprecated feh-cam und gen-cam-menu scripts |
| curl | 1 | use libcurl to view http:// and similar images |
| app  | 0 | install icons to /usr/share, regardless of `DESTDIR` and `PREFIX`, and call gtk-update-icon-cache afterwards |
| curl | 1 | use libcurl to view https:// and similar images |
| debug | 0 | debug build, enables `--debug` |
| exif | 0 | Builtin EXIF tag display support |
| help | 0 | include help text (refers to the manpage otherwise) |
@@ -89,18 +94,19 @@ Available flags are:
| verscmp | 1 | Support naturing sorting (`--version-sort`). Requires a GNU-compatible libc exposing `strverscmp` |
| xinerama | 1 | Support Xinerama/XRandR multiscreen setups |

So, by default **libcurl** and **Xinerama** are enabled, the rest is disabled.
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.

**PREFIX _(default: /usr)_** controls where the application and its data files
**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`.

**DESTDIR _(default: empty)_** sets the installation root during "make install". It
is mostly useful for package maintainers.

**Note:** config.mk is designed so that in most cases, you can set environment
variables instead of editing it. E.g.:
**Note:** Defaults are specified in `config.mk`. It is designed so that in most
cases, you can set environment variables instead of editing it. E.g.:

```bash
CFLAGS='-g -Os' make
@@ -115,26 +121,29 @@ Builtin EXIF support is maintained by Dennis Real, [here](https://github.com/rea

Testing (non-X)
---------------

The non-X11 parts of feh can be automatically tested by running

```bash
$ make test
```

Requires **perl >= 5.10** with `Test::Command`. The tests are non-interactive and
work without X, so they can safely be run even on a headless buildserver.
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.


Testing (X)
-----------
Contributing
---

Requires
 * import (usually supplied by imagemagick)
 * perl >= 5.10 with GD, Test::More and X11::GUITest
 * twm
 * Xephyr
Bugfixes are always welcome, just open a pull request :)

```bash
$ make test-x11
```
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.

**_Be aware that this is quite experimental, so far the X-tests have only been
run on one machine. So they may or may not work for you._**
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
(src/help.raw). Although the help is not compiled in by default, it should be
kept up-to-date. On space-constrained embedded systems, it may be more useful
than the (significantly larger) man page.

cam/ChangeLog

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line
0.3
---
- added this changelog..

0.4
---
- added richlowe's patch.  since he pretty much rewrote everything, he's
an author, not a contributor. :)
- uses "use strict" now
- uses POD for documentation
- added title support in cam bookmarks file
- cmd line flag for different bookmars file
- getoppt_long use for command-line flags
- rmeoved richlow's damn nonstandard Pod::Usage stuff

cam/README

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line
Cam 0.4 README
==============
This document was last updated on 20010223-1620-PST.
Please see the file COPYING for licensing information.

Description
===========
feh-cam is a Perl wrapper for feh that simlifies viewing webcams. It uses
keyed bookmarks.  Type "feh-cam --help" at the command line for usage
information.

Webcam Information
==================
All webcam images are the property of their respective owners.  If you
enjoy the cam, you should check out the page too!  The initial list of
cam bookmarks (in the cam_bookmarks file) is a combination of webcams
scoured from the #E People Page (http://bma.debian.net/~bma/e-irc/),
my favorite webcams from the Stile Project's cam pages
(http://www.stileproject.com/), and additional #e people cams that
have come online since cam's original release (0.1).

Installation
============
- Copy the "feh-cam" script to a location in your PATH (ex /usr/bin,
  /usr/local/bin, or $HOME/bin), and make sure hte execute bit on the
  script is set (type "chmod a+x $HOME/.cam_bookmarks").
- Copy the "cam_bookmarks" file to $HOME/.cam_bookmarks and make sure
  cam can see it by typing "feh-cam --list".
- Optionally, modify the options inside the feh-cam script.  You can pass
  feh any options before the image by adjusting the $PRE variable, 
  and any options after the image by adjustin the $POST variable.
  For example, I like to keep all cam images by default; you can enable
  this behavior with the -k command line option, or enable it permanently
  by adding it to the $PRE flags in feh-cam.

About the Authors
=================
Paul Duncan <pabs@pablotron.org>, pabs on #e
http://www.pablotron.org/

Richard Lowe <richlowe@btinternet.com>, richlowe on #e
http://www.richlowe.btinternet.co.uk/

...but the real credit goes to Tom Gilbert for making feh, an awesome
image viewer. :)
Loading