Commit 2a981df1 authored by Sven Willner's avatar Sven Willner
Browse files

added inotify support

parent 3b53d965

config.mk

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ else 
	MAN_EXIF = disabled

endif



ifeq (${inotify},1)

	CFLAGS += -DHAVE_INOTIFY

	MAN_INOTIFY = enabled

else

	MAN_INOTIFY = disabled

endif



MAN_DATE ?= ${shell date '+%B %d, %Y'}



# Uncomment this to use dmalloc

man/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ all: ${TARGETS} 
	-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \

	-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \

	-e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \

	-e 's/\$$MAN_INOTIFY\$$/${MAN_INOTIFY}/' \

	-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \

	< ${@:.1=.pre} > $@

man/feh.pre

+7 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ $VERSION$ 
.Pp

.

Compile-time switches: libcurl support $MAN_CURL$, Xinerama support

$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$$MAN_DEBUG$

$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$, inotify support

$MAN_INOTIFY$$MAN_DEBUG$

.

.

.Sh DESCRIPTION
@@ -396,6 +397,11 @@ is set to 
the output will not be displayed by default, but has to be enabled by the

toggle_info key.

.

.It Cm --inotify

.

.Pq only if compiled with inotify=1

automatically reload shown image if file was changed

.

.It Cm -k , --keep-http

.

When viewing files using HTTP,

src/feh.h

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ void feh_edit_inplace_lossless(winwidget w, int orientation); 
gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style);

char *build_caption_filename(feh_file * file, short create_dir);

gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num);

#ifdef HAVE_INOTIFY

void feh_event_handle_inotify(void);

#endif



/* Imlib stuff */

extern Display *disp;

src/help.raw

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ OPTIONS 
     --min-dimension WxH   Only show images with width >= W and height >= H

     --max-dimension WxH   Only show images with width <= W and height <= H

     --scroll-step COUNT   scroll COUNT pixels when movement key is pressed

     --inotify             automatically reload shown image if file was changed



MONTAGE MODE OPTIONS

 -X, --ignore-aspect       Set thumbnail to specified width/height without