Commit 353578eb authored by Dennis Real's avatar Dennis Real
Browse files

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

parents 38c3c37b 6ea43a32
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
/share/applications/*.desktop
/src/deps.mk
/src/*.o
/src/*.inc
+7 −0
Original line number Diff line number Diff line
git HEAD
    * Add --keep-zoom-vp option to keep zoom and offsets when switching
      images (patch by sdaau). Press 'k' to toggle it.
    * Add --sort mtime option (patch by guns)
    * Add a desktop file (installed to share/applications/feh.desktop)
    * Use "feh -" to read image from stdin

Mon, 24 Dec 2012 15:45:54 +0100  Daniel Friesel <derf+feh@finalrewind.org>

* Release v2.8
+15 −3
Original line number Diff line number Diff line
include config.mk

all: build-src build-man
all: build-src build-man build-applications

build-src:
	@${MAKE} -C src
@@ -8,6 +8,9 @@ build-src:
build-man:
	@${MAKE} -C man

build-applications:
	@${MAKE} -C share/applications

test: all
	@PACKAGE=${PACKAGE} prove test

@@ -16,7 +19,7 @@ test-x11: all
	prove test/feh-bg.i

install: install-man install-doc install-bin install-font install-img
install: install-examples
install: install-examples install-applications

install-man:
	@echo installing manuals to ${man_dir}
@@ -57,12 +60,19 @@ install-examples:
	@cp examples/* ${example_dir}
	@chmod 644 ${example_dir}/*

install-applications:
	@echo installing desktop file to ${desktop_dir}
	@mkdir -p ${desktop_dir}
	@cp share/applications/feh.desktop ${desktop_dir}
	@chmod 644 ${desktop_dir}/feh.desktop


uninstall:
	rm -f ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1
	rm -f ${man_dir}/man1/gen-cam-menu.1
	rm -rf ${doc_dir}
	rm -f ${bin_dir}/feh ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu
	rm -f ${desktop_dir}/feh.desktop
	rm -rf ${font_dir}
	rm -rf ${image_dir}

@@ -86,6 +96,8 @@ disttest: dist
clean:
	@${MAKE} -C src clean
	@${MAKE} -C man clean
	@${MAKE} -C share/applications clean

.PHONY: all test test-x11 install uninstall clean install-man install-doc \
	install-bin install-font install-img install-examples dist
	install-bin install-font install-img install-examples \
	install-applications dist
+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ doc_dir = ${main_dir}/share/doc/feh
image_dir = ${main_dir}/share/feh/images
font_dir = ${main_dir}/share/feh/fonts
example_dir = ${main_dir}/share/doc/feh/examples
desktop_dir = ${main_dir}/share/applications

# default CFLAGS
CFLAGS ?= -g -O2
+27 −7
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ image in it, the keyboard and mouse can be used to change slides
In slideshow mode, images can be deleted either from the filelist or from the
disk, the new filelist can then be saved to the disk and reopened at a later
time.
An image can also be read from stdin via
.Qq feh - .
However, you should not combine reading from stdin with normal file / filelist
usage.
.
.Pp
.
@@ -375,6 +379,11 @@ with
.Qq Nm
in the name.
.
.It Cm --keep-zoom-vp
.
When switching images, keep zoom and viewport settings
.Pq zoom level and X, Y offsets
.
.It Cm -l , --list
.
Don't display images.  Analyze them and display an
@@ -527,10 +536,15 @@ in paused mode.
.It Cm -S , --sort Ar sort_type
.
The file list may be sorted according to image parameters.  Allowed sort
types are: name, filename, width, height, pixels, size, format.  For sort
modes other than name or filename, a preload run will be necessary,
types are: name, filename, mtime, width, height, pixels, size, format.  For sort
modes other than name, filename, or mtime, a preload run will be necessary,
causing a delay proportional to the number of images in the list.
.
.Pp
.
The mtime sort mode sorts images by most recently modified. To sort by oldest
first, reverse the filelist with --reverse.
.
.It Cm -| , --start-at Ar filename
.
Start the filelist at
@@ -1048,16 +1062,16 @@ and save the caption, or escape to cancel editing. Note that you can insert
an actual newline into the caption using
.Aq CTRL+return .
.
.It e Bq toggle_exif
.
.Pq only if compiled with exif=1
Toggle EXIF tag display
.
.It d Bq toggle_filenames
.
Toggle filename display
.Pq see Cm --draw-filename
.
.It e Bq toggle_exif
.
.Pq only if compiled with exif=1
Toggle EXIF tag display
.
.It f Bq save_filelist
.
Save the current filelist as
@@ -1074,6 +1088,12 @@ change slides based on
Toggle info display
.Pq see Cm --info
.
.It k Bq toggle_keep_vp
.
Toggle zoom and viewport keeping. When enabled,
.Nm
will keep zoom and X, Y offset when switching images.
.
.It m Bq toggle_menu
.
Show menu.  Use the arrow keys and return to select items,
Loading