summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-04-12 16:34:12 +0200
committerDaniel Friesel <derf@finalrewind.org>2019-04-12 16:34:12 +0200
commitf8270763d6eb37e944999aa30fb648e564353a46 (patch)
tree3f59564728c1ea7933f0a24f662920110da6c18c /src/options.c
parente6dd09e65e22cc13692e09b0018960e878b965c7 (diff)
parenta9ffd5d2234433bc3f3829713b0968a1d6c13b94 (diff)
Merge branch 'master' of https://github.com/swillner/feh into swillner-master
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/options.c b/src/options.c
index 37fad88..2a5aae8 100644
--- a/src/options.c
+++ b/src/options.c
@@ -25,7 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <strings.h>
-
#include "feh.h"
#include "filelist.h"
#include "options.h"
@@ -425,6 +424,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"conversion-timeout" , 1, 0, 245},
{"version-sort" , 0, 0, 246},
{"offset" , 1, 0, 247},
+#ifdef HAVE_INOTIFY
+ {"auto-reload" , 0, 0, 248},
+#endif
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
@@ -810,6 +812,11 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt.offset_flags = XParseGeometry(optarg, &opt.offset_x,
&opt.offset_y, (unsigned int *)&discard, (unsigned int *)&discard);
break;
+#ifdef HAVE_INOTIFY
+ case 248:
+ opt.auto_reload = 1;
+ break;
+#endif
default:
break;
}
@@ -897,6 +904,10 @@ static void show_version(void)
"exif "
#endif
+#ifdef HAVE_INOTIFY
+ "inotify "
+#endif
+
#ifdef INCLUDE_HELP
"help "
#endif