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

changed option from inotify to auto-reload

parent 177cbff6

man/feh.pre

+5 −5
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ for details. Example usage: 
.

Extra actions which can be set and triggered using the appropriate number key.

.

.It Cm --auto-reload

.

.Pq only if compiled with inotify=1

automatically reload shown image if file was changed

.

.It Cm --auto-rotate

.

.Pq only if compiled with exif=1
@@ -397,11 +402,6 @@ 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/help.raw

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +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

     --auto-reload         automatically reload shown image if file was changed



MONTAGE MODE OPTIONS

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

src/main.c

+4 −4
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ int main(int argc, char **argv) 
		init_keyevents();

		init_buttonbindings();

#ifdef HAVE_INOTIFY

        if (opt.inotify) {

        if (opt.auto_reload) {

            opt.inotify_fd = inotify_init();

            if (opt.inotify_fd < 0) {

                opt.inotify = 0;

                opt.auto_reload = 0;

                eprintf("inotify_init failed");

            }

        }
@@ -162,7 +162,7 @@ int feh_main_iteration(int block) 
	if (control_via_stdin)

		FD_SET(STDIN_FILENO, &fdset);

#ifdef HAVE_INOTIFY

    if (opt.inotify) {

    if (opt.auto_reload) {

        FD_SET(opt.inotify_fd, &fdset);

        if (opt.inotify_fd >= fdsize)

            fdsize = opt.inotify_fd + 1;
@@ -250,7 +250,7 @@ void feh_clean_exit(void) 
	free(opt.menu_font);



#ifdef HAVE_INOTIFY

    if (opt.inotify)

    if (opt.auto_reload)

        if (close(opt.inotify_fd))

            eprintf("inotify close failed");

#endif

src/options.c

+2 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		{"insecure"      , 0, 0, 240},

		{"no-recursive"  , 0, 0, 241},

#ifdef HAVE_INOTIFY

		{"inotify"       , 0, 0, 243},

		{"auto-reload"   , 0, 0, 243},

#endif

		{0, 0, 0, 0}

	};
@@ -740,7 +740,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
#endif

#ifdef HAVE_INOTIFY

		case 243:

			opt.inotify = 1;

			opt.auto_reload = 1;

			break;

#endif

		case 224:

src/options.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct __fehoptions { 
	unsigned char auto_rotate;

#endif

#ifdef HAVE_INOTIFY

	unsigned char inotify;

	unsigned char auto_reload;

    int inotify_fd;

#endif

	unsigned char list;