81 files changed, 15290 insertions, 15026 deletions
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..2968671
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,64 @@
+include ../config.mk
+
+TARGETS = \
+	events.c \
+	feh_png.c \
+	filelist.c \
+	gib_hash.c \
+	gib_imlib.c \
+	gib_list.c \
+	gib_style.c \
+	imlib.c \
+	index.c \
+	keyevents.c \
+	list.c \
+	main.c \
+	md5.c \
+	menu.c \
+	multiwindow.c \
+	options.c \
+	signals.c \
+	slideshow.c \
+	thumbnail.c \
+	timers.c \
+	utils.c \
+	wallpaper.c \
+	winwidget.c
+
+ifeq (${exif},1)
+	TARGETS += \
+		exif.c \
+		exif_canon.c \
+		exif_nikon.c
+endif
+
+ifneq (${verscmp},1)
+	TARGETS += strverscmp.c
+endif
+
+OBJECTS = ${TARGETS:.c=.o}
+
+I_SRCS = ${shell echo *.raw}
+I_DSTS = ${I_SRCS:.raw=.inc}
+
+feh: deps.mk ${OBJECTS} ${I_DSTS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${OBJECTS} ${LDLIBS}
+
+include deps.mk
+
+.raw.inc:
+	sed 's/^\(.*\)$$/"\1\\n"/' < ${@:.inc=.raw} > $@
+
+fehrc.inc: fehrc.raw
+help.inc: help.raw
+
+# CFLAGS might contain include paths needed to resolve includes in headers
+deps.mk: ${TARGETS} ${I_DSTS}
+	${CC} ${CFLAGS} -MM ${TARGETS} > $@
+
+clean:
+	rm -f feh *.o *.inc
+
+.PHONY: clean
+
+.SUFFIXES: .inc .raw
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index d4a347f..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-LDFLAGS           = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
-INCLUDES          = -I/usr/X11R6/include $(X_CFLAGS) \
-                    -I$(prefix)/include -I$(includedir) \
-                    -I. -I$(top_srcdir)/src \
-                    -I/usr/local/include/libpng \
-                    -DPREFIX=\""$(prefix)"\" \
-                    @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-LIBOBJS = @LIBOBJS@
-
-bin_PROGRAMS      = feh
-feh_SOURCES       = main.c getopt.c getopt1.c getopt.h feh.h \
-options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h \
-filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c \
-utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h \
-events.c events.h support.c support.h transupp.c transupp.h \
-thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h \
-jpegint.h
-
-feh_LDADD         = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
-
-images_DATA = about.png menubg_default.png menubg_sky.png \
-menubg_chrome.png menubg_brushed.png \
-menubg_pastel.png menubg_aluminium.png menubg_aqua.png \
-menubg_wood.png menubg_black.png
-
-imagesdir=$(prefix)/share/feh/images
-EXTRA_DIST = $(images_DATA)
-
-test:
-	@for i in test[0-9]* ; do \
-	  if test -x $$i ; then \
-	    echo "Executing test script $$i..." ; \
-	    ./$$i ; \
-	  fi ; \
-	done
-
-testclean:
-	-rm -f _test*.jpg
-
-SUBDIRS = ttfonts
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index 815f187..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,496 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# A list of all the files in the current directory which can be regenerated
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GIBLIB_CFLAGS = @GIBLIB_CFLAGS@
-GIBLIB_LIBS = @GIBLIB_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-HAVE_LIB = @HAVE_LIB@
-HAVE_XINERAMA = @HAVE_XINERAMA@
-IMLIB_CFLAGS = @IMLIB_CFLAGS@
-IMLIB_LIBS = @IMLIB_LIBS@
-LIB = @LIB@
-LTLIB = @LTLIB@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-UP = @UP@
-VERSION = @VERSION@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-
-MAINTAINERCLEANFILES = Makefile.in				
-
-LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
-INCLUDES = -I/usr/X11R6/include $(X_CFLAGS)                     -I$(prefix)/include -I$(includedir)                     -I. -I$(top_srcdir)/src                     -I/usr/local/include/libpng                     -DPREFIX=\""$(prefix)"\"                     @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-
-LIBOBJS = @LIBOBJS@
-
-bin_PROGRAMS = feh
-feh_SOURCES = main.c getopt.c getopt1.c getopt.h feh.h options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h events.c events.h support.c support.h transupp.c transupp.h thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h jpegint.h
-
-
-feh_LDADD = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
-
-images_DATA = about.png menubg_default.png menubg_sky.png menubg_chrome.png menubg_brushed.png menubg_pastel.png menubg_aluminium.png menubg_aqua.png menubg_wood.png menubg_black.png
-
-
-imagesdir = $(prefix)/share/feh/images
-EXTRA_DIST = $(images_DATA)
-
-SUBDIRS = ttfonts
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-feh_OBJECTS =  main.o getopt.o getopt1.o options.o winwidget.o menu.o \
-filelist.o multiwindow.o imlib.o index.o slideshow.o utils.o \
-keyevents.o timers.o list.o collage.o events.o support.o transupp.o \
-thumbnail.o ipc.o md5.o feh_png.o
-feh_DEPENDENCIES = 
-feh_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(images_DATA)
-
-DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(feh_SOURCES)
-OBJECTS = $(feh_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-feh: $(feh_OBJECTS) $(feh_DEPENDENCIES)
-	@rm -f feh
-	$(LINK) $(feh_LDFLAGS) $(feh_OBJECTS) $(feh_LDADD) $(LIBS)
-
-install-imagesDATA: $(images_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(imagesdir)
-	@list='$(images_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagesdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagesdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(imagesdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(imagesdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-imagesDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(images_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(imagesdir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-collage.o: collage.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h winwidget.h filelist.h options.h
-events.o: events.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h timers.h options.h \
-	events.h thumbnail.h
-feh_png.o: feh_png.c feh_png.h feh.h config.h getopt.h structs.h menu.h \
-	ipc.h utils.h debug.h
-filelist.o: filelist.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h
-getopt.o: getopt.c config.h
-getopt1.o: getopt1.c config.h getopt.h
-imlib.o: imlib.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h options.h transupp.h
-index.o: index.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h options.h
-ipc.o: ipc.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h options.h
-keyevents.o: keyevents.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h thumbnail.h filelist.h winwidget.h options.h
-list.o: list.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h options.h
-main.o: main.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h timers.h options.h events.h \
-	support.h
-md5.o: md5.c md5.h
-menu.o: menu.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h support.h thumbnail.h filelist.h winwidget.h options.h
-multiwindow.o: multiwindow.c feh.h config.h getopt.h structs.h menu.h \
-	ipc.h utils.h debug.h winwidget.h timers.h filelist.h options.h
-options.o: options.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h
-slideshow.o: slideshow.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h timers.h winwidget.h options.h
-support.o: support.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h support.h
-thumbnail.o: thumbnail.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h options.h thumbnail.h \
-	md5.h feh_png.h
-timers.o: timers.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h options.h timers.h
-transupp.o: transupp.c transupp.h
-utils.o: utils.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h options.h
-winwidget.o: winwidget.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h options.h
-
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-recursive
-
-install-data-am: install-imagesDATA
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-imagesDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(imagesdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-imagesDATA install-imagesDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-test:
-	@for i in test[0-9]* ; do \
-	  if test -x $$i ; then \
-	    echo "Executing test script $$i..." ; \
-	    ./$$i ; \
-	  fi ; \
-	done
-
-testclean:
-	-rm -f _test*.jpg
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/about.png b/src/about.png
deleted file mode 100644
index 5aaaf17..0000000
--- a/src/about.png
+++ /dev/null
diff --git a/src/collage.c b/src/collage.c
deleted file mode 100644
index 3377e84..0000000
--- a/src/collage.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* collage.c
-
-Copyright (C) 1999-2003 Tom Gilbert.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its documentation and acknowledgment shall be
-given in the documentation and software packages that this Software was
-used.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include "feh.h"
-#include "winwidget.h"
-#include "filelist.h"
-#include "options.h"
-
-void
-init_collage_mode(void)
-{
-   Imlib_Image im_main;
-   Imlib_Image im_temp;
-   int ww, hh, www, hhh, xxx, yyy;
-   int w = 800, h = 600;
-   int bg_w = 0, bg_h = 0;
-   winwidget winwid = NULL;
-   Imlib_Image bg_im = NULL, im_thumb = NULL;
-   feh_file *file = NULL;
-   unsigned char trans_bg = 0;
-   gib_list *l, *last = NULL;
-   char *s;
-
-   D_ENTER(4);
-
-   mode = "collage";
-
-   /* Use bg image dimensions for default size */
-   if (opt.bg && opt.bg_file)
-   {
-      if (!strcmp(opt.bg_file, "trans"))
-         trans_bg = 1;
-      else
-      {
-
-         D(4,("Time to apply a background to blend onto\n"));
-         if (feh_load_image_char(&bg_im, opt.bg_file) != 0)
-         {
-            bg_w = gib_imlib_image_get_width(bg_im);
-            bg_h = gib_imlib_image_get_height(bg_im);
-         }
-      }
-   }
-
-   if (!opt.limit_w || !opt.limit_h)
-   {
-      if (bg_im)
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for collage.\n"
-                    " You did specify a background however, so the\n"
-                    " collage size has defaulted to the size of the image\n");
-         opt.limit_w = bg_w;
-         opt.limit_h = bg_h;
-      }
-      else
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for collage.\n"
-                    " - For collage mode, you need to specify width and height.\n"
-                    " Using defaults (width 800, height 600)\n");
-         opt.limit_w = 800;
-         opt.limit_h = 600;
-      }
-   }
-
-   w = opt.limit_w;
-   h = opt.limit_h;
-   D(4,("Limiting width to %d and height to %d\n", w, h));
-
-   im_main = imlib_create_image(w, h);
-
-   if (!im_main)
-      eprintf("Imlib error creating image");
-
-   if (bg_im)
-      gib_imlib_blend_image_onto_image(im_main, bg_im,
-                                       gib_imlib_image_has_alpha(bg_im), 0, 0,
-                                       bg_w, bg_h, 0, 0, w, h, 1, 0, 0);
-   else if (trans_bg)
-   {
-      gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h, 0, 0, 0, 0);
-      gib_imlib_image_set_has_alpha(im_main, 1);
-   }
-   else
-   {
-      /* Colour the background */
-      gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h, 0, 0, 0, 255);
-   }
-
-   /* Create the title string */
-   
-   if (!opt.title)
-	  s = estrdup(PACKAGE " [collage mode]");
-   else
-	  s = estrdup(feh_printf(opt.title, NULL));
-   
-   if (opt.display)
-   {
-      winwid =
-         winwidget_create_from_image(im_main, s, WIN_TYPE_SINGLE);
-      winwidget_show(winwid);
-   }
-
-
-   for (l = filelist; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      if (last)
-      {
-         filelist = feh_file_remove_from_list(filelist, last);
-         filelist_len--;
-         last = NULL;
-      }
-      D(3,("About to load image %s\n", file->filename));
-      if (feh_load_image(&im_temp, file) != 0)
-      {
-         D(3,("Successfully loaded %s\n", file->filename));
-         if (opt.verbose)
-            feh_display_status('.');
-         www = opt.thumb_w;
-         hhh = opt.thumb_h;
-         ww = gib_imlib_image_get_width(im_temp);
-         hh = gib_imlib_image_get_height(im_temp);
-
-         if (opt.aspect)
-         {
-            double ratio = 0.0;
-
-            /* Keep the aspect ratio for the thumbnail */
-            ratio = ((double) ww / hh) / ((double) www / hhh);
-
-            if (ratio > 1.0)
-               hhh = opt.thumb_h / ratio;
-            else if (ratio != 1.0)
-               www = opt.thumb_w * ratio;
-         }
-
-         if ((!opt.stretch) && ((www > ww) || (hhh > hh)))
-         {
-            /* Don't make the image larger unless stretch is specified */
-            www = ww;
-            hhh = hh;
-         }
-
-         /* pick random coords for thumbnail */
-         xxx = ((w - www) * ((double) rand() / RAND_MAX));
-         yyy = ((h - hhh) * ((double) rand() / RAND_MAX));
-         D(5,("image going on at x=%d, y=%d\n", xxx, yyy));
-
-         im_thumb =
-            gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, ww, hh, www,
-                                                  hhh, 1);
-         gib_imlib_free_image_and_decache(im_temp);
-
-         if (opt.alpha)
-         {
-            DATA8 atab[256];
-
-            D(4,("Applying alpha options\n"));
-            gib_imlib_image_set_has_alpha(im_thumb, 1);
-            memset(atab, opt.alpha_level, sizeof(atab));
-            gib_imlib_apply_color_modifier_to_rectangle(im_thumb, 0, 0, www,
-                                                        hhh, NULL, NULL, NULL,
-                                                        atab);
-         }
-         gib_imlib_blend_image_onto_image(im_main, im_thumb,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0, 0, www, hhh, xxx, yyy, www, hhh,
-                                          1,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0);
-         gib_imlib_free_image_and_decache(im_thumb);
-      }
-      else
-      {
-         last = l;
-         if (opt.verbose)
-            feh_display_status('x');
-      }
-      if (opt.display)
-      {
-         winwidget_render_image(winwid, 0, 0);
-         if (!feh_main_iteration(0))
-            exit(0);
-      }
-   }
-   if (opt.verbose)
-      fprintf(stdout, "\n");
-
-   if (opt.output && opt.output_file)
-   {
-      char output_buf[1024];
-      if (opt.output_dir)
-        snprintf(output_buf,1024,"%s/%s", opt.output_dir, opt.output_file);
-      else 
-        strncpy(output_buf,opt.output_file, 1024);
-      gib_imlib_save_image(im_main, output_buf);
-      if (opt.verbose)
-      {
-         int tw, th;
-
-         tw = gib_imlib_image_get_width(im_main);
-         th = gib_imlib_image_get_height(im_main);
-         fprintf(stdout, PACKAGE " - File saved as %s\n", output_buf);
-         fprintf(stdout,
-                 "    - Image is %dx%d pixels and contains %d thumbnails\n",
-                 tw, th, (tw / opt.thumb_w) * (th / opt.thumb_h));
-      }
-   }
-
-   if (!opt.display)
-      gib_imlib_free_image_and_decache(im_main);
-   free(s);
-   D_RETURN_(4);
-}
diff --git a/src/config.h.in b/src/config.h.in
deleted file mode 100644
index 75777c7..0000000
--- a/src/config.h.in
+++ /dev/null
@@ -1,37 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `jpeg' library (-ljpeg). */
-#undef HAVE_LIBJPEG
-
-/* Define to 1 if you have the `Xext' library (-lXext). */
-#undef HAVE_LIBXEXT
-
-/* Define to 1 if you have the `Xinerama' library (-lXinerama). */
-#undef HAVE_LIBXINERAMA
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if using the dmalloc debugging malloc package */
-#undef WITH_DMALLOC
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
diff --git a/src/debug.h b/src/debug.h
index 3585cd7..0ff1447 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,7 @@
 /* debug.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -26,8 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef DEBUG_H
 #define DEBUG_H
 
-/* #define DEBUG */
-
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
 #define emalloc(a) malloc(a)
@@ -41,75 +40,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef DEBUG
 #ifdef __GNUC__
-#define D(i, a) \
-{ \
-      if(i <= opt.debug_level) \
-      { \
-         printf("%s +%u %s() %s ",__FILE__,__LINE__,__FUNCTION__, stroflen(' ', call_level)); \
-         printf a; \
-         fflush(stdout); \
-      } \
-  }
-#define D_ENTER(i) \
-  { \
-     call_level++; \
-     if(i <= opt.debug_level) \
-     { \
-         printf("%s +%u %s() %s ENTER\n",__FILE__,__LINE__,__FUNCTION__, stroflen('>', call_level)); \
-         fflush(stdout); \
-     } \
-  }
-#define D_RETURN(i, a) \
+#define D(a) \
 { \
-      if(i <= opt.debug_level) \
-      { \
-         printf("%s +%u %s() %s LEAVE\n",__FILE__,__LINE__,__FUNCTION__, stroflen('<', call_level)); \
-         fflush(stdout); \
-      } \
-      call_level--; \
-      return (a); \
+	if (opt.debug) { \
+		printf("%-12s +%-4u %-20s : ",__FILE__,__LINE__,__FUNCTION__); \
+		printf a; \
+		fflush(stdout); \
+	} \
   }
-#define D_RETURN_(i) \
+#else					/* __GNUC__ */
+#define D(a) \
 { \
-      if(i <= opt.debug_level) \
-      { \
-         printf("%s +%u %s() %s LEAVE\n",__FILE__,__LINE__,__FUNCTION__, stroflen('<', call_level)); \
-         fflush(stdout); \
-      } \
-      call_level--; \
-      return; \
-  }
-#else
-#define D(i, a) \
-{ \
-   if(i <= opt.debug_level) \
-   { \
-      printf("%s +%u : ",__FILE__,__LINE__); \
-         printf a; \
-   } \
-      fflush(stdout); \
-  }
-#define D_ENTER(a)
-#define D_RETURN(i, a) \
-  { \
-      return(a); \
-  }
-#define D_RETURN_(i) \
-  { \
-      return; \
-  }
-#endif
-#else
-#define D(i,a)
-#define D_ENTER(a)
-#define D_RETURN(i, a) \
-  { \
-      return (a); \
-  }
-#define D_RETURN_(i) \
-  { \
-      return; \
-  }
-#endif
+	if (opt.debug) { \
+		printf("%-12s +%-4u : ",__FILE__,__LINE__); \
+		printf a; \
+		fflush(stdout); \
+	} \
+}
+#endif					/* __GNUC__ */
+#else					/* DEBUG */
+#define D(a)
+#endif					/* DEBUG */
 
-#endif
+#endif					/* DEBUG_H */
diff --git a/src/events.c b/src/events.c
index ad78fbe..bafc517 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,6 +1,7 @@
 /* events.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -31,658 +32,684 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "events.h"
 #include "thumbnail.h"
 
+#define FEH_JITTER_OFFSET 2
+#define FEH_JITTER_TIME 1
+
+extern struct __fehkey keys[EVENT_LIST_END];
+fehkey *feh_str_to_kb(char *action);
+
 feh_event_handler *ev_handler[LASTEvent];
 
 static void feh_event_handle_ButtonPress(XEvent * ev);
 static void feh_event_handle_ButtonRelease(XEvent * ev);
-static void feh_event_handle_ConfigureNotify(XEvent * ev);
-static void feh_event_handle_EnterNotify(XEvent * ev);
 static void feh_event_handle_LeaveNotify(XEvent * ev);
 static void feh_event_handle_MotionNotify(XEvent * ev);
 static void feh_event_handle_ClientMessage(XEvent * ev);
 
-void
-feh_event_init(void)
+static void feh_set_bb(unsigned int bb_index, int modifier, char button)
 {
-   int i;
-
-   D_ENTER(4);
-   for (i = 0; i < LASTEvent; i++)
-      ev_handler[i] = NULL;
-
-   ev_handler[KeyPress] = feh_event_handle_keypress;
-   ev_handler[ButtonPress] = feh_event_handle_ButtonPress;
-   ev_handler[ButtonRelease] = feh_event_handle_ButtonRelease;
-   ev_handler[ConfigureNotify] = feh_event_handle_ConfigureNotify;
-   ev_handler[EnterNotify] = feh_event_handle_EnterNotify;
-   ev_handler[LeaveNotify] = feh_event_handle_LeaveNotify;
-   ev_handler[MotionNotify] = feh_event_handle_MotionNotify;
-   ev_handler[ClientMessage] = feh_event_handle_ClientMessage;
-
-   D_RETURN_(4);
+	keys[bb_index].state  = modifier;
+	keys[bb_index].button = button;
 }
 
-static void
-feh_event_handle_ButtonPress(XEvent * ev)
+static void feh_set_parse_bb_partial(fehkey *button, char *binding)
 {
-   winwidget winwid = NULL;
-   int scr_width, scr_height;
+	char *cur = binding;
+	int mod = 0;
+
+	if (!*binding) {
+		button->button = 0;
+		return;
+	}
+
+	while (cur[1] == '-') {
+		switch (cur[0]) {
+			case 'C':
+				mod |= ControlMask;
+				break;
+			case 'S':
+				mod |= ShiftMask;
+				break;
+			case '1':
+				mod |= Mod1Mask;
+				break;
+			case '4':
+				mod |= Mod4Mask;
+				break;
+			default:
+				weprintf("buttons: invalid modifier %c in \"%s\"", cur[0], binding);
+				break;
+		}
+		cur += 2;
+	}
+
+	button->button = atoi(cur);
+	button->state  = mod;
+
+	if (button->button == 0) {
+		/*
+		 * Mod3 is unused on today's keyboards. If Mod3 is unset and button==0,
+		 * we are dealing with an uninitialized or unset binding. If Mod3 is set
+		 * and button==0, it refers to mouse movement.
+		 */
+		button->state |= Mod3Mask;
+	}
+}
 
-   D_ENTER(4);
+/*
+ * Called after init_keyevents in keyevents.c
+ * -> no need to memset
+ */
+void init_buttonbindings(void)
+{
+	char *home = NULL;
+	char *confhome = NULL;
+	char *confpath = NULL;
+	char line[128];
+	char action[32], button[8];
+	struct __fehkey *cur_bb = NULL;
+	FILE *conf = NULL;
+	int read = 0;
+
+	feh_set_bb(EVENT_pan,         0, 1);
+	feh_set_bb(EVENT_zoom,        0, 2);
+	feh_set_bb(EVENT_toggle_menu, 0, 3);
+	feh_set_bb(EVENT_prev_img,    0, 4);
+	feh_set_bb(EVENT_next_img,    0, 5);
+	feh_set_bb(EVENT_blur,        4, 1);
+	feh_set_bb(EVENT_rotate,      4, 2);
+
+	home = getenv("HOME");
+	confhome = getenv("XDG_CONFIG_HOME");
+
+	if (confhome)
+		confpath = estrjoin("/", confhome, "feh/buttons", NULL);
+	else if (home)
+		confpath = estrjoin("/", home, ".config/feh/buttons", NULL);
+	else
+		return;
+
+	conf = fopen(confpath, "r");
+
+	free(confpath);
+
+	if (!conf && ((conf = fopen("/etc/feh/buttons", "r")) == NULL))
+		return;
+
+	while (fgets(line, sizeof(line), conf)) {
+		*action = '\0';
+		*button = '\0';
+		cur_bb = NULL;
+
+		read = sscanf(line, "%31s %7s\n", (char *) &action, (char *) &button);
+
+		if ((read == EOF) || (read == 0) || (line[0] == '#'))
+			continue;
+
+		cur_bb = feh_str_to_kb(action);
+		if (cur_bb == NULL) {
+			if (!strcmp(action, "reload"))
+				cur_bb = &keys[EVENT_reload_image];
+			else if (!strcmp(action, "menu"))
+				cur_bb = &keys[EVENT_toggle_menu];
+			else if (!strcmp(action, "prev"))
+				cur_bb = &keys[EVENT_prev_img];
+			else if (!strcmp(action, "next"))
+				cur_bb = &keys[EVENT_next_img];
+		}
+		if (cur_bb)
+			feh_set_parse_bb_partial(cur_bb, button);
+		else
+			weprintf("buttons: Invalid action: %s", action);
+	}
+	fclose(conf);
+}
 
-   /* get the heck out if it's a mouse-click on the
-      cover, we'll hide the menus on release */
-   if (ev->xbutton.window == menu_cover) {
-      D_RETURN_(4);
-   }
+static short feh_is_bb(unsigned int key_index, unsigned int button, unsigned int mod)
+{
+	if ((keys[key_index].state == mod) && (keys[key_index].button == button))
+		return 1;
+	return 0;
+}
 
-   scr_width = scr->width;
-   scr_height = scr->height;
-#ifdef HAVE_LIBXINERAMA
-    if (opt.xinerama && xinerama_screens) {
-      scr_width = xinerama_screens[xinerama_screen].width;
-      scr_height = xinerama_screens[xinerama_screen].height;
-    }
-#endif /* HAVE_LIBXINERAMA */
-
-   winwid = winwidget_get_from_window(ev->xbutton.window);
-   if (winwid && winwid->caption_entry) {
-     D_RETURN_(4);
-   }
-
-   if (!opt.no_menus && EV_IS_MENU_BUTTON(ev)) {
-      D(3, ("Menu Button Press event\n"));
-      if (winwid != NULL) {
-        winwidget_show_menu(winwid);
-      }
-   }
-   else if ((ev->xbutton.button == opt.rotate_button)
-            && ((opt.no_rotate_ctrl_mask)
-                || (ev->xbutton.state & ControlMask)))
-   {
-      if (winwid != NULL)
-      {
-         opt.mode = MODE_ROTATE;
-         winwid->mode = MODE_ROTATE;
-         D(3, ("rotate starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
-      }
-   }
-   else if ((ev->xbutton.button == opt.blur_button)
-            && ((opt.no_blur_ctrl_mask) || (ev->xbutton.state & ControlMask)))
-   {
-      if (winwid != NULL)
-      {
-         opt.mode = MODE_BLUR;
-         winwid->mode = MODE_BLUR;
-         D(3, ("blur starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
-      }
-   }
-   else if (ev->xbutton.button == opt.next_button)
-   {
-      D(3, ("Next Button Press event\n"));
-      if (winwid != NULL)
-      {
-         D(3, ("Next button, but could be pan mode\n"));
-         opt.mode = MODE_NEXT;
-         winwid->mode = MODE_NEXT;
-         D(3, ("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
-         winwid->click_offset_x = ev->xbutton.x - winwid->im_x;
-         winwid->click_offset_y = ev->xbutton.y - winwid->im_y;
-      }
-   }
-   else if (ev->xbutton.button == opt.zoom_button)
-   {
-      D(3, ("Zoom Button Press event\n"));
-      if (winwid != NULL)
-      {
-         D(3, ("Zoom mode baby!\n"));
-         opt.mode = MODE_ZOOM;
-         winwid->mode = MODE_ZOOM;
-         D(3, ("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
-         winwid->click_offset_x = ev->xbutton.x - winwid->im_x;
-         winwid->click_offset_y = ev->xbutton.y - winwid->im_y;
-         winwid->im_click_offset_x = winwid->click_offset_x / winwid->zoom;
-         winwid->im_click_offset_y = winwid->click_offset_y / winwid->zoom;
-         winwid->zoom = 1.0;
-         if (winwid->full_screen)
-         {
-            winwid->im_x = (scr_width - winwid->im_w) >> 1;
-            winwid->im_y = (scr_height - winwid->im_h) >> 1;
-         }
-         else
-         {
-           if (opt.geom_flags & WidthValue) {
-             winwid->im_x = (opt.geom_w - winwid->im_w) >> 1;
-           } else {
-             winwid->im_x = 0;
-           }
-           if (opt.geom_flags & HeightValue) {
-             winwid->im_y = (opt.geom_h - winwid->im_h) >> 1;
-           } else {
-              winwid->im_y = 0;
-           }
-         }
-         if (winwid->im_click_offset_x < 30)
-            winwid->im_click_offset_x = 30;
-         if (winwid->im_click_offset_y < 0)
-            winwid->im_click_offset_y = 0;
-         if (winwid->im_click_offset_x > winwid->im_w)
-            winwid->im_click_offset_x = winwid->im_w;
-         if (winwid->im_click_offset_y > winwid->im_h)
-            winwid->im_click_offset_y = winwid->im_h;
-
-         if (winwid->click_offset_x < 30)
-            winwid->click_offset_x = 30;
-         if (winwid->click_offset_y < 0)
-            winwid->click_offset_y = 0;
-         if (winwid->click_offset_x > winwid->w)
-            winwid->click_offset_x = winwid->w;
-         if (winwid->click_offset_y > winwid->h)
-            winwid->click_offset_y = winwid->h;
-         
-         winwidget_render_image(winwid, 0, 0);
-      }
-   }
-   else if (ev->xbutton.button == opt.reload_button)
-   {
-      D(3, ("Reload Button Press event\n"));
-      if (winwid != NULL)
-         feh_reload_image(winwid, 0, 0);
-   }
-   else if (ev->xbutton.button == 4 /* this is bad */ )
-   {
-      D(3, ("Button 4 Press event\n"));
-      if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW))
-         slideshow_change_image(winwid, SLIDE_PREV);
-   }
-   else if (ev->xbutton.button == 5 /* this is bad */ )
-   {
-      D(3, ("Button 5 Press event\n"));
-      if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW))
-         slideshow_change_image(winwid, SLIDE_NEXT);
-   }
-   else
-   {
-      D(3, ("Received other ButtonPress event\n"));
-   }
-   D_RETURN_(4);
+
+void feh_event_init(void)
+{
+	int i;
+
+	for (i = 0; i < LASTEvent; i++)
+		ev_handler[i] = NULL;
+
+	ev_handler[KeyPress] = feh_event_handle_keypress;
+	ev_handler[ButtonPress] = feh_event_handle_ButtonPress;
+	ev_handler[ButtonRelease] = feh_event_handle_ButtonRelease;
+	ev_handler[ConfigureNotify] = feh_event_handle_ConfigureNotify;
+	ev_handler[LeaveNotify] = feh_event_handle_LeaveNotify;
+	ev_handler[MotionNotify] = feh_event_handle_MotionNotify;
+	ev_handler[ClientMessage] = feh_event_handle_ClientMessage;
+
+	return;
 }
 
-static void
-feh_event_handle_ButtonRelease(XEvent * ev)
+static void feh_event_handle_ButtonPress(XEvent * ev)
 {
-   winwidget winwid = NULL;
-
-   D_ENTER(4);
-   if (menu_root)
-   {
-      /* if menus are open, close them, and execute action if needed */
-
-      if (ev->xbutton.window == menu_cover) {
-         feh_menu_hide(menu_root, True);
-      } else if (menu_root) {
-         feh_menu *m;
-
-         if ((m = feh_menu_get_from_window(ev->xbutton.window)))
-         {
-            feh_menu_item *i = NULL;
-
-            i = feh_menu_find_selected(m);
-            feh_menu_item_activate(m, i);
-         }
-      }
-      D_RETURN_(4);
-   }
-   
-   winwid = winwidget_get_from_window(ev->xbutton.window);
-   if (winwid && winwid->caption_entry) {
-     D_RETURN_(4);
-   }
-
-   if ((ev->xbutton.button == opt.menu_button)
-       &&
-       (((!opt.menu_ctrl_mask)
-         && ((!(ev->xbutton.state & ControlMask))
-             || ((ev->xbutton.state & ControlMask) && (opt.menu_ctrl_mask)))))
-       && (opt.no_menus))
-      winwidget_destroy_all();
-   else if (ev->xbutton.button == opt.next_button)
-   {
-      if (opt.mode == MODE_PAN)
-      {
-         if (winwid != NULL)
-         {
-            D(3, ("Disabling pan mode\n"));
-            opt.mode = MODE_NORMAL;
-            winwid->mode = MODE_NORMAL;
-            winwidget_sanitise_offsets(winwid);
-            winwidget_render_image(winwid, 0, 1);
-         }
-      }
-      else
-      {
-         opt.mode = MODE_NORMAL;
-         if(winwid != NULL)
-           winwid->mode = MODE_NORMAL;
-         if ((winwid != NULL) && (winwid->type == WIN_TYPE_SLIDESHOW))
-         {
-            slideshow_change_image(winwid, SLIDE_NEXT);
-         }
-         else if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL))
-         {
-            feh_file *thumbfile;
-            winwidget thumbwin = NULL;
-            int x, y;
-            char *s;
-
-            x = ev->xbutton.x;
-            y = ev->xbutton.y;
-            x -= winwid->im_x;
-            y -= winwid->im_y;
-            x /= winwid->zoom;
-            y /= winwid->zoom;
-            thumbfile = feh_thumbnail_get_file_from_coords(x, y);
-            if (thumbfile)
-            {
-               if (!opt.thumb_title)
-                  s = thumbfile->name;
-               else
-                  s = feh_printf(opt.thumb_title, thumbfile);
-               thumbwin =
-                  winwidget_get_first_window_of_type
-                  (WIN_TYPE_THUMBNAIL_VIEWER);
-               if (!thumbwin)
-               {
-                  thumbwin =
-                     winwidget_create_from_file(gib_list_add_front
-                                                (NULL, thumbfile), s,
-                                                WIN_TYPE_THUMBNAIL_VIEWER);
-                  winwidget_show(thumbwin);
-               }
-               else if (FEH_FILE(thumbwin->file->data) != thumbfile)
-               {
-                  free(thumbwin->file);
-                  thumbwin->file = gib_list_add_front(NULL, thumbfile);
-                  winwidget_rename(thumbwin, s);
-                  feh_reload_image(thumbwin, 1, 0);
-               }
-            }
-         }
-      }
-   }
-   else if ((ev->xbutton.button == opt.rotate_button)
-            || (ev->xbutton.button == opt.zoom_button))
-   {
-      D(3, ("Mode-based Button Release event\n"));
-      if (winwid != NULL)
-      {
-         D(3, ("Disabling mode\n"));
-         opt.mode = MODE_NORMAL;
-         winwid->mode = MODE_NORMAL;
-         winwidget_sanitise_offsets(winwid);
-         winwidget_render_image(winwid, 0, 1);
-      }
-   }
-   else if ((ev->xbutton.button == opt.blur_button)
-            && ((opt.no_blur_ctrl_mask) || (ev->xbutton.state & ControlMask)))
-   {
-      D(3, ("Blur Button Release event\n"));
-      if (winwid != NULL)
-      {
-         D(3, ("Disabling Blur mode\n"));
-         opt.mode = MODE_NORMAL;
-         winwid->mode = MODE_NORMAL;
-      }
-   }
-   D_RETURN_(4);
+	winwidget winwid = NULL;
+	unsigned int state, button;
+
+	/* get the heck out if it's a mouse-click on the
+	   cover, we'll hide the menus on release */
+	if (ev->xbutton.window == menu_cover) {
+		return;
+	}
+
+	winwid = winwidget_get_from_window(ev->xbutton.window);
+	if (winwid == NULL || winwid->caption_entry) {
+		return;
+	}
+
+	state = ev->xbutton.state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
+	button = ev->xbutton.button;
+
+	if (!opt.no_menus && feh_is_bb(EVENT_toggle_menu, button, state)) {
+		D(("Menu Button Press event\n"));
+		winwidget_show_menu(winwid);
+
+	} else if (feh_is_bb(EVENT_rotate, button, state)
+		   && (winwid->type != WIN_TYPE_THUMBNAIL)) {
+		opt.mode = MODE_ROTATE;
+		winwid->mode = MODE_ROTATE;
+		D(("rotate starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
+
+	} else if (feh_is_bb(EVENT_blur, button, state)
+		   && (winwid->type != WIN_TYPE_THUMBNAIL)) {
+		opt.mode = MODE_BLUR;
+		winwid->mode = MODE_BLUR;
+		D(("blur starting at %d, %d\n", ev->xbutton.x, ev->xbutton.y));
+
+	} else if (feh_is_bb(EVENT_pan, button, state)) {
+		D(("Next button, but could be pan mode\n"));
+		opt.mode = MODE_NEXT;
+		winwid->mode = MODE_NEXT;
+		D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
+		winwid->click_offset_x = ev->xbutton.x - winwid->im_x;
+		winwid->click_offset_y = ev->xbutton.y - winwid->im_y;
+		winwid->click_start_time = time(NULL);
+
+	} else if (feh_is_bb(EVENT_zoom, button, state)) {
+		D(("Zoom Button Press event\n"));
+		opt.mode = MODE_ZOOM;
+		winwid->mode = MODE_ZOOM;
+		D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
+		winwid->click_offset_x = ev->xbutton.x;
+		winwid->click_offset_y = ev->xbutton.y;
+		winwid->old_zoom = winwid->zoom;
+
+		/* required to adjust the image position in zoom mode */
+		winwid->im_click_offset_x = (winwid->click_offset_x
+				- winwid->im_x) / winwid->old_zoom;
+		winwid->im_click_offset_y = (winwid->click_offset_y
+				- winwid->im_y) / winwid->old_zoom;
+
+	} else if (feh_is_bb(EVENT_zoom_in, button, state)) {
+		D(("Zoom_In Button Press event\n"));
+		D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
+		winwid->click_offset_x = ev->xbutton.x;
+		winwid->click_offset_y = ev->xbutton.y;
+		winwid->old_zoom = winwid->zoom;
+
+		/* required to adjust the image position in zoom mode */
+		winwid->im_click_offset_x = (winwid->click_offset_x
+				- winwid->im_x) / winwid->old_zoom;
+		winwid->im_click_offset_y = (winwid->click_offset_y
+				- winwid->im_y) / winwid->old_zoom;
+
+		/* copied from zoom_in, keyevents.c */
+		winwid->zoom = winwid->zoom * opt.zoom_rate;
+
+		if (winwid->zoom > ZOOM_MAX)
+			winwid->zoom = ZOOM_MAX;
+
+		/* copied from below (ZOOM, feh_event_handle_MotionNotify) */
+		winwid->im_x = winwid->click_offset_x
+				- (winwid->im_click_offset_x * winwid->zoom);
+		winwid->im_y = winwid->click_offset_y
+				- (winwid->im_click_offset_y * winwid->zoom);
+
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+
+	} else if (feh_is_bb(EVENT_zoom_out, button, state)) {
+		D(("Zoom_Out Button Press event\n"));
+		D(("click offset is %d,%d\n", ev->xbutton.x, ev->xbutton.y));
+		winwid->click_offset_x = ev->xbutton.x;
+		winwid->click_offset_y = ev->xbutton.y;
+		winwid->old_zoom = winwid->zoom;
+
+		/* required to adjust the image position in zoom mode */
+		winwid->im_click_offset_x = (winwid->click_offset_x
+				- winwid->im_x) / winwid->old_zoom;
+		winwid->im_click_offset_y = (winwid->click_offset_y
+				- winwid->im_y) / winwid->old_zoom;
+
+		/* copied from zoom_out, keyevents.c */
+		winwid->zoom = winwid->zoom / opt.zoom_rate;
+
+		if (winwid->zoom < ZOOM_MIN)
+			winwid->zoom = ZOOM_MIN;
+
+		/* copied from below (ZOOM, feh_event_handle_MotionNotify) */
+		winwid->im_x = winwid->click_offset_x
+				- (winwid->im_click_offset_x * winwid->zoom);
+		winwid->im_y = winwid->click_offset_y
+				- (winwid->im_click_offset_y * winwid->zoom);
+
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+
+	} else if (feh_is_bb(EVENT_reload_image, button, state)) {
+		D(("Reload Button Press event\n"));
+			feh_reload_image(winwid, 0, 1);
+
+	} else if (feh_is_bb(EVENT_prev_img, button, state)) {
+		D(("Prev Button Press event\n"));
+		if (winwid->type == WIN_TYPE_SLIDESHOW)
+			slideshow_change_image(winwid, SLIDE_PREV, 1);
+
+	} else if (feh_is_bb(EVENT_next_img, button, state)) {
+		D(("Next Button Press event\n"));
+		if (winwid->type == WIN_TYPE_SLIDESHOW)
+			slideshow_change_image(winwid, SLIDE_NEXT, 1);
+
+	} else {
+		D(("Received other ButtonPress event\n"));
+		feh_event_handle_generic(winwid, state, NoSymbol, button);
+	}
+	return;
 }
 
-static void
-feh_event_handle_ConfigureNotify(XEvent * ev)
+static void feh_event_handle_ButtonRelease(XEvent * ev)
 {
-   D_ENTER(4);
-   while (XCheckTypedWindowEvent
-          (disp, ev->xconfigure.window, ConfigureNotify, ev));
-   if (!menu_root)
-   {
-      winwidget w = winwidget_get_from_window(ev->xconfigure.window);
-
-      if (w)
-      {
-         D(3,
-           ("configure size %dx%d\n", ev->xconfigure.width,
-            ev->xconfigure.height));
-         if ((w->w != ev->xconfigure.width)
-             || (w->h != ev->xconfigure.height))
-         {
-            D(3, ("assigning size and rerendering\n"));
-            w->w = ev->xconfigure.width;
-            w->h = ev->xconfigure.height;
-            w->had_resize = 1;
-            if (opt.geom_flags & WidthValue || opt.geom_flags & HeightValue)
-            {
-               opt.geom_w = w->w;
-               opt.geom_h = w->h;
-            }
-            winwidget_render_image(w, 0, 1);
-         }
-      }
-   }
-
-   D_RETURN_(4);
+	winwidget winwid = NULL;
+	unsigned int state = ev->xbutton.state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
+	unsigned int button = ev->xbutton.button;
+
+	if (menu_root) {
+		/* if menus are open, close them, and execute action if needed */
+
+		if (ev->xbutton.window == menu_cover) {
+			feh_menu_hide(menu_root, True);
+		} else if (menu_root) {
+			feh_menu *m;
+
+			if ((m = feh_menu_get_from_window(ev->xbutton.window))) {
+				feh_menu_item *i = NULL;
+
+				i = feh_menu_find_selected(m);
+				feh_menu_item_activate(m, i);
+			}
+		}
+		return;
+	}
+
+	winwid = winwidget_get_from_window(ev->xbutton.window);
+	if (winwid == NULL || winwid->caption_entry) {
+		return;
+	}
+
+	if (feh_is_bb(EVENT_pan, button, state)) {
+		if (opt.mode == MODE_PAN) {
+			D(("Disabling pan mode\n"));
+			opt.mode = MODE_NORMAL;
+			winwid->mode = MODE_NORMAL;
+			winwidget_sanitise_offsets(winwid);
+			winwidget_render_image(winwid, 0, 0);
+		} else if (opt.mode == MODE_NEXT) {
+			opt.mode = MODE_NORMAL;
+			winwid->mode = MODE_NORMAL;
+			if (winwid->type == WIN_TYPE_SLIDESHOW) {
+				if (opt.tap_zones && ev->xbutton.x < winwid->w / 2)
+					slideshow_change_image(winwid, SLIDE_PREV, 1);
+				else
+					slideshow_change_image(winwid, SLIDE_NEXT, 1);
+			} else if (winwid->type == WIN_TYPE_THUMBNAIL) {
+				feh_file *thumbfile;
+				int x, y;
+
+				x = ev->xbutton.x;
+				y = ev->xbutton.y;
+				x -= winwid->im_x;
+				y -= winwid->im_y;
+				x /= winwid->zoom;
+				y /= winwid->zoom;
+				thumbfile = feh_thumbnail_get_file_from_coords(x, y);
+				if (thumbfile) {
+					if (opt.actions[0]) {
+						feh_action_run(thumbfile, opt.actions[0], winwid);
+						if (!opt.hold_actions[0])
+							feh_thumbnail_mark_removed(thumbfile, 0);
+					} else {
+						feh_thumbnail_show_fullsize(thumbfile);
+					}
+				}
+			}
+		} else {
+			opt.mode = MODE_NORMAL;
+			winwid->mode = MODE_NORMAL;
+		}
+
+	} else if (feh_is_bb(EVENT_rotate, button, state)
+			|| feh_is_bb(EVENT_zoom, button, state)) {
+		D(("Disabling mode\n"));
+		opt.mode = MODE_NORMAL;
+		winwid->mode = MODE_NORMAL;
+
+		if ((feh_is_bb(EVENT_zoom, button, state))
+				&& (ev->xbutton.x == winwid->click_offset_x)
+				&& (ev->xbutton.y == winwid->click_offset_y)) {
+			winwid->zoom = 1.0;
+			winwidget_center_image(winwid);
+		} else
+			winwidget_sanitise_offsets(winwid);
+
+		winwidget_render_image(winwid, 0, 0);
+
+	} else if (feh_is_bb(EVENT_blur, button, state)) {
+		D(("Disabling Blur mode\n"));
+		opt.mode = MODE_NORMAL;
+		winwid->mode = MODE_NORMAL;
+	}
+	return;
 }
 
-static void
-feh_event_handle_EnterNotify(XEvent * ev)
+void feh_event_handle_ConfigureNotify(XEvent * ev)
 {
-   D_ENTER(4);
-   D_RETURN_(4);
-   ev = NULL;
+	while (XCheckTypedWindowEvent(disp, ev->xconfigure.window, ConfigureNotify, ev));
+	if (!menu_root) {
+		winwidget w = winwidget_get_from_window(ev->xconfigure.window);
+
+		if (w) {
+			D(("configure size %dx%d\n", ev->xconfigure.width, ev->xconfigure.height));
+			if ((w->w != ev->xconfigure.width)
+					|| (w->h != ev->xconfigure.height)) {
+				D(("assigning size and rerendering\n"));
+				w->w = ev->xconfigure.width;
+				w->h = ev->xconfigure.height;
+				w->had_resize = 1;
+				if (opt.geom_flags & WidthValue || opt.geom_flags & HeightValue) {
+					opt.geom_w = w->w;
+					opt.geom_h = w->h;
+				}
+				winwidget_render_image(w, 0, 0);
+			}
+		}
+	}
+
+	return;
 }
 
-static void
-feh_event_handle_LeaveNotify(XEvent * ev)
+static void feh_event_handle_LeaveNotify(XEvent * ev)
 {
-   D_ENTER(4);
-   if ((menu_root) && (ev->xcrossing.window == menu_root->win))
-   {
-      feh_menu_item *ii;
-
-      D(4, ("It is for a menu\n"));
-      for (ii = menu_root->items; ii; ii = ii->next)
-      {
-         if (MENU_ITEM_IS_SELECTED(ii))
-         {
-            D(4, ("Unselecting menu\n"));
-            MENU_ITEM_SET_NORMAL(ii);
-            menu_root->updates =
-               imlib_update_append_rect(menu_root->updates, ii->x, ii->y,
-                                        ii->w, ii->h);
-            menu_root->needs_redraw = 1;
-         }
-      }
-      feh_raise_all_menus();
-   }
-
-   D_RETURN_(4);
+	if ((menu_root) && (ev->xcrossing.window == menu_root->win)) {
+		feh_menu_item *ii;
+
+		D(("It is for a menu\n"));
+		for (ii = menu_root->items; ii; ii = ii->next) {
+			if (MENU_ITEM_IS_SELECTED(ii)) {
+				D(("Unselecting menu\n"));
+				MENU_ITEM_SET_NORMAL(ii);
+				menu_root->updates =
+					imlib_update_append_rect(menu_root->updates, ii->x, ii->y, ii->w, ii->h);
+				menu_root->needs_redraw = 1;
+			}
+		}
+		feh_raise_all_menus();
+	}
+
+	return;
 }
 
-static void
-feh_event_handle_MotionNotify(XEvent * ev)
+static void feh_event_handle_MotionNotify(XEvent * ev)
 {
-   winwidget winwid = NULL;
-   int dx, dy;
-   int scr_width, scr_height;
+	winwidget winwid = NULL;
+	int dx, dy;
+	int scr_width, scr_height;
 
-   scr_width = scr->width;
-   scr_height = scr->height;
+	scr_width = scr->width;
+	scr_height = scr->height;
 #ifdef HAVE_LIBXINERAMA
-    if (opt.xinerama && xinerama_screens) {
-      scr_width = xinerama_screens[xinerama_screen].width;
-      scr_height = xinerama_screens[xinerama_screen].height;
-    }
-#endif /* HAVE_LIBXINERAMA */
-
-   D_ENTER(5);
-   if (menu_root)
-   {
-      feh_menu *m;
-      feh_menu_item *selected_item, *mouseover_item;
-
-      D(3, ("motion notify with menus open\n"));
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-
-      if (ev->xmotion.window == menu_cover)
-      {
-         D_RETURN_(5);
-      }
-      else if ((m = feh_menu_get_from_window(ev->xmotion.window)))
-      {
-         selected_item = feh_menu_find_selected(m);
-         mouseover_item =
-            feh_menu_find_at_xy(m, ev->xmotion.x, ev->xmotion.y);
-
-         if (selected_item != mouseover_item)
-         {
-            D(4, ("selecting a menu item\n"));
-            if (selected_item)
-               feh_menu_deselect_selected(m);
-            if ((mouseover_item)
-                && ((mouseover_item->func) || (mouseover_item->submenu)
-                    || (mouseover_item->func_gen_sub)))
-               feh_menu_select(m, mouseover_item);
-         }
-         /* check if we are close to the right and/or the bottom edge of the
-          * screen. If so, and if the menu we are currently over is partially
-          * hidden, slide the menu to the left and/or up until it is
-          * fully visible */
-
-         /* FIXME: get this working nicely with xinerama screen edges --
-          * at the moment it does really funky stuff with
-          * scr_{width,height} instead of scr->{width,height} -- pabs*/
-         if (mouseover_item
-             && ((scr->width - (ev->xmotion.x + m->x)) < m->w
-                 || (scr->height - (ev->xmotion.y + m->y)) < m->w))
-         {
-            dx = scr_width - (m->x + m->w);
-            dy = scr_height - (m->y + m->h);
-            dx = dx < 0 ? dx : 0;
-            dy = dy < 0 ? dy : 0;
-            if (dx || dy)
-               feh_menu_slide_all_menus_relative(dx, dy);
-         }
-         /* if a submenu is open we want to see that also */
-         if (mouseover_item && m->next
-             && ((scr->width - (ev->xmotion.x + m->next->x)) < m->next->w
-                 || (scr->height - (ev->xmotion.y + m->next->y)) < m->next->w))
-         {
-            dx = scr->width - (m->next->x + m->next->w);
-            dy = scr->height - (m->next->y + m->next->h);
-            dx = dx < 0 ? dx : 0;
-            dy = dy < 0 ? dy : 0;
-            if (dx || dy)
-               feh_menu_slide_all_menus_relative(dx, dy);
-         }
-      }
-   }
-   else if (opt.mode == MODE_ZOOM)
-   {
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-
-      winwid = winwidget_get_from_window(ev->xmotion.window);
-      if (winwid)
-      {
-         winwid->zoom =
-            ((double) ev->xmotion.x - (double) winwid->click_offset_x) / 64.0;
-         if (winwid->zoom < 0)
-            winwid->zoom =
-               1.0 +
-               ((winwid->zoom * 64.0) /
-                ((double) (winwid->click_offset_x + 1)));
-         else
-            winwid->zoom += 1.0;
-
-         if (winwid->zoom < 0.01)
-            winwid->zoom = 0.01;
-
-         /* calculate change in zoom and move im_x and im_y respectively to
-            enable zooming to the clicked spot... */
-         /* for now, center around im_click_offset_x and im_click_offset_y */
-         winwid->im_x =
-            (winwid->w / 2) - (winwid->im_click_offset_x * winwid->zoom);
-         winwid->im_y =
-            (winwid->h / 2) - (winwid->im_click_offset_y * winwid->zoom);
-
-         winwidget_render_image(winwid, 0, 0);
-      }
-   }
-   else if ((opt.mode == MODE_PAN) || (opt.mode == MODE_NEXT))
-   {
-      int orig_x, orig_y;
-
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-      winwid = winwidget_get_from_window(ev->xmotion.window);
-      if (winwid)
-      {
-         if (opt.mode == MODE_NEXT)
-         {
-            opt.mode = MODE_PAN;
-            winwid->mode = MODE_PAN;
-         }
-         D(5, ("Panning\n"));
-         orig_x = winwid->im_x;
-         orig_y = winwid->im_y;
-
-         winwid->im_x = ev->xmotion.x - winwid->click_offset_x;
-         winwid->im_y = ev->xmotion.y - winwid->click_offset_y;
-
-         winwidget_sanitise_offsets(winwid);
-
-         if ((winwid->im_x != orig_x) || (winwid->im_y != orig_y))
-            winwidget_render_image(winwid, 0, 0);
-      }
-   }
-   else if (opt.mode == MODE_ROTATE)
-   {
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-      winwid = winwidget_get_from_window(ev->xmotion.window);
-      if (winwid)
-      {
-         D(5, ("Rotating\n"));
-         if (!winwid->has_rotated)
-         {
-            Imlib_Image temp;
-
-            temp = gib_imlib_create_rotated_image(winwid->im, 0.0);
-            winwid->im_w = gib_imlib_image_get_width(temp);
-            winwid->im_h = gib_imlib_image_get_height(temp);
-            gib_imlib_free_image_and_decache(temp);
-            if (!winwid->full_screen && !opt.geom_flags)
-               winwidget_resize(winwid, winwid->im_w, winwid->im_h);
-            winwid->has_rotated = 1;
-         }
-         winwid->im_angle =
-            (ev->xmotion.x -
-             winwid->w / 2) / ((double) winwid->w / 2) * 3.1415926535;
-         D(5, ("angle: %f\n", winwid->im_angle));
-         winwidget_render_image(winwid, 0, 0);
-      }
-   }
-   else if (opt.mode == MODE_BLUR)
-   {
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-      winwid = winwidget_get_from_window(ev->xmotion.window);
-      if (winwid)
-      {
-         Imlib_Image temp, ptr;
-         signed int blur_radius;
-
-         D(5, ("Blurring\n"));
-
-         temp = gib_imlib_clone_image(winwid->im);
-         blur_radius = (((double) ev->xmotion.x / winwid->w) * 20) - 10;
-         D(5, ("angle: %d\n", blur_radius));
-         if (blur_radius > 0)
-            gib_imlib_image_sharpen(temp, blur_radius);
-         else
-            gib_imlib_image_blur(temp, 0 - blur_radius);
-         ptr = winwid->im;
-         winwid->im = temp;
-         winwidget_render_image(winwid, 0, 0);
-         gib_imlib_free_image_and_decache(winwid->im);
-         winwid->im = ptr;
-      }
-   }
-   else
-   {
-      while (XCheckTypedWindowEvent
-             (disp, ev->xmotion.window, MotionNotify, ev));
-      winwid = winwidget_get_from_window(ev->xmotion.window);
-      if (winwid != NULL)
-      {
-         if (winwid->type == WIN_TYPE_ABOUT)
-         {
-            Imlib_Image orig_im;
-            int x, y;
-
-            x = ev->xmotion.x - winwid->im_x;
-            y = ev->xmotion.y - winwid->im_y;
-            orig_im = winwid->im;
-            winwid->im = gib_imlib_clone_image(orig_im);
-            imlib_context_set_image(winwid->im);
-            imlib_apply_filter("bump_map_point(x=[],y=[],map=" PREFIX
-                               "/share/feh/images/about.png);", &x, &y);
-            winwidget_render_image(winwid, 0, 1);
-            gib_imlib_free_image_and_decache(winwid->im);
-            winwid->im = orig_im;
-         }
-         else if (winwid->type == WIN_TYPE_THUMBNAIL)
-         {
-            static feh_thumbnail *last_thumb = NULL;
-            feh_thumbnail *thumbnail;
-            int x, y;
-
-            x = (ev->xbutton.x - winwid->im_x) / winwid->zoom;
-            y = (ev->xbutton.y - winwid->im_y) / winwid->zoom;
-            thumbnail = feh_thumbnail_get_thumbnail_from_coords(x, y);
-            if (thumbnail != last_thumb)
-            {
-               if (thumbnail)
-               {
-                  Imlib_Image origwin;
-
-                  origwin = winwid->im;
-                  winwid->im = gib_imlib_clone_image(origwin);
-                  gib_imlib_image_fill_rectangle(winwid->im, thumbnail->x,
-                                                 thumbnail->y, thumbnail->w,
-                                                 thumbnail->h, 50, 50, 255,
-                                                 100);
-                  gib_imlib_image_draw_rectangle(winwid->im, thumbnail->x,
-                                                 thumbnail->y, thumbnail->w,
-                                                 thumbnail->h, 255, 255, 255,
-                                                 255);
-                  gib_imlib_image_draw_rectangle(winwid->im, thumbnail->x + 1,
-                                                 thumbnail->y + 1,
-                                                 thumbnail->w - 2,
-                                                 thumbnail->h - 2, 0, 0, 0,
-                                                 255);
-                  gib_imlib_image_draw_rectangle(winwid->im, thumbnail->x + 2,
-                                                 thumbnail->y + 2,
-                                                 thumbnail->w - 4,
-                                                 thumbnail->h - 4, 255, 255,
-                                                 255, 255);
-                  winwidget_render_image(winwid, 0, 1);
-                  gib_imlib_free_image_and_decache(winwid->im);
-                  winwid->im = origwin;
-               }
-               else
-                  winwidget_render_image(winwid, 0, 1);
-            }
-            last_thumb = thumbnail;
-         }
-      }
-   }
-   D_RETURN_(5);
+	if (opt.xinerama && xinerama_screens) {
+		scr_width = xinerama_screens[xinerama_screen].width;
+		scr_height = xinerama_screens[xinerama_screen].height;
+	}
+#endif				/* HAVE_LIBXINERAMA */
+
+	if (menu_root) {
+		feh_menu *m;
+		feh_menu_item *selected_item, *mouseover_item;
+
+		D(("motion notify with menus open\n"));
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+
+		if (ev->xmotion.window == menu_cover) {
+			return;
+		} else if ((m = feh_menu_get_from_window(ev->xmotion.window))) {
+			selected_item = feh_menu_find_selected(m);
+			mouseover_item = feh_menu_find_at_xy(m, ev->xmotion.x, ev->xmotion.y);
+
+			if (selected_item != mouseover_item) {
+				D(("selecting a menu item\n"));
+				if (selected_item)
+					feh_menu_deselect_selected(m);
+				if ((mouseover_item)
+						&& ((mouseover_item->action)
+							|| (mouseover_item->submenu)
+							|| (mouseover_item->func_gen_sub)))
+					feh_menu_select(m, mouseover_item);
+			}
+			/* check if we are close to the right and/or the bottom edge of the
+			 * screen. If so, and if the menu we are currently over is partially
+			 * hidden, slide the menu to the left and/or up until it is
+			 * fully visible */
+
+			/* FIXME: get this working nicely with xinerama screen edges --
+			 * at the moment it does really funky stuff with
+			 * scr_{width,height} instead of scr->{width,height} -- pabs*/
+			if (mouseover_item
+					&& ((scr->width - (ev->xmotion.x + m->x)) <
+						m->w || (scr->height - (ev->xmotion.y + m->y)) < m->w)) {
+				dx = scr_width - (m->x + m->w);
+				dy = scr_height - (m->y + m->h);
+				dx = dx < 0 ? dx : 0;
+				dy = dy < 0 ? dy : 0;
+				dx = m->x + dx < 0 ? -m->x : dx;
+				dy = m->y + dy < 0 ? -m->y : dy;
+				if (dx || dy)
+					feh_menu_slide_all_menus_relative(dx, dy);
+			}
+			/* if a submenu is open we want to see that also */
+			if (mouseover_item && m->next && ((scr->width - (ev->xmotion.x + m->next->x))
+						< m->next->w
+						|| (scr->height -
+							(ev->xmotion.y + m->next->y)) < m->next->w)) {
+				dx = scr->width - (m->next->x + m->next->w);
+				dy = scr->height - (m->next->y + m->next->h);
+				dx = dx < 0 ? dx : 0;
+				dy = dy < 0 ? dy : 0;
+				dx = m->x + dx < 0 ? -m->x : dx;
+				dy = m->y + dy < 0 ? -m->y : dy;
+				if (dx || dy)
+					feh_menu_slide_all_menus_relative(dx, dy);
+			}
+		}
+	} else if (opt.mode == MODE_ZOOM) {
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+
+		winwid = winwidget_get_from_window(ev->xmotion.window);
+		if (winwid) {
+			if (ev->xmotion.x > winwid->click_offset_x)
+				winwid->zoom = winwid->old_zoom + (
+						((double) ev->xmotion.x - (double) winwid->click_offset_x)
+						/ 128.0);
+			else
+				winwid->zoom = winwid->old_zoom - (
+						((double) winwid->click_offset_x - (double) ev->xmotion.x)
+						/ 128.0);
+
+			if (winwid->zoom < ZOOM_MIN)
+				winwid->zoom = ZOOM_MIN;
+			else if (winwid->zoom > ZOOM_MAX)
+				winwid->zoom = ZOOM_MAX;
+
+			/* center around click_offset */
+			winwid->im_x = winwid->click_offset_x
+					- (winwid->im_click_offset_x * winwid->zoom);
+			winwid->im_y = winwid->click_offset_y
+					- (winwid->im_click_offset_y * winwid->zoom);
+
+			winwidget_render_image(winwid, 0, 1);
+		}
+	} else if ((opt.mode == MODE_PAN) || (opt.mode == MODE_NEXT)) {
+		int orig_x, orig_y;
+
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+		winwid = winwidget_get_from_window(ev->xmotion.window);
+		if (winwid) {
+			if (opt.mode == MODE_NEXT) {
+				if ((abs(winwid->click_offset_x - (ev->xmotion.x - winwid->im_x)) > FEH_JITTER_OFFSET)
+						|| (abs(winwid->click_offset_y - (ev->xmotion.y - winwid->im_y)) > FEH_JITTER_OFFSET)
+						|| (time(NULL) - winwid->click_start_time > FEH_JITTER_TIME)) {
+					opt.mode = MODE_PAN;
+					winwid->mode = MODE_PAN;
+				}
+				else
+					return;
+			}
+			D(("Panning\n"));
+			orig_x = winwid->im_x;
+			orig_y = winwid->im_y;
+
+			winwid->im_x = ev->xmotion.x - winwid->click_offset_x;
+			winwid->im_y = ev->xmotion.y - winwid->click_offset_y;
+
+			winwidget_sanitise_offsets(winwid);
+
+			D(("im_x %d, im_w %d, off %d, mx %d, my %d\n", winwid->im_x,
+				winwid->im_w, winwid->click_offset_x, ev->xmotion.x,
+				ev->xmotion.y));
+
+			/* XWarpPointer generates a MotionNotify event which we will
+			 * parse. Since that event would undo the effect of the pointer
+			 * warp, we need to change the click_offset to compensate this.
+			 */
+			if ((winwid->w - ev->xmotion.x <= 1) && (winwid->im_x < 0))
+			{
+				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0, 3,
+					ev->xmotion.y);
+				winwid->click_offset_x -= winwid->w - 4;
+			}
+			// TODO needlessly warps for certain zoom levels
+			else if ((ev->xmotion.x <= 1) && (winwid->im_x >
+					(winwid->w - winwid->im_w * winwid->zoom)))
+			{
+				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0,
+					winwid->w - 4, ev->xmotion.y);
+				winwid->click_offset_x += winwid->w - 4;
+			}
+			else if ((winwid->h - ev->xmotion.y <= 1)
+					&& (winwid->im_y < 0))
+			{
+				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0,
+					ev->xmotion.x, 3);
+				winwid->click_offset_y -= winwid->h - 4;
+			}
+			// TODO needlessly warps for certain zoomlevels
+			else if ((ev->xmotion.y <= 1) && (winwid->im_y >
+					(winwid->h - winwid->im_h * winwid->zoom)))
+			{
+				XWarpPointer(disp, None, winwid->win, 0, 0, 0, 0,
+					ev->xmotion.x, winwid->h - 4);
+				winwid->click_offset_y += winwid->h - 4;
+			}
+
+			if ((winwid->im_x != orig_x)
+					|| (winwid->im_y != orig_y))
+				winwidget_render_image(winwid, 0, 1);
+		}
+	} else if (opt.mode == MODE_ROTATE) {
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+		winwid = winwidget_get_from_window(ev->xmotion.window);
+		if (winwid) {
+			D(("Rotating\n"));
+			if (!winwid->has_rotated) {
+				Imlib_Image temp;
+
+				temp = gib_imlib_create_rotated_image(winwid->im, 0.0);
+				if (temp != NULL) {
+					winwid->im_w = gib_imlib_image_get_width(temp);
+					winwid->im_h = gib_imlib_image_get_height(temp);
+					gib_imlib_free_image_and_decache(temp);
+					if (!winwid->full_screen && !opt.geom_flags)
+						winwidget_resize(winwid, winwid->im_w, winwid->im_h, 0);
+					winwid->has_rotated = 1;
+				}
+			}
+			winwid->im_angle = (ev->xmotion.x - winwid->w / 2) / ((double) winwid->w / 2) * 3.1415926535;
+			D(("angle: %f\n", winwid->im_angle));
+			winwidget_render_image(winwid, 0, 1);
+		}
+	} else if (opt.mode == MODE_BLUR) {
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+		winwid = winwidget_get_from_window(ev->xmotion.window);
+		if (winwid) {
+			Imlib_Image temp, ptr;
+			signed int blur_radius;
+
+			D(("Blurring\n"));
+
+			temp = gib_imlib_clone_image(winwid->im);
+			if (temp != NULL) {
+				blur_radius = (((double) ev->xmotion.x / winwid->w) * 20) - 10;
+				D(("angle: %d\n", blur_radius));
+				if (blur_radius > 0)
+					gib_imlib_image_sharpen(temp, blur_radius);
+				else
+					gib_imlib_image_blur(temp, 0 - blur_radius);
+				ptr = winwid->im;
+				winwid->im = temp;
+				winwidget_render_image(winwid, 0, 1);
+				gib_imlib_free_image_and_decache(winwid->im);
+				winwid->im = ptr;
+			}
+		}
+	} else {
+		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));
+		winwid = winwidget_get_from_window(ev->xmotion.window);
+		if (winwid != NULL) {
+			if (winwid->type == WIN_TYPE_THUMBNAIL) {
+				feh_thumbnail *thumbnail;
+				int x, y;
+
+				x = (ev->xbutton.x - winwid->im_x) / winwid->zoom;
+				y = (ev->xbutton.y - winwid->im_y) / winwid->zoom;
+				thumbnail = feh_thumbnail_get_thumbnail_from_coords(x, y);
+				feh_thumbnail_select(winwid, thumbnail);
+			} else {
+				feh_event_handle_generic(winwid, ev->xmotion.state | Mod3Mask, NoSymbol, 0);
+			}
+		}
+	}
+	return;
 }
 
-static void
-feh_event_handle_ClientMessage(XEvent * ev)
+static void feh_event_handle_ClientMessage(XEvent * ev)
 {
-   winwidget winwid = NULL;
-
-   D_ENTER(4);
-   if (ev->xclient.format == 32
-       && ev->xclient.data.l[0] == (signed) wmDeleteWindow)
-   {
-      winwid = winwidget_get_from_window(ev->xclient.window);
-      if (winwid)
-         winwidget_destroy(winwid);
-   }
-
-   D_RETURN_(4);
+	winwidget winwid = NULL;
+
+	if (ev->xclient.format == 32 && ev->xclient.data.l[0] == (signed) wmDeleteWindow) {
+		winwid = winwidget_get_from_window(ev->xclient.window);
+		if (winwid)
+			winwidget_destroy(winwid);
+	}
+
+	return;
 }
diff --git a/src/events.h b/src/events.h
index 22abaf7..f334c58 100644
--- a/src/events.h
+++ b/src/events.h
@@ -32,6 +32,6 @@ extern feh_event_handler *ev_handler[];
 
 void feh_event_init(void);
 
-#define EV_IS_MENU_BUTTON(ev) ((((ev)->xbutton.button == opt.menu_button) || (opt.menu_button == 0)) && (((!opt.menu_ctrl_mask) && (!((ev)->xbutton.state & ControlMask))) || (((ev)->xbutton.state & ControlMask) && (opt.menu_ctrl_mask))))
+void feh_event_handle_ConfigureNotify(XEvent * ev);
 
 #endif
diff --git a/src/exif.c b/src/exif.c
new file mode 100644
index 0000000..6b0719d
--- /dev/null
+++ b/src/exif.c
@@ -0,0 +1,439 @@
+/* exif.c
+
+Copyright (C) 2012      Dennis Real.
+Copyright (C) 2021      Birte Kristina Friesel.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifdef HAVE_LIBEXIF
+
+#include <stdio.h>
+#include <string.h>
+#include <libexif/exif-data.h>
+#include <limits.h>
+
+#include "feh.h"
+#include "options.h"
+#include "debug.h"
+#include "exif.h"
+#include "exif_canon.h"
+#include "exif_nikon.h"
+#include "exif_cfg.h"
+
+
+/* remove all spaces on the right end of a string */
+void exif_trim_spaces(char *str)
+{
+	char *end;
+
+	for (end = str; *str != '\0'; str++) {
+		if (*str != ' ') {
+			end = str + 1;
+		}
+	}
+	*end = '\0';
+}
+
+
+
+/* show given exif tag content with tag name */
+void exif_get_tag(ExifData * d, ExifIfd ifd, ExifTag tag, char *buffer,
+		  unsigned int maxsize)
+{
+	char s[EXIF_MAX_DATA];
+	ExifEntry *entry = NULL;
+
+	if ((d != NULL) && (buffer != NULL) && (maxsize > 0)) {
+		entry = exif_content_get_entry(d->ifd[ifd], tag);
+		if (entry != NULL) {
+			/* Get the contents of the tag in human-readable form */
+			exif_entry_get_value(entry, s, EXIF_MAX_DATA);
+
+			/* Don't bother printing it if it's entirely blank */
+			exif_trim_spaces(s);
+			if (*s != '\0') {
+				D(("%s: %s\n",
+				   exif_tag_get_name_in_ifd(tag, ifd), s));
+				snprintf(buffer, (size_t) maxsize,
+					 "%s: %s\n",
+					 exif_tag_get_name_in_ifd(tag,
+								  ifd), s);
+			}
+		}
+	}
+}
+
+
+
+/* show given exif tag content without tag name */
+void exif_get_tag_content(ExifData * d, ExifIfd ifd, ExifTag tag,
+			  char *buffer, unsigned int maxsize)
+{
+	char s[EXIF_MAX_DATA];
+	ExifEntry *entry = NULL;
+
+	if ((d != NULL) && (buffer != NULL) && (maxsize > 0)) {
+		entry = exif_content_get_entry(d->ifd[ifd], tag);
+		if (entry != NULL) {
+			/* Get the contents of the tag in human-readable form */
+			exif_entry_get_value(entry, s, EXIF_MAX_DATA);
+
+			/* Don't bother printing it if it's entirely blank */
+			exif_trim_spaces(s);
+			if (*s != '\0') {
+				D(("%s - %s\n",
+				   exif_tag_get_name_in_ifd(tag, ifd), s));
+				snprintf(buffer, (size_t) maxsize, "%s",
+					 s);
+			}
+		}
+	}
+
+}
+
+
+
+/* Show the given MakerNote tag if it exists */
+void exif_get_mnote_tag(ExifData * d, unsigned int tag, char *buffer,
+			unsigned int maxsize)
+{
+	ExifMnoteData *mn = NULL;
+	int i, num;
+	char buf[1024];
+
+	if ((d != NULL) && (buffer != NULL) && (maxsize > 0)) {
+		mn = exif_data_get_mnote_data(d);
+	} else {
+		return;
+	}
+
+	if (mn != NULL) {
+		num = exif_mnote_data_count(mn);
+
+		/* Loop through all MakerNote tags, searching for the desired one */
+		for (i = 0; i < num; ++i) {
+			D(("%d/%d %d 0x%2x %s; %s\n", i, num,
+			   exif_mnote_data_get_id(mn, i),
+			   exif_mnote_data_get_id(mn, i),
+			   exif_mnote_data_get_name(mn, i),
+			   exif_mnote_data_get_title(mn, i)));
+
+			if (exif_mnote_data_get_id(mn, i) == tag) {
+				if (exif_mnote_data_get_value
+				    (mn, i, buf, sizeof(buf))) {
+					/* Don't bother printing it if it's entirely blank */
+					exif_trim_spaces(buf);
+					if (*buf != '\0') {
+						D(("%s\n", buf));
+						snprintf(buffer,
+							 (size_t) maxsize,
+							 "%s: %s\n",
+							 exif_mnote_data_get_title
+							 (mn, i), buf);
+					}
+				}
+			}
+		}
+	}
+}
+
+void exif_get_make_model_lens(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char make[EXIF_STD_BUF_LEN];
+	char model[EXIF_STD_BUF_LEN];
+	char lens[EXIF_STD_BUF_LEN];
+	unsigned int offset = 0;
+
+	make[0] = model[0] = lens[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_0, EXIF_TAG_MAKE, make, sizeof(make));
+	exif_get_tag_content(ed, EXIF_IFD_0, EXIF_TAG_MODEL, model, sizeof(model));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, 0xa434, lens, sizeof(lens));
+
+	if (make[0] && strncmp(make, model, strlen(make)) != 0) {
+		offset += snprintf(buffer, maxsize, "%s ", make);
+	}
+	if (model[0]) {
+		offset += snprintf(buffer + offset, maxsize - offset, "%s", model);
+	}
+	if (lens[0]) {
+		offset += snprintf(buffer + offset, maxsize - offset, " + %s", lens);
+	}
+	snprintf(buffer + offset, maxsize - offset, "\n");
+}
+
+void exif_get_exposure(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char fnumber[EXIF_STD_BUF_LEN];
+	char exposure[EXIF_STD_BUF_LEN];
+	char iso[EXIF_STD_BUF_LEN];
+	char focus[EXIF_STD_BUF_LEN];
+	char focus35[EXIF_STD_BUF_LEN];
+	unsigned int offset = 0;
+
+	fnumber[0] = exposure[0] = iso[0] = '\0';
+	focus[0] = focus35[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_FNUMBER, fnumber, sizeof(fnumber));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_TIME, exposure, sizeof(exposure));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_ISO_SPEED_RATINGS, iso, sizeof(iso));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH, focus, sizeof(focus));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM, focus35, sizeof(focus35));
+
+	if (fnumber[0] || exposure[0]) {
+		offset += snprintf(buffer, maxsize, "%s  %s  ", fnumber, exposure);
+	}
+	if (iso[0]) {
+		offset += snprintf(buffer + offset, maxsize - offset, "ISO%s  ", iso);
+	}
+	if (focus[0] && focus35[0]) {
+		snprintf(buffer + offset, maxsize - offset, "%s (%s mm)\n", focus, focus35);
+	} else if (focus[0]) {
+		snprintf(buffer + offset, maxsize - offset, "%s\n", focus);
+	}
+}
+
+void exif_get_flash(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char flash[EXIF_STD_BUF_LEN];
+
+	flash[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH, flash, sizeof(flash));
+
+	if (flash[0]) {
+		snprintf(buffer, maxsize, "%s\n", flash);
+	}
+}
+
+void exif_get_mode(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char mode[EXIF_STD_BUF_LEN];
+	char program[EXIF_STD_BUF_LEN];
+
+	mode[0] = program[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_MODE, mode, sizeof(mode));
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_PROGRAM, program, sizeof(program));
+
+	if (mode[0] || program[0]) {
+		snprintf(buffer, maxsize, "%s (%s)\n", mode, program);
+	}
+}
+
+void exif_get_datetime(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char datetime[EXIF_STD_BUF_LEN];
+
+	datetime[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL, datetime, sizeof(datetime));
+
+	if (datetime[0]) {
+		snprintf(buffer, maxsize, "%s\n", datetime);
+	}
+}
+
+void exif_get_description(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char description[EXIF_STD_BUF_LEN];
+
+	description[0] = '\0';
+
+	exif_get_tag_content(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION, description, sizeof(description));
+
+	if (description[0]) {
+		snprintf(buffer, maxsize, "\"%s\"\n", description);
+	}
+}
+
+
+/* get gps coordinates if available */
+void exif_get_gps_coords(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+
+	buf[0] = '\0';
+	exif_get_tag_content(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE_REF,
+			     buf, sizeof(buf));
+	if (buf[0] != '\0') {
+		snprintf(buffer + strlen(buffer), maxsize - strlen(buffer),
+			 "GPS: %s ", buf);
+	} else {
+		return;
+	}
+
+	buf[0] = '\0';
+	exif_get_tag_content(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE, buf,
+			     sizeof(buf));
+	if (buf[0] != '\0') {
+		snprintf(buffer + strlen(buffer), maxsize - strlen(buffer),
+			 "%s ", buf);
+	} else {
+		return;
+	}
+
+	buf[0] = '\0';
+	exif_get_tag_content(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE_REF,
+			     buf, sizeof(buf));
+	if (buf[0] != '\0') {
+		snprintf(buffer + strlen(buffer), maxsize - strlen(buffer),
+			 ", %s ", buf);
+	} else {
+		return;
+	}
+
+	buf[0] = '\0';
+	exif_get_tag_content(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE, buf,
+			     sizeof(buf));
+	if (buf[0] != '\0') {
+		snprintf(buffer + strlen(buffer), maxsize - strlen(buffer),
+			 "%s ", buf);
+	} else {
+		return;
+	}
+
+	buf[0] = '\0';
+	exif_get_tag_content(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_MAP_DATUM, buf,
+			     sizeof(buf));
+	if (buf[0] != '\0') {
+		snprintf(buffer + strlen(buffer), maxsize - strlen(buffer),
+			 "(%s)\n", buf);
+	} else {
+		return;
+	}
+
+}
+
+
+
+/* return data structure with exif data if available */
+ExifData *exif_get_data(char *path)
+{
+	ExifData *ed = NULL;
+
+	/* Load an ExifData object from an EXIF file */
+	ed = exif_data_new_from_file(path);
+	if (ed == NULL) {
+		D(("File not readable or no Exif data present in %s\n",
+		   path));
+	}
+
+	return (ed);
+}
+
+
+
+
+/* get all exif data in readable form */
+void exif_get_info(ExifData * ed, char *buffer, unsigned int maxsize)
+{
+	ExifEntry *entry = NULL;
+	char buf[EXIF_STD_BUF_LEN];
+	unsigned short int i = 0;
+
+	if ((buffer == NULL) || (maxsize == 0)) {
+		return;
+	} else if (ed == NULL) {
+		snprintf(buffer, (size_t) maxsize, "%s\n",
+			 "No Exif data in file.");
+		return;
+	}
+
+	exif_get_description(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+	exif_get_make_model_lens(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+	exif_get_exposure(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+	exif_get_mode(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+	exif_get_flash(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+	exif_get_datetime(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+
+	/* show vendor specific makernote tags */
+	entry =
+			exif_content_get_entry(ed->ifd[EXIF_IFD_0],
+					EXIF_TAG_MAKE);
+	if (entry != NULL) {
+
+		if (exif_entry_get_value(entry, buf, sizeof(buf))) {
+			exif_trim_spaces(buf);
+
+			if ((strcmp(buf, "NIKON CORPORATION") == 0)
+					|| (strcmp(buf, "Nikon") == 0)
+					|| (strcmp(buf, "NIKON") == 0)
+					) {
+				/* show nikon makernote exif tags. list must be defined in exif_cfg.h  */
+				i = 0;
+				while ((i < USHRT_MAX)
+							&&
+							(Exif_makernote_nikon_tag_list
+					[i] !=
+					EXIF_NIKON_MAKERNOTE_END))
+				{
+					exn_get_mnote_nikon_tags
+							(ed,
+							Exif_makernote_nikon_tag_list
+							[i],
+							buffer +
+							strlen(buffer),
+							maxsize -
+							strlen(buffer));
+					i++;
+				}
+
+			} else if ((strcmp(buf, "Canon") == 0)) {
+				/* show canon makernote exif tags. list must be defined in exif_cfg.h  */
+				i = 0;
+				while ((i < USHRT_MAX)
+							&&
+							(Exif_makernote_canon_tag_list
+					[i] !=
+					EXIF_CANON_MAKERNOTE_END))
+				{
+					exc_get_mnote_canon_tags
+							(ed,
+							Exif_makernote_canon_tag_list
+							[i],
+							buffer +
+							strlen(buffer),
+							maxsize -
+							strlen(buffer));
+					i++;
+				}
+
+			} else {
+			}
+		}
+
+	}
+
+	/* show gps coordinates */
+	exif_get_gps_coords(ed, buffer + strlen(buffer),
+					maxsize - strlen(buffer));
+
+}
+
+#endif
diff --git a/src/exif.h b/src/exif.h
new file mode 100644
index 0000000..41769c0
--- /dev/null
+++ b/src/exif.h
@@ -0,0 +1,47 @@
+/* exif.h
+
+Copyright (C) 2012      Dennis Real.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef EXIF_H
+#define EXIF_H
+
+#include <libexif/exif-data.h>
+
+#define EXIF_MAX_DATA 1024
+#define EXIF_STD_BUF_LEN 128
+
+extern void exif_trim_spaces(char *str);
+extern void exif_get_tag(ExifData * d, ExifIfd ifd, ExifTag tag,
+			 char *buffer, unsigned int maxsize);
+extern void exif_get_tag_content(ExifData * d, ExifIfd ifd, ExifTag tag,
+				 char *buffer, unsigned int maxsize);
+extern void exif_get_mnote_tag(ExifData * d, unsigned int tag,
+			       char *buffer, unsigned int maxsize);
+extern void exif_get_gps_coords(ExifData * ed, char *buffer,
+				unsigned int maxsize);
+extern ExifData *exif_get_data(char *path);
+extern void exif_get_info(ExifData * ed, char *buffer,
+			  unsigned int maxsize);
+
+#endif
diff --git a/src/exif_canon.c b/src/exif_canon.c
new file mode 100644
index 0000000..ee72164
--- /dev/null
+++ b/src/exif_canon.c
@@ -0,0 +1,61 @@
+/* exif_canon.c
+
+Copyright (C) 2012      Dennis Real.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifdef HAVE_LIBEXIF
+
+#include <stdio.h>
+#include <libexif/exif-data.h>
+
+#include "feh.h"
+#include "debug.h"
+#include "exif.h"
+#include "exif_canon.h"
+
+
+
+/* get interesting canon maker note tags in readable form */
+void exc_get_mnote_canon_tags(ExifData * ed, unsigned int tag,
+			      char *buffer, unsigned int maxsize)
+{
+	/* char buf[EXIF_STD_BUF_LEN];
+
+	   buf[0] = '\0';
+	   exif_get_tag(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH, buf, sizeof(buf));
+	   exif_trim_spaces(buf); */
+
+	switch (tag) {
+	default:
+		{
+			/* normal makernote tags without special treatment */
+			exif_get_mnote_tag(ed, tag, buffer, maxsize);
+		}
+		break;
+	}
+
+
+	return;
+}
+
+#endif
diff --git a/src/ipc.h b/src/exif_canon.h
index 63f819e..58ecc0e 100644
--- a/src/ipc.h
+++ b/src/exif_canon.h
@@ -1,6 +1,6 @@
-/* ipc.h
+/* exif_canon.h
 
-Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2012      Dennis Real.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -23,35 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#ifndef IPC_H
-#define IPC_H
+#ifndef EXIF_CANON_H
+#define EXIF_CANON_H
 
-#define FEH_IPC_VERSION 0x100;
+#include <libexif/exif-data.h>
 
-int feh_ipc_create_socket(void);
-int feh_ipc_get_session_id(void);
-
-typedef struct
-{
-  unsigned int version;
-  unsigned int command;
-  unsigned int data_length;
-}
-feh_ipc_client_header;
-
-typedef struct
-{
-  unsigned int version;
-  unsigned int data_length;
-}
-feh_ipc_server_header;
-
-enum {
-  IPC_CMD_QUIT,
-  IPC_CMD_FILELIST_NEXT,
-  IPC_CMD_FILELIST_PREV,
-};
+extern void exc_get_mnote_canon_tags(ExifData * ed, unsigned int tag,
+				     char *buffer, unsigned int maxsize);
 
 #endif
-
-
diff --git a/src/exif_cfg.h b/src/exif_cfg.h
new file mode 100644
index 0000000..0a13fa3
--- /dev/null
+++ b/src/exif_cfg.h
@@ -0,0 +1,71 @@
+/* exif_cfg.h
+
+Copyright (C) 2012      Dennis Real.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef EXIF_CFG_H
+#define EXIF_CFG_H
+
+#include <libexif/exif-data.h>
+
+/* Nikon */
+
+#define EXIF_NIKON_MAKERNOTE_END 0	/* end marker: if 0 used as a tag we must find something else */
+
+/* show these nikon makernote tags */
+const unsigned int Exif_makernote_nikon_tag_list[] = {
+
+	6,
+	8,			/* Flash Setting */
+	9,			/* Flash Mode */
+	135,			/* Flash used */
+	18,			/* Flash Exposure Comp */
+	168,			/* Flash info: control mode */
+
+	2,			/* ISO. Has some more info than EXIF_TAG_ISO_SPEED_RATINGS but also fails on Lo.1 */
+	5,			/* White Balance */
+	132,			/* Lens */
+	171,			/* Digital Vari-Program */
+	34,			/* Active D-Lighting */
+
+	35,			/* PictureControlData */
+	183,			/* AFInfo2 */
+
+	EXIF_NIKON_MAKERNOTE_END	/* end marker */
+};
+
+
+
+/* Canon */
+#define EXIF_CANON_MAKERNOTE_END 0xFFFF	/* end marker: if this is used as a tag we must find something else */
+
+/* show these canon makernote tags */
+const unsigned int Exif_makernote_canon_tag_list[] = {
+	8,			/* Image Number */
+	9,			/* Owner Name */
+
+	EXIF_CANON_MAKERNOTE_END	/* end marker */
+};
+
+
+#endif
diff --git a/src/exif_nikon.c b/src/exif_nikon.c
new file mode 100644
index 0000000..a81f290
--- /dev/null
+++ b/src/exif_nikon.c
@@ -0,0 +1,542 @@
+/* exif_nikon.c
+
+Copyright (C) 2012      Dennis Real.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifdef HAVE_LIBEXIF
+
+#include <stdio.h>
+#include <libexif/exif-data.h>
+
+#include "feh.h"
+#include "debug.h"
+#include "exif.h"
+#include "exif_nikon.h"
+
+
+/* Flash control mode */
+/* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#FlashControlMode */
+#define EXN_FLASH_CONTROL_MODES_MAX 9
+char *EXN_NikonFlashControlModeValues[EXN_FLASH_CONTROL_MODES_MAX] =
+    { "Off",
+	"iTTL-BL", "iTTL", "Auto Aperture",
+	"Automatic", "GN (distance priority)",
+	"Manual", "Repeating Flash",
+	"N/A"			/* "N/A" is not a nikon setting */
+};
+
+#define EXN_FLASH_CONTROL_MODE_MASK 0x7F
+
+
+/* AFInfo2 */
+/* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#AFInfo2 */
+#define EXN_CONTRAST_DETECT_AF_MAX 2
+char *EXN_NikonContrastDetectAF[EXN_CONTRAST_DETECT_AF_MAX] =
+    { "Off", "On" };
+
+/* AFArea Mode for ContrastDetectAF Off */
+#define EXN_AF_AREA_MODE_P_MAX 13
+char *EXN_NikonAFAreaModePhase[EXN_AF_AREA_MODE_P_MAX] = {
+	"Single Area", "Dynamic Area", "Dynamic Area (closest subject)",
+	"Group Dynamic ", "Dynamic Area (9 points) ",
+	"Dynamic Area (21 points)",
+	"Dynamic Area (51 points) ",
+	"Dynamic Area (51 points, 3D-tracking)",
+	"Auto-area", "Dynamic Area (3D-tracking)", "Single Area (wide)",
+	"Dynamic Area (wide)", "Dynamic Area (wide, 3D-tracking)"
+};
+
+/* AFArea Mode for ContrastDetectAF On */
+#define EXN_AF_AREA_MODE_C_MAX 5
+char *EXN_NikonAFAreaModeContr[EXN_AF_AREA_MODE_C_MAX] = {
+	"Contrast-detect",
+	"Contrast-detect (normal area)",
+	"Contrast-detect (wide area)",
+	"Contrast-detect (face priority)",
+	"Contrast-detect (subject tracking)"
+};
+
+#define EXN_PHASE_DETECT_AF_MAX 4
+char *EXN_NikonPhaseDetectAF[EXN_PHASE_DETECT_AF_MAX] =
+    { "Off", "On (51-point)",
+	"On (11-point)", "On (39-point)"
+};
+
+/* PrimaryAFPoint and AFPointsUsed only valid with PhaseDetectAF == On */
+
+#define EXN_PRIM_AF_PT_51_MAX 52
+char *EXN_Prim_AF_Pt_51[EXN_PRIM_AF_PT_51_MAX] =
+    { "(none)", "C6 (Center)", "B6", "A5",
+	"D6", "E5", "C7", "B7", "A6", "D7", "E6", "C5", "B5", "A4", "D5",
+	"E4", "C8", "B8",
+	"A7", "D8", "E7", "C9", "B9", "A8", "D9", "E8", "C10", "B10", "A9",
+	"D10", "E9",
+	"C11", "B11", "D11", "C4", "B4", "A3", "D4", "E3", "C3", "B3",
+	"A2", "D3", "E2",
+	"C2", "B2", "A1", "D2", "E1", "C1", "B1", "D1"
+};
+
+#define EXN_PRIM_AF_PT_11_MAX 12
+char *EXN_Prim_AF_Pt_11[EXN_PRIM_AF_PT_11_MAX] =
+    { "(none)", "Center", "Top", "Bottom",
+	"Mid-left", "Upper-left", "Lower-left", "Far Left", "Mid-right",
+	"Upper-right",
+	"Lower-right", "Far Right"
+};
+
+#define EXN_PRIM_AF_PT_39_MAX 40
+char *EXN_Prim_AF_Pt_39[EXN_PRIM_AF_PT_39_MAX] =
+    { "(none)", "C6 (Center)", "B6", "A2",
+	"D6", "E2", "C7", "B7", "A3", "D7", "E3", "C5", "B5", "A1", "D5",
+	"E1", "C8", "B8",
+	"D8", "C9", "B9", "D9", "C10", "B10", "D10", "C11", "B11", "D11",
+	"C4", "B4", "D4",
+	"C3", "B3", "D3", "C2", "B2", "D2", "C1", "B1", "D1"
+};
+
+
+#define EXN_PIC_CTRL_ADJ_MAX 3
+char *EXN_Pic_Ctrl_Adj[EXN_PIC_CTRL_ADJ_MAX] = { "Default Settings",
+	"Quick Adjust",
+	"Full Control"
+};
+
+
+
+static void exn_get_prim_af_pt(unsigned int phasedetectaf,
+			       unsigned int primafpt,
+			       char *buffer, unsigned int maxsize);
+static void exn_get_flash_output(unsigned int flashoutput, char *buffer,
+				 unsigned int maxsize);
+static void exn_get_mnote_nikon_18(ExifData * ed, char *buffer,
+				   unsigned int maxsize);
+static void exn_get_mnote_nikon_34(ExifData * ed, char *buffer,
+				   unsigned int maxsize);
+static void exn_get_mnote_nikon_35(ExifData * ed, char *buffer,
+				   unsigned int maxsize);
+static void exn_get_mnote_nikon_168(ExifData * ed, char *buffer,
+				    unsigned int maxsize);
+static void exn_get_mnote_nikon_183(ExifData * ed, char *buffer,
+				    unsigned int maxsize);
+
+
+
+/* get primary AF point */
+static void exn_get_prim_af_pt(unsigned int phasedetectaf,
+			       unsigned int primafpt,
+			       char *buffer, unsigned int maxsize)
+{
+
+	switch (phasedetectaf) {
+	case 0:
+		{
+			/* phasedetect not used. should not happen */
+			snprintf(buffer, maxsize, "FAIL");
+			return;
+		}
+		break;
+	case 1:
+		{
+			/* 51 pt */
+			if (primafpt < EXN_PRIM_AF_PT_51_MAX) {
+				snprintf(buffer, maxsize, "%s",
+					 EXN_Prim_AF_Pt_51[primafpt]);
+			}
+			return;
+		}
+		break;
+	case 2:
+		{
+			/* 11 pt */
+			if (primafpt < EXN_PRIM_AF_PT_11_MAX) {
+				snprintf(buffer, maxsize, "%s",
+					 EXN_Prim_AF_Pt_11[primafpt]);
+			}
+			return;
+		}
+		break;
+	case 3:
+		{
+			/* 39 pt */
+			if (primafpt < EXN_PRIM_AF_PT_39_MAX) {
+				snprintf(buffer, maxsize, "%s",
+					 EXN_Prim_AF_Pt_39[primafpt]);
+			}
+			return;
+		}
+		break;
+	default:
+		{
+			snprintf(buffer, maxsize, "?");
+			return;
+		}
+		break;
+
+	}
+
+}
+
+
+
+/* get flash output power (for FlashInfo010x) */
+static void exn_get_flash_output(unsigned int flashoutput, char *buffer,
+				 unsigned int maxsize)
+{
+
+	if (flashoutput == 0) {
+		/* full power */
+		snprintf(buffer, maxsize, "Full");
+	} else {
+		if ((flashoutput % 6) == 0) {
+			/* value is a power of 2 */
+			snprintf(buffer, maxsize, "1/%d",
+				 1 << (flashoutput / 6));
+		} else {
+			/* something uneven...ugly. maybe introduce pow() function from libm later */
+			snprintf(buffer, maxsize, "1/2^(%f)",
+				 ((float) flashoutput) / 6.0);
+		}
+	}
+}
+
+
+
+/* get ActiveD-Lighting (18) info */
+static void exn_get_mnote_nikon_18(ExifData * ed, char *buffer,
+				   unsigned int maxsize)
+{
+
+	char buf[EXIF_STD_BUF_LEN];
+	float data = 0;
+
+	buf[0] = '\0';
+	exif_get_mnote_tag(ed, 18, buf, sizeof(buf));
+
+	sscanf(buf, "Flash Exposure Compensation: %f", &data);	/* libexif buggy here. fix conversion */
+
+	snprintf(buffer, maxsize, "FlashExposureCompensation: %+.1f EV\n",
+		 ((float) ((signed char) round(data * 6.0))) / 6.0);
+}
+
+
+
+/* get ActiveD-Lighting (34) info */
+static void exn_get_mnote_nikon_34(ExifData * ed, char *buffer,
+				   unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+	unsigned int data = 0;
+	char *answer;
+
+	buf[0] = '\0';
+	exif_get_mnote_tag(ed, 34, buf, sizeof(buf));
+	sscanf(buf, "(null): %u", &data);	/* not directly supported by libexif yet */
+
+	switch (data) {
+	case 0:
+		{
+			answer = "Off";
+		}
+		break;
+	case 1:
+		{
+			answer = "Low";
+		}
+		break;
+	case 3:
+		{
+			answer = "Normal";
+		}
+		break;
+	case 5:
+		{
+			answer = "High";
+		}
+		break;
+	case 7:
+		{
+			answer = "Extra High";
+		}
+		break;
+	case 65535:
+		{
+			answer = "Auto";
+		}
+		break;
+	default:
+		{
+			answer = "N/A";	/* this is not a nikon value */
+		}
+
+	}
+
+	snprintf(buffer, maxsize, "Active D-Lightning: %s\n", answer);
+
+}
+
+
+
+/* get nikon PictureControlData (35) info */
+static void exn_get_mnote_nikon_35(ExifData * ed, char *buffer,
+				   unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+	char picturecontrolname[EXIF_STD_BUF_LEN];
+	char picturecontrolbase[EXIF_STD_BUF_LEN];
+	unsigned int version = 0;
+	unsigned int length = 0;
+	unsigned int piccontroladj = 0;
+	unsigned int piccontrolquickadj = 0;
+	unsigned int sharpness = 0;
+	unsigned int contrast = 0;
+	unsigned int brightness = 0;
+	unsigned int saturation = 0;
+	unsigned int hueadjustment = 0;
+	unsigned int i, j;
+
+	/* libexif does not support PictureControlData 35 yet. so we have to parse the debug data :-( */
+	buf[0] = '\0';
+	exif_get_mnote_tag(ed, 35, buf, sizeof(buf));
+
+	sscanf(buf,
+	       "(null): %u bytes unknown data: 303130%02X%40s%40s%*8s%02X%02X%02X%02X%02X%02X%02X",
+	       &length, &version, &picturecontrolname[0],
+	       &picturecontrolbase[0], &piccontroladj, &piccontrolquickadj,
+	       &sharpness, &contrast, &brightness, &saturation,
+	       &hueadjustment);
+
+	/* printf("--%s %d-%d-\n", buf, version, piccontroladj); */
+
+	for (i = 0; i < 40; i++) {
+		sscanf(&picturecontrolname[2 * i], "%2X", &j);
+		picturecontrolname[i] = j;
+		sscanf(&picturecontrolbase[2 * i], "%2X", &j);
+		picturecontrolbase[i] = j;
+
+	}
+	exif_trim_spaces(picturecontrolname);
+	exif_trim_spaces(picturecontrolbase);
+
+	if (((length == 58) && (version == '0'))
+	    && (piccontroladj < EXN_PIC_CTRL_ADJ_MAX)
+	    ) {
+		snprintf(buffer, maxsize,
+			 "PictCtrlData: Name: %s; Base: %s; CtrlAdj: %s; Quick: %d; Shrp: %d; Contr: %d; Brght: %d; Sat: %d; Hue: %d\n",
+			 picturecontrolname, picturecontrolbase,
+			 EXN_Pic_Ctrl_Adj[piccontroladj],
+			 piccontrolquickadj, sharpness, contrast,
+			 brightness, saturation, hueadjustment);
+	}
+
+}
+
+
+
+
+/* get nikon Flash info: control mode (168) info */
+static void exn_get_mnote_nikon_168(ExifData * ed, char *buffer,
+				    unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+	unsigned int version = 0;
+	unsigned int length = 0;
+	unsigned int exn_fcm = (EXN_FLASH_CONTROL_MODES_MAX - 1);	/* default to N/A */
+	unsigned int flashoutput = 0;
+	unsigned int externalflashflags = 0;
+	unsigned int flashcompensation = 0;
+
+	/* libexif does not support flash info 168 yet. so we have to parse the debug data :-( */
+	buf[0] = '\0';
+	exif_get_mnote_tag(ed, 168, buf, sizeof(buf));
+	sscanf(buf,
+	       "(null): %u bytes unknown data: 303130%02X%*8s%02X%02X%02X%02X",
+	       &length, &version, &externalflashflags, &exn_fcm,
+	       &flashoutput, &flashcompensation);
+	exn_fcm = exn_fcm & EXN_FLASH_CONTROL_MODE_MASK;
+
+	/* printf("%s - %d %d %d %d\n", buf, externalflashflags, exn_fcm, flashoutput, (signed char)flashcompensation); */
+
+	if ((exn_fcm < EXN_FLASH_CONTROL_MODES_MAX)
+	    && (((length == 22) && (version == '3'))	/* Nikon FlashInfo0103 */
+		||((length == 22) && (version == '4'))	/* Nikon FlashInfo0104 */
+		||((length == 21) && (version == '2'))	/* Nikon FlashInfo0102 */
+		||((length == 19) && (version == '0'))	/* Nikon FlashInfo0100 */
+	    )
+	    ) {
+
+		buf[0] = '\0';
+		exn_get_flash_output(flashoutput, buf, EXIF_STD_BUF_LEN);
+		snprintf(buffer, maxsize,
+			 "NikonFlashControlMode: %s (Power: %s)\n",
+			 EXN_NikonFlashControlModeValues[exn_fcm], buf);
+
+		/* External Flash Flags. Not as useful as expected. Not used (yet). */
+		/* if ( (externalflashflags & (1<<2)) ) -> Bounce Flash */
+		/* if ( (externalflashflags & (1<<4)) ) -> Wide Flash Adapter */
+		/* if ( (externalflashflags & (1<<5)) ) -> Dome Diffusor */
+
+	}
+
+}
+
+
+
+/* get nikon AFInfo2 (183) info */
+static void exn_get_mnote_nikon_183(ExifData * ed, char *buffer,
+				    unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+	unsigned int contrastdetectaf = 0;
+	unsigned int afareamode = 0;
+	unsigned int phasedetectaf = 0;
+	unsigned int primaryafpoint = 0;
+	unsigned int version = 0;
+	unsigned int length = 0;
+
+	/* AFInfo2 */
+	/* libexif does not support AFInfo2 183 yet. so we have to parse the debug data :-( */
+	buf[0] = '\0';
+	exif_get_mnote_tag(ed, 183, buf, sizeof(buf));
+	sscanf(buf,
+	       "(null): %u bytes unknown data: 303130%02X%02X%02X%02X%02X",
+	       &length, &version, &contrastdetectaf, &afareamode,
+	       &phasedetectaf, &primaryafpoint);
+
+
+	if (((length == 30) && (version == '0'))
+	    && (contrastdetectaf < EXN_CONTRAST_DETECT_AF_MAX)
+	    && (phasedetectaf < EXN_PHASE_DETECT_AF_MAX)
+	    ) {
+		if ((contrastdetectaf != 0)
+		    && (afareamode < EXN_AF_AREA_MODE_C_MAX)) {
+			/* Contrast AF (live view) */
+			snprintf(buffer, maxsize,
+				 "ContrastDetectAF: %s; AFAreaMode: %s\n",
+				 EXN_NikonContrastDetectAF
+				 [contrastdetectaf],
+				 EXN_NikonAFAreaModeContr[afareamode]);
+
+		} else if ((phasedetectaf != 0)
+			   && (afareamode < EXN_AF_AREA_MODE_P_MAX)) {
+			/* Phase AF */
+			buf[0] = '\0';
+			exn_get_prim_af_pt(phasedetectaf, primaryafpoint,
+					   buf, EXIF_STD_BUF_LEN);
+
+			snprintf(buffer, maxsize,
+				 "PhaseDetectAF: %s; AreaMode: %s; PrimaryAFPoint: %s\n",
+				 EXN_NikonPhaseDetectAF[phasedetectaf],
+				 EXN_NikonAFAreaModePhase[afareamode],
+				 buf);
+		}
+
+	}
+}
+
+
+
+/* get interesting nikon maker note tags in readable form */
+void exn_get_mnote_nikon_tags(ExifData * ed, unsigned int tag,
+			      char *buffer, unsigned int maxsize)
+{
+	char buf[EXIF_STD_BUF_LEN];
+
+	buf[0] = '\0';
+	exif_get_tag(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH, buf, sizeof(buf));
+	exif_trim_spaces(buf);
+
+	switch (tag) {
+		/* show only if flash was used */
+	case 8:		/* Flash Setting */
+	case 9:		/* Flash Mode */
+	case 135:		/* Flash used */
+		{
+			if (!
+			    (strcmp("Flash: Flash did not fire\n", buf) ==
+			     0)) {
+				/* show extended flash info only if flash was fired */
+				exif_get_mnote_tag(ed, tag, buffer,
+						   maxsize);
+			}
+		}
+		break;
+
+	case 18:		/* FlashExposureComp */
+		{
+			if (!
+			    (strcmp("Flash: Flash did not fire\n", buf) ==
+			     0)) {
+				/* show only if flash was fired */
+				exn_get_mnote_nikon_18(ed, buffer,
+						       maxsize);
+			}
+		}
+		break;
+
+	case 34:
+		{
+			/* ActiveD-Lighting */
+			exn_get_mnote_nikon_34(ed, buffer, maxsize);
+		}
+		break;
+
+	case 35:
+		{
+			/* PictureControlData */
+			exn_get_mnote_nikon_35(ed, buffer, maxsize);
+		}
+		break;
+
+	case 168:
+		{
+			/* Flash info: control mode */
+			if (!
+			    (strcmp("Flash: Flash did not fire\n", buf) ==
+			     0)) {
+				/* show extended flash info only if flash was fired */
+				exn_get_mnote_nikon_168(ed, buffer,
+							maxsize);
+			}
+		}
+		break;
+
+	case 183:
+		{
+			/* AFInfo 2 */
+			exn_get_mnote_nikon_183(ed, buffer, maxsize);
+		}
+		break;
+
+	default:
+		{
+			/* normal makernote tags without special treatment */
+			exif_get_mnote_tag(ed, tag, buffer, maxsize);
+		}
+		break;
+	}
+
+
+	return;
+}
+
+#endif
diff --git a/src/exif_nikon.h b/src/exif_nikon.h
new file mode 100644
index 0000000..49d14b6
--- /dev/null
+++ b/src/exif_nikon.h
@@ -0,0 +1,34 @@
+/* exif_nikon.h
+
+Copyright (C) 2012      Dennis Real.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef EXIF_NIKON_H
+#define EXIF_NIKON_H
+
+#include <libexif/exif-data.h>
+
+extern void exn_get_mnote_nikon_tags(ExifData * ed, unsigned int tag,
+				     char *buffer, unsigned int maxsize);
+
+#endif
diff --git a/src/feh.h b/src/feh.h
index 5e2826b..54e78ea 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -1,6 +1,7 @@
 /* feh.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -26,7 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef FEH_H
 #define FEH_H
 
-#include "config.h"
+/*
+ * strverscmp(3) is a GNU extension. In most supporting C libraries it
+ * requires _GNU_SOURCE to be defined.
+ */
+#ifdef HAVE_STRVERSCMP
+#define _GNU_SOURCE
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -37,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef HAVE_LIBXINERAMA
 #include <X11/extensions/Xinerama.h>
 #include <X11/X.h>
-#endif /* HAVE_LIBXINERAMA */
+#endif				/* HAVE_LIBXINERAMA */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -56,17 +63,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <signal.h>
 #include <sys/wait.h>
 #include <math.h>
+#include <getopt.h>
 
 #include <Imlib2.h>
-#include <giblib/giblib.h>
+#include "gib_hash.h"
+#include "gib_imlib.h"
+#include "gib_list.h"
+#include "gib_style.h"
 
 #include "structs.h"
 #include "menu.h"
-#include "ipc.h"
 
 #include "utils.h"
-#include "getopt.h"
-
 
 #include "debug.h"
 
@@ -89,67 +97,106 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DEFAULT_FONT_BIG "yudit/12"
 #define DEFAULT_FONT_TITLE "yudit/14"
 
-enum mode_type
-{ MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT };
+enum mode_type { MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT
+};
+
+enum bgmode_type { BG_MODE_NONE = 0, BG_MODE_TILE, BG_MODE_CENTER,
+	BG_MODE_SCALE, BG_MODE_FILL, BG_MODE_MAX
+};
 
-enum bgmode_type
-{ BG_MODE_NONE = 0, BG_MODE_TILE, BG_MODE_CENTER, BG_MODE_SEAMLESS, BG_MODE_SCALE };
+enum zoom_mode { ZOOM_MODE_FILL = 1, ZOOM_MODE_MAX };
 
-enum slide_change
-{ SLIDE_NEXT, SLIDE_PREV, SLIDE_FIRST, SLIDE_LAST, SLIDE_JUMP_FWD,
-   SLIDE_JUMP_BACK
+enum text_bg { TEXT_BG_CLEAR = 0, TEXT_BG_TINTED };
+
+enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_RAND, SLIDE_FIRST, SLIDE_LAST,
+	SLIDE_JUMP_FWD,
+	SLIDE_JUMP_BACK,
+	SLIDE_JUMP_NEXT_DIR,
+	SLIDE_JUMP_PREV_DIR
+};
+
+enum feh_load_error {
+	LOAD_ERROR_IMLIB = 0,
+	LOAD_ERROR_IMAGEMAGICK,
+	LOAD_ERROR_CURL,
+	LOAD_ERROR_DCRAW,
+	LOAD_ERROR_MAGICBYTES
 };
 
+#define INPLACE_EDIT_FLIP   -1
+#define INPLACE_EDIT_MIRROR -2
+
+#define ZOOM_MIN 0.002
+#define ZOOM_MAX 2000
+
 typedef void (*sighandler_t) (int);
 
-void show_usage(void);
-void show_version(void);
 int feh_main_iteration(int block);
 void feh_handle_event(XEvent * ev);
 void init_imlib_fonts(void);
 void init_x_and_imlib(void);
 #ifdef HAVE_LIBXINERAMA
 void init_xinerama(void);
-#endif /* HAVE_LIBXINERAMA */
+#endif				/* HAVE_LIBXINERAMA */
 void init_multiwindow_mode(void);
 void init_thumbnail_mode(void);
-void init_collage_mode(void);
 void init_index_mode(void);
 void init_slideshow_mode(void);
 void init_list_mode(void);
 void init_loadables_mode(void);
 void init_unloadables_mode(void);
+#ifdef HAVE_LIBMAGIC
+void uninit_magic(void);
+void init_magic(void);
+#endif
 void feh_clean_exit(void);
+int feh_should_ignore_image(Imlib_Image * im);
 int feh_load_image(Imlib_Image * im, feh_file * file);
 void show_mini_usage(void);
-void slideshow_change_image(winwidget winwid, int change);
+void slideshow_change_image(winwidget winwid, int change, int render);
 void slideshow_pause_toggle(winwidget w);
-char *slideshow_create_name(feh_file * file);
-char *chop_file_from_full_path(char *str);
+void init_keyevents(void);
+void init_buttonbindings(void);
+void setup_stdin(void);
+void restore_stdin(void);
 void feh_event_handle_keypress(XEvent * ev);
-void feh_action_run(feh_file * file, char *action);
-char *feh_printf(char *str, feh_file * file);
+void feh_event_handle_stdin(void);
+void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysym, unsigned int button);
+fehkey *feh_str_to_kb(char * action);
+void feh_action_run(feh_file * file, char *action, winwidget winwid);
+char *format_size(double size);
+char *feh_printf(char *str, feh_file * file, winwidget winwid);
+void im_weprintf(winwidget w, char *fmt, ...);
 void feh_draw_zoom(winwidget w);
 void feh_draw_checks(winwidget win);
 void cb_slide_timer(void *data);
 void cb_reload_timer(void *data);
-char *feh_http_load_image(char *url);
 int feh_load_image_char(Imlib_Image * im, char *filename);
 void feh_draw_filename(winwidget w);
+#ifdef HAVE_LIBEXIF
+void feh_draw_exif(winwidget w);
+#endif
+void feh_draw_actions(winwidget w);
 void feh_draw_caption(winwidget w);
+void feh_draw_info(winwidget w);
+void feh_draw_errstr(winwidget w);
 void feh_display_status(char stat);
 void real_loadables_mode(int loadable);
 void feh_reload_image(winwidget w, int resize, int force_new);
 void feh_filelist_image_remove(winwidget winwid, char do_delete);
-char *feh_strip_hostname(char *url);
-struct hostent *feh_gethostbyname(const char *name);
+void feh_print_load_error(char *file, winwidget w, Imlib_Load_Error err, enum feh_load_error feh_err);
 void slideshow_save_image(winwidget win);
-void feh_edit_inplace_orient(winwidget w, int orientation);
-void feh_edit_inplace_lossless_rotate(winwidget w, int orientation);
-gib_list * feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style);
-char *build_caption_filename(feh_file *file);
-gib_list * feh_list_jump(gib_list * root, gib_list * l, int direction, int num);
-
+void feh_edit_inplace(winwidget w, int orientation);
+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
+#ifndef HAVE_STRVERSCMP
+int strverscmp(const char *l0, const char *r0);
+#endif
 
 /* Imlib stuff */
 extern Display *disp;
@@ -162,7 +209,7 @@ extern Atom wmDeleteWindow;
 extern int num_xinerama_screens;
 extern XineramaScreenInfo *xinerama_screens;
 extern int xinerama_screen;
-#endif /* HAVE_LIBXINERAMA */
+#endif				/* HAVE_LIBXINERAMA */
 
 /* Thumbnail sizes */
 extern int cmdargc;
@@ -171,9 +218,13 @@ extern Window root;
 extern XContext xid_context;
 extern Screen *scr;
 extern unsigned char reset_output;
-extern int call_level;
 extern feh_menu *menu_main;
 extern feh_menu *menu_close;
-extern char *mode; /* label for the current mode */
+extern char *mode;		/* label for the current mode */
+
+/* to terminate long-running children with SIGALRM */
+extern int childpid;
+
+extern unsigned char control_via_stdin;
 
 #endif
diff --git a/src/feh_png.c b/src/feh_png.c
index 7654880..8f5b94d 100644
--- a/src/feh_png.c
+++ b/src/feh_png.c
@@ -23,56 +23,51 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#include "feh_png.h"
-
 #include <png.h>
 
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "feh_png.h"
+
 #define FEH_PNG_COMPRESSION 3
-#define FEH_PNG_NUM_COMMENTS 2 /* only Thumb::URI and Thumb::MTime for now */
+#define FEH_PNG_NUM_COMMENTS 4
 
-gib_hash*
-feh_png_read_comments(char *file)
+gib_hash *feh_png_read_comments(char *file)
 {
-	gib_hash *hash = NULL;
-
 	FILE *fp;
 	int i, sig_bytes, comments = 0;
 
 	png_structp png_ptr;
 	png_infop info_ptr;
 	png_textp text_ptr;
-		
- 	if (!(fp = fopen(file, "rb")))
-		return hash;
+
+	if (!(fp = fopen(file, "rb")))
+		return NULL;
 
 	if (!(sig_bytes = feh_png_file_is_png(fp))) {
 		fclose(fp);
-		return hash;
+		return NULL;
 	}
 
 	/* initialize data structures */
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (!png_ptr)
-	{
+	if (!png_ptr) {
 		fclose(fp);
-		return hash;
+		return NULL;
 	}
 
 	info_ptr = png_create_info_struct(png_ptr);
 	if (!info_ptr) {
 		png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
 		fclose(fp);
-		return hash;
+		return NULL;
 	}
 
-	if (setjmp(png_ptr->jmpbuf))
-	{
+	if (setjmp(png_jmpbuf(png_ptr))) {
 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 		fclose(fp);
-		return hash;
+		return NULL;
 	}
 
 	/* initialize reading */
@@ -81,6 +76,8 @@ feh_png_read_comments(char *file)
 
 	png_read_info(png_ptr, info_ptr);
 
+	gib_hash *hash = NULL;
+
 #ifdef PNG_TEXT_SUPPORTED
 	png_get_text(png_ptr, info_ptr, &text_ptr, &comments);
 	if (comments > 0) {
@@ -88,7 +85,7 @@ feh_png_read_comments(char *file)
 		for (i = 0; i < comments; i++)
 			gib_hash_set(hash, text_ptr[i].key, estrdup(text_ptr[i].text));
 	}
-#endif /* PNG_TEXT_SUPPORTED */
+#endif				/* PNG_TEXT_SUPPORTED */
 
 	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 	fclose(fp);
@@ -97,8 +94,7 @@ feh_png_read_comments(char *file)
 }
 
 /* grab image data from image and write info file with comments ... */
-int
-feh_png_write_png(Imlib_Image image, char *file, ...)
+int feh_png_write_png_fd(Imlib_Image image, int fd, ...)
 {
 	FILE *fp;
 	int i, w, h;
@@ -113,24 +109,25 @@ feh_png_write_png(Imlib_Image image, char *file, ...)
 	va_list args;
 	png_text text[FEH_PNG_NUM_COMMENTS];
 	char *pair_key, *pair_text;
-#endif /* PNG_TEXT_SUPPORTED */
+#endif				/* PNG_TEXT_SUPPORTED */
 
-	if (!(fp = fopen(file, "wb")))
+	if (!(fp = fdopen(fd, "wb")))
 		return 0;
 
 	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (!png_ptr)
+	if (!png_ptr) {
+		fclose(fp);
 		return 0;
+	}
 
 	info_ptr = png_create_info_struct(png_ptr);
-	if (!info_ptr)
-	{
+	if (!info_ptr) {
 		png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+		fclose(fp);
 		return 0;
 	}
 
-	if (setjmp(png_ptr->jmpbuf))
-	{
+	if (setjmp(png_jmpbuf(png_ptr))) {
 		fclose(fp);
 		png_destroy_write_struct(&png_ptr, &info_ptr);
 		png_destroy_info_struct(png_ptr, &info_ptr);
@@ -143,14 +140,13 @@ feh_png_write_png(Imlib_Image image, char *file, ...)
 	png_init_io(png_ptr, fp);
 
 	png_set_IHDR(png_ptr, info_ptr, w, h, 8, PNG_COLOR_TYPE_RGB_ALPHA,
-							 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-							 PNG_FILTER_TYPE_DEFAULT);
+		     PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
 #ifdef WORDS_BIGENDIAN
 	png_set_swap_alpha(png_ptr);
-#else /* !WORDS_BIGENDIAN */
+#else				/* !WORDS_BIGENDIAN */
 	png_set_bgr(png_ptr);
-#endif /* WORDS_BIGENDIAN */
+#endif				/* WORDS_BIGENDIAN */
 
 	sig_bit.red = 8;
 	sig_bit.green = 8;
@@ -159,25 +155,22 @@ feh_png_write_png(Imlib_Image image, char *file, ...)
 	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
 
 #ifdef PNG_TEXT_SUPPORTED
-	va_start(args, file);
-	for (i = 0; i < FEH_PNG_NUM_COMMENTS; i++)
-	{
-		if ((pair_key = va_arg(args, char *)) &&
-				(pair_text = va_arg(args, char *)))
-		{
+	va_start(args, fd);
+	for (i = 0; i < FEH_PNG_NUM_COMMENTS; i++) {
+		if ((pair_key = va_arg(args, char *))
+		    && (pair_text = va_arg(args, char *))) {
 			/* got a complete pair, add to info structure */
 			text[i].key = pair_key;
 			text[i].text = pair_text;
 			text[i].compression = PNG_TEXT_COMPRESSION_NONE;
-		}
-		else
+		} else
 			break;
 	}
 	va_end(args);
 
 	if (i > 0)
 		png_set_text(png_ptr, info_ptr, text, i);
-#endif /* PNG_TEXT_SUPPORTED */
+#endif				/* PNG_TEXT_SUPPORTED */
 
 	png_set_compression_level(png_ptr, FEH_PNG_COMPRESSION);
 	png_write_info(png_ptr, info_ptr);
@@ -200,12 +193,14 @@ feh_png_write_png(Imlib_Image image, char *file, ...)
 }
 
 /* check PNG signature */
-int
-feh_png_file_is_png(FILE *fp)
+int feh_png_file_is_png(FILE * fp)
 {
 	unsigned char buf[8];
 
-	fread(buf, 1, 8, fp);
+	if (fread(buf, 1, 8, fp) != 8) {
+		return 0;
+	}
+
 	if (png_sig_cmp(buf, 0, 8)) {
 		return 0;
 	}
diff --git a/src/feh_png.h b/src/feh_png.h
index 458f6c5..035d36a 100644
--- a/src/feh_png.h
+++ b/src/feh_png.h
@@ -26,14 +26,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef FEH_PNG_H
 #define FEH_PNG_H
 
-#include "feh.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "feh.h"
+
 gib_hash *feh_png_read_comments(char *file);
-int feh_png_write_png(Imlib_Image image, char *file, ...);
+int feh_png_write_png_fd(Imlib_Image image, int fd, ...);
 
-int feh_png_file_is_png(FILE *fp);
+int feh_png_file_is_png(FILE * fp);
 
-#endif /* FEH_PNG_H */
+#endif				/* FEH_PNG_H */
diff --git a/src/filelist.c b/src/filelist.c
index dcbab54..3d9bcef 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -1,6 +1,7 @@
 /* filelist.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -25,587 +26,693 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "feh.h"
 #include "filelist.h"
+#include "signals.h"
 #include "options.h"
 
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
+
 gib_list *filelist = NULL;
-int       filelist_len = 0;
+gib_list *original_file_items = NULL; /* original file items from argv */
+int filelist_len = 0;
 gib_list *current_file = NULL;
-extern int errno;
 
 static gib_list *rm_filelist = NULL;
 
-feh_file *
-feh_file_new(char *filename)
+feh_file *feh_file_new(char *filename)
+{
+	feh_file *newfile;
+	char *s;
+
+	newfile = (feh_file *) emalloc(sizeof(feh_file));
+	newfile->caption = NULL;
+	newfile->filename = estrdup(filename);
+	s = strrchr(filename, '/');
+	if (s)
+		newfile->name = estrdup(s + 1);
+	else
+		newfile->name = estrdup(filename);
+	newfile->size = -1;
+	newfile->mtime = 0;
+	newfile->info = NULL;
+#ifdef HAVE_LIBEXIF
+	newfile->ed = NULL;
+#endif
+	return(newfile);
+}
+
+void feh_file_free(feh_file * file)
+{
+	if (!file)
+		return;
+	if (file->filename)
+		free(file->filename);
+	if (file->name)
+		free(file->name);
+	if (file->caption)
+		free(file->caption);
+	if (file->info)
+		feh_file_info_free(file->info);
+#ifdef HAVE_LIBEXIF
+	if (file->ed)
+		exif_data_unref(file->ed);
+#endif
+	free(file);
+	return;
+}
+
+feh_file_info *feh_file_info_new(void)
 {
-   feh_file *newfile;
-   char *s;
+	feh_file_info *info;
+
+
+	info = (feh_file_info *) emalloc(sizeof(feh_file_info));
+
+	info->width = 0;
+	info->height = 0;
+	info->pixels = 0;
+	info->has_alpha = 0;
+	info->format = NULL;
+	info->extension = NULL;
+
+	return(info);
+}
 
-   D_ENTER(4);
+void feh_file_info_free(feh_file_info * info)
+{
+	if (!info)
+		return;
+	if (info->format)
+		free(info->format);
+	if (info->extension)
+		free(info->extension);
+	free(info);
+	return;
+}
 
-   newfile = (feh_file *) emalloc(sizeof(feh_file));
-   newfile->caption = NULL;
-   newfile->filename = estrdup(filename);
-   s = strrchr(filename, '/');
-   if (s)
-      newfile->name = estrdup(s + 1);
-   else
-      newfile->name = estrdup(filename);
-   newfile->info = NULL;
-   D_RETURN(4, newfile);
+gib_list *feh_file_rm_and_free(gib_list * list, gib_list * l)
+{
+	unlink(FEH_FILE(l->data)->filename);
+	return(feh_file_remove_from_list(list, l));
 }
 
-void
-feh_file_free(feh_file * file)
+gib_list *feh_file_remove_from_list(gib_list * list, gib_list * l)
 {
-   D_ENTER(4);
-   if (!file)
-      D_RETURN_(4);
-   if (file->filename)
-      free(file->filename);
-   if (file->name)
-      free(file->name);
-   if (file->caption)
-      free(file->caption);
-   if (file->info)
-      feh_file_info_free(file->info);
-   free(file);
-   D_RETURN_(4);
+	feh_file_free(FEH_FILE(l->data));
+	D(("filelist_len %d -> %d\n", filelist_len, filelist_len - 1));
+	filelist_len--;
+	return(gib_list_remove(list, l));
 }
 
-feh_file_info *
-feh_file_info_new(void)
+int file_selector_all(const struct dirent *unused __attribute__((unused)))
 {
-   feh_file_info *info;
+  return 1;
+}
 
-   D_ENTER(4);
+static void feh_print_stat_error(char *path)
+{
+	if (opt.quiet)
+		return;
+
+	switch (errno) {
+	case ENOENT:
+	case ENOTDIR:
+		weprintf("%s does not exist - skipping", path);
+		break;
+	case ELOOP:
+		weprintf("%s - too many levels of symbolic links - skipping", path);
+		break;
+	case EACCES:
+		weprintf("you don't have permission to open %s - skipping", path);
+		break;
+	case EOVERFLOW:
+		weprintf("Cannot open %s - EOVERFLOW.\n"
+			"Recompile with stat64=1 to fix this", path);
+		break;
+	default:
+		weprintf("couldn't open %s", path);
+		break;
+	}
+}
 
-   info = (feh_file_info *) emalloc(sizeof(feh_file_info));
+static void add_stdin_to_filelist(void)
+{
+	char buf[1024];
+	size_t readsize;
+	char *sfn = estrjoin("_", "/tmp/feh_stdin", "XXXXXX", NULL);
+	int fd = mkstemp(sfn);
+	FILE *outfile;
+
+	if (fd == -1) {
+		free(sfn);
+		weprintf("cannot read from stdin: mktemp:");
+		return;
+	}
+
+	outfile = fdopen(fd, "w");
+
+	if (outfile == NULL) {
+		free(sfn);
+		weprintf("cannot read from stdin: fdopen:");
+		return;
+	}
+
+	while ((readsize = fread(buf, sizeof(char), sizeof(buf), stdin)) > 0) {
+		if (fwrite(buf, sizeof(char), readsize, outfile) < readsize) {
+			free(sfn);
+			fclose(outfile);
+			return;
+		}
+	}
+	fclose(outfile);
+
+	filelist = gib_list_add_front(filelist, feh_file_new(sfn));
+	add_file_to_rm_filelist(sfn);
+	free(sfn);
+}
 
-   info->width = 0;
-   info->height = 0;
-   info->size = 0;
-   info->pixels = 0;
-   info->has_alpha = 0;
-   info->format = NULL;
-   info->extension = NULL;
 
-   D_RETURN(4, info);
+/* Recursive */
+void add_file_to_filelist_recursively(char *origpath, unsigned char level)
+{
+	struct stat st;
+	char *path;
+
+	if (!origpath || *origpath == '\0')
+		return;
+
+	path = estrdup(origpath);
+	D(("file is %s\n", path));
+
+	if (level == FILELIST_FIRST) {
+		/* First time through, sort out pathname */
+		int len = 0;
+
+		len = strlen(path);
+		if (path[len - 1] == '/')
+			path[len - 1] = '\0';
+
+		if (path_is_url(path)) {
+			D(("Adding url %s to filelist\n", path));
+			filelist = gib_list_add_front(filelist, feh_file_new(path));
+			/* We'll download it later... */
+			free(path);
+			return;
+		} else if ((len == 1) && (path[0] == '-')) {
+			D(("Adding temporary file for stdin (-) to filelist\n"));
+			add_stdin_to_filelist();
+			free(path);
+			return;
+		} else if (opt.filelistfile) {
+			char *newpath = feh_absolute_path(path);
+
+			free(path);
+			path = newpath;
+		}
+	}
+
+	errno = 0;
+	if (stat(path, &st)) {
+		feh_print_stat_error(path);
+		free(path);
+		return;
+	}
+
+	if ((S_ISDIR(st.st_mode)) && (level != FILELIST_LAST)) {
+		struct dirent **de;
+		DIR *dir;
+		int cnt, n;
+
+		D(("It is a directory\n"));
+
+		if ((dir = opendir(path)) == NULL) {
+			if (!opt.quiet)
+				weprintf("couldn't open directory %s:", path);
+			free(path);
+			return;
+		}
+		n = scandir(path, &de, file_selector_all, alphasort);
+		if (n < 0) {
+			switch (errno) {
+			case ENOMEM:
+				weprintf("Insufficient memory to scan directory %s:", path);
+				break;
+			default:
+				weprintf("Failed to scan directory %s:", path);
+			}
+		} else {
+			for (cnt = 0; cnt < n; cnt++) {
+				if (strcmp(de[cnt]->d_name, ".")
+						&& strcmp(de[cnt]->d_name, "..")) {
+					char *newfile;
+
+					newfile = estrjoin("", path, "/", de[cnt]->d_name, NULL);
+
+					/* This ensures we go down one level even if not fully recursive
+					   - this way "feh some_dir" expands to some_dir's contents */
+					if (opt.recursive)
+						add_file_to_filelist_recursively(newfile, FILELIST_CONTINUE);
+					else
+						add_file_to_filelist_recursively(newfile, FILELIST_LAST);
+
+					free(newfile);
+				}
+				free(de[cnt]);
+			}
+			free(de);
+		}
+		closedir(dir);
+	} else if (S_ISREG(st.st_mode)) {
+		D(("Adding regular file %s to filelist\n", path));
+		filelist = gib_list_add_front(filelist, feh_file_new(path));
+	}
+	free(path);
+	return;
 }
 
-void
-feh_file_info_free(feh_file_info * info)
+void add_file_to_rm_filelist(char *file)
 {
-   D_ENTER(4);
-   if (!info)
-      D_RETURN_(4);
-   if (info->format)
-      free(info->format);
-   if (info->extension)
-      free(info->extension);
-   free(info);
-   D_RETURN_(4);
+	rm_filelist = gib_list_add_front(rm_filelist, feh_file_new(file));
+	return;
 }
 
-gib_list *
-feh_file_rm_and_free(gib_list * list, gib_list * l)
+void delete_rm_files(void)
 {
-   D_ENTER(4);
-   unlink(FEH_FILE(l->data)->filename);
-   D_RETURN(4, feh_file_remove_from_list(list, l));
+	gib_list *l;
+
+	for (l = rm_filelist; l; l = l->next)
+		unlink(FEH_FILE(l->data)->filename);
+	return;
 }
 
-gib_list *
-feh_file_remove_from_list(gib_list * list, gib_list * l)
+gib_list *feh_file_info_preload(gib_list * list, int load_images)
 {
-   D_ENTER(4);
-   feh_file_free(FEH_FILE(l->data));
-   D_RETURN(4, gib_list_remove(list, l));
+	gib_list *l;
+	feh_file *file = NULL;
+	gib_list *remove_list = NULL;
+
+	for (l = list; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		D(("file %p, file->next %p, file->name %s\n", l, l->next, file->name));
+		if (load_images) {
+			if (feh_file_info_load(file, NULL)) {
+				D(("Failed to load file %p\n", file));
+				remove_list = gib_list_add_front(remove_list, l);
+				if (opt.verbose)
+					feh_display_status('x');
+			} else if (((unsigned int)file->info->width < opt.min_width)
+					|| ((unsigned int)file->info->width > opt.max_width)
+					|| ((unsigned int)file->info->height < opt.min_height)
+					|| ((unsigned int)file->info->height > opt.max_height)) {
+				remove_list = gib_list_add_front(remove_list, l);
+				if (opt.verbose)
+					feh_display_status('s');
+			} else if (opt.verbose)
+				feh_display_status('.');
+		} else {
+			if (feh_file_stat(file)) {
+				D(("Failed to stat file %p\n", file));
+				remove_list = gib_list_add_front(remove_list, l);
+			}
+		}
+		if (sig_exit) {
+			feh_display_status(0);
+			exit(sig_exit);
+		}
+	}
+	if (opt.verbose)
+		feh_display_status(0);
+
+	if (remove_list) {
+		for (l = remove_list; l; l = l->next) {
+			feh_file_free(FEH_FILE(((gib_list *) l->data)->data));
+			filelist = list = gib_list_remove(list, (gib_list *) l->data);
+		}
+
+		gib_list_free(remove_list);
+	}
+
+	return(list);
 }
 
-/* Recursive */
-void
-add_file_to_filelist_recursively(char *origpath, unsigned char level)
-{
-   struct stat st;
-   char *path;
-
-   D_ENTER(5);
-   if (!origpath)
-      D_RETURN_(5);
-
-   path = estrdup(origpath);
-   D(4, ("file is %s\n", path));
-
-   if (level == FILELIST_FIRST)
-   {
-      /* First time through, sort out pathname */
-      int len = 0;
-
-      len = strlen(path);
-      if (path[len - 1] == '/')
-         path[len - 1] = '\0';
-
-      if ((!strncmp(path, "http://", 7)) || 
-          (!strncmp(path, "https://", 8)) || 
-          (!strncmp(path, "ftp://", 6)))
-      {
-         /* Its a url */
-         D(3, ("Adding url %s to filelist\n", path));
-         filelist = gib_list_add_front(filelist, feh_file_new(path));
-         /* We'll download it later... */
-         free(path);
-         D_RETURN_(5);
-      }
-      else if (opt.filelistfile)
-      {
-         char *newpath = feh_absolute_path(path);
-
-         free(path);
-         path = newpath;
-      }
-   }
-
-   errno = 0;
-   if (stat(path, &st))
-   {
-      /* Display useful error message */
-      switch (errno)
-      {
-        case ENOENT:
-        case ENOTDIR:
-           if (!opt.quiet)
-              weprintf("%s does not exist - skipping", path);
-           break;
-        case ELOOP:
-           if (!opt.quiet)
-              weprintf("%s - too many levels of symbolic links - skipping",
-                       path);
-           break;
-        case EACCES:
-           if (!opt.quiet)
-              weprintf("you don't have permission to open %s - skipping",
-                       path);
-           break;
-        default:
-           if (!opt.quiet)
-              weprintf("couldn't open %s", path);
-           break;
-      }
-      free(path);
-      D_RETURN_(5);
-   }
-
-   if ((S_ISDIR(st.st_mode)) && (level != FILELIST_LAST))
-   {
-      struct dirent *de;
-      DIR *dir;
-
-      D(4, ("It is a directory\n"));
-
-      if ((dir = opendir(path)) == NULL)
-      {
-         if (!opt.quiet)
-            weprintf("couldn't open directory %s:", path);
-         free(path);
-         D_RETURN_(5);
-      }
-      de = readdir(dir);
-      while (de != NULL)
-      {
-         if (strcmp(de->d_name, ".") && strcmp(de->d_name, ".."))
-         {
-            char *newfile;
-
-            newfile = estrjoin("", path, "/", de->d_name, NULL);
-
-            /* This ensures we go down one level even if not fully recursive
-               - this way "feh some_dir" expands to some_dir's contents */
-            if (opt.recursive)
-               add_file_to_filelist_recursively(newfile, FILELIST_CONTINUE);
-            else
-               add_file_to_filelist_recursively(newfile, FILELIST_LAST);
-
-            free(newfile);
-         }
-         de = readdir(dir);
-      }
-      closedir(dir);
-   }
-   else if (S_ISREG(st.st_mode))
-   {
-      D(5, ("Adding regular file %s to filelist\n", path));
-      filelist = gib_list_add_front(filelist, feh_file_new(path));
-   }
-   free(path);
-   D_RETURN_(5);
-}
-
-void
-add_file_to_rm_filelist(char *file)
-{
-   D_ENTER(4);
-   rm_filelist = gib_list_add_front(rm_filelist, feh_file_new(file));
-   D_RETURN_(4);
-}
-
-void
-delete_rm_files(void)
-{
-   gib_list *l;
-
-   D_ENTER(4);
-   for (l = rm_filelist; l; l = l->next)
-      unlink(FEH_FILE(l->data)->filename);
-   D_RETURN_(4);
-}
-
-gib_list *
-feh_file_info_preload(gib_list * list)
-{
-   gib_list *l;
-   feh_file *file = NULL;
-   gib_list *remove_list = NULL;
-
-   D_ENTER(4);
-   if (opt.verbose)
-      fprintf(stdout, PACKAGE " - preloading...\n");
-
-   for (l = list; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      D(5,
-        ("file %p, file->next %p, file->name %s\n", l, l->next, file->name));
-      if (feh_file_info_load(file, NULL))
-      {
-         D(3, ("Failed to load file %p\n", file));
-         remove_list = gib_list_add_front(remove_list, l);
-         if (opt.verbose)
-            feh_display_status('x');
-      }
-      else if (opt.verbose)
-         feh_display_status('.');
-   }
-   if (opt.verbose)
-      fprintf(stdout, "\n");
-
-   if (remove_list)
-   {
-      for (l = remove_list; l; l = l->next)
-         filelist = list = gib_list_remove(list, (gib_list *) l->data);
-
-      gib_list_free(remove_list);
-   }
-
-   D_RETURN(4, list);
+int feh_file_stat(feh_file * file)
+{
+	struct stat st;
+
+	errno = 0;
+	if (stat(file->filename, &st)) {
+		feh_print_stat_error(file->filename);
+		return(1);
+	}
+
+	file->mtime = st.st_mtime;
+
+	file->size = st.st_size;
+
+	return(0);
+}
+
+int feh_file_info_load(feh_file * file, Imlib_Image im)
+{
+	int need_free = 1;
+	Imlib_Image im1;
+
+	if (feh_file_stat(file))
+		return(1);
+
+	D(("im is %p\n", im));
+
+	if (im)
+		need_free = 0;
+
+	if (im)
+		im1 = im;
+	else if (!feh_load_image(&im1, file) || !im1)
+		return(1);
+
+	file->info = feh_file_info_new();
+
+	file->info->width = gib_imlib_image_get_width(im1);
+	file->info->height = gib_imlib_image_get_height(im1);
+
+	file->info->has_alpha = gib_imlib_image_has_alpha(im1);
+
+	file->info->pixels = file->info->width * file->info->height;
+
+	file->info->format = estrdup(gib_imlib_image_format(im1));
+
+	if (need_free)
+		gib_imlib_free_image_and_decache(im1);
+	return(0);
+}
+
+void feh_file_dirname(char *dst, feh_file * f, int maxlen)
+{
+	int n = strlen(f->filename) - strlen(f->name);
+
+	/* Give up on long dirnames */
+	if (n <= 0 || n >= maxlen) {
+		dst[0] = '\0';
+		return;
+	}
+
+	memcpy(dst, f->filename, n);
+	dst[n] = '\0';
 }
 
-int
-feh_file_info_load(feh_file * file, Imlib_Image im)
+static inline int strcmp_or_strverscmp(const char *s1, const char *s2)
 {
-   struct stat st;
-   int need_free = 1;
-   Imlib_Image im1;
+	if (!opt.version_sort)
+		return(strcmp(s1, s2));
+	else
+		return(strverscmp(s1, s2));
+}
+
+int feh_cmp_filename(void *file1, void *file2)
+{
+	return(strcmp_or_strverscmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
+}
 
-   D_ENTER(4);
+int feh_cmp_name(void *file1, void *file2)
+{
+	return(strcmp_or_strverscmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
+}
 
-   D(4, ("im is %p\n", im));
+int feh_cmp_dirname(void *file1, void *file2)
+{
+	char dir1[PATH_MAX], dir2[PATH_MAX];
+	int cmp;
+	feh_file_dirname(dir1, FEH_FILE(file1), PATH_MAX);
+	feh_file_dirname(dir2, FEH_FILE(file2), PATH_MAX);
+	if ((cmp = strcmp_or_strverscmp(dir1, dir2)) != 0)
+		return(cmp);
+	return(feh_cmp_name(file1, file2));
+}
 
-   if (im)
-      need_free = 0;
+/* Return -1 if file1 is _newer_ than file2 */
+int feh_cmp_mtime(void *file1, void *file2)
+{
+	/* gib_list_sort is not stable, so explicitly return 0 as -1 */
+	return(FEH_FILE(file1)->mtime >= FEH_FILE(file2)->mtime ? -1 : 1);
+}
 
-   errno = 0;
-   if (stat(file->filename, &st))
-   {
-      /* Display useful error message */
-      switch (errno)
-      {
-        case ENOENT:
-        case ENOTDIR:
-           if (!opt.quiet)
-              weprintf("%s does not exist - skipping", file->filename);
-           break;
-        case ELOOP:
-           if (!opt.quiet)
-              weprintf("%s - too many levels of symbolic links - skipping",
-                       file->filename);
-           break;
-        case EACCES:
-           if (!opt.quiet)
-              weprintf("you don't have permission to open %s - skipping",
-                       file->filename);
-           break;
-        default:
-           if (!opt.quiet)
-              weprintf("couldn't open %s ", file->filename);
-           break;
-      }
-      D_RETURN(4, 1);
-   }
+int feh_cmp_width(void *file1, void *file2)
+{
+	return((FEH_FILE(file1)->info->width - FEH_FILE(file2)->info->width));
+}
 
-   if (im)
-      im1 = im;
-   else if (!feh_load_image(&im1, file))
-      D_RETURN(4, 1);
+int feh_cmp_height(void *file1, void *file2)
+{
+	return((FEH_FILE(file1)->info->height - FEH_FILE(file2)->info->height));
+}
 
-   if (!im1)
-      D_RETURN(4, 1);
+int feh_cmp_pixels(void *file1, void *file2)
+{
+	return((FEH_FILE(file1)->info->pixels - FEH_FILE(file2)->info->pixels));
+}
 
-   file->info = feh_file_info_new();
+int feh_cmp_size(void *file1, void *file2)
+{
+	return((FEH_FILE(file1)->size - FEH_FILE(file2)->size));
+}
 
-   file->info->width = gib_imlib_image_get_width(im1);
-   file->info->height = gib_imlib_image_get_height(im1);
-
-   file->info->has_alpha = gib_imlib_image_has_alpha(im1);
-
-   file->info->pixels = file->info->width * file->info->height;
-
-   file->info->format = estrdup(gib_imlib_image_format(im1));
-
-   file->info->size = st.st_size;
-
-   if (need_free && im1)
-      gib_imlib_free_image_and_decache(im1);
-   D_RETURN(4, 0);
-}
-
-int
-feh_cmp_filename(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4, strcmp(FEH_FILE(file1)->filename, FEH_FILE(file2)->filename));
-}
-
-int
-feh_cmp_name(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4, strcmp(FEH_FILE(file1)->name, FEH_FILE(file2)->name));
-}
-
-int
-feh_cmp_width(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4, (FEH_FILE(file1)->info->width - FEH_FILE(file2)->info->width));
-}
-
-int
-feh_cmp_height(void *file1, void *file2)
+int feh_cmp_format(void *file1, void *file2)
 {
-   D_ENTER(4);
-   D_RETURN(4,
-            (FEH_FILE(file1)->info->height - FEH_FILE(file2)->info->height));
+	return(strcmp(FEH_FILE(file1)->info->format, FEH_FILE(file2)->info->format));
 }
-
-int
-feh_cmp_pixels(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4,
-            (FEH_FILE(file1)->info->pixels - FEH_FILE(file2)->info->pixels));
-}
-
-int
-feh_cmp_size(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4, (FEH_FILE(file1)->info->size - FEH_FILE(file2)->info->size));
-}
-
-int
-feh_cmp_format(void *file1, void *file2)
-{
-   D_ENTER(4);
-   D_RETURN(4,
-            strcmp(FEH_FILE(file1)->info->format,
-                   FEH_FILE(file2)->info->format));
+
+void feh_prepare_filelist(void)
+{
+	/*
+	 * list and customlist mode as well as the somewhat more fancy sort modes
+	 * need access to file infos. Preloading them is also useful for
+	 * list/customlist as --min-dimension/--max-dimension may filter images
+	 * which should not be processed.
+	 * Finally, if --min-dimension/--max-dimension (-> opt.filter_by_dimensions)
+	 * is set and we're in thumbnail mode, we need to filter images first so
+	 * we can create a properly sized thumbnail list.
+	 */
+	if (opt.list || opt.preload || opt.customlist || (opt.sort >= SORT_WIDTH)
+			|| (opt.filter_by_dimensions && (opt.index || opt.thumbs || opt.bgmode))) {
+		/* For these sort options, we have to preload images */
+		filelist = feh_file_info_preload(filelist, TRUE);
+		if (!gib_list_length(filelist))
+			show_mini_usage();
+	} else if (opt.sort >= SORT_SIZE) {
+		/* For these sort options, we need stat(2) information on the files,
+		 * but there is no need to load the images. */
+		filelist = feh_file_info_preload(filelist, FALSE);
+		if (!gib_list_length(filelist))
+			show_mini_usage();
+	}
+
+	D(("sort mode requested is: %d\n", opt.sort));
+	switch (opt.sort) {
+	case SORT_NONE:
+		if (opt.randomize) {
+			/* Randomize the filename order */
+			filelist = gib_list_randomize(filelist);
+		} else if (!opt.reverse) {
+			/* Let's reverse the list. Its back-to-front right now ;) */
+			filelist = gib_list_reverse(filelist);
+		}
+		break;
+	case SORT_NAME:
+		filelist = gib_list_sort(filelist, feh_cmp_name);
+		break;
+	case SORT_FILENAME:
+		filelist = gib_list_sort(filelist, feh_cmp_filename);
+		break;
+	case SORT_DIRNAME:
+		filelist = gib_list_sort(filelist, feh_cmp_dirname);
+		break;
+	case SORT_MTIME:
+		filelist = gib_list_sort(filelist, feh_cmp_mtime);
+		break;
+	case SORT_WIDTH:
+		filelist = gib_list_sort(filelist, feh_cmp_width);
+		break;
+	case SORT_HEIGHT:
+		filelist = gib_list_sort(filelist, feh_cmp_height);
+		break;
+	case SORT_PIXELS:
+		filelist = gib_list_sort(filelist, feh_cmp_pixels);
+		break;
+	case SORT_SIZE:
+		filelist = gib_list_sort(filelist, feh_cmp_size);
+		break;
+	case SORT_FORMAT:
+		filelist = gib_list_sort(filelist, feh_cmp_format);
+		break;
+	default:
+		break;
+	}
+
+	/* no point reversing a random list */
+	if (opt.reverse && (opt.sort != SORT_NONE)) {
+		D(("Reversing filelist as requested\n"));
+		filelist = gib_list_reverse(filelist);
+	}
+
+	return;
 }
 
-void
-feh_prepare_filelist(void)
+int feh_write_filelist(gib_list * list, char *filename)
 {
-   D_ENTER(4);
-   if (opt.list || opt.customlist || (opt.sort > SORT_FILENAME)
-       || opt.preload)
-   {
-      /* For these sort options, we have to preload images */
-      filelist = feh_file_info_preload(filelist);
-      if (!gib_list_length(filelist))
-         show_mini_usage();
-   }
+	FILE *fp;
+	gib_list *l;
+
+	if (!list || !filename || !strcmp(filename, "/dev/stdin"))
+		return(0);
+
+	errno = 0;
+	if ((fp = fopen(filename, "w")) == NULL) {
+		weprintf("can't write filelist %s:", filename);
+		return(0);
+	}
+
+	for (l = list; l; l = l->next)
+		fprintf(fp, "%s\n", (FEH_FILE(l->data)->filename));
+
+	fclose(fp);
 
-   D(3, ("sort mode requested is: %d\n", opt.sort));
-   switch (opt.sort)
-   {
-     case SORT_NONE:
-        if (opt.randomize)
-        {
-           /* Randomize the filename order */
-           filelist = gib_list_randomize(filelist);
-        }
-        else if (!opt.reverse)
-        {
-           /* Let's reverse the list. Its back-to-front right now ;) */
-           filelist = gib_list_reverse(filelist);
-        }
-        break;
-     case SORT_NAME:
-        filelist = gib_list_sort(filelist, feh_cmp_name);
-        break;
-     case SORT_FILENAME:
-        filelist = gib_list_sort(filelist, feh_cmp_filename);
-        break;
-     case SORT_WIDTH:
-        filelist = gib_list_sort(filelist, feh_cmp_width);
-        break;
-     case SORT_HEIGHT:
-        filelist = gib_list_sort(filelist, feh_cmp_height);
-        break;
-     case SORT_PIXELS:
-        filelist = gib_list_sort(filelist, feh_cmp_pixels);
-        break;
-     case SORT_SIZE:
-        filelist = gib_list_sort(filelist, feh_cmp_size);
-        break;
-     case SORT_FORMAT:
-        filelist = gib_list_sort(filelist, feh_cmp_format);
-        break;
-     default:
-        break;
-   }
-
-   /* no point reversing a random list */
-   if (opt.reverse && (opt.sort != SORT_NONE))
-   {
-      D(3, ("Reversing filelist as requested\n"));
-      filelist = gib_list_reverse(filelist);
-   }
-
-   D_RETURN_(4);
-}
-
-int
-feh_write_filelist(gib_list * list, char *filename)
-{
-   FILE *fp;
-   gib_list *l;
-
-   D_ENTER(4);
-
-   if (!list || !filename)
-      D_RETURN(4, 0);
-
-   errno = 0;
-   if ((fp = fopen(filename, "w")) == NULL)
-   {
-      weprintf("can't write filelist %s:", filename);
-      D_RETURN(4, 0);
-   }
-
-   for (l = list; l; l = l->next)
-      fprintf(fp, "%s\n", (FEH_FILE(l->data)->filename));
-
-   fclose(fp);
-
-   D_RETURN(4, 1);
-}
-
-gib_list *
-feh_read_filelist(char *filename)
-{
-   FILE *fp;
-   gib_list *list = NULL;
-   char s[1024], s1[1024];
-   Imlib_Image im1;
-
-   D_ENTER(4);
-
-   if (!filename)
-      D_RETURN(4, NULL);
-
-   /* try and load the given filelist as an image, cowardly refuse to
-    * overwrite an image with a filelist. (requested by user who did feh -df *
-    * when he meant feh -dF *, as it overwrote the first image with the
-    * filelist).
-    */
-   if (feh_load_image_char(&im1, filename)) {
-      weprintf("The file you specified as a filelist to read - %s - appears to be an image. Ignoring it (this is a common mistake).\n", filename);
-      opt.filelistfile = NULL;
-      D_RETURN(4, NULL);
-   }
-   
-   errno = 0;
-   if ((fp = fopen(filename, "r")) == NULL)
-   {
-      /* return quietly, as it's okay to specify a filelist file that doesn't
-         exist. In that case we create it on exit. */
-      D_RETURN(4, NULL);
-   }
-
-   for (; fgets(s, sizeof(s), fp);)
-   {
-      D(5, ("Got line '%s'\n", s));
-      s1[0] = '\0';
-      sscanf(s, "%[^\n]", (char *) &s1);
-      if (!(*s1) || (*s1 == '\n'))
-         continue;
-      D(5, ("Got filename %s from filelist file\n", s1));
-      /* Add it to the new list */
-      list = gib_list_add_front(list, feh_file_new(s1));
-   }
-   fclose(fp);
-
-   D_RETURN(4, list);
-}
-
-char *
-feh_absolute_path(char *path)
-{
-   char cwd[PATH_MAX];
-   char fullpath[PATH_MAX];
-   char temp[PATH_MAX];
-   char *ret;
-
-   D_ENTER(4);
-
-   if (!path)
-      D_RETURN(4, NULL);
-   if (path[0] == '/')
-      D_RETURN(4, estrdup(path));
-   /* This path is not relative. We're gonna convert it, so that a
-      filelist file can be saved anywhere and feh will still find the
-      images */
-   D(4, ("Need to convert %s to an absolute form\n", path));
-   /* I SHOULD be able to just use a simple realpath() here, but dumb * 
-      old Solaris's realpath doesn't return an absolute path if the
-      path you give it is relative. Linux and BSD get this right... */
-   getcwd(cwd, sizeof(cwd));
-   snprintf(temp, sizeof(temp), "%s/%s", cwd, path);
-   if (realpath(temp, fullpath) != NULL)
-   {
-      ret = estrdup(fullpath);
-   }
-   else
-   {
-      ret = estrdup(temp);
-   }
-   D(4, ("Converted path to %s\n", ret));
-   D_RETURN(4, ret);
-}
-
-void feh_save_filelist()
-{
-   char *tmpname;
-
-   D_ENTER(4);
-
-      tmpname =
-         feh_unique_filename("", "filelist");
-
-   if(!opt.quiet)
-      printf("saving filelist to filename '%s'\n", tmpname);
-
-   feh_write_filelist(filelist, tmpname);
-   free(tmpname);
-   D_RETURN_(4);
+	return(1);
 }
+
+gib_list *feh_read_filelist(char *filename)
+{
+	FILE *fp;
+	gib_list *list = NULL;
+	char s[1024], s1[1024];
+	Imlib_Load_Error err = IMLIB_LOAD_ERROR_NONE;
+	Imlib_Image tmp_im;
+	struct stat st;
+	signed short tmp_conversion_timeout;
+
+	if (!filename)
+		return(NULL);
+
+	/*
+	 * feh_load_image will fail horribly if filename is not seekable
+	 */
+	tmp_conversion_timeout = opt.conversion_timeout;
+	opt.conversion_timeout = -1;
+	if (!stat(filename, &st) && S_ISREG(st.st_mode)) {
+		tmp_im = imlib_load_image_with_error_return(filename, &err);
+		if (err == IMLIB_LOAD_ERROR_NONE) {
+			gib_imlib_free_image_and_decache(tmp_im);
+			weprintf("Filelist file %s is an image, refusing to use it.\n"
+				"Did you mix up -f and -F?", filename);
+			opt.filelistfile = NULL;
+			return NULL;
+		}
+	}
+	opt.conversion_timeout = tmp_conversion_timeout;
+
+	errno = 0;
+
+	if (!strcmp(filename, "/dev/stdin"))
+		fp = stdin;
+	else
+		fp = fopen(filename, "r");
+
+	if (fp == NULL) {
+		/* return quietly, as it's okay to specify a filelist file that doesn't
+		   exist. In that case we create it on exit. */
+		return(NULL);
+	}
+
+	for (; fgets(s, sizeof(s), fp);) {
+		D(("Got line '%s'\n", s));
+		s1[0] = '\0';
+		sscanf(s, "%[^\n]", (char *) &s1);
+		if (!(*s1) || (*s1 == '\n'))
+			continue;
+		D(("Got filename %s from filelist file\n", s1));
+		/* Add it to the new list */
+		list = gib_list_add_front(list, feh_file_new(s1));
+	}
+	if (strcmp(filename, "/dev/stdin"))
+		fclose(fp);
+
+	return(list);
+}
+
+char *feh_absolute_path(char *path)
+{
+	char cwd[PATH_MAX];
+	char fullpath[PATH_MAX];
+	char temp[PATH_MAX];
+	char *ret;
+
+	if (!path)
+		return(NULL);
+	if (path[0] == '/' || path_is_url(path))
+		return(estrdup(path));
+	/* This path is not relative. We're gonna convert it, so that a
+	   filelist file can be saved anywhere and feh will still find the
+	   images */
+	D(("Need to convert %s to an absolute form\n", path));
+	/* I SHOULD be able to just use a simple realpath() here, but dumb *
+	   old Solaris's realpath doesn't return an absolute path if the
+	   path you give it is relative. Linux and BSD get this right... */
+	if (getcwd(cwd, sizeof(cwd)) == NULL)
+		eprintf("Cannot determine working directory:");
+	if ((size_t) snprintf(temp, sizeof(temp), "%s/%s", cwd, path) >= sizeof(temp))
+		eprintf("Absolute path for working directory was truncated");
+	if (realpath(temp, fullpath) != NULL) {
+		ret = estrdup(fullpath);
+	} else {
+		ret = estrdup(temp);
+	}
+	D(("Converted path to %s\n", ret));
+	return(ret);
+}
+
+void feh_save_filelist(void)
+{
+	char *tmpname;
+	char *base_dir = "";
+
+	if (opt.output_dir) {
+		base_dir = estrjoin("", opt.output_dir, "/", NULL);
+	}
+
+	tmpname = feh_unique_filename(base_dir, "filelist");
+
+	if (opt.output_dir) {
+		free(base_dir);
+	}
+
+	if (opt.verbose)
+		fprintf(stderr, "saving filelist to filename '%s'\n", tmpname);
+
+	feh_write_filelist(filelist, tmpname);
+	free(tmpname);
+	return;
+}
+
+#ifdef HAVE_LIBCURL
+
+char *feh_http_unescape(char *url)
+{
+	CURL *curl = curl_easy_init();
+	if (!curl) {
+		return NULL;
+	}
+	char *tmp_url = curl_easy_unescape(curl, url, 0, NULL);
+	char *new_url = estrdup(tmp_url);
+	curl_free(tmp_url);
+	curl_easy_cleanup(curl);
+	return new_url;
+}
+
+#else
+
+char *feh_http_unescape(char *url)
+{
+	return NULL;
+}
+
+#endif
diff --git a/src/filelist.h b/src/filelist.h
index a292bb4..4fc3930 100644
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -1,6 +1,7 @@
 /* filelist.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -26,35 +27,58 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef FILELIST_H
 #define FILELIST_H
 
-struct __feh_file
-{
-   char *filename;
-   char *caption;
-   char *name;
+#ifdef HAVE_LIBEXIF
+#include <libexif/exif-data.h>
+#endif
 
-   /* info stuff */
-   feh_file_info *info;  /* only set when needed */
+struct __feh_file {
+	char *filename;
+	char *caption;
+	char *name;
+
+	/* info stuff */
+	time_t mtime;
+	int size;
+	feh_file_info *info;	/* only set when needed */
+#ifdef HAVE_LIBEXIF
+	ExifData *ed;
+#endif
 };
 
-struct __feh_file_info
-{
-   int width;
-   int height;
-   int size;
-   int pixels;
-   unsigned char has_alpha;
-   char *format;
-   char *extension;
+struct __feh_file_info {
+	int width;
+	int height;
+	int pixels;
+	unsigned char has_alpha;
+	char *format;
+	char *extension;
 };
 
 #define FEH_FILE(l) ((feh_file *) l)
 
-enum filelist_recurse
-{ FILELIST_FIRST, FILELIST_CONTINUE, FILELIST_LAST };
+/*
+ * PATH_MAX may not be defined on all systems. Since we only use it in for a
+ * getcwd call in feh_absolute_path, it isn't really worth the effort to malloc
+ * ever-increasing buffers until it fits. Instead, we just set it to 4096 and
+ * have --filelist and --bg-* hiccup if the path is larger.
+ */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
 
-enum sort_type
-{ SORT_NONE, SORT_NAME, SORT_FILENAME, SORT_WIDTH, SORT_HEIGHT, SORT_PIXELS,
-   SORT_SIZE, SORT_FORMAT
+enum filelist_recurse { FILELIST_FIRST, FILELIST_CONTINUE, FILELIST_LAST };
+
+enum sort_type {
+	SORT_NONE,
+	SORT_NAME,
+	SORT_FILENAME,
+	SORT_DIRNAME,
+	SORT_SIZE, // everything after SORT_SIZE requires stat(2) information on the filelist
+	SORT_MTIME,
+	SORT_WIDTH, // everything after SORT_WIDTH requires preloading the images in the filelist
+	SORT_HEIGHT,
+	SORT_PIXELS,
+	SORT_FORMAT
 };
 
 feh_file *feh_file_new(char *filename);
@@ -62,20 +86,26 @@ void feh_file_free(feh_file * file);
 feh_file_info *feh_file_info_new(void);
 void feh_file_info_free(feh_file_info * info);
 gib_list *feh_file_rm_and_free(gib_list * list, gib_list * file);
+int file_selector_all(const struct dirent *unused);
 void add_file_to_filelist_recursively(char *origpath, unsigned char level);
 void add_file_to_rm_filelist(char *file);
 void delete_rm_files(void);
-gib_list *feh_file_info_preload(gib_list * list);
+gib_list *feh_file_info_preload(gib_list * list, int load_images);
+int feh_file_stat(feh_file * file);
 int feh_file_info_load(feh_file * file, Imlib_Image im);
+void feh_file_dirname(char *dst, feh_file * f, int maxlen);
 void feh_prepare_filelist(void);
 int feh_write_filelist(gib_list * list, char *filename);
 gib_list *feh_read_filelist(char *filename);
 char *feh_absolute_path(char *path);
 gib_list *feh_file_remove_from_list(gib_list * list, gib_list * l);
-void feh_save_filelist();
+void feh_save_filelist(void);
+char *feh_http_unescape(char * url);
 
 int feh_cmp_name(void *file1, void *file2);
+int feh_cmp_dirname(void *file1, void *file2);
 int feh_cmp_filename(void *file1, void *file2);
+int feh_cmp_mtime(void *file1, void *file2);
 int feh_cmp_width(void *file1, void *file2);
 int feh_cmp_height(void *file1, void *file2);
 int feh_cmp_pixels(void *file1, void *file2);
@@ -83,7 +113,8 @@ int feh_cmp_size(void *file1, void *file2);
 int feh_cmp_format(void *file1, void *file2);
 
 extern gib_list *filelist;
-extern int       filelist_len;
+extern gib_list *original_file_items;
+extern int filelist_len;
 extern gib_list *current_file;
 
 #endif
diff --git a/src/getopt.c b/src/getopt.c
deleted file mode 100644
index 4503953..0000000
--- a/src/getopt.c
+++ /dev/null
@@ -1,1045 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
-   	Free Software Foundation, Inc.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
-   Ditto for AIX 3.2 and <stdlib.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
-#include <unistd.h>
-#endif /* GNU C library.  */
-
-#ifdef VMS
-#include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-#ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid)	gettext (msgid)
-#else
-# define _(msgid)	(msgid)
-#endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = NULL;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* 1003.2 says this must be 1 before any call.  */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
-   causes problems with re-calling getopt as programs generally don't
-   know that. */
-
-int __getopt_initialized = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
-
-static enum
-{
-   REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-}
-ordering;
-
-/* Value of POSIXLY_CORRECT environment variable.  */
-static char *posixly_correct;
-
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-#include <string.h>
-#define	my_index	strchr
-#else
-
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv();
-
-static char *
-my_index(str, chr)
-   const char *str;
-   int chr;
-{
-   while (*str)
-   {
-      if (*str == chr)
-         return (char *) str;
-      str++;
-   }
-   return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
-   If not using GCC, it is ok not to declare it.  */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   That was relevant to code that was here before.  */
-#if !defined (__STDC__) || !__STDC__
-/* gcc with -traditional declares the built-in strlen to return int,
-   and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen(const char *);
-#endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-#ifdef _LIBC
-/* Bash 2.0 gives us an environment variable containing flags
-   indicating ARGV elements that should not be considered arguments.  */
-
-/* Defined in getopt_init.c  */
-extern char *__getopt_nonoption_flags;
-
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-
-static int original_argc;
-static char *const *original_argv;
-
-/* Make sure the environment variable bash 2.0 puts in the environment
-   is valid for the getopt call we must make sure that the ARGV passed
-   to getopt is that one passed to the process.  */
-static void __attribute__ ((unused)) store_args_and_env(int argc,
-                                                        char *const *argv)
-{
-   /* XXX This is no good solution.  We should rather copy the args so that
-      we can compare them later.  But we must not use malloc(3).  */
-   original_argc = argc;
-   original_argv = argv;
-}
-
-# ifdef text_set_element
-text_set_element(__libc_subinit, store_args_and_env);
-# endif /* text_set_element */
-
-# define SWAP_FLAGS(ch1, ch2) \
-  if (nonoption_flags_len > 0)						      \
-    {									      \
-      char __tmp = __getopt_nonoption_flags[ch1];			      \
-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
-      __getopt_nonoption_flags[ch2] = __tmp;				      \
-    }
-#else /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif /* _LIBC */
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.  */
-
-#if defined (__STDC__) && __STDC__
-static void exchange(char **);
-#endif
-
-static void
-exchange(argv)
-   char **argv;
-{
-   int bottom = first_nonopt;
-   int middle = last_nonopt;
-   int top = optind;
-   char *tem;
-
-   /* Exchange the shorter segment with the far end of the longer segment.
-      That puts the shorter segment into the right place. It leaves the
-      longer segment in the right place overall, but it consists of two parts 
-      that need to be swapped next.  */
-
-#ifdef _LIBC
-   /* First make sure the handling of the `__getopt_nonoption_flags' string
-      can work normally.  Our top argument must be in the range of the
-      string.  */
-   if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
-   {
-      /* We must extend the array.  The user plays games with us and presents 
-         new arguments.  */
-      char *new_str = malloc(top + 1);
-
-      if (new_str == NULL)
-         nonoption_flags_len = nonoption_flags_max_len = 0;
-      else
-      {
-         memset(__mempcpy
-                (new_str, __getopt_nonoption_flags, nonoption_flags_max_len),
-                '\0', top + 1 - nonoption_flags_max_len);
-         nonoption_flags_max_len = top + 1;
-         __getopt_nonoption_flags = new_str;
-      }
-   }
-#endif
-
-   while (top > middle && middle > bottom)
-   {
-      if (top - middle > middle - bottom)
-      {
-         /* Bottom segment is the short one.  */
-         int len = middle - bottom;
-         register int i;
-
-         /* Swap it with the top part of the top segment.  */
-         for (i = 0; i < len; i++)
-         {
-            tem = argv[bottom + i];
-            argv[bottom + i] = argv[top - (middle - bottom) + i];
-            argv[top - (middle - bottom) + i] = tem;
-            SWAP_FLAGS(bottom + i, top - (middle - bottom) + i);
-         }
-         /* Exclude the moved bottom segment from further swapping.  */
-         top -= len;
-      }
-      else
-      {
-         /* Top segment is the short one.  */
-         int len = top - middle;
-         register int i;
-
-         /* Swap it with the bottom part of the bottom segment.  */
-         for (i = 0; i < len; i++)
-         {
-            tem = argv[bottom + i];
-            argv[bottom + i] = argv[middle + i];
-            argv[middle + i] = tem;
-            SWAP_FLAGS(bottom + i, middle + i);
-         }
-         /* Exclude the moved top segment from further swapping.  */
-         bottom += len;
-      }
-   }
-
-   /* Update records for the slots the non-options now occupy.  */
-
-   first_nonopt += (optind - last_nonopt);
-   last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made.  */
-
-#if defined (__STDC__) && __STDC__
-static const char *_getopt_initialize(int, char *const *, const char *);
-#endif
-static const char *
-_getopt_initialize(argc, argv, optstring)
-   int argc;
-   char *const *argv;
-   const char *optstring;
-{
-   /* Start processing options with ARGV-element 1 (since ARGV-element 0 is
-      the program name); the sequence of previously skipped non-option
-      ARGV-elements is empty.  */
-
-   first_nonopt = last_nonopt = optind;
-
-   nextchar = NULL;
-
-   posixly_correct = getenv("POSIXLY_CORRECT");
-
-   /* Determine how to handle the ordering of options and nonoptions.  */
-
-   if (optstring[0] == '-')
-   {
-      ordering = RETURN_IN_ORDER;
-      ++optstring;
-   }
-   else if (optstring[0] == '+')
-   {
-      ordering = REQUIRE_ORDER;
-      ++optstring;
-   }
-   else if (posixly_correct != NULL)
-      ordering = REQUIRE_ORDER;
-   else
-      ordering = PERMUTE;
-
-#ifdef _LIBC
-   if (posixly_correct == NULL && argc == original_argc
-       && argv == original_argv)
-   {
-      if (nonoption_flags_max_len == 0)
-      {
-         if (__getopt_nonoption_flags == NULL
-             || __getopt_nonoption_flags[0] == '\0')
-            nonoption_flags_max_len = -1;
-         else
-         {
-            const char *orig_str = __getopt_nonoption_flags;
-            int len = nonoption_flags_max_len = strlen(orig_str);
-
-            if (nonoption_flags_max_len < argc)
-               nonoption_flags_max_len = argc;
-            __getopt_nonoption_flags =
-               (char *) malloc(nonoption_flags_max_len);
-            if (__getopt_nonoption_flags == NULL)
-               nonoption_flags_max_len = -1;
-            else
-               memset(__mempcpy(__getopt_nonoption_flags, orig_str, len),
-                      '\0', nonoption_flags_max_len - len);
-         }
-      }
-      nonoption_flags_len = nonoption_flags_max_len;
-   }
-   else
-      nonoption_flags_len = 0;
-#endif
-
-   return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns -1.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return '?'.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   The elements of ARGV aren't really const, because we permute them.
-   But we pretend they're const in the prototype to be compatible
-   with other systems.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-int
-_getopt_internal(argc, argv, optstring, longopts, longind, long_only)
-   int argc;
-   char *const *argv;
-   const char *optstring;
-   const struct option *longopts;
-   int *longind;
-   int long_only;
-{
-   optarg = NULL;
-
-   if (optind == 0 || !__getopt_initialized)
-   {
-      if (optind == 0)
-         optind = 1;                        /* Don't scan ARGV[0], the
-                                               program name.  */
-      optstring = _getopt_initialize(argc, argv, optstring);
-      __getopt_initialized = 1;
-   }
-
-   /* Test whether ARGV[optind] points to a non-option argument. Either it
-      does not have option syntax, or there is an environment flag from the
-      shell indicating it is not an option.  The later information is only
-      used when the used in the GNU libc.  */
-#ifdef _LIBC
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
-		     || (optind < nonoption_flags_len			      \
-			 && __getopt_nonoption_flags[optind] == '1'))
-#else
-#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#endif
-
-   if (nextchar == NULL || *nextchar == '\0')
-   {
-      /* Advance to the next ARGV-element.  */
-
-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
-         moved back by the user (who may also have changed the arguments).  */
-      if (last_nonopt > optind)
-         last_nonopt = optind;
-      if (first_nonopt > optind)
-         first_nonopt = optind;
-
-      if (ordering == PERMUTE)
-      {
-         /* If we have just processed some options following some
-            non-options, exchange them so that the options come first.  */
-
-         if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange((char **) argv);
-         else if (last_nonopt != optind)
-            first_nonopt = optind;
-
-         /* Skip any additional non-options and extend the range of
-            non-options previously skipped.  */
-
-         while (optind < argc && NONOPTION_P)
-            optind++;
-         last_nonopt = optind;
-      }
-
-      /* The special ARGV-element `--' means premature end of options. Skip
-         it like a null option, then exchange with previous non-options as if 
-         it were an option, then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp(argv[optind], "--"))
-      {
-         optind++;
-
-         if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange((char **) argv);
-         else if (first_nonopt == last_nonopt)
-            first_nonopt = optind;
-         last_nonopt = argc;
-
-         optind = argc;
-      }
-
-      /* If we have done all the ARGV-elements, stop the scan and back over
-         any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-      {
-         /* Set the next-arg-index to point at the non-options that we
-            previously skipped, so the caller will digest them.  */
-         if (first_nonopt != last_nonopt)
-            optind = first_nonopt;
-         return -1;
-      }
-
-      /* If we have come to a non-option and did not permute it, either stop
-         the scan or describe it to the caller and pass it by.  */
-
-      if (NONOPTION_P)
-      {
-         if (ordering == REQUIRE_ORDER)
-            return -1;
-         optarg = argv[optind++];
-         return 1;
-      }
-
-      /* We have found another option-ARGV-element. Skip the initial
-         punctuation.  */
-
-      nextchar =
-         (argv[optind] + 1 + (longopts != NULL && argv[optind][1] == '-'));
-   }
-
-   /* Decode the current option-ARGV-element.  */
-
-   /* Check whether the ARGV-element is a long option.
-
-      If long_only and the ARGV-element has the form "-f", where f is a valid 
-      short option, don't consider it an abbreviated form of a long option
-      that starts with f.  Otherwise there would be no way to give the -f
-      short option.
-
-      On the other hand, if there's a long option "fubar" and the
-      ARGV-element is "-fu", do consider that an abbreviation of the long
-      option, just like "--fu", and not "-f" with arg "u".
-
-      This distinction seems to be the most useful approach.  */
-
-   if (longopts != NULL
-       && (argv[optind][1] == '-'
-           || (long_only
-               && (argv[optind][2]
-                   || !my_index(optstring, argv[optind][1])))))
-   {
-      char *nameend;
-      const struct option *p;
-      const struct option *pfound = NULL;
-      int exact = 0;
-      int ambig = 0;
-      int indfound = -1;
-      int option_index;
-
-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
-         /* Do nothing.  */ ;
-
-      /* Test all long options for either exact match or abbreviated matches. 
-       */
-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
-         if (!strncmp(p->name, nextchar, nameend - nextchar))
-         {
-            if ((unsigned int) (nameend - nextchar) ==
-                (unsigned int) strlen(p->name))
-            {
-               /* Exact match found.  */
-               pfound = p;
-               indfound = option_index;
-               exact = 1;
-               break;
-            }
-            else if (pfound == NULL)
-            {
-               /* First nonexact match found.  */
-               pfound = p;
-               indfound = option_index;
-            }
-            else
-               /* Second or later nonexact match found.  */
-               ambig = 1;
-         }
-
-      if (ambig && !exact)
-      {
-         if (opterr)
-            fprintf(stderr, _("%s: option `%s' is ambiguous\n"), argv[0],
-                    argv[optind]);
-         nextchar += strlen(nextchar);
-         optind++;
-         optopt = 0;
-         return '?';
-      }
-
-      if (pfound != NULL)
-      {
-         option_index = indfound;
-         optind++;
-         if (*nameend)
-         {
-            /* Don't test has_arg with >, because some C compilers don't
-               allow it to be used on enums.  */
-            if (pfound->has_arg)
-               optarg = nameend + 1;
-            else
-            {
-               if (opterr)
-	       {
-                  if (argv[optind - 1][1] == '-')
-                     /* --option */
-                     fprintf(stderr,
-                             _
-                             ("%s: option `--%s' doesn't allow an argument\n"),
-                             argv[0], pfound->name);
-                  else
-                     /* +option or -option */
-                     fprintf(stderr,
-                             _
-                             ("%s: option `%c%s' doesn't allow an argument\n"),
-                             argv[0], argv[optind - 1][0], pfound->name);
-	       }
-
-               nextchar += strlen(nextchar);
-
-               optopt = pfound->val;
-               return '?';
-            }
-         }
-         else if (pfound->has_arg == 1)
-         {
-            if (optind < argc)
-               optarg = argv[optind++];
-            else
-            {
-               if (opterr)
-                  fprintf(stderr, _("%s: option `%s' requires an argument\n"),
-                          argv[0], argv[optind - 1]);
-               nextchar += strlen(nextchar);
-               optopt = pfound->val;
-               return optstring[0] == ':' ? ':' : '?';
-            }
-         }
-         nextchar += strlen(nextchar);
-         if (longind != NULL)
-            *longind = option_index;
-         if (pfound->flag)
-         {
-            *(pfound->flag) = pfound->val;
-            return 0;
-         }
-         return pfound->val;
-      }
-
-      /* Can't find it as a long option.  If this is not getopt_long_only, or 
-         the option starts with '--' or is not a valid short option, then
-         it's an error. Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-          || my_index(optstring, *nextchar) == NULL)
-      {
-         if (opterr)
-         {
-            if (argv[optind][1] == '-')
-               /* --option */
-               fprintf(stderr, _("%s: unrecognized option `--%s'\n"), argv[0],
-                       nextchar);
-            else
-               /* +option or -option */
-               fprintf(stderr, _("%s: unrecognized option `%c%s'\n"), argv[0],
-                       argv[optind][0], nextchar);
-         }
-         nextchar = (char *) "";
-         optind++;
-         optopt = 0;
-         return '?';
-      }
-   }
-
-   /* Look at and handle the next short option-character.  */
-
-   {
-      char c = *nextchar++;
-      char *temp = my_index(optstring, c);
-
-      /* Increment `optind' when we start to process its last character.  */
-      if (*nextchar == '\0')
-         ++optind;
-
-      if (temp == NULL || c == ':')
-      {
-         if (opterr)
-         {
-            if (posixly_correct)
-               /* 1003.2 specifies the format of this message.  */
-               fprintf(stderr, _("%s: illegal option -- %c\n"), argv[0], c);
-            else
-               fprintf(stderr, _("%s: invalid option -- %c\n"), argv[0], c);
-         }
-         optopt = c;
-         return '?';
-      }
-      /* Convenience. Treat POSIX -W foo same as long option --foo */
-      if (temp[0] == 'W' && temp[1] == ';')
-      {
-         char *nameend;
-         const struct option *p;
-         const struct option *pfound = NULL;
-         int exact = 0;
-         int ambig = 0;
-         int indfound = 0;
-         int option_index;
-
-         /* This is an option that requires an argument.  */
-         if (*nextchar != '\0')
-         {
-            optarg = nextchar;
-            /* If we end this ARGV-element by taking the rest as an arg, we
-               must advance to the next element now.  */
-            optind++;
-         }
-         else if (optind == argc)
-         {
-            if (opterr)
-            {
-               /* 1003.2 specifies the format of this message.  */
-               fprintf(stderr, _("%s: option requires an argument -- %c\n"),
-                       argv[0], c);
-            }
-            optopt = c;
-            if (optstring[0] == ':')
-               c = ':';
-            else
-               c = '?';
-            return c;
-         }
-         else
-            /* We already incremented `optind' once; increment it again when
-               taking next ARGV-elt as argument.  */
-            optarg = argv[optind++];
-
-         /* optarg is now the argument, see if it's in the table of longopts. 
-          */
-
-         for (nextchar = nameend = optarg; *nameend && *nameend != '=';
-              nameend++)
-            /* Do nothing.  */ ;
-
-         /* Test all long options for either exact match or abbreviated
-            matches.  */
-         for (p = longopts, option_index = 0; p->name; p++, option_index++)
-            if (!strncmp(p->name, nextchar, nameend - nextchar))
-            {
-               if ((unsigned int) (nameend - nextchar) == strlen(p->name))
-               {
-                  /* Exact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-                  exact = 1;
-                  break;
-               }
-               else if (pfound == NULL)
-               {
-                  /* First nonexact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-               }
-               else
-                  /* Second or later nonexact match found.  */
-                  ambig = 1;
-            }
-         if (ambig && !exact)
-         {
-            if (opterr)
-               fprintf(stderr, _("%s: option `-W %s' is ambiguous\n"),
-                       argv[0], argv[optind]);
-            nextchar += strlen(nextchar);
-            optind++;
-            return '?';
-         }
-         if (pfound != NULL)
-         {
-            option_index = indfound;
-            if (*nameend)
-            {
-               /* Don't test has_arg with >, because some C compilers don't
-                  allow it to be used on enums.  */
-               if (pfound->has_arg)
-                  optarg = nameend + 1;
-               else
-               {
-                  if (opterr)
-                     fprintf(stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"), argv[0], pfound->name);
-
-                  nextchar += strlen(nextchar);
-                  return '?';
-               }
-            }
-            else if (pfound->has_arg == 1)
-            {
-               if (optind < argc)
-                  optarg = argv[optind++];
-               else
-               {
-                  if (opterr)
-                     fprintf(stderr,
-                             _("%s: option `%s' requires an argument\n"),
-                             argv[0], argv[optind - 1]);
-                  nextchar += strlen(nextchar);
-                  return optstring[0] == ':' ? ':' : '?';
-               }
-            }
-            nextchar += strlen(nextchar);
-            if (longind != NULL)
-               *longind = option_index;
-            if (pfound->flag)
-            {
-               *(pfound->flag) = pfound->val;
-               return 0;
-            }
-            return pfound->val;
-         }
-         nextchar = NULL;
-         return 'W';                        /* Let the application handle it. 
-                                             */
-      }
-      if (temp[1] == ':')
-      {
-         if (temp[2] == ':')
-         {
-            /* This is an option that accepts an argument optionally.  */
-            if (*nextchar != '\0')
-            {
-               optarg = nextchar;
-               optind++;
-            }
-            else
-               optarg = NULL;
-            nextchar = NULL;
-         }
-         else
-         {
-            /* This is an option that requires an argument.  */
-            if (*nextchar != '\0')
-            {
-               optarg = nextchar;
-               /* If we end this ARGV-element by taking the rest as an arg,
-                  we must advance to the next element now.  */
-               optind++;
-            }
-            else if (optind == argc)
-            {
-               if (opterr)
-               {
-                  /* 1003.2 specifies the format of this message.  */
-                  fprintf(stderr,
-                          _("%s: option requires an argument -- %c\n"),
-                          argv[0], c);
-               }
-               optopt = c;
-               if (optstring[0] == ':')
-                  c = ':';
-               else
-                  c = '?';
-            }
-            else
-               /* We already incremented `optind' once; increment it again
-                  when taking next ARGV-elt as argument.  */
-               optarg = argv[optind++];
-            nextchar = NULL;
-         }
-      }
-      return c;
-   }
-}
-
-int
-getopt(argc, argv, optstring)
-   int argc;
-   char *const *argv;
-   const char *optstring;
-{
-   return _getopt_internal(argc, argv, optstring, (const struct option *) 0,
-                           (int *) 0, 0);
-}
-
-#endif /* Not ELIDE_CODE.  */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main(argc, argv)
-   int argc;
-   char **argv;
-{
-   int c;
-   int digit_optind = 0;
-
-   while (1)
-   {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt(argc, argv, "abc:d:0123456789");
-      if (c == -1)
-         break;
-
-      switch (c)
-      {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-           if (digit_optind != 0 && digit_optind != this_option_optind)
-              printf("digits occur in two different argv-elements.\n");
-           digit_optind = this_option_optind;
-           printf("option %c\n", c);
-           break;
-
-        case 'a':
-           printf("option a\n");
-           break;
-
-        case 'b':
-           printf("option b\n");
-           break;
-
-        case 'c':
-           printf("option c with value `%s'\n", optarg);
-           break;
-
-        case '?':
-           break;
-
-        default:
-           printf("?? getopt returned character code 0%o ??\n", c);
-      }
-   }
-
-   if (optind < argc)
-   {
-      printf("non-option ARGV-elements: ");
-      while (optind < argc)
-         printf("%s ", argv[optind++]);
-      printf("\n");
-   }
-
-   exit(0);
-}
-
-#endif /* TEST */
diff --git a/src/getopt.h b/src/getopt.h
deleted file mode 100644
index 73ec1b7..0000000
--- a/src/getopt.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef	__cplusplus
-extern "C"
-{
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-   extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-   extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-   extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-   extern int optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-   struct option
-   {
-#if defined (__STDC__) && __STDC__
-      const char *name;
-#else
-      char *name;
-#endif
-      /* has_arg can't be an enum because some compilers complain about type
-         mismatches in all the code that assumes it is an int.  */
-      int has_arg;
-      int *flag;
-      int val;
-   };
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-   extern int getopt(int argc, char *const *argv, const char *shortopts);
-#else                           /* not __GNU_LIBRARY__ */
-#ifndef __cplusplus
-/* C++ is more pedantic, and demands a full prototype, not this.
-   Hope that stdlib.h has a prototype for `getopt'.  */
-   extern int getopt();
-#endif                          /* __cplusplus */
-#endif                          /* __GNU_LIBRARY__ */
-   extern int getopt_long(int argc, char *const *argv, const char *shortopts,
-                          const struct option *longopts, int *longind);
-   extern int getopt_long_only(int argc, char *const *argv,
-                               const char *shortopts,
-                               const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-   extern int _getopt_internal(int argc, char *const *argv,
-                               const char *shortopts,
-                               const struct option *longopts, int *longind,
-                               int long_only);
-#else                           /* not __STDC__ */
-   extern int getopt();
-   extern int getopt_long();
-   extern int getopt_long_only();
-
-   extern int _getopt_internal();
-#endif                          /* __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif                          /* getopt.h */
diff --git a/src/getopt1.c b/src/getopt1.c
deleted file mode 100644
index 24dd347..0000000
--- a/src/getopt1.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "getopt.h"
-
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef	NULL
-#define NULL 0
-#endif
-
-int
-getopt_long(argc, argv, options, long_options, opt_index)
-   int argc;
-   char *const *argv;
-   const char *options;
-   const struct option *long_options;
-   int *opt_index;
-{
-   return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
-   If an option that starts with '-' (not '--') doesn't match a long option,
-   but does match a short option, it is parsed as a short option
-   instead.  */
-
-int
-getopt_long_only(argc, argv, options, long_options, opt_index)
-   int argc;
-   char *const *argv;
-   const char *options;
-   const struct option *long_options;
-   int *opt_index;
-{
-   return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif /* Not ELIDE_CODE.  */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main(argc, argv)
-   int argc;
-   char **argv;
-{
-   int c;
-   int digit_optind = 0;
-
-   while (1)
-   {
-      int this_option_optind = optind ? optind : 1;
-      int option_index = 0;
-      static struct option long_options[] = {
-         {"add", 1, 0, 0},
-         {"append", 0, 0, 0},
-         {"delete", 1, 0, 0},
-         {"verbose", 0, 0, 0},
-         {"create", 0, 0, 0},
-         {"file", 1, 0, 0},
-         {0, 0, 0, 0}
-      };
-
-      c =
-         getopt_long(argc, argv, "abc:d:0123456789", long_options,
-                     &option_index);
-      if (c == -1)
-         break;
-
-      switch (c)
-      {
-        case 0:
-           printf("option %s", long_options[option_index].name);
-           if (optarg)
-              printf(" with arg %s", optarg);
-           printf("\n");
-           break;
-
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-           if (digit_optind != 0 && digit_optind != this_option_optind)
-              printf("digits occur in two different argv-elements.\n");
-           digit_optind = this_option_optind;
-           printf("option %c\n", c);
-           break;
-
-        case 'a':
-           printf("option a\n");
-           break;
-
-        case 'b':
-           printf("option b\n");
-           break;
-
-        case 'c':
-           printf("option c with value `%s'\n", optarg);
-           break;
-
-        case 'd':
-           printf("option d with value `%s'\n", optarg);
-           break;
-
-        case '?':
-           break;
-
-        default:
-           printf("?? getopt returned character code 0%o ??\n", c);
-      }
-   }
-
-   if (optind < argc)
-   {
-      printf("non-option ARGV-elements: ");
-      while (optind < argc)
-         printf("%s ", argv[optind++]);
-      printf("\n");
-   }
-
-   exit(0);
-}
-
-#endif /* TEST */
diff --git a/src/gib_hash.c b/src/gib_hash.c
new file mode 100644
index 0000000..9497d04
--- /dev/null
+++ b/src/gib_hash.c
@@ -0,0 +1,149 @@
+/* gib_hash.c
+
+Copyright (C) 1999,2000 Paul Duncan.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+#include <strings.h>
+
+#include "gib_hash.h"
+#include "utils.h"
+#include "debug.h"
+
+gib_hash_node *gib_hash_node_new(char *key, void *data)
+{
+	gib_hash_node *node = emalloc(sizeof(gib_hash_node));
+	node->key = strdup(key);
+	GIB_LIST(node)->data = data;
+	GIB_LIST(node)->next = NULL;
+	GIB_LIST(node)->prev = NULL;
+	return node;
+
+}
+
+void           gib_hash_node_free(gib_hash_node *node)
+{
+	free(node->key);
+	free(node);
+	return;
+}
+
+void           gib_hash_node_free_and_data(gib_hash_node *node)
+{
+	free(node->list.data);
+	gib_hash_node_free(node);
+	return;
+}
+
+gib_hash *gib_hash_new(void)
+{
+	gib_hash *hash = emalloc(sizeof(gib_hash));
+	hash->base = gib_hash_node_new("__gib_hash_new",NULL);
+	return hash;
+}
+
+void      gib_hash_free(gib_hash *hash)
+{
+	/* free hash keys as it's not taken care of by gib_list_free */
+	gib_list *i;
+	for (i = GIB_LIST(hash->base); i; i = i->next)
+		free(GIB_HASH_NODE(i)->key);
+
+	gib_list_free(GIB_LIST(hash->base));
+	free(hash);
+	return;
+}
+
+void      gib_hash_free_and_data(gib_hash *hash)
+{
+	/* free hash keys as it's not taken care of by gib_list_free */
+	gib_list *i;
+	for (i = GIB_LIST(hash->base); i; i = i->next)
+		free(GIB_HASH_NODE(i)->key);
+
+	gib_list_free_and_data(GIB_LIST(hash->base));
+	free(hash);
+	return;
+}
+
+static unsigned char gib_hash_find_callback(gib_list *list, void *data)
+{
+	gib_hash_node *node = GIB_HASH_NODE(list);
+	char          *key  = (char*) data;
+
+	/* strncasecmp causes similar keys like key1 and key11 clobber each other */
+	return !strcasecmp(node->key, key);
+}
+
+void      gib_hash_set(gib_hash *hash, char *key, void *data)
+{
+	gib_list *l;
+	gib_hash_node *n;
+
+	n = GIB_HASH_NODE(gib_list_find(GIB_LIST(hash->base),
+	                                gib_hash_find_callback,
+	                                key));
+	if (n)	{
+		GIB_LIST(n)->data = data;
+	} else {
+		/* not using gib_list_add_end here as that would nest the
+			 data one level, doing manual insert instead */
+		n = gib_hash_node_new(key,data);
+		l = gib_list_last(GIB_LIST(hash->base));
+
+		GIB_LIST(n)->next = NULL;
+		GIB_LIST(n)->prev = l;
+
+		if (l)
+			l->next = GIB_LIST(n);
+	}
+}
+
+void     *gib_hash_get(gib_hash *hash, char *key)
+{
+	gib_list *n = gib_list_find(GIB_LIST(hash->base),gib_hash_find_callback,key);
+	return n?n->data:NULL;
+}
+
+/* unused
+
+void      gib_hash_remove(gib_hash *hash, char *key)
+{
+	gib_list *n = gib_list_find(GIB_LIST(hash->base), gib_hash_find_callback, key);
+	if (n) {
+		gib_list_unlink(GIB_LIST(hash->base), n);
+    gib_hash_node_free(GIB_HASH_NODE(n->data));
+  }
+
+	return;
+}
+
+void      gib_hash_foreach(gib_hash *hash, void (*foreach_cb)(gib_hash_node *node, void *data), void *data)
+{
+	gib_hash_node *i, *next;
+	for (i=hash->base; i; i=next) {
+		next = GIB_HASH_NODE(GIB_LIST(i)->next);
+		foreach_cb(i,data);
+	}
+	return;
+}
+
+*/
diff --git a/src/gib_hash.h b/src/gib_hash.h
new file mode 100644
index 0000000..125e280
--- /dev/null
+++ b/src/gib_hash.h
@@ -0,0 +1,75 @@
+
+/* gib_hash.h
+
+Copyright (C) 1999,2000 Paul Duncan.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef GIB_HASH_H
+#define GIB_HASH_H
+
+#include "gib_list.h"
+
+#define GIB_HASH(a) ((gib_hash*)a)
+#define GIB_HASH_NODE(a) ((gib_hash_node*)a)
+
+typedef struct __gib_hash      gib_hash;
+typedef struct __gib_hash_node gib_hash_node;
+
+struct __gib_hash
+{
+	gib_hash_node *base;
+};
+
+struct __gib_hash_node
+{
+   gib_list  list;
+   char     *key;
+};
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+gib_hash_node *gib_hash_node_new(char *key, void *data);
+void           gib_hash_node_free(gib_hash_node *node);
+void           gib_hash_node_free_and_data(gib_hash_node *node);
+
+gib_hash *gib_hash_new(void);
+void      gib_hash_free(gib_hash *hash);
+void      gib_hash_free_and_data(gib_hash *hash);
+
+void      gib_hash_set(gib_hash *hash, char *key, void *data);
+void     *gib_hash_get(gib_hash *hash, char *key);
+
+/* unused
+void      gib_hash_remove(gib_hash *hash, char *key);
+
+void      gib_hash_foreach(gib_hash *hash, void (*foreach_cb)(gib_hash_node *node, void *data), void *data);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GIB_HASH_H */
diff --git a/src/gib_imlib.c b/src/gib_imlib.c
new file mode 100644
index 0000000..39d0081
--- /dev/null
+++ b/src/gib_imlib.c
@@ -0,0 +1,732 @@
+/* gib_imlib.c
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#include "gib_imlib.h"
+#include "utils.h"
+#include "debug.h"
+
+/*
+int
+gib_imlib_load_image(Imlib_Image * im, char *filename)
+{
+   Imlib_Load_Error err;
+
+   imlib_context_set_progress_function(NULL);
+   if (!filename)
+      return (0);
+   *im = imlib_load_image_with_error_return(filename, &err);
+   if ((err) || (!im))
+   {
+      switch (err)
+      {
+        case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
+           weprintf("%s - File does not exist", filename);
+           break;
+        case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
+           weprintf("%s - Directory specified for image filename", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
+           weprintf("%s - No read access to directory", filename);
+           break;
+        case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
+           weprintf("%s - No Imlib2 loader for that file format", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
+           weprintf("%s - Path specified is too long", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
+           weprintf("%s - Path component does not exist", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
+           weprintf("%s - Path component is not a directory", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
+           weprintf("%s - Path points outside address space", filename);
+           break;
+        case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
+           weprintf("%s - Too many levels of symbolic links", filename);
+           break;
+        case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
+           eprintf("While loading %s - Out of memory", filename);
+           break;
+        case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
+           eprintf("While loading %s - Out of file descriptors", filename);
+           break;
+        case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
+           weprintf("%s - Cannot write to directory", filename);
+           break;
+        case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
+           weprintf("%s - Cannot write - out of disk space", filename);
+           break;
+        case IMLIB_LOAD_ERROR_UNKNOWN:
+        default:
+           weprintf
+              ("While loading %s - Unknown error. Attempting to continue",
+               filename);
+           break;
+      }
+      return (0);
+   }
+   return (1);
+}
+*/
+
+int
+gib_imlib_image_get_width(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   return imlib_image_get_width();
+}
+
+int
+gib_imlib_image_get_height(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   return imlib_image_get_height();
+}
+
+int
+gib_imlib_image_has_alpha(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   return imlib_image_has_alpha();
+}
+
+void
+gib_imlib_free_image_and_decache(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   imlib_free_image_and_decache();
+}
+
+void
+gib_imlib_free_image(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   imlib_free_image();
+}
+
+const char *
+gib_imlib_image_get_filename(Imlib_Image im)
+{
+   if (im)
+   {
+      imlib_context_set_image(im);
+      return imlib_image_get_filename();
+   }
+   else
+      return NULL;
+}
+
+void
+gib_imlib_render_image_on_drawable(Drawable d, Imlib_Image im, int x, int y,
+                                   char dither, char blend, char alias)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_drawable(d);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(0);
+   imlib_render_image_on_drawable(x, y);
+}
+
+/*
+void
+gib_imlib_render_image_on_drawable_with_rotation(Drawable d, Imlib_Image im,
+                                                 int x, int y, double angle,
+                                                 char dither, char blend,
+                                                 char alias)
+{
+   Imlib_Image new_im;
+
+   imlib_context_set_image(im);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(angle);
+   imlib_context_set_drawable(d);
+   new_im = imlib_create_rotated_image(angle);
+   imlib_context_set_image(new_im);
+   imlib_render_image_on_drawable(x, y);
+   imlib_free_image();
+}
+*/
+
+void
+gib_imlib_render_image_on_drawable_at_size(Drawable d, Imlib_Image im, int x,
+                                           int y, int w, int h, char dither,
+                                           char blend, char alias)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_drawable(d);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(0);
+   imlib_render_image_on_drawable_at_size(x, y, w, h);
+}
+
+
+/*
+void
+gib_imlib_render_image_on_drawable_at_size_with_rotation(Drawable d,
+                                                         Imlib_Image im,
+                                                         int x, int y, int w,
+                                                         int h, double angle,
+                                                         char dither,
+                                                         char blend,
+                                                         char alias)
+{
+   Imlib_Image new_im;
+
+   imlib_context_set_image(im);
+   imlib_context_set_drawable(d);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(angle);
+   new_im = imlib_create_rotated_image(angle);
+   imlib_context_set_image(new_im);
+   imlib_render_image_on_drawable_at_size(x, y, w, h);
+   imlib_free_image_and_decache();
+}
+*/
+
+
+void
+gib_imlib_render_image_part_on_drawable_at_size(Drawable d, Imlib_Image im,
+                                                int sx, int sy, int sw,
+                                                int sh, int dx, int dy,
+                                                int dw, int dh, char dither,
+                                                char blend, char alias)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_drawable(d);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(0);
+   imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw,
+                                               dh);
+}
+
+
+void
+gib_imlib_render_image_part_on_drawable_at_size_with_rotation(Drawable d,
+                                                              Imlib_Image im,
+                                                              int sx, int sy,
+                                                              int sw, int sh,
+                                                              int dx, int dy,
+                                                              int dw, int dh,
+                                                              double angle,
+                                                              char dither,
+                                                              char blend,
+                                                              char alias)
+{
+   Imlib_Image new_im;
+
+   imlib_context_set_image(im);
+   imlib_context_set_drawable(d);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_angle(angle);
+   imlib_context_set_blend(blend);
+   new_im = imlib_create_rotated_image(angle);
+   imlib_context_set_image(new_im);
+   imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw,
+                                               dh);
+   imlib_free_image_and_decache();
+}
+
+
+void
+gib_imlib_image_fill_rectangle(Imlib_Image im, int x, int y, int w, int h,
+                               int r, int g, int b, int a)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_color(r, g, b, a);
+   imlib_image_fill_rectangle(x, y, w, h);
+}
+
+void
+gib_imlib_image_fill_polygon(Imlib_Image im, ImlibPolygon poly, int r, int g,
+                             int b, int a, unsigned char alias, int cx,
+                             int cy, int cw, int ch)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_color(r, g, b, a);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_cliprect(cx, cy, cw, ch);
+   imlib_image_fill_polygon(poly);
+   imlib_context_set_cliprect(0, 0, 0, 0);
+}
+
+void
+gib_imlib_image_draw_polygon(Imlib_Image im, ImlibPolygon poly, int r, int g,
+                             int b, int a, unsigned char closed,
+                             unsigned char alias, int cx, int cy, int cw,
+                             int ch)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_color(r, g, b, a);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_cliprect(cx, cy, cw, ch);
+   imlib_image_draw_polygon(poly, closed);
+   imlib_context_set_cliprect(0, 0, 0, 0);
+}
+
+
+void
+gib_imlib_image_draw_rectangle(Imlib_Image im, int x, int y, int w, int h,
+                               int r, int g, int b, int a)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_color(r, g, b, a);
+   imlib_image_draw_rectangle(x, y, w, h);
+}
+
+
+void
+gib_imlib_text_draw(Imlib_Image im, Imlib_Font fn, gib_style * s, int x,
+                    int y, char *text, Imlib_Text_Direction dir, int r, int g,
+                    int b, int a)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_font(fn);
+   imlib_context_set_direction(dir);
+   if (s)
+   {
+      int min_x = 0, min_y = 0;
+      gib_style_bit *bb;
+      gib_list *l;
+
+      /* here we shift the draw to accommodate bits with negative offsets,
+       * which would be drawn at negative coords otherwise */
+      l = s->bits;
+      while (l)
+      {
+         bb = (gib_style_bit *) l->data;
+         if (bb)
+         {
+            if (bb->x_offset < min_x)
+               min_x = bb->x_offset;
+            if (bb->y_offset < min_y)
+               min_y = bb->y_offset;
+         }
+         l = l->next;
+      }
+      x -= min_x;
+      y -= min_y;
+
+      /* Now draw the bits */
+      l = s->bits;
+      while (l)
+      {
+         bb = (gib_style_bit *) l->data;
+         if (bb)
+         {
+            if ((bb->r + bb->g + bb->b + bb->a) == 0)
+               imlib_context_set_color(r, g, b, a);
+            else
+               imlib_context_set_color(bb->r, bb->g, bb->b, bb->a);
+            imlib_text_draw(x + bb->x_offset, y + bb->y_offset, text);
+         }
+         l = l->next;
+      }
+   }
+   else
+   {
+      imlib_context_set_color(r, g, b, a);
+      imlib_text_draw(x, y, text);
+   }
+}
+
+char **
+gib_imlib_list_fonts(int *num)
+{
+   return imlib_list_fonts(num);
+}
+
+
+void
+gib_imlib_get_text_size(Imlib_Font fn, char *text, gib_style * s, int *w,
+                        int *h, Imlib_Text_Direction dir)
+{
+
+   imlib_context_set_font(fn);
+   imlib_context_set_direction(dir);
+   imlib_get_text_size(text, w, h);
+   if (s)
+   {
+      gib_style_bit *b;
+      int max_x_off = 0, min_x_off = 0, max_y_off = 0, min_y_off = 0;
+      gib_list *l;
+
+      l = s->bits;
+      while (l)
+      {
+         b = (gib_style_bit *) l->data;
+         if (b)
+         {
+            if (b->x_offset > max_x_off)
+               max_x_off = b->x_offset;
+            else if (b->x_offset < min_x_off)
+               min_x_off = b->x_offset;
+            if (b->y_offset > max_y_off)
+               max_y_off = b->y_offset;
+            else if (b->y_offset < min_y_off)
+               min_y_off = b->y_offset;
+         }
+         l = l->next;
+      }
+      if (h)
+      {
+         *h += max_y_off;
+         *h -= min_y_off;
+      }
+      if (w)
+      {
+         *w += max_x_off;
+         *w -= min_x_off;
+      }
+   }
+}
+
+Imlib_Image gib_imlib_clone_image(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   return imlib_clone_image();
+}
+
+char *
+gib_imlib_image_format(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   return imlib_image_format();
+}
+
+
+void
+gib_imlib_blend_image_onto_image(Imlib_Image dest_image,
+                                 Imlib_Image source_image, char merge_alpha,
+                                 int sx, int sy, int sw, int sh, int dx,
+                                 int dy, int dw, int dh, char dither,
+                                 char blend, char alias)
+{
+   imlib_context_set_image(dest_image);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(0);
+   imlib_blend_image_onto_image(source_image, merge_alpha, sx, sy, sw, sh, dx,
+                                dy, dw, dh);
+}
+
+
+/*
+void
+gib_imlib_blend_image_onto_image_with_rotation(Imlib_Image dest_image,
+                                               Imlib_Image source_image,
+                                               char merge_alpha, int sx,
+                                               int sy, int sw, int sh, int dx,
+                                               int dy, int dw, int dh,
+                                               double angle, char dither,
+                                               char blend, char alias)
+{
+   imlib_context_set_image(dest_image);
+   imlib_context_set_anti_alias(alias);
+   imlib_context_set_dither(dither);
+   imlib_context_set_blend(blend);
+   imlib_context_set_angle(angle);
+   imlib_blend_image_onto_image_at_angle(source_image, merge_alpha, sx, sy,
+                                         sw, sh, dx, dy, (int) angle,
+                                         (int) angle);
+   return;
+   dw = 0;
+   dh = 0;
+}
+*/
+
+Imlib_Image gib_imlib_create_cropped_scaled_image(Imlib_Image im, int sx,
+                                                  int sy, int sw, int sh,
+                                                  int dw, int dh, char alias)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_anti_alias(alias);
+   return imlib_create_cropped_scaled_image(sx, sy, sw, sh, dw, dh);
+}
+
+void
+gib_imlib_apply_color_modifier_to_rectangle(Imlib_Image im, int x, int y,
+                                            int w, int h, DATA8 * rtab,
+                                            DATA8 * gtab, DATA8 * btab,
+                                            DATA8 * atab)
+{
+   Imlib_Color_Modifier cm;
+
+   imlib_context_set_image(im);
+   cm = imlib_create_color_modifier();
+   imlib_context_set_color_modifier(cm);
+   imlib_set_color_modifier_tables(rtab, gtab, btab, atab);
+   imlib_apply_color_modifier_to_rectangle(x, y, w, h);
+   imlib_free_color_modifier();
+}
+
+void
+gib_imlib_image_set_has_alpha(Imlib_Image im, int alpha)
+{
+   imlib_context_set_image(im);
+   imlib_image_set_has_alpha(alpha);
+}
+
+void
+gib_imlib_save_image(Imlib_Image im, char *file)
+{
+   char *tmp;
+
+   imlib_context_set_image(im);
+   tmp = strrchr(file, '.');
+   if (tmp)
+   {
+     char *p, *pp;
+     p = strdup(tmp + 1);
+     pp = p;
+     while(*pp) {
+       *pp = tolower(*pp);
+       pp++;
+     }
+     imlib_image_set_format(p);
+     free(p);
+   }
+   imlib_save_image(file);
+}
+
+void
+gib_imlib_save_image_with_error_return(Imlib_Image im, char *file,
+                                       Imlib_Load_Error * error_return)
+{
+    char *tmp;
+
+    imlib_context_set_image(im);
+    tmp = strrchr(file, '.');
+    if (tmp) {
+        char *p, *pp;
+        p = estrdup(tmp + 1);
+        pp = p;
+        while(*pp) {
+            *pp = tolower(*pp);
+            pp++;
+        }
+        imlib_image_set_format(p);
+        free(p);
+    }
+    imlib_save_image_with_error_return(file, error_return);
+}
+
+void
+gib_imlib_free_font(Imlib_Font fn)
+{
+   imlib_context_set_font(fn);
+   imlib_free_font();
+}
+
+void
+gib_imlib_image_draw_line(Imlib_Image im, int x1, int y1, int x2, int y2,
+                          char make_updates, int r, int g, int b, int a)
+{
+   imlib_context_set_image(im);
+   imlib_context_set_color(r, g, b, a);
+   imlib_image_draw_line(x1, y1, x2, y2, make_updates);
+}
+
+Imlib_Image gib_imlib_create_rotated_image(Imlib_Image im, double angle)
+{
+   imlib_context_set_image(im);
+   return (imlib_create_rotated_image(angle));
+}
+
+void
+gib_imlib_image_tile(Imlib_Image im)
+{
+   imlib_context_set_image(im);
+   imlib_image_tile();
+}
+
+void
+gib_imlib_image_blur(Imlib_Image im, int radius)
+{
+   imlib_context_set_image(im);
+   imlib_image_blur(radius);
+}
+
+void
+gib_imlib_image_sharpen(Imlib_Image im, int radius)
+{
+   imlib_context_set_image(im);
+   imlib_image_sharpen(radius);
+}
+
+void
+gib_imlib_line_clip_and_draw(Imlib_Image dest, int x0, int y0, int x1, int y1,
+                             int cx, int cy, int cw, int ch, int r, int g,
+                             int b, int a)
+{
+   imlib_context_set_cliprect(cx, cy, cw, ch);
+   gib_imlib_image_draw_line(dest, x0, y0, x1, y1, 0, r, g, b, a);
+   imlib_context_set_cliprect(0, 0, 0, 0);
+}
+
+Imlib_Image
+gib_imlib_create_image_from_drawable(Drawable d, Pixmap mask, int x, int y,
+                                     int width, int height,
+                                     char need_to_grab_x)
+{
+   imlib_context_set_drawable(d);
+   return imlib_create_image_from_drawable(mask, x, y, width, height,
+                                           need_to_grab_x);
+}
+
+void gib_imlib_parse_color(char *col, int *r, int *g, int *b, int *a)
+   {
+   gib_list *ll;
+   unsigned long cc, rr, gg, bb, aa;
+   int len;
+
+   if (col[0] == '#')
+   {
+      /* #RRGGBBAA style */
+      /* skip the '#' */
+      col++;
+      len = strlen(col);
+      if (len == 8)
+      {
+         cc = (unsigned long) strtoul(col, NULL, 16);
+         rr = (cc & 0xff000000) >> 24;
+         gg = (cc & 0x00ff0000) >> 16;
+         bb = (cc & 0x0000ff00) >> 8;
+         aa = (cc & 0x000000ff);
+      }
+      else if (len == 6)
+      {
+         cc = (unsigned long) strtoul(col, NULL, 16);
+         rr = (cc & 0xff0000) >> 16;
+         gg = (cc & 0x00ff00) >> 8;
+         bb = (cc & 0x0000ff);
+         aa = 255;
+      }
+      else
+      {
+         weprintf("unable to parse color %s\n", col);
+         return;
+      }
+   }
+   else
+   {
+      /* r,g,b,a style */
+      ll = gib_string_split(col, ",");
+      if (!ll)
+      {
+         weprintf("unable to parse color %s\n", col);
+         return;
+      }
+      len = gib_list_length(ll);
+      if (len == 3)
+      {
+         rr = atoi(ll->data);
+         gg = atoi(ll->next->data);
+         bb = atoi(ll->next->next->data);
+         aa = 255;
+      }
+      else if (len == 4)
+      {
+         rr = atoi(ll->data);
+         gg = atoi(ll->next->data);
+         bb = atoi(ll->next->next->data);
+         aa = atoi(ll->next->next->next->data);
+      }
+      else
+      {
+         weprintf("unable to parse color %s\n", col);
+         return;
+      }
+   }
+   *r = rr;
+   *g = gg;
+   *b = bb;
+   *a = aa;
+   }
+
+void
+gib_imlib_parse_fontpath(char *path)
+{
+   gib_list *l, *ll;
+
+   if (!path)
+      return;
+
+   l = gib_string_split(path, ":");
+   if (!l)
+      return;
+   ll = l;
+   while (ll)
+   {
+      imlib_add_path_to_font_path((char *) ll->data);
+      ll = ll->next;
+   }
+   gib_list_free_and_data(l);
+}
+
+Imlib_Font
+gib_imlib_load_font(char *name)
+{
+   Imlib_Font fn;
+
+   if ((fn = imlib_load_font(name)))
+      return fn;
+   weprintf("couldn't load font %s, attempting to fall back to fixed.", name);
+   if ((fn = imlib_load_font("fixed")))
+      return fn;
+   weprintf("failed to even load fixed! Attempting to find any font.");
+   return imlib_load_font("*");
+}
+
+void gib_imlib_image_orientate(Imlib_Image im, int orientation)
+{
+  imlib_context_set_image(im);
+  imlib_image_orientate(orientation);
+}
+
+void gib_imlib_image_flip_horizontal(Imlib_Image im)
+{
+  imlib_context_set_image(im);
+  imlib_image_flip_horizontal();
+}
+
+void gib_imlib_image_flip_vertical(Imlib_Image im)
+{
+  imlib_context_set_image(im);
+  imlib_image_flip_vertical();
+}
diff --git a/src/gib_imlib.h b/src/gib_imlib.h
new file mode 100644
index 0000000..6a35e7e
--- /dev/null
+++ b/src/gib_imlib.h
@@ -0,0 +1,194 @@
+/* gib_imlib.h
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef GIB_IMLIB_H
+#define GIB_IMLIB_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <Imlib2.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include "gib_style.h"
+
+#define GIBCLIP(x, y, w, h, xx, yy, ww, hh) \
+{ \
+   if ((yy) > y) { h -= (yy) - y; y = (yy); } \
+   if ((yy) + hh < y + h) { h -= y + h - ((yy) + (hh)); } \
+   if ((xx) > x) { w -= (xx) - x; x = (xx); } \
+   if ((xx) + (ww) < x + w) { w -= x + w - ((xx) + (ww)); } \
+}
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*
+int gib_imlib_load_image(Imlib_Image * im, char *filename);
+*/
+int gib_imlib_image_get_width(Imlib_Image im);
+int gib_imlib_image_get_height(Imlib_Image im);
+int gib_imlib_image_has_alpha(Imlib_Image im);
+const char *gib_imlib_image_get_filename(Imlib_Image im);
+void gib_imlib_free_image_and_decache(Imlib_Image im);
+void gib_imlib_render_image_on_drawable(Drawable d, Imlib_Image im, int x,
+                                        int y, char dither, char blend,
+
+                                        char alias);
+/*
+void gib_imlib_render_image_on_drawable_with_rotation(Drawable d,
+                                                      Imlib_Image im, int x,
+                                                      int y, double angle,
+
+                                                      char dither, char blend,
+                                                      char alias);
+*/
+void gib_imlib_render_image_part_on_drawable_at_size(Drawable d,
+                                                     Imlib_Image im, int sx,
+                                                     int sy, int sw, int sh,
+                                                     int dx, int dy, int dw,
+                                                     int dh, char dither,
+
+                                                     char blend, char alias);
+
+void gib_imlib_render_image_part_on_drawable_at_size_with_rotation(Drawable d,
+                                                                   Imlib_Image
+
+                                                                   im, int sx,
+                                                                   int sy,
+                                                                   int sw,
+                                                                   int sh,
+                                                                   int dx,
+                                                                   int dy,
+                                                                   int dw,
+                                                                   int dh,
+                                                                   double
+                                                                   angle,
+                                                                   char
+                                                                   dither,
+                                                                   char blend,
+                                                                   char
+                                                                   alias);
+
+void gib_imlib_image_fill_rectangle(Imlib_Image im, int x, int y, int w,
+                                    int h, int r, int g, int b, int a);
+void gib_imlib_text_draw(Imlib_Image im, Imlib_Font fn, gib_style * s, int x,
+                         int y, char *text, Imlib_Text_Direction dir, int r,
+                         int g, int b, int a);
+void gib_imlib_get_text_size(Imlib_Font fn, char *text, gib_style * s, int *w,
+                             int *h, Imlib_Text_Direction dir);
+Imlib_Image gib_imlib_clone_image(Imlib_Image im);
+char *gib_imlib_image_format(Imlib_Image im);
+char **gib_imlib_list_fonts(int *num);
+void gib_imlib_render_image_on_drawable_at_size(Drawable d, Imlib_Image im,
+                                                int x, int y, int w, int h,
+                                                char dither, char blend,
+
+                                                char alias);
+/*
+void gib_imlib_render_image_on_drawable_at_size_with_rotation(Drawable d,
+                                                              Imlib_Image im,
+                                                              int x, int y,
+
+                                                              int w, int h,
+                                                              double angle,
+                                                              char dither,
+                                                              char blend,
+                                                              char alias);
+*/
+
+void gib_imlib_blend_image_onto_image(Imlib_Image dest_image,
+                                      Imlib_Image source_image,
+                                      char merge_alpha, int sx, int sy,
+                                      int sw, int sh, int dx, int dy, int dw,
+                                      int dh, char dither, char blend,
+
+                                      char alias);
+
+/*
+void gib_imlib_blend_image_onto_image_with_rotation(Imlib_Image dest_image,
+                                                    Imlib_Image source_image,
+                                                    char merge_alpha, int sx,
+                                                    int sy, int sw, int sh,
+                                                    int dx, int dy, int dw,
+                                                    int dh, double angle,
+
+                                                    char dither, char blend,
+                                                    char alias);
+*/
+Imlib_Image gib_imlib_create_cropped_scaled_image(Imlib_Image im, int sx,
+                                                  int sy, int sw, int sh,
+                                                  int dw, int dh, char alias);
+void gib_imlib_apply_color_modifier_to_rectangle(Imlib_Image im, int x, int y,
+                                                 int w, int h, DATA8 * rtab,
+                                                 DATA8 * gtab, DATA8 * btab,
+                                                 DATA8 * atab);
+void gib_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
+void gib_imlib_save_image(Imlib_Image im, char *file);
+void gib_imlib_save_image_with_error_return(Imlib_Image im, char *file,
+                                            Imlib_Load_Error * error_return);
+void gib_imlib_free_font(Imlib_Font fn);
+void gib_imlib_free_image(Imlib_Image im);
+void gib_imlib_image_draw_line(Imlib_Image im, int x1, int y1, int x2, int y2,
+                               char make_updates, int r, int g, int b, int a);
+void gib_imlib_image_set_has_alpha(Imlib_Image im, int alpha);
+void gib_imlib_free_font(Imlib_Font fn);
+Imlib_Image gib_imlib_create_rotated_image(Imlib_Image im, double angle);
+void gib_imlib_image_tile(Imlib_Image im);
+void gib_imlib_image_blur(Imlib_Image im, int radius);
+void gib_imlib_image_sharpen(Imlib_Image im, int radius);
+void gib_imlib_image_draw_rectangle(Imlib_Image im, int x, int y, int w,
+                                    int h, int r, int g, int b, int a);
+void gib_imlib_line_clip_and_draw(Imlib_Image dest, int x0, int y0, int x1,
+                                  int y1, int cx, int cy, int cw, int ch,
+                                  int r, int g, int b, int a);
+void gib_imlib_image_fill_polygon(Imlib_Image im, ImlibPolygon poly, int r,
+                                  int g, int b, int a, unsigned char alias,
+                                  int cx, int cy, int cw, int ch);
+void gib_imlib_image_draw_polygon(Imlib_Image im, ImlibPolygon poly, int r,
+                                  int g, int b, int a, unsigned char closed,
+                                  unsigned char alias, int cx, int cy, int cw,
+
+                                  int ch);
+Imlib_Image gib_imlib_create_image_from_drawable(Drawable d, Pixmap mask,
+                                                 int x, int y, int width,
+
+                                                 int height,
+                                                 char need_to_grab_x);
+void gib_imlib_parse_color(char *col, int *r, int *g, int *b, int *a);
+void gib_imlib_parse_fontpath(char *path);
+Imlib_Font gib_imlib_load_font(char *name);
+void gib_imlib_image_orientate(Imlib_Image im, int orientation);
+void gib_imlib_image_flip_horizontal(Imlib_Image im);
+void gib_imlib_image_flip_vertical(Imlib_Image im);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/src/gib_list.c b/src/gib_list.c
new file mode 100644
index 0000000..e7710bc
--- /dev/null
+++ b/src/gib_list.c
@@ -0,0 +1,579 @@
+/* gib_list.c
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#include <time.h>
+#include "gib_list.h"
+#include "utils.h"
+#include "debug.h"
+
+gib_list *
+gib_list_new(void)
+{
+   gib_list *l;
+
+   l = (gib_list *) emalloc(sizeof(gib_list));
+   l->data = NULL;
+   l->next = NULL;
+   l->prev = NULL;
+   return (l);
+}
+
+void
+gib_list_free(gib_list * l)
+{
+   gib_list *ll;
+
+   if (!l)
+      return;
+
+   while (l)
+   {
+      ll = l;
+      l = l->next;
+      free(ll);
+   }
+
+   return;
+}
+
+void
+gib_list_free_and_data(gib_list * l)
+{
+   gib_list *ll;
+
+   if (!l)
+      return;
+
+   while (l)
+   {
+      ll = l;
+      l = l->next;
+      free(ll->data);
+      free(ll);
+   }
+   return;
+}
+
+#if 0
+gib_list *
+gib_list_dup(gib_list * list)
+{
+   gib_list *ret = NULL;
+
+   if (list)
+   {
+      gib_list *last;
+
+      ret = gib_list_new();
+      ret->data = list->data;
+      last = ret;
+      list = list->next;
+      while (list)
+      {
+         last->next = gib_list_new();
+         last->next->prev = last;
+         last = last->next;
+         last->data = list->data;
+         list = list->next;
+      }
+   }
+   return (ret);
+}
+
+gib_list *
+gib_list_dup_special(gib_list * list,
+                     void (*cpy_func) (void **dest, void *data))
+{
+   gib_list *ret = NULL;
+
+   if (list)
+   {
+      gib_list *last;
+
+      ret = gib_list_new();
+      cpy_func(&(ret->data), list->data);
+      last = ret;
+      list = list->next;
+      while (list)
+      {
+         last->next = gib_list_new();
+         last->next->prev = last;
+         last = last->next;
+         cpy_func(&(last->data), list->data);
+         list = list->next;
+      }
+   }
+   return (ret);
+}
+#endif
+
+gib_list *
+gib_list_add_front(gib_list * root, void *data)
+{
+   gib_list *l;
+
+   l = gib_list_new();
+   l->next = root;
+   l->data = data;
+   if (root)
+      root->prev = l;
+   return (l);
+}
+
+gib_list *
+gib_list_add_end(gib_list * root, void *data)
+{
+   gib_list *l, *last;
+
+   last = gib_list_last(root);
+   l = gib_list_new();
+   l->prev = last;
+   l->data = data;
+   if (last)
+   {
+      last->next = l;
+      return (root);
+   }
+   else
+   {
+      return (l);
+   }
+}
+
+#if 0
+gib_list *
+gib_list_add_at_pos(gib_list * root, int pos, void *data)
+{
+   gib_list *l, *top;
+
+   if (pos == gib_list_length(root))
+      root = gib_list_add_end(root, data);
+   else if (pos == 0)
+      root = gib_list_add_front(root, data);
+   else
+   {
+      top = gib_list_nth(root, pos);
+
+      if (!top)
+         return (root);
+
+      l = gib_list_new();
+      l->next = top;
+      l->prev = top->prev;
+      l->data = data;
+      if (top->prev)
+         top->prev->next = l;
+
+      top->prev = l;
+   }
+   return (root);
+}
+
+gib_list *
+gib_list_move_up_by_one(gib_list * root, gib_list * l)
+{
+   if (l || l->prev)
+      root = gib_list_move_down_by_one(root, l->prev);
+   return (root);
+}
+
+gib_list *
+gib_list_move_down_by_one(gib_list * root, gib_list * l)
+{
+   gib_list *temp;
+
+   if (!l || !l->next)
+      return (root);
+
+   /* store item we link next to */
+   temp = l->next;
+   /* remove from list */
+   root = gib_list_unlink(root, l);
+   /* add back one before */
+   l->next = temp->next;
+   l->prev = temp;
+   if (temp->next)
+      temp->next->prev = l;
+   temp->next = l;
+
+   return (root);
+}
+#endif
+
+
+unsigned char
+gib_list_has_more_than_one_item(gib_list * root)
+{
+   if (root->next)
+      return (1);
+   else
+      return (0);
+}
+
+#if 0
+gib_list *
+gib_list_pop_to_end(gib_list * root, gib_list * l)
+{
+   root = gib_list_unlink(root, l);
+   root = gib_list_add_end(root, l->data);
+   free(l);
+
+   return (root);
+}
+#endif
+
+gib_list *
+gib_list_cat(gib_list * root, gib_list * l)
+{
+   gib_list *last;
+
+   if (!l)
+      return (root);
+   if (!root)
+      return (l);
+   last = gib_list_last(root);
+   last->next = l;
+   l->prev = last;
+   return (root);
+}
+
+int
+gib_list_length(gib_list * l)
+{
+   int length;
+
+   length = 0;
+   while (l)
+   {
+      length++;
+      l = l->next;
+   }
+   return (length);
+}
+
+gib_list *
+gib_list_last(gib_list * l)
+{
+   if (l)
+   {
+      while (l->next)
+         l = l->next;
+   }
+   return (l);
+}
+
+gib_list *
+gib_list_first(gib_list * l)
+{
+   if (l)
+   {
+      while (l->prev)
+         l = l->prev;
+   }
+   return (l);
+}
+
+gib_list *
+gib_list_jump(gib_list * root, gib_list * l, int direction, int num)
+{
+   int i;
+   gib_list *ret = NULL;
+
+   if (!root)
+      return (NULL);
+   if (!l)
+      return (root);
+
+   ret = l;
+
+   for (i = 0; i < num; i++)
+   {
+      if (direction == FORWARD)
+      {
+         if (ret->next)
+            ret = ret->next;
+         else
+            ret = root;
+      }
+      else
+      {
+         if (ret->prev)
+            ret = ret->prev;
+         else
+            ret = gib_list_last(ret);
+      }
+   }
+   return (ret);
+}
+
+gib_list *
+gib_list_reverse(gib_list * l)
+{
+   gib_list *last;
+
+   last = NULL;
+   while (l)
+   {
+      last = l;
+      l = last->next;
+      last->next = last->prev;
+      last->prev = l;
+   }
+   return (last);
+}
+
+gib_list *
+gib_list_randomize(gib_list * list)
+{
+   int len, r, i;
+   gib_list **farray, *f, *t;
+
+   if (!list)
+      return (NULL);
+   len = gib_list_length(list);
+   if (len <= 1)
+      return (list);
+   farray = (gib_list **) emalloc(sizeof(gib_list *) * len);
+   for (f = list, i = 0; f; f = f->next, i++)
+   {
+      farray[i] = f;
+   }
+   for (i = 0; i < len - 1; i++)
+   {
+      r = i + random() / (RAND_MAX / (len - i) + 1 );
+      t = farray[r];
+      farray[r] = farray[i];
+      farray[i] = t;
+   }
+   list = farray[0];
+   list->prev = NULL;
+   list->next = farray[1];
+   for (i = 1, f = farray[1]; i < len - 1; i++, f = f->next)
+   {
+      f->prev = farray[i - 1];
+      f->next = farray[i + 1];
+   }
+   f->prev = farray[len - 2];
+   f->next = NULL;
+   free(farray);
+   return (list);
+}
+
+int
+gib_list_num(gib_list * root, gib_list * l)
+{
+   int i = 0;
+
+   while (root)
+   {
+      if (root == l)
+         return (i);
+      i++;
+      root = root->next;
+   }
+   return (-1);
+}
+
+gib_list *
+gib_list_unlink(gib_list * root, gib_list * l)
+{
+   if (!l)
+      return (root);
+
+   if ((!root) || ((l == root) && (!l->next)))
+      return (NULL);
+
+   if (l->prev)
+      l->prev->next = l->next;
+   if (l->next)
+      l->next->prev = l->prev;
+   if (root == l)
+      root = root->next;
+   return (root);
+}
+
+
+gib_list *
+gib_list_remove(gib_list * root, gib_list * l)
+{
+   root = gib_list_unlink(root, l);
+   free(l);
+   return (root);
+}
+
+gib_list *
+gib_list_sort(gib_list * list, gib_compare_fn cmp)
+{
+   gib_list *l1, *l2;
+
+   if (!list)
+      return (NULL);
+   if (!list->next)
+      return (list);
+
+   l1 = list;
+   l2 = list->next;
+
+   while ((l2 = l2->next) != NULL)
+   {
+      if ((l2 = l2->next) == NULL)
+         break;
+      l1 = l1->next;
+   }
+   l2 = l1->next;
+   l1->next = NULL;
+
+   return (gib_list_sort_merge
+           (gib_list_sort(list, cmp), gib_list_sort(l2, cmp), cmp));
+}
+
+gib_list *
+gib_list_sort_merge(gib_list * l1, gib_list * l2, gib_compare_fn cmp)
+{
+   gib_list list, *l, *lprev;
+
+   l = &list;
+   lprev = NULL;
+
+   while (l1 && l2)
+   {
+      if (cmp(l1->data, l2->data) < 0)
+      {
+         l->next = l1;
+         l = l->next;
+         l->prev = lprev;
+         lprev = l;
+         l1 = l1->next;
+      }
+      else
+      {
+         l->next = l2;
+         l = l->next;
+         l->prev = lprev;
+         lprev = l;
+         l2 = l2->next;
+      }
+   }
+   l->next = l1 ? l1 : l2;
+   l->next->prev = l;
+
+   return (list.next);
+}
+
+#if 0
+gib_list *
+gib_list_nth(gib_list * root, unsigned int num)
+{
+   unsigned int i;
+   gib_list *l;
+
+   if (num > (unsigned int) gib_list_length(root))
+      return (gib_list_last(root));
+   l = root;
+   for (i = 0; l; ++i)
+   {
+      if (i == num)
+         return (l);
+      l = l->next;
+   }
+   return (root);
+}
+#endif
+
+gib_list *
+gib_list_foreach(gib_list *root, void (*fe_func)(gib_list *node, void *data), void *data)
+{
+	gib_list *i, *next = NULL;
+	for (i=root; i; i=next) {
+		next=i->next;
+		fe_func(i, data);
+	}
+	return root;
+}
+
+gib_list *
+gib_list_find(gib_list *root, unsigned char (*find_func)(gib_list *node, void *data), void *data)
+{
+	gib_list *i = NULL;
+	for (i=root; i; i=i->next)
+		if (find_func(i,data))
+			return i;
+
+	return NULL;
+}
+
+static unsigned char gib_list_find_by_data_callback(gib_list *list, void *data)
+{
+	return (list->data==data);
+}
+
+gib_list *
+gib_list_find_by_data(gib_list *root, void *data)
+{
+	return gib_list_find(root, gib_list_find_by_data_callback, data);
+}
+
+gib_list *
+gib_string_split(const char *string, const char *delimiter)
+{
+   gib_list *string_list = NULL;
+   char *s;
+   unsigned int n = 1;
+
+   if (!string || !delimiter)
+      return NULL;
+
+   s = strstr(string, delimiter);
+   if (s)
+   {
+      unsigned int delimiter_len = strlen(delimiter);
+
+      do
+      {
+         unsigned int len;
+         char *new_string;
+
+         len = s - string;
+         new_string = emalloc(sizeof(char) * (len + 1));
+
+         strncpy(new_string, string, len);
+         new_string[len] = 0;
+         string_list = gib_list_add_front(string_list, new_string);
+         n++;
+         string = s + delimiter_len;
+         s = strstr(string, delimiter);
+      }
+      while (s);
+   }
+   if (*string)
+   {
+      n++;
+      string_list = gib_list_add_front(string_list, strdup((char *)string));
+   }
+
+   string_list = gib_list_reverse(string_list);
+
+   return string_list;
+}
diff --git a/src/gib_list.h b/src/gib_list.h
new file mode 100644
index 0000000..94c4c39
--- /dev/null
+++ b/src/gib_list.h
@@ -0,0 +1,105 @@
+/* gib_list.h
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef GIB_LIST_H
+#define GIB_LIST_H
+
+#include <stdarg.h>
+
+#define GIB_LIST(a) ((gib_list*)a)
+
+enum __direction
+{ FORWARD, BACK };
+
+typedef struct __gib_list gib_list;
+
+struct __gib_list
+{
+   void *data;
+
+   gib_list *next;
+   gib_list *prev;
+};
+
+typedef int (gib_compare_fn) (void *data1, void *data2);
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+gib_list *gib_list_new(void);
+void gib_list_free(gib_list * l);
+gib_list *gib_list_add_front(gib_list * root, void *data);
+gib_list *gib_list_add_end(gib_list * root, void *data);
+/*
+gib_list *gib_list_add_at_pos(gib_list * root, int pos, void *data);
+gib_list *gib_list_pop_to_end(gib_list * root, gib_list * l);
+*/
+gib_list *gib_list_unlink(gib_list * root, gib_list * l);
+gib_list *gib_list_cat(gib_list * root, gib_list * l);
+int gib_list_length(gib_list * l);
+gib_list *gib_list_last(gib_list * l);
+gib_list *gib_list_first(gib_list * l);
+gib_list *gib_list_jump(gib_list * root, gib_list * l, int direction,
+
+                        int num);
+gib_list *gib_list_reverse(gib_list * l);
+gib_list *gib_list_randomize(gib_list * list);
+int gib_list_num(gib_list * root, gib_list * l);
+gib_list *gib_list_remove(gib_list * root, gib_list * l);
+gib_list *gib_list_sort(gib_list * list, gib_compare_fn cmp);
+gib_list *gib_list_sort_merge(gib_list * l1, gib_list * l2,
+
+                              gib_compare_fn cmp);
+/*
+gib_list *gib_list_nth(gib_list * root, unsigned int num);
+*/
+unsigned char gib_list_has_more_than_one_item(gib_list * root);
+void gib_list_free_and_data(gib_list * l);
+/*
+gib_list *gib_list_dup(gib_list * list);
+gib_list *gib_list_dup_special(gib_list * list,
+                               void (*cpy_func) (void **dest, void *data));
+gib_list *gib_list_move_down_by_one(gib_list * root, gib_list * l);
+gib_list *gib_list_move_up_by_one(gib_list * root, gib_list * l);
+*/
+
+gib_list *gib_list_foreach(gib_list *root, void (*fe_func)(gib_list *node, void *data), void *data);
+gib_list *gib_list_find(gib_list *root, unsigned char (*find_func)(gib_list *node, void *data), void *data);
+gib_list *gib_list_find_by_data(gib_list *root, void *data);
+
+/* don't really belong here, will do for now */
+gib_list *gib_string_split(const char *string, const char *delimiter);
+/*
+char *gib_strjoin(const char *separator, ...);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/src/gib_style.c b/src/gib_style.c
new file mode 100644
index 0000000..9280217
--- /dev/null
+++ b/src/gib_style.c
@@ -0,0 +1,114 @@
+/* gib_style.c
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#include "gib_style.h"
+#include "utils.h"
+#include "debug.h"
+
+gib_style *
+gib_style_new(char *name)
+{
+   gib_style *s = NULL;
+
+   s = emalloc(sizeof(gib_style));
+
+   memset(s, 0, sizeof(gib_style));
+   if (name)
+      s->name = strdup(name);
+
+   return (s);
+}
+
+void
+gib_style_free(gib_style * s)
+{
+   if (s)
+   {
+      if (s->name)
+         free(s->name);
+      if (s->bits)
+      {
+         gib_list *l;
+
+         l = s->bits;
+         while (l)
+         {
+            gib_style_bit_free((gib_style_bit *) l->data);
+            l = l->next;
+         }
+         gib_list_free(s->bits);
+      }
+      free(s);
+   }
+   return;
+}
+
+gib_style_bit *
+gib_style_bit_new(int x_offset, int y_offset, int r, int g, int b, int a)
+{
+   gib_style_bit *sb;
+
+   sb = emalloc(sizeof(gib_style_bit));
+   memset(sb, 0, sizeof(gib_style_bit));
+
+   sb->x_offset = x_offset;
+   sb->y_offset = y_offset;
+   sb->r = r;
+   sb->g = g;
+   sb->b = b;
+   sb->a = a;
+
+   return (sb);
+}
+
+void
+gib_style_bit_free(gib_style_bit * s)
+{
+   if (s)
+      free(s);
+   return;
+}
+
+#if 0
+gib_style *
+gib_style_dup(gib_style * s)
+{
+   gib_style *ret;
+
+   ret = gib_style_new(s->name);
+   ret->bits = gib_list_dup_special(s->bits, gib_dup_style_bit);
+
+   return (ret);
+}
+
+void
+gib_dup_style_bit(void **dest, void *data)
+{
+   *dest = malloc(sizeof(gib_style_bit));
+   memcpy(*dest, data, sizeof(gib_style_bit));
+
+   return;
+}
+#endif
diff --git a/src/gib_style.h b/src/gib_style.h
new file mode 100644
index 0000000..d54e2d4
--- /dev/null
+++ b/src/gib_style.h
@@ -0,0 +1,69 @@
+/* gib_style.h
+
+Copyright (C) 1999,2000 Tom Gilbert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+
+#ifndef GIB_STYLE_H
+#define GIB_STYLE_H
+
+#include "gib_list.h"
+
+#define GIB_STYLE(O) ((gib_style *)O)
+#define GIB_STYLE_BIT(O) ((gib_style_bit *)O)
+
+typedef struct __gib_style_bit gib_style_bit;
+typedef struct __gib_style gib_style;
+
+struct __gib_style_bit
+{
+   int x_offset, y_offset;
+   int r,g,b,a;
+};
+
+struct __gib_style
+{
+   gib_list *bits;
+   char *name;
+};
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+gib_style_bit *gib_style_bit_new(int x_offset, int y_offset, int r, int g, int b, int a);
+gib_style *gib_style_new(char *name);
+void gib_style_bit_free(gib_style_bit *s);
+void gib_style_free(gib_style *s);
+/*
+gib_style *gib_style_dup(gib_style *s);
+void gib_dup_style_bit(void **dest, void *data);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/src/help.raw b/src/help.raw
new file mode 100644
index 0000000..0e99c68
--- /dev/null
+++ b/src/help.raw
@@ -0,0 +1,211 @@
+" PACKAGE " version " VERSION "
+
+Usage : " PACKAGE " [options] <files or directories ...>
+
+ This is just a short option summary.  Please see \"man " PACKAGE "\" for details.
+
+OPTIONS
+ -h, --help                Show help and exit
+ -v, --version             Show version information and exit
+ -V, --verbose             Show progress bars and other extra information
+ -q, --quiet               Hide non-fatal errors. May be used with --verbose
+ -T, --theme THEME         Load options with name THEME
+ -r, --recursive           Recursively expand any directories in FILE to
+                           the content of those directories
+     --no-recursive        Do not recursively expand directories
+                           (this is the default)
+ -z, --randomize           Randomize the filelist
+ --no-jump-on-resort       Don't jump to the first image when the filelist
+                           is resorted
+ -g, --geometry WxH[+X+Y]  Limit the window size to DIMENSION[+OFFSET]
+ -f, --filelist FILE       Load/save images from/to the FILE filelist
+ -|, --start-at FILENAME   Start at FILENAME in the filelist
+ -p, --preload             Remove unloadable files from the internal filelist
+                           before attempting to display anything
+ -., --scale-down          Automatically scale down images to fit screen size
+ -F, --fullscreen          Make the window full screen
+ -Z, --auto-zoom           Zoom picture to screen size in fullscreen/geom mode
+     --zoom PERCENT        Zooms images by a PERCENT, when in full screen
+                           mode or when window geometry is fixed. If combined
+                           with --auto-zoom, zooming will be limited to the
+                           the size. Also support \"max\" and \"fill\"
+     --zoom-step PERCENT   Zoom images in and out by PERCENT (default: 25)
+                           when using the zoom keys / buttons
+     --keep-zoom-vp        Keep viewport zoom and settings while changing images
+ -w, --multiwindow         Open all files at once, one window per image
+ -x, --borderless          Create borderless windows
+ -d, --draw-filename       Show the filename in the image window
+     --draw-tinted         Show overlay texts on semi-transparent background
+     --draw-exif           Show some Exif information (if compiled with exif=1)
+     --edit                Make flip/rotation keys flip/rotate the underlying file
+     --auto-rotate         Rotate images according to Exif info (if compiled with exif=1)
+ -^, --title TITLE         Set window title (see FORMAT SPECIFIERS)
+ -D, --slideshow-delay NUM Set delay between automatically changing slides
+     --on-last-slide quit  Exit after one loop through the slide show (old --cycle-once)
+     --on-last-slide hold  Stop at both ends of the filelist
+ -R, --reload NUM          Reload images after NUM seconds
+ -k, --keep-http           Keep local copies when viewing HTTP/FTP files
+     --insecure            Disable peer/host verification when using HTTPS.
+ -K, --caption-path PATH   Path to caption directory, enables caption display
+ -j, --output-dir          With -k: Output directory for saved files
+ -l, --list                list mode: ls-style output with image information
+ -L, --customlist FORMAT   list mode with custom output, see FORMAT SPECIFIERS
+ -U, --loadable            List all loadable files. No image display
+ -u, --unloadable          List all unloadable files. No image display
+ -S, --sort SORT_TYPE      Sort files by:
+                           name, filename, mtime, width, height, pixels, size,
+                           or format
+ -n, --reverse             Reverse sort order
+     --version-sort        Natural sort of (version) numbers within text
+ -A, --action [;]ACTION    Specify action to perform when pressing <return>.
+                           Executed by /bin/sh, may contain FORMAT SPECIFIERS
+                           reloads image with \";\", switches to next otherwise
+     --action[1-9]         Extra actions triggered by pressing keys <1>to <9>
+ -G, --draw-actions        Show the defined actions in the image window
+     --tap-zones           Enable tap zones for previous/next file in slide show mode
+     --force-aliasing      Disable antialiasing
+ -m, --montage             Enable montage mode
+ -i, --index               Create an index print of all images
+     --info CMD            Run CMD and show its output in the image window
+ -t, --thumbnails          Show images as clickable thumbnails
+ -P, --cache-thumbnails    Enable thumbnail caching for thumbnail mode.
+                           Only works with thumbnails <= 256x256 pixels
+ -J, --thumb-redraw N      Redraw thumbnail window every N images
+ -~, --thumb-title STRING  Title for windows opened from thumbnail mode
+ -I, --fullindex           Index mode with additional image information
+     --index-info FORMAT   Show FORMAT below images in index/thumbnail mode
+     --bg-center FILE      Set FILE as centered desktop background
+     --bg-fill FILE        Like --bg-scale, but preserves aspect ratio by
+                           zooming the image until it fits. May cut off
+                           corners
+     --bg-max FILE         Like --bg-fill, but scale the image to the maximum
+                           size that fits the screen with black borders on one
+                           side
+     --bg-scale FILE       Set FILE as scaled desktop background. This will
+                           fill the whole background, but the images' aspect
+                           ratio may not be preserved
+     --bg-tile FILE        Set FILE as tiled desktop background
+     --no-fehbg            Do not write a ~/.fehbg file
+ -C, --fontpath PATH       Specify an extra directory to look in for fonts,
+                           can be used multiple times to add multiple paths.
+ -M, --menu-font FONT      Use FONT for the font in menus.
+ -B, --image-bg STYLE      Set background for transparent images and the like.
+                           Accepted values: default, checks, or a XColor (eg. #428bdd)
+     --xinerama-index I    Assumee that I is the active xinerama screen
+ -N, --no-menus            Don't load or show any menus.
+     --no-xinerama         Disable Xinerama support
+     --no-screen-clip      Do not limit window size to screen size
+ -Y, --hide-pointer        Hide the pointer
+     --conversion-timeout  INT  Load unknown files with dcraw or ImageMagick,
+                           timeout after INT seconds (0: no timeout)
+     --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
+     --cache-size NUM      imlib cache size in mebibytes (0 .. 2048)
+     --auto-reload         automatically reload shown image if file was changed
+     --window-id ID        Draw to an existing X11 window by its ID
+
+MONTAGE MODE OPTIONS
+ -X, --ignore-aspect       Set thumbnail to specified width/height without
+                           retaining aspect ratio
+ -s, --stretch             Scale up images if they are smaller than the
+                           specified thumbnail size
+ -y, --thumb-width NUM     Set thumbnail width in pixels
+ -E, --thumb-height NUM    Set thumbnail height in pixels
+ -W, --limit-width NUM     Limit the width of the montage in pixels
+ -H, --limit-height NUM    Limit the height of the montage in pixels
+                           (at least one of these two must be specified)
+ -b, --bg FILE|trans       Set montage background
+ -a, --alpha NUM           Set thumbnail transparency level (0 .. 255)
+ -o, --output FILE         Save the created montage to FILE
+ -O, --output-only  FILE   Just save the created montage to FILE
+                           WITHOUT displaying it
+ -e, --font FONT           Set font for thumbnail information, in the form
+                           fontname/pointsize
+
+INDEX MODE OPTIONS
+ -@, --title-font FONT     Use FONT to print a title on the index, if no
+                           font is specified, a title will not be printed
+
+FORMAT SPECIFIERS
+ %a     information about slideshow state (playing/paused)
+ %f     image path/filename
+ %F     image path/filename (shell-escaped)
+ %g     window dimensions (\"width,height\") in pixels
+ %h     image height
+ %l     total number of files in the filelist
+ %L     path to temporary copy of filelist
+ %m     current mode (slideshow, multiwindow...)
+ %n     image name
+ %N     image name (shell-escaped)
+ %o     offset of top-left image corner to window (\"x,y\") in pixels
+ %p     image pixel size
+ %P     image pixel size in kilo-/megapixels
+ %r     image rotation. half right turn == 3.1415 (pi)
+ %s     image size in bytes
+ %S     image size with appropriate unit (kB/MB)
+ %t     image format
+ %u     current file number
+ %w     image width
+ %v     " PACKAGE " version
+ %V     process ID
+ %z     current image zoom, rounded to two decimal places
+ %Z     current image zoom, high precision
+ %%     %
+ \\n     newline
+
+DEFAULT KEYS
+ a                       Toggle action display (--draw-actions)
+ A                       Toggle anti-aliasing
+ c                       Enable caption entry mode
+ d                       Toggle filename display (--draw-filename)
+ e                       Toggle exif tag display (if compiled with exif=1)
+ f                       Toggle fullscreen
+ g                       Toggle fixed geometry mode
+ h                       pause/continue slideshow
+ i                       Toggle --info display
+ k                       Toggle zoom/viewport freeze when switching images
+ L                       Save current filelist to unique filename
+ m                       Show/hide menu
+ n, <SPACE>, <RIGHT>     Go to next image
+ o                       Toggle pointer visibility
+ p, <BACKSPACE>, <LEFT>  Go to previous image
+ q, <ESCAPE>             Quit
+ r                       Reload image
+ R                       Render/anti-alias image
+ s                       Save current image to unique filename
+ w                       Resize window to current image dimensions
+ x                       Close current window
+ z                       Jump to a random position in the current filelist
+ Z                       Toggle auto-zoom
+ [, ]                    Jump to previous/next directory
+ <, >                    Rotate 90 degrees right/left
+ _                       Vertical flip
+ |                       Horizontal flip
+ 0, <ENTER>              Run action specified by --action option
+ 1-9                     Run action 1-9 specified by --action[1-9] options
+ <HOME>                  Go to first slide
+ <END>                   Go to last slide
+ <PAGEUP>                Go forward 5% of the filelist
+ <PAGEDOWN>              Go backward 5% of the filelist
+ +                       Increase reload delay by 1 second
+ -                       Decrease reload delay by 1 second
+ <DELETE>                Remove the currently viewed file from the filelist
+ <CTRL+DELETE>           Like <DELETE>, but also removes the file from the
+                         filesystem. Caution: Does not ask for confirmation
+ <KEYPAD LEFT>           Move the image to the left
+ <KEYPAD RIGHT>          Move the image to the right
+ <KEYPAD UP>             Move the image up
+ <KEYPAD DOWN>           Move the image down
+ <KEYPAD BEGIN>          Antialias the image
+ <KEYPAD +>, <UP>        Zoom in
+ <KEYPAD ->, <DOWN>      Zoom out
+ <KEYPAD *>              Zoom to 100%
+ <KEYPAD />              Zoom to fit the window
+
+This program is free software, see the file COPYING for licensing info.
+Copyright Tom Gilbert (and various contributors) 1999-2003.
+Copyright Birte Kristina Friesel (and various contributors) 2010-2020.
+
+Homepage: http://feh.finalrewind.org
+Report bugs to <derf+feh@finalrewind.org> or #feh on irc.oftc.net.
diff --git a/src/imlib.c b/src/imlib.c
index 1b2ae12..d2352fd 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1,6 +1,7 @@
 /* imlib.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -25,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "feh.h"
 #include "filelist.h"
+#include "signals.h"
 #include "winwidget.h"
 #include "options.h"
 
@@ -33,9 +35,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <jpeglib.h>
 
-#include "transupp.h"
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
+
+#ifdef HAVE_LIBEXIF
+#include "exif.h"
+#endif
+
+#ifdef HAVE_LIBMAGIC
+#include <magic.h>
+
+magic_t magic = NULL;
+#endif
 
 Display *disp = NULL;
 Visual *vis = NULL;
@@ -51,1246 +64,1814 @@ Window root = 0;
 XineramaScreenInfo *xinerama_screens = NULL;
 int xinerama_screen;
 int num_xinerama_screens;
-#endif /* HAVE_LIBXINERAMA */
+#endif				/* HAVE_LIBXINERAMA */
+
+gib_hash* conversion_cache = NULL;
+
+int childpid = 0;
+
+static int feh_file_is_raw(char *filename);
+static char *feh_http_load_image(char *url);
+static char *feh_dcraw_load_image(char *filename);
+static char *feh_magick_load_image(char *filename);
 
 #ifdef HAVE_LIBXINERAMA
-void
-init_xinerama(void)
+void init_xinerama(void)
 {
-  if (opt.xinerama && XineramaIsActive(disp)) {
-    int major, minor;
-    xinerama_screen = 0;
-    XineramaQueryVersion(disp, &major, &minor);
-    xinerama_screens = XineramaQueryScreens(disp, &num_xinerama_screens);
-  }
+	if (opt.xinerama && XineramaIsActive(disp)) {
+		int major, minor, px, py, i;
+
+		/* discarded */
+		Window dw;
+		int di;
+		unsigned int du;
+
+		XineramaQueryVersion(disp, &major, &minor);
+		xinerama_screens = XineramaQueryScreens(disp, &num_xinerama_screens);
+
+		if (opt.xinerama_index >= 0)
+			xinerama_screen = opt.xinerama_index;
+		else {
+			xinerama_screen = 0;
+			XQueryPointer(disp, root, &dw, &dw, &px, &py, &di, &di, &du);
+			for (i = 0; i < num_xinerama_screens; i++) {
+				if (XY_IN_RECT(px, py,
+							xinerama_screens[i].x_org,
+							xinerama_screens[i].y_org,
+							xinerama_screens[i].width,
+							xinerama_screens[i].height)) {
+					xinerama_screen = i;
+					break;
+				}
+			}
+		}
+	}
 }
-#endif /* HAVE_LIBXINERAMA */
+#endif				/* HAVE_LIBXINERAMA */
 
-void
-init_imlib_fonts(void)
+void init_imlib_fonts(void)
 {
-   D_ENTER(4);
+	/* Set up the font stuff */
+	imlib_add_path_to_font_path(".");
+	imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");
 
-   /* Set up the font stuff */
-   imlib_add_path_to_font_path(".");
-   imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");
-   imlib_add_path_to_font_path("./ttfonts");
-
-   D_RETURN_(4);
+	return;
 }
 
-void
-init_x_and_imlib(void)
+void init_x_and_imlib(void)
 {
-   D_ENTER(4);
-
-   disp = XOpenDisplay(NULL);
-   if (!disp)
-      eprintf("Can't open X display. It *is* running, yeah?");
-   vis = DefaultVisual(disp, DefaultScreen(disp));
-   depth = DefaultDepth(disp, DefaultScreen(disp));
-   cm = DefaultColormap(disp, DefaultScreen(disp));
-   root = RootWindow(disp, DefaultScreen(disp));
-   scr = ScreenOfDisplay(disp, DefaultScreen(disp));
-   xid_context = XUniqueContext();
+	disp = XOpenDisplay(NULL);
+	if (!disp)
+		eprintf("Can't open X display. It *is* running, yeah?");
+	vis = DefaultVisual(disp, DefaultScreen(disp));
+	depth = DefaultDepth(disp, DefaultScreen(disp));
+	cm = DefaultColormap(disp, DefaultScreen(disp));
+	root = RootWindow(disp, DefaultScreen(disp));
+	scr = ScreenOfDisplay(disp, DefaultScreen(disp));
+	xid_context = XUniqueContext();
 
 #ifdef HAVE_LIBXINERAMA
-   init_xinerama();
-#endif /* HAVE_LIBXINERAMA */
+	init_xinerama();
+#endif				/* HAVE_LIBXINERAMA */
 
-   imlib_context_set_display(disp);
-   imlib_context_set_visual(vis);
-   imlib_context_set_colormap(cm);
-   imlib_context_set_color_modifier(NULL);
-   imlib_context_set_progress_function(NULL);
-   imlib_context_set_operation(IMLIB_OP_COPY);
-   wmDeleteWindow = XInternAtom(disp, "WM_DELETE_WINDOW", False);
+	imlib_context_set_display(disp);
+	imlib_context_set_visual(vis);
+	imlib_context_set_colormap(cm);
+	imlib_context_set_color_modifier(NULL);
+	imlib_context_set_progress_function(NULL);
+	imlib_context_set_operation(IMLIB_OP_COPY);
+	wmDeleteWindow = XInternAtom(disp, "WM_DELETE_WINDOW", False);
 
-   /* Initialise random numbers */
-   srand(getpid() * time(NULL) % ((unsigned int) -1));
+	imlib_set_cache_size(opt.cache_size * 1024 * 1024);
 
-   D_RETURN_(4);
+	return;
 }
 
-int
-feh_load_image_char(Imlib_Image * im, char *filename)
+int feh_should_ignore_image(Imlib_Image * im)
 {
-   feh_file *file;
-   int i;
-
-   D_ENTER(4);
-   file = feh_file_new(filename);
-   i = feh_load_image(im, file);
-   feh_file_free(file);
-   D_RETURN(4, i);
+	if (opt.filter_by_dimensions) {
+		unsigned int w = gib_imlib_image_get_width(im);
+		unsigned int h = gib_imlib_image_get_height(im);
+		if (w < opt.min_width || w > opt.max_width || h < opt.min_height || h > opt.max_height) {
+			return 1;
+		}
+	}
+	return 0;
 }
 
-int
-feh_load_image(Imlib_Image * im, feh_file * file)
+int feh_load_image_char(Imlib_Image * im, char *filename)
 {
-   Imlib_Load_Error err;
-
-   D_ENTER(4);
-   D(3, ("filename is %s, image is %p\n", file->filename, im));
-
-   if (!file || !file->filename)
-      D_RETURN(4, 0);
-
-   /* Handle URLs */
-   if ((!strncmp(file->filename, "http://", 7)) ||
-       (!strncmp(file->filename, "https://", 8)) ||
-       (!strncmp(file->filename, "ftp://", 6)))
-   {
-      char *tmpname = NULL;
-      char *tempcpy;
-
-      tmpname = feh_http_load_image(file->filename);
-      if (tmpname == NULL)
-         D_RETURN(4, 0);
-      *im = imlib_load_image_with_error_return(tmpname, &err);
-      if (im)
-      {
-         /* load the info now, in case it's needed after we delete the
-            temporary image file */
-         tempcpy = file->filename;
-         file->filename = tmpname;
-         feh_file_info_load(file, *im);
-         file->filename = tempcpy;
-      }
-      if ((opt.slideshow) && (opt.reload == 0))
-      {
-         /* Http, no reload, slideshow. Let's keep this image on hand... */
-         free(file->filename);
-         file->filename = estrdup(tmpname);
-      }
-      else
-      {
-         /* Don't cache the image if we're doing reload + http (webcams etc) */
-         if (!opt.keep_http)
-            unlink(tmpname);
-      }
-      if (!opt.keep_http)
-         add_file_to_rm_filelist(tmpname);
-      free(tmpname);
-   }
-   else
-   {
-      *im = imlib_load_image_with_error_return(file->filename, &err);
-   }
-
-   if ((err) || (!im))
-   {
-      if (opt.verbose && !opt.quiet)
-      {
-         fprintf(stdout, "\n");
-         reset_output = 1;
-      }
-      /* Check error code */
-      switch (err)
-      {
-        case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
-           if (!opt.quiet)
-              weprintf("%s - File does not exist", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
-           if (!opt.quiet)
-              weprintf("%s - Directory specified for image filename",
-                       file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
-           if (!opt.quiet)
-              weprintf("%s - No read access to directory", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_UNKNOWN:
-        case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
-           if (!opt.quiet)
-              weprintf("%s - No Imlib2 loader for that file format",
-                       file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
-           if (!opt.quiet)
-              weprintf("%s - Path specified is too long", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
-           if (!opt.quiet)
-              weprintf("%s - Path component does not exist", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
-           if (!opt.quiet)
-              weprintf("%s - Path component is not a directory",
-                       file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
-           if (!opt.quiet)
-              weprintf("%s - Path points outside address space",
-                       file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
-           if (!opt.quiet)
-              weprintf("%s - Too many levels of symbolic links",
-                       file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
-           if (!opt.quiet)
-              weprintf("While loading %s - Out of memory", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
-           eprintf("While loading %s - Out of file descriptors",
-                   file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
-           if (!opt.quiet)
-              weprintf("%s - Cannot write to directory", file->filename);
-           break;
-        case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
-           if (!opt.quiet)
-              weprintf("%s - Cannot write - out of disk space",
-                       file->filename);
-           break;
-        default:
-           if (!opt.quiet)
-              weprintf
-                 ("While loading %s - Unknown error (%d). Attempting to continue",
-                  file->filename, err);
-           break;
-      }
-      D(3, ("Load *failed*\n"));
-      D_RETURN(4, 0);
-   }
-
-   D(3, ("Loaded ok\n"));
-   D_RETURN(4, 1);
+	feh_file *file;
+	int i;
+
+	file = feh_file_new(filename);
+	i = feh_load_image(im, file);
+	feh_file_free(file);
+	return(i);
 }
 
-char *
-feh_http_load_image(char *url)
+void feh_print_load_error(char *file, winwidget w, Imlib_Load_Error err, enum feh_load_error feh_err)
 {
-   char *tmpname;
-   char *tmpname_timestamper = NULL;
-   char *basename;
-   char *newurl = NULL;
-   char randnum[20];
-   int rnum;
-   char *path = NULL;
-
-   D_ENTER(4);
-
-   if (opt.keep_http)
-   {
-      if (opt.output_dir)
-         path = opt.output_dir;
-      else
-         path = "";
-   }
-   else
-      path = "/tmp/";
-
-   basename = strrchr(url, '/') + 1;
-   tmpname = feh_unique_filename(path, basename);
-
-   if (opt.wget_timestamp)
-   {
-      char cppid[10];
-      pid_t ppid;
-
-      ppid = getpid();
-      snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid);
-      tmpname_timestamper =
-         estrjoin("", "/tmp/feh_", cppid, "_", basename, NULL);
-      newurl = estrdup(url);
-   }
-   else
-   {
-      rnum = rand();
-      snprintf(randnum, sizeof(randnum), "%d", rnum);
-      newurl = estrjoin("?", url, randnum, NULL);
-   }
-   D(3, ("newurl: %s\n", newurl));
-
-   if (opt.builtin_http)
-   {
-      /* state for HTTP header parser */
-#define SAW_NONE    1
-#define SAW_ONE_CM  2
-#define SAW_ONE_CJ  3
-#define SAW_TWO_CM  4
-#define IN_BODY     5
-
-#define OUR_BUF_SIZE 1024
-#define EOL "\015\012"
-
-      int sockno = 0;
-      int size;
-      int body = SAW_NONE;
-      struct sockaddr_in addr;
-      struct hostent *hptr;
-      char *hostname;
-      char *get_string;
-      char *host_string;
-      char *query_string;
-      char *get_url;
-      static char buf[OUR_BUF_SIZE];
-      char ua_string[] = "User-Agent: feh image viewer";
-      char accept_string[] = "Accept: image/*";
-      FILE *fp;
-
-      D(4, ("using builtin http collection\n"));
-      fp = fopen(tmpname, "w");
-      if (!fp)
-      {
-         weprintf("couldn't write to file %s:", tmpname);
-         free(tmpname);
-         D_RETURN(4, NULL);
-      }
-
-      hostname = feh_strip_hostname(newurl);
-      if (!hostname)
-      {
-         weprintf("couldn't work out hostname from %s:", newurl);
-         free(tmpname);
-         free(newurl);
-         D_RETURN(4, NULL);
-      }
-
-      D(4, ("trying hostname %s\n", hostname));
-
-      if (!(hptr = feh_gethostbyname(hostname)))
-      {
-         weprintf("error resolving host %s:", hostname);
-         free(hostname);
-         free(tmpname);
-         free(newurl);
-         D_RETURN(4, NULL);
-      }
-
-      /* Copy the address of the host to socket description. */
-      memcpy(&addr.sin_addr, hptr->h_addr, hptr->h_length);
-
-      /* Set port and protocol */
-      addr.sin_family = AF_INET;
-      addr.sin_port = htons(80);
-
-      if ((sockno = socket(PF_INET, SOCK_STREAM, 0)) == -1)
-      {
-         weprintf("error opening socket:");
-         free(tmpname);
-         free(hostname);
-         free(newurl);
-         D_RETURN(4, NULL);
-      }
-      if (connect(sockno, (struct sockaddr *) &addr, sizeof(addr)) == -1)
-      {
-         weprintf("error connecting socket:");
-         free(tmpname);
-         free(hostname);
-         free(newurl);
-         D_RETURN(4, NULL);
-      }
-
-      get_url = strchr(newurl, '/') + 2;
-      get_url = strchr(get_url, '/');
-
-      get_string = estrjoin(" ", "GET", get_url, "HTTP/1.0", NULL);
-      host_string = estrjoin(" ", "Host:", hostname, NULL);
-      query_string =
-         estrjoin(EOL, get_string, host_string, accept_string, ua_string, "",
-                  "", NULL);
-      /* At this point query_string looks something like
-         **
-         **    GET /dir/foo.jpg?123456 HTTP/1.0^M^J
-         **    Host: www.example.com^M^J
-         **    Accept: image/ *^M^J
-         **    User-Agent: feh image viewer^M^J
-         **    ^M^J
-         **
-         ** Host: is required by HTTP/1.1 and very important for some sites,
-         ** even with HTTP/1.0
-         **
-         ** -- BEG
-       */
-      if ((send(sockno, query_string, strlen(query_string), 0)) == -1)
-      {
-         free(get_string);
-         free(host_string);
-         free(query_string);
-         free(tmpname);
-         free(hostname);
-         free(newurl);
-         weprintf("error sending over socket:");
-         D_RETURN(4, NULL);
-      }
-      free(get_string);
-      free(host_string);
-      free(query_string);
-      free(hostname);
-      free(newurl);
-
-      while ((size = read(sockno, &buf, OUR_BUF_SIZE)))
-      {
-         if (body == IN_BODY)
-         {
-            fwrite(buf, 1, size, fp);
-         }
-         else
-         {
-            int i;
-
-            for (i = 0; i < size; i++)
-            {
-               /* We are looking for ^M^J^M^J, but will accept
-                  ** ^J^J from broken servers. Stray ^Ms will be
-                  ** ignored.
-                  **
-                  ** TODO:
-                  ** Checking the headers for a
-                  **    Content-Type: image/ *
-                  ** header would help detect problems with results.
-                  ** Maybe look at the response code too? But there is
-                  ** no fundamental reason why a 4xx or 5xx response
-                  ** could not return an image, it is just the 3xx
-                  ** series we need to worry about.
-                  **
-                  ** Also, grabbing the size from the Content-Length
-                  ** header and killing the connection after that
-                  ** many bytes where read would speed up closing the
-                  ** socket.
-                  ** -- BEG
-                */
-
-               switch (body)
-               {
-
-                 case IN_BODY:
-                    fwrite(buf + i, 1, size - i, fp);
-                    i = size;
-                    break;
-
-                 case SAW_ONE_CM:
-                    if (buf[i] == '\012')
-                    {
-                       body = SAW_ONE_CJ;
-                    }
-                    else
-                    {
-                       body = SAW_NONE;
-                    }
-                    break;
-
-                 case SAW_ONE_CJ:
-                    if (buf[i] == '\015')
-                    {
-                       body = SAW_TWO_CM;
-                    }
-                    else
-                    {
-                       if (buf[i] == '\012')
-                       {
-                          body = IN_BODY;
-                       }
-                       else
-                       {
-                          body = SAW_NONE;
-                       }
-                    }
-                    break;
-
-                 case SAW_TWO_CM:
-                    if (buf[i] == '\012')
-                    {
-                       body = IN_BODY;
-                    }
-                    else
-                    {
-                       body = SAW_NONE;
-                    }
-                    break;
-
-                 case SAW_NONE:
-                    if (buf[i] == '\015')
-                    {
-                       body = SAW_ONE_CM;
-                    }
-                    else
-                    {
-                       if (buf[i] == '\012')
-                       {
-                          body = SAW_ONE_CJ;
-                       }
-                    }
-                    break;
-
-               }                            /* switch */
-            }                               /* for i */
-         }
-      }                                     /* while read */
-      close(sockno);
-      fclose(fp);
-   }
-   else
-   {
-      int pid;
-      int status;
-
-      if ((pid = fork()) < 0)
-      {
-         weprintf("open url: fork failed:");
-         free(tmpname);
-         free(newurl);
-         D_RETURN(4, NULL);
-      }
-      else if (pid == 0)
-      {
-         char *quiet = NULL;
-
-         if (!opt.verbose)
-            quiet = estrdup("-q");
-
-         if (opt.wget_timestamp)
-         {
-            execlp("wget", "wget", "-N", "-O", tmpname_timestamper, newurl,
-                   quiet, (char*) NULL);
-         }
-         else
-         {
-            execlp("wget", "wget", "--cache=off", "-O", tmpname, newurl,
-               quiet, NULL);
-         }
-         eprintf("url: exec failed: wget:");
-      }
-      else
-      {
-         waitpid(pid, &status, 0);
-
-         if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
-         {
-            weprintf("url: wget failed to load URL %s\n", url);
-            free(newurl);
-            free(tmpname);
-            D_RETURN(4, NULL);
-         }
-         if (opt.wget_timestamp)
-         {
-            char cmd[2048];
-
-            snprintf(cmd, sizeof(cmd), "/bin/cp %s %s", tmpname_timestamper,
-                     tmpname);
-            system(cmd);
-         }
-         free(newurl);
-      }
-   }
-
-   D_RETURN(4, tmpname);
+	if (err == IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS)
+		eprintf("%s - Out of file descriptors while loading", file);
+	else if (!opt.quiet || w) {
+		switch (feh_err) {
+			case LOAD_ERROR_IMLIB:
+				// handled in the next switch/case statement
+				break;
+			case LOAD_ERROR_IMAGEMAGICK:
+				im_weprintf(w, "%s - No ImageMagick loader for that file format", file);
+				break;
+			case LOAD_ERROR_CURL:
+				im_weprintf(w, "%s - libcurl was unable to retrieve the file", file);
+				break;
+			case LOAD_ERROR_DCRAW:
+				im_weprintf(w, "%s - Unable to open preview via dcraw", file);
+				break;
+			case LOAD_ERROR_MAGICBYTES:
+				im_weprintf(w, "%s - Does not look like an image (magic bytes missing)", file);
+				break;
+		}
+		if (feh_err != LOAD_ERROR_IMLIB) {
+			return;
+		}
+		switch (err) {
+		case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
+			im_weprintf(w, "%s - File does not exist", file);
+			break;
+		case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
+			im_weprintf(w, "%s - Directory specified for image filename", file);
+			break;
+		case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
+			im_weprintf(w, "%s - No read access", file);
+			break;
+		case IMLIB_LOAD_ERROR_UNKNOWN:
+		case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
+			im_weprintf(w, "%s - No Imlib2 loader for that file format", file);
+			break;
+		case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
+			im_weprintf(w, "%s - Path specified is too long", file);
+			break;
+		case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
+			im_weprintf(w, "%s - Path component does not exist", file);
+			break;
+		case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
+			im_weprintf(w, "%s - Path component is not a directory", file);
+			break;
+		case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
+			im_weprintf(w, "%s - Path points outside address space", file);
+			break;
+		case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
+			im_weprintf(w, "%s - Too many levels of symbolic links", file);
+			break;
+		case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
+			im_weprintf(w, "While loading %s - Out of memory", file);
+			break;
+		case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
+			im_weprintf(w, "%s - Cannot write to directory", file);
+			break;
+		case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
+			im_weprintf(w, "%s - Cannot write - out of disk space", file);
+			break;
+#if defined(IMLIB2_VERSION_MAJOR) && defined(IMLIB2_VERSION_MINOR) && (IMLIB2_VERSION_MAJOR > 1 || IMLIB2_VERSION_MINOR > 7)
+		case IMLIB_LOAD_ERROR_IMAGE_READ:
+			im_weprintf(w, "%s - Invalid image file", file);
+			break;
+		case IMLIB_LOAD_ERROR_IMAGE_FRAME:
+			im_weprintf(w, "%s - Requested frame not in image", file);
+			break;
+#endif
+		default:
+			im_weprintf(w, "While loading %s - Unknown error (%d)",
+					file, err);
+			break;
+		}
+	}
 }
 
-struct hostent *
-feh_gethostbyname(const char *name)
+#ifdef HAVE_LIBMAGIC
+void uninit_magic(void)
 {
-   struct hostent *hp;
-   unsigned long addr;
-
-   D_ENTER(3);
-   addr = (unsigned long) inet_addr(name);
-   if ((int) addr != -1)
-      hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
-   else
-      hp = gethostbyname(name);
-   D_RETURN(3, hp);
+	if (!magic) {
+		return;
+	}
+
+	magic_close(magic);
+	magic = NULL;
 }
+void init_magic(void)
+{
+	if (getenv("FEH_SKIP_MAGIC")) {
+		return;
+	}
+
+	if (!(magic = magic_open(MAGIC_NONE))) {
+		weprintf("unable to initialize magic library\n");
+		return;
+	}
 
-char *
-feh_strip_hostname(char *url)
+	if (magic_load(magic, NULL) != 0) {
+		weprintf("cannot load magic database: %s\n", magic_error(magic));
+		uninit_magic();
+	}
+}
+
+/*
+ * This is a workaround for an Imlib2 regression, causing unloadable image
+ * detection to be excessively slow (and, thus, causing feh to hang for a while
+ * when encountering an unloadable image). We use magic byte detection to
+ * avoid calling Imlib2 for files it probably cannot handle. See
+ * <https://phab.enlightenment.org/T8739> and
+ * <https://github.com/derf/feh/issues/505>.
+ */
+int feh_is_image(feh_file * file, int magic_flags)
 {
-   char *ret;
-   char *start;
-   char *finish;
-   int len;
+	const char * mime_type = NULL;
 
-   D_ENTER(3);
+	if (!magic) {
+		return 1;
+	}
 
-   start = strchr(url, '/');
-   if (!start)
-      D_RETURN(3, NULL);
+	magic_setflags(magic, MAGIC_MIME_TYPE | MAGIC_SYMLINK | magic_flags);
+	mime_type = magic_file(magic, file->filename);
 
-   start += 2;
+	if (!mime_type) {
+		return 0;
+	}
 
-   finish = strchr(start, '/');
-   if (!finish)
-      D_RETURN(3, NULL);
+	D(("file %s has mime type: %s\n", file->filename, mime_type));
 
-   len = finish - start;
+	if (strncmp(mime_type, "image/", 6) == 0) {
+		return 1;
+	}
+
+	/* no infinite loop on compressed content, please */
+	if (magic_flags) {
+		return 0;
+	}
+
+	/* imlib2 supports loading compressed images, let's have a look inside */
+	if (strcmp(mime_type, "application/gzip") == 0 ||
+	    strcmp(mime_type, "application/x-bzip2") == 0 ||
+	    strcmp(mime_type, "application/x-xz") == 0) {
+		return feh_is_image(file, MAGIC_COMPRESS);
+	}
 
-   ret = emalloc(len + 1);
-   strncpy(ret, start, len);
-   ret[len] = '\0';
-   D_RETURN(3, ret);
+	return 0;
 }
+#else
+int feh_is_image(__attribute__((unused)) feh_file * file, __attribute__((unused)) int magic_flags)
+{
+	return 1;
+}
+#endif
 
-void
-feh_draw_zoom(winwidget w)
+int feh_load_image(Imlib_Image * im, feh_file * file)
 {
-   static Imlib_Font fn = NULL;
-   int tw = 0, th = 0;
-   Imlib_Image im = NULL;
-   char buf[100];
-   static DATA8 atab[256];
-
-   D_ENTER(4);
-
-   if (!w->im)
-      D_RETURN_(4);
-
-   if (!fn) {
-      fn = gib_imlib_load_font(DEFAULT_FONT);
-      memset(atab, 0, sizeof(atab));
-   }
-
-   if (!fn)
-   {
-      weprintf("Couldn't load font for zoom printing");
-      D_RETURN_(4);
-   }
-
-   snprintf(buf, sizeof(buf), "%.0f%%, %dx%d", w->zoom * 100,
-            (int) (w->im_w * w->zoom), (int) (w->im_h * w->zoom));
-
-   /* Work out how high the font is */
-   gib_imlib_get_text_size(fn, buf, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-
-   tw += 3;
-   th += 3;
-   im = imlib_create_image(tw, th);
-   if (!im)
-      eprintf("Couldn't create image. Out of memory?");
-
-   gib_imlib_image_set_has_alpha(im, 1);
-   gib_imlib_apply_color_modifier_to_rectangle(im, 0, 0, tw, th,
-                                               NULL, NULL, NULL, atab);
-   gib_imlib_image_fill_rectangle(im, 0, 0, tw, th, 0, 0, 0, 0);
-
-   gib_imlib_text_draw(im, fn, NULL, 2, 2, buf, IMLIB_TEXT_TO_RIGHT,
-                       0, 0, 0, 255);
-   gib_imlib_text_draw(im, fn, NULL, 1, 1, buf, IMLIB_TEXT_TO_RIGHT,
-                       255, 255, 255, 255);
-   gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - th, 1, 1, 0);
-   gib_imlib_free_image_and_decache(im);
-   D_RETURN_(4);
+	Imlib_Load_Error err = IMLIB_LOAD_ERROR_NONE;
+	enum feh_load_error feh_err = LOAD_ERROR_IMLIB;
+	enum { SRC_IMLIB, SRC_HTTP, SRC_MAGICK, SRC_DCRAW } image_source = SRC_IMLIB;
+	char *tmpname = NULL;
+	char *real_filename = NULL;
+
+	D(("filename is %s, image is %p\n", file->filename, im));
+
+	if (!file || !file->filename)
+		return 0;
+
+	if (path_is_url(file->filename)) {
+		image_source = SRC_HTTP;
+
+		if ((tmpname = feh_http_load_image(file->filename)) == NULL) {
+			feh_err = LOAD_ERROR_CURL;
+			err = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST;
+		}
+	}
+	else {
+		if (feh_is_image(file, 0)) {
+			*im = imlib_load_image_with_error_return(file->filename, &err);
+		} else {
+			feh_err = LOAD_ERROR_MAGICBYTES;
+			err = IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT;
+		}
+	}
+
+	if (opt.conversion_timeout >= 0 && (
+			(err == IMLIB_LOAD_ERROR_UNKNOWN) ||
+			(err == IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT))) {
+		if (feh_file_is_raw(file->filename)) {
+			image_source = SRC_DCRAW;
+			tmpname = feh_dcraw_load_image(file->filename);
+			if (!tmpname) {
+				feh_err = LOAD_ERROR_DCRAW;
+			}
+		} else {
+			image_source = SRC_MAGICK;
+			feh_err = LOAD_ERROR_IMLIB;
+			tmpname = feh_magick_load_image(file->filename);
+			if (!tmpname) {
+				feh_err = LOAD_ERROR_IMAGEMAGICK;
+			}
+		}
+	}
+
+	if (tmpname) {
+		*im = imlib_load_image_with_error_return(tmpname, &err);
+		if (!err && im) {
+			real_filename = file->filename;
+			file->filename = tmpname;
+
+			/*
+			 * feh does not associate a non-native image with its temporary
+			 * filename and may delete the temporary file right after loading.
+			 * To ensure that it is still aware of image size, dimensions, etc.,
+			 * file_info is preloaded here. To avoid a memory leak when loading
+			 * a non-native file multiple times in a slideshow, the file_info
+			 * struct is freed first. If file->info is not set, feh_file_info_free
+			 * is a no-op.
+			 */
+			feh_file_info_free(file->info);
+			feh_file_info_load(file, *im);
+
+			file->filename = real_filename;
+#ifdef HAVE_LIBEXIF
+			/*
+			 * if we're called from within feh_reload_image, file->ed is already
+			 * populated.
+			 */
+			if (file->ed) {
+				exif_data_unref(file->ed);
+			}
+			file->ed = exif_data_new_from_file(tmpname);
+#endif
+		}
+		if (!opt.use_conversion_cache && ((image_source != SRC_HTTP) || !opt.keep_http))
+			unlink(tmpname);
+		// keep_http already performs an add_file_to_rm_filelist call
+		else if (opt.use_conversion_cache && !opt.keep_http)
+			// add_file_to_rm_filelist duplicates tmpname
+			add_file_to_rm_filelist(tmpname);
+
+		if (!opt.use_conversion_cache)
+			free(tmpname);
+	} else if (im) {
+#ifdef HAVE_LIBEXIF
+		/*
+			* if we're called from within feh_reload_image, file->ed is already
+			* populated.
+			*/
+		if (file->ed) {
+			exif_data_unref(file->ed);
+		}
+		file->ed = exif_data_new_from_file(file->filename);
+#endif
+	}
+
+	if ((err) || (!im)) {
+		if (opt.verbose && !opt.quiet) {
+			fputs("\n", stderr);
+			reset_output = 1;
+		}
+		feh_print_load_error(file->filename, NULL, err, feh_err);
+		D(("Load *failed*\n"));
+		return(0);
+	}
+
+	/*
+	 * By default, Imlib2 unconditionally loads a cached file without checking
+	 * if it was modified on disk. However, feh (or rather its users) should
+	 * expect image changes to appear at the next reload. So we tell Imlib2 to
+	 * always check the file modification time and only use a cached image if
+	 * the mtime was not changed. The performance penalty is usually negligible.
+	 */
+	imlib_context_set_image(*im);
+	imlib_image_set_changes_on_disk();
+
+#ifdef HAVE_LIBEXIF
+	int orientation = 0;
+	if (file->ed) {
+		ExifByteOrder byteOrder = exif_data_get_byte_order(file->ed);
+		ExifEntry *exifEntry = exif_data_get_entry(file->ed, EXIF_TAG_ORIENTATION);
+		if (exifEntry && opt.auto_rotate) {
+			orientation = exif_get_short(exifEntry->data, byteOrder);
+		}
+	}
+
+	if (orientation == 2)
+		gib_imlib_image_flip_horizontal(*im);
+	else if (orientation == 3)
+		gib_imlib_image_orientate(*im, 2);
+	else if (orientation == 4)
+		gib_imlib_image_flip_vertical(*im);
+	else if (orientation == 5) {
+		gib_imlib_image_orientate(*im, 3);
+		gib_imlib_image_flip_vertical(*im);
+	}
+	else if (orientation == 6)
+		gib_imlib_image_orientate(*im, 1);
+	else if (orientation == 7) {
+		gib_imlib_image_orientate(*im, 3);
+		gib_imlib_image_flip_horizontal(*im);
+	}
+	else if (orientation == 8)
+		gib_imlib_image_orientate(*im, 3);
+#endif
+
+	D(("Loaded ok\n"));
+	return(1);
 }
 
-void
-feh_draw_filename(winwidget w)
+void feh_reload_image(winwidget w, int resize, int force_new)
 {
-   static Imlib_Font fn = NULL;
-   int tw = 0, th = 0;
-   Imlib_Image im = NULL;
-   static DATA8 atab[256];
-   char *s = NULL;
-   int len = 0;
-
-   D_ENTER(4);
-
-   if ((!w->file) || (!FEH_FILE(w->file->data))
-       || (!FEH_FILE(w->file->data)->filename))
-      D_RETURN_(4);
-
-   if (!fn)
-   {
-      memset(atab, 0, sizeof(atab));
-      if (w->full_screen)
-         fn = gib_imlib_load_font(DEFAULT_FONT_BIG);
-      else
-         fn = gib_imlib_load_font(DEFAULT_FONT);
-   }
-
-   if (!fn)
-   {
-      weprintf("Couldn't load font for filename printing");
-      D_RETURN_(4);
-   }
-
-   /* Work out how high the font is */
-   gib_imlib_get_text_size(fn, FEH_FILE(w->file->data)->filename, NULL, &tw, &th,
-                           IMLIB_TEXT_TO_RIGHT);
-
-   /* tw is no longer correct, if the filename is shorter than
-    * the string "%d of %d" used below in fullscreen mode */
-   tw += 3;
-   th += 3;
-   im = imlib_create_image(tw, 2*th);
-   if (!im)
-      eprintf("Couldn't create image. Out of memory?");
-
-   gib_imlib_image_set_has_alpha(im, 1);
-   gib_imlib_apply_color_modifier_to_rectangle(im, 0, 0, tw, 2*th,
-                                               NULL, NULL, NULL, atab);
-   gib_imlib_image_fill_rectangle(im, 0, 0, tw, 2*th, 0, 0, 0, 0);
-
-   gib_imlib_text_draw(im, fn, NULL, 2, 2, FEH_FILE(w->file->data)->filename,
-                       IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
-   gib_imlib_text_draw(im, fn, NULL, 1, 1, FEH_FILE(w->file->data)->filename,
-                       IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-   /* Print the position in the filelist, if we are in fullscreen and the
-    * list has more than one element */
-   if (w->full_screen && (gib_list_length(filelist)-1))
-   {
-      /* sic! */
-      len = snprintf(NULL, 0, "%d of %d", gib_list_length(filelist), gib_list_length(filelist))+1;
-      s = emalloc(len);
-      snprintf(s, len, "%d of %d",
-               gib_list_num(filelist, current_file) + 1,
-               gib_list_length(filelist));
-      /* This should somehow be right-aligned */
-      gib_imlib_text_draw(im, fn, NULL, 2, th+1, s, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
-      gib_imlib_text_draw(im, fn, NULL, 1, th, s, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-      free(s);
-   }
-
-   gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, 0, 1, 1, 0);
-
-   gib_imlib_free_image_and_decache(im);
-   D_RETURN_(4);
+	char *new_title;
+	int len;
+	Imlib_Image tmp;
+	int old_w, old_h;
+
+	if (!w->file) {
+		im_weprintf(w, "couldn't reload, this image has no file associated with it.");
+		winwidget_render_image(w, 0, 0);
+		return;
+	}
+
+	D(("resize %d, force_new %d\n", resize, force_new));
+
+	free(FEH_FILE(w->file->data)->caption);
+	FEH_FILE(w->file->data)->caption = NULL;
+
+	len = strlen(w->name) + sizeof("Reloading: ") + 1;
+	new_title = emalloc(len);
+	snprintf(new_title, len, "Reloading: %s", w->name);
+	winwidget_rename(w, new_title);
+	free(new_title);
+
+	old_w = gib_imlib_image_get_width(w->im);
+	old_h = gib_imlib_image_get_height(w->im);
+
+	/*
+	 * If we don't free the old image before loading the new one, Imlib2's
+	 * caching will get in our way.
+	 * However, if --reload is used (force_new == 0), we want to continue if
+	 * the new image cannot be loaded, so we must not free the old image yet.
+	 */
+	if (force_new)
+		winwidget_free_image(w);
+
+	// if it's an external image, our own cache will also get in your way
+	char *sfn;
+	if (opt.use_conversion_cache && conversion_cache && (sfn = gib_hash_get(conversion_cache, FEH_FILE(w->file->data)->filename)) != NULL) {
+		free(sfn);
+		gib_hash_set(conversion_cache, FEH_FILE(w->file->data)->filename, NULL);
+	}
+
+	if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) {
+		if (force_new)
+			eprintf("failed to reload image\n");
+		else {
+			im_weprintf(w, "Couldn't reload image. Is it still there?");
+			winwidget_render_image(w, 0, 0);
+		}
+		return;
+	}
+
+	if (!resize && ((old_w != gib_imlib_image_get_width(tmp)) ||
+			(old_h != gib_imlib_image_get_height(tmp))))
+		resize = 1;
+
+	if (!force_new)
+		winwidget_free_image(w);
+
+	w->im = tmp;
+	winwidget_reset_image(w);
+
+	w->mode = MODE_NORMAL;
+	if ((w->im_w != gib_imlib_image_get_width(w->im))
+	    || (w->im_h != gib_imlib_image_get_height(w->im)))
+		w->had_resize = 1;
+	if (w->has_rotated) {
+		Imlib_Image temp;
+
+		temp = gib_imlib_create_rotated_image(w->im, 0.0);
+		w->im_w = gib_imlib_image_get_width(temp);
+		w->im_h = gib_imlib_image_get_height(temp);
+		gib_imlib_free_image_and_decache(temp);
+	} else {
+		w->im_w = gib_imlib_image_get_width(w->im);
+		w->im_h = gib_imlib_image_get_height(w->im);
+	}
+	winwidget_render_image(w, resize, 0);
+
+	return;
 }
 
-char *build_caption_filename(feh_file *file) {
-  char *caption_filename;
-  char *s, *dir;
-  s = strrchr(file->filename, '/');
-  if (s) {
-    dir = estrdup(file->filename);
-    s = strrchr(dir, '/');
-    *s = '\0';
-  } else {
-    dir = estrdup(".");
-  }
-  caption_filename = estrjoin("",
-                              dir,
-                              "/",
-                              opt.caption_path,
-                              "/",
-                              file->name,
-                              ".txt",
-                              NULL);
-  free(dir);
-  return caption_filename;
+static int feh_file_is_raw(char *filename)
+{
+	childpid = fork();
+	if (childpid == -1) {
+		perror("fork");
+		return 0;
+	}
+
+	if (childpid == 0) {
+		int devnull = open("/dev/null", O_WRONLY);
+		dup2(devnull, 1);
+		dup2(devnull, 2);
+		execlp("dcraw", "dcraw", "-i", filename, NULL);
+		_exit(1);
+	} else {
+		int status;
+		do {
+			waitpid(childpid, &status, WUNTRACED);
+			if (WIFEXITED(status)) {
+				return !WEXITSTATUS(status);
+			}
+		} while (!WIFEXITED(status) && !WIFSIGNALED(status));
+	}
+
+	return 0;
 }
 
-void
-feh_draw_caption(winwidget w)
+static char *feh_dcraw_load_image(char *filename)
 {
-   static Imlib_Font fn = NULL;
-   int tw = 0, th = 0, ww, hh;
-   int x, y;
-   Imlib_Image im = NULL;
-   static DATA8 atab[256];
-   char *p;
-   gib_list *lines, *l;
-   static gib_style *caption_style = NULL;
-   feh_file *file;
-
-   D_ENTER(4);
-
-   if (!w->file) {
-     D_RETURN_(4);
-   }
-   file = FEH_FILE(w->file->data);
-   if (!file->filename) {
-     D_RETURN_(4);
-   }
-
-   if (!file->caption) {
-      char *caption_filename;
-      caption_filename = build_caption_filename(file);
-      /* read caption from file */
-      file->caption = ereadfile(caption_filename);
-      free(caption_filename);
-   }
-
-   if (file->caption == NULL) {
-     /* caption file is not there, we want to cache that, otherwise we'll stat
-      * the damn file every time we render the image. Reloading an image will
-      * always cause the caption to be reread though so we're safe to do so.
-      * (Before this bit was added, when zooming a captionless image with
-      * captions enabled, the captions file would be stat()d like 30 times a
-      * second) - don't forget this function is called from
-      * winwidget_render_image().
-      */
-     file->caption = estrdup("");
-     D_RETURN_(4);
-   }
-
-   if (file->caption == '\0') {
-     D_RETURN_(4);
-   }
-
-   if (!caption_style) {
-     caption_style = gib_style_new("caption");
-     caption_style->bits = gib_list_add_front(caption_style->bits,
-                                            gib_style_bit_new(0,0,0,0,0,0));
-     caption_style->bits = gib_list_add_front(caption_style->bits, 
-                                            gib_style_bit_new(1,1,0,0,0,255));
-   }
-
-   if (!fn)
-   {
-      memset(atab, 0, sizeof(atab));
-      if (w->full_screen)
-         fn = gib_imlib_load_font(DEFAULT_FONT_BIG);
-      else
-         fn = gib_imlib_load_font(DEFAULT_FONT);
-   }
-
-   if (!fn)
-   {
-      weprintf("Couldn't load font for caption printing");
-      D_RETURN_(4);
-   }
-
-   lines = feh_wrap_string(file->caption, w->w, w->h, fn, NULL);
-   if (!lines)
-     D_RETURN_(4);
-
-   /* Work out how high/wide the caption is */
-   l = lines;
-   while (l) {
-     p = (char *) l->data;
-     gib_imlib_get_text_size(fn, p, caption_style, &ww, &hh, IMLIB_TEXT_TO_RIGHT);
-     if (ww > tw)
-       tw = ww;
-     th += hh;
-     if (l->next)
-       th += 1; /* line spacing */
-     l = l->next;
-   }
-   
-   /* we don't want the caption overlay larger than our window */
-   if (th > w->h)
-     th = w->h;
-   if (tw > w->w)
-     tw = w->w;
-
-   im = imlib_create_image(tw, th);
-   if (!im)
-      eprintf("Couldn't create image. Out of memory?");
-
-   gib_imlib_image_set_has_alpha(im, 1);
-   gib_imlib_apply_color_modifier_to_rectangle(im, 0, 0, tw, th,
-                                               NULL, NULL, NULL, atab);
-   gib_imlib_image_fill_rectangle(im, 0, 0, tw, th, 0, 0, 0, 0);
-   
-   l = lines;
-   x = 0;
-   y = 0;
-   while (l) {
-     p = (char *) l->data;
-     gib_imlib_get_text_size(fn, p, caption_style, &ww, &hh, IMLIB_TEXT_TO_RIGHT);
-     x = (tw - ww) / 2;
-     if (w->caption_entry) {
-     gib_imlib_text_draw(im, fn, caption_style, x, y, p, IMLIB_TEXT_TO_RIGHT,
-                         255, 255, 0, 255);
-     } else {
-     gib_imlib_text_draw(im, fn, caption_style, x, y, p, IMLIB_TEXT_TO_RIGHT,
-                         255, 255, 255, 255);
-     }
-                
-     y += hh + 1; /* line spacing */
-     l = l->next;
-   }
-   
-   gib_imlib_render_image_on_drawable(w->bg_pmap, im, (w->w - tw) / 2, w->h - th, 1, 1, 0);
-   gib_imlib_free_image_and_decache(im);
-   gib_list_free_and_data(lines);
-   D_RETURN_(4);
+	char *basename;
+	char *tmpname;
+	char *sfn;
+	int fd = -1;
+
+	if (opt.use_conversion_cache) {
+		if (!conversion_cache)
+			conversion_cache = gib_hash_new();
+		if ((sfn = gib_hash_get(conversion_cache, filename)) != NULL)
+			return sfn;
+	}
+
+	basename = strrchr(filename, '/');
+
+	if (basename == NULL)
+		basename = filename;
+	else
+		basename++;
+
+	tmpname = feh_unique_filename("/tmp/", basename);
+
+	if (strlen(tmpname) > (NAME_MAX-6))
+		tmpname[NAME_MAX-7] = '\0';
+
+	sfn = estrjoin("_", tmpname, "XXXXXX", NULL);
+	free(tmpname);
+
+	fd = mkstemp(sfn);
+
+	if (fd == -1) {
+		free(sfn);
+		return NULL;
+	}
+
+	childpid = fork();
+	if (childpid == -1) {
+		weprintf("%s: Can't load with dcraw. Fork failed:", filename);
+		unlink(sfn);
+		free(sfn);
+		close(fd);
+		return NULL;
+	} else if (childpid == 0) {
+		dup2(fd, STDOUT_FILENO);
+		close(fd);
+
+		alarm(opt.conversion_timeout);
+		execlp("dcraw", "dcraw", "-c", "-e", filename, NULL);
+		_exit(1);
+	}
+
+	int status;
+	waitpid(-1, &status, 0);
+	if (WIFSIGNALED(status)) {
+		unlink(sfn);
+		free(sfn);
+		sfn = NULL;
+		if (!opt.quiet)
+			weprintf("%s - Conversion took too long, skipping", filename);
+	}
+
+	if ((sfn != NULL) && opt.use_conversion_cache)
+		gib_hash_set(conversion_cache, filename, sfn);
+
+	return sfn;
 }
 
+static char *feh_magick_load_image(char *filename)
+{
+	char *argv_fn;
+	char *basename;
+	char *tmpname;
+	char *sfn;
+	char tempdir[] = "/tmp/.feh-magick-tmp-XXXXXX";
+	int fd = -1, devnull = -1;
+	int status;
+	char created_tempdir = 0;
+
+	if (opt.use_conversion_cache) {
+		if (!conversion_cache)
+			conversion_cache = gib_hash_new();
+		if ((sfn = gib_hash_get(conversion_cache, filename)) != NULL)
+			return sfn;
+	}
 
-unsigned char reset_output = 0;
+	basename = strrchr(filename, '/');
+
+	if (basename == NULL)
+		basename = filename;
+	else
+		basename++;
 
-void
-feh_display_status(char stat)
+	tmpname = feh_unique_filename("/tmp/", basename);
+
+	if (strlen(tmpname) > (NAME_MAX-6))
+		tmpname[NAME_MAX-7] = '\0';
+
+	sfn = estrjoin("_", tmpname, "XXXXXX", NULL);
+	free(tmpname);
+
+	fd = mkstemp(sfn);
+
+	if (fd == -1) {
+		free(sfn);
+		return NULL;
+	}
+
+	/*
+	 * We could use png:fd:(whatever mkstemp returned) as target filename
+	 * for convert, but this seems to be broken in some ImageMagick versions.
+	 * So we resort to png:(sfn) instead.
+	 */
+	argv_fn = estrjoin(":", "png", sfn, NULL);
+
+	/*
+	 * By default, ImageMagick saves (occasionally lots of) temporary files
+	 * in /tmp. It doesn't remove them if it runs into a timeout and is killed
+	 * by us, no matter whether we use SIGINT, SIGTERM or SIGKILL. So, unless
+	 * MAGICK_TMPDIR has already been set by the user, we create our own
+	 * temporary directory for ImageMagick and remove its contents at the end of
+	 * this function.
+	 */
+	if (getenv("MAGICK_TMPDIR") == NULL) {
+		if (mkdtemp(tempdir) == NULL) {
+			weprintf("%s: ImageMagick may leave temporary files in /tmp. mkdtemp failed:", filename);
+		} else {
+			created_tempdir = 1;
+		}
+	}
+
+	if ((childpid = fork()) < 0) {
+		weprintf("%s: Can't load with imagemagick. Fork failed:", filename);
+		unlink(sfn);
+		free(sfn);
+		sfn = NULL;
+	}
+	else if (childpid == 0) {
+
+		devnull = open("/dev/null", O_WRONLY);
+		dup2(devnull, 0);
+		if (opt.quiet) {
+			/* discard convert output */
+			dup2(devnull, 1);
+			dup2(devnull, 2);
+		}
+
+		/*
+		 * convert only accepts SIGINT via killpg, a normal kill doesn't work
+		 */
+		setpgid(0, 0);
+
+		if (created_tempdir) {
+			// no error checking - this is a best-effort code path
+			setenv("MAGICK_TMPDIR", tempdir, 0);
+		}
+
+		execlp("convert", "convert", filename, argv_fn, NULL);
+		_exit(1);
+	}
+	else {
+		alarm(opt.conversion_timeout);
+		waitpid(childpid, &status, 0);
+		kill(childpid, SIGKILL);
+		if (opt.conversion_timeout > 0 && !alarm(0)) {
+			unlink(sfn);
+			free(sfn);
+			sfn = NULL;
+
+			if (!opt.quiet) {
+				weprintf("%s: Conversion took too long, skipping", filename);
+			}
+		}
+		close(fd);
+		childpid = 0;
+	}
+
+	if (created_tempdir) {
+		DIR *dir;
+		struct dirent *de;
+		if ((dir = opendir(tempdir)) == NULL) {
+			weprintf("%s: Cannot remove temporary ImageMagick files from %s:", filename, tempdir);
+		} else {
+			while ((de = readdir(dir)) != NULL) {
+				if (de->d_name[0] != '.') {
+					char *temporary_file_name = estrjoin("/", tempdir, de->d_name, NULL);
+					/*
+					 * We assume that ImageMagick only creates temporary files and
+					 * not directories.
+					 */
+					if (unlink(temporary_file_name) == -1) {
+						weprintf("unlink %s:", temporary_file_name);
+					}
+					free(temporary_file_name);
+				}
+			}
+			if (rmdir(tempdir) == -1) {
+				weprintf("rmdir %s:", tempdir);
+			}
+		}
+		closedir(dir);
+	}
+
+	free(argv_fn);
+
+	if ((sfn != NULL) && opt.use_conversion_cache)
+		gib_hash_set(conversion_cache, filename, sfn);
+
+	return sfn;
+}
+
+#ifdef HAVE_LIBCURL
+
+#if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */
+static int curl_quit_function(void *clientp,  curl_off_t dltotal,  curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+#else
+static int curl_quit_function(void *clientp,  double dltotal,  double dlnow, double ultotal, double ulnow)
+#endif
 {
-   static int i = 0;
-   static int init_len = 0;
-   int j = 0;
-
-   D_ENTER(5);
-
-   D(5, ("filelist %p, filelist->next %p\n", filelist, filelist->next));
-
-   if (!init_len)
-      init_len = gib_list_length(filelist);
-
-   if (i)
-   {
-      if (reset_output)
-      {
-         /* There's just been an error message. Unfortunate ;) */
-         for (j = 0; j < (((i % 50) + ((i % 50) / 10)) + 7); j++)
-            fprintf(stdout, " ");
-      }
-
-      if (!(i % 50))
-      {
-         int len;
-         char buf[50];
-
-         len = gib_list_length(filelist);
-         snprintf(buf, sizeof(buf), " %5d/%d (%d)\n[%3d%%] ", i, init_len,
-                  len, ((int) ((float) i / init_len * 100)));
-         fprintf(stdout, buf);
-      }
-      else if ((!(i % 10)) && (!reset_output))
-         fprintf(stdout, " ");
-
-      reset_output = 0;
-   }
-   else
-      fprintf(stdout, "[  0%%] ");
-
-   fprintf(stdout, "%c", stat);
-   fflush(stdout);
-   i++;
-   D_RETURN_(5);
+	// ignore "unused parameter" warnings
+	(void)clientp;
+	(void)dltotal;
+	(void)dlnow;
+	(void)ultotal;
+	(void)ulnow;
+	if (sig_exit) {
+		/*
+		 * The user wants to quit feh. Tell libcurl to abort the transfer and
+		 * return control to the main loop, where we can quit gracefully.
+		 */
+		return 1;
+	}
+	return 0;
 }
 
-void feh_edit_inplace_orient(winwidget w, int orientation) {
-  int ret;
-  Imlib_Image old;
-  D_ENTER(4);
-  if(!w->file
-    || !w->file->data 
-    || !FEH_FILE(w->file->data)->filename)
-    D_RETURN_(4);
-
-  if (!strcmp(gib_imlib_image_format(w->im), "jpeg")) {
-    feh_edit_inplace_lossless_rotate(w, orientation);
-    feh_reload_image(w, 1, 1);
-    D_RETURN_(4);
-  }
-
-  ret = feh_load_image(&old, FEH_FILE(w->file->data));
-  if(ret) {
-    gib_imlib_image_orientate(old, orientation);
-    gib_imlib_save_image(old, FEH_FILE(w->file->data)->filename);
-    gib_imlib_free_image(old);
-    feh_reload_image(w, 1, 1);
-  } else {
-    weprintf("failed to load image from disk to edit it in place\n");
-  }
-  
-  D_RETURN_(4);
+static char *feh_http_load_image(char *url)
+{
+	CURL *curl;
+	CURLcode res;
+	char *sfn;
+	FILE *sfp;
+	int fd = -1;
+	char *ebuff;
+	char *tmpname;
+	char *basename;
+	char *path = NULL;
+
+	if (opt.use_conversion_cache) {
+		if (!conversion_cache)
+			conversion_cache = gib_hash_new();
+		if ((sfn = gib_hash_get(conversion_cache, url)) != NULL)
+			return sfn;
+	}
+
+	if (opt.keep_http) {
+		if (opt.output_dir)
+			path = opt.output_dir;
+		else
+			path = "";
+	} else
+		path = "/tmp/";
+
+	curl = curl_easy_init();
+	if (!curl) {
+		weprintf("open url: libcurl initialization failure");
+		return NULL;
+	}
+
+	basename = strrchr(url, '/') + 1;
+
+#ifdef HAVE_MKSTEMPS
+	tmpname = estrjoin("_", "feh_curl_XXXXXX", basename, NULL);
+
+	if (strlen(tmpname) > NAME_MAX) {
+		tmpname[NAME_MAX] = '\0';
+	}
+#else
+	if (strlen(basename) > NAME_MAX-7) {
+		tmpname = estrdup("feh_curl_XXXXXX");
+	} else {
+		tmpname = estrjoin("_", "feh_curl", basename, "XXXXXX", NULL);
+	}
+#endif
+
+	sfn = estrjoin("", path, tmpname, NULL);
+	free(tmpname);
+
+	D(("sfn is %s\n", sfn))
+
+#ifdef HAVE_MKSTEMPS
+	fd = mkstemps(sfn, strlen(basename) + 1);
+#else
+	fd = mkstemp(sfn);
+#endif
+
+	if (fd != -1) {
+		sfp = fdopen(fd, "w+");
+		if (sfp != NULL) {
+#ifdef DEBUG
+			curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+#endif
+			/*
+			 * Do not allow requests to take longer than 30 minutes.
+			 * This should be sufficiently high to accommodate use cases with
+			 * unusually high latencies, while at the same time avoiding
+			 * feh hanging indefinitely in unattended slideshows.
+			 */
+			curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1800);
+			curl_easy_setopt(curl, CURLOPT_URL, url);
+			curl_easy_setopt(curl, CURLOPT_WRITEDATA, sfp);
+			ebuff = emalloc(CURL_ERROR_SIZE);
+			curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ebuff);
+			curl_easy_setopt(curl, CURLOPT_USERAGENT, PACKAGE "/" VERSION);
+			curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
+			curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+#if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */
+			curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, curl_quit_function);
+#else
+			curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_quit_function);
+#endif
+			curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+			if (opt.insecure_ssl) {
+				curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+				curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+			} else if (getenv("CURL_CA_BUNDLE") != NULL) {
+				// Allow the user to specify custom CA certificates.
+				curl_easy_setopt(curl, CURLOPT_CAINFO,
+						getenv("CURL_CA_BUNDLE"));
+			}
+
+			res = curl_easy_perform(curl);
+			curl_easy_cleanup(curl);
+			if (res != CURLE_OK) {
+				if (res != CURLE_ABORTED_BY_CALLBACK) {
+					weprintf("open url: %s", ebuff);
+				}
+				unlink(sfn);
+				close(fd);
+				free(sfn);
+				sfn = NULL;
+			}
+
+			free(ebuff);
+			fclose(sfp);
+			if (opt.use_conversion_cache)
+				gib_hash_set(conversion_cache, url, sfn);
+			return sfn;
+		} else {
+			weprintf("open url: fdopen failed:");
+			unlink(sfn);
+			free(sfn);
+			close(fd);
+		}
+	} else {
+#ifdef HAVE_MKSTEMPS
+		weprintf("open url: mkstemps failed:");
+#else
+		weprintf("open url: mkstemp failed:");
+#endif
+		free(sfn);
+	}
+	curl_easy_cleanup(curl);
+	return NULL;
 }
 
+#else				/* HAVE_LIBCURL */
 
-/* TODO max_height is ignored... Could use a function which generates a
- * transparent text overlay image, with wrapping and all. Would be useful */
-gib_list *
-feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style)
+char *feh_http_load_image(char *url)
 {
-   gib_list *ll, *lines = NULL, *list = NULL, *words;
-   gib_list *l = NULL;
-   char delim[2] = { '\n', '\0' };
-   int w, line_width;
-   int tw, th;
-   char *p, *pp;
-   char *line = NULL;
-   char *temp;
-   int space_width = 0, m_width = 0, t_width = 0, new_width = 0;
-
-   lines = gib_string_split(text, delim);
-
-   if (wrap_width)
-   {
-      gib_imlib_get_text_size(fn, "M M", style, &t_width, NULL,
-                              IMLIB_TEXT_TO_RIGHT);
-      gib_imlib_get_text_size(fn, "M", style, &m_width, NULL,
-                              IMLIB_TEXT_TO_RIGHT);
-      space_width = t_width - (2 * m_width);
-      w = wrap_width;
-      l = lines;
-      while (l)
-      {
-         line_width = 0;
-         p = (char *) l->data;
-         /* quick check to see if whole line fits okay */
-         gib_imlib_get_text_size(fn, p, style, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-         if (tw <= w) {
-            list = gib_list_add_end(list, estrdup(p));
-         } else if (strlen(p) == 0) {
-            list = gib_list_add_end(list, estrdup(""));
-         } else if (!strcmp(p, " ")) {
-            list = gib_list_add_end(list, estrdup(" "));
-         } else {
-            words = gib_string_split(p, " ");
-            if (words) {
-               ll = words;
-               while (ll) {
-                  pp = (char *) ll->data;
-                  if (strcmp(pp, " ")) {
-                     gib_imlib_get_text_size(fn, pp, style, &tw, &th,
-                                             IMLIB_TEXT_TO_RIGHT);
-                     if (line_width == 0)
-                        new_width = tw;
-                     else
-                        new_width = line_width + space_width + tw;
-                     if (new_width <= w) {
-                        /* add word to line */
-                        if (line) {
-                           int len;
-
-                           len = strlen(line) + strlen(pp) + 2;
-                           temp = emalloc(len);
-                           snprintf(temp, len, "%s %s", line, pp);
-                           free(line);
-                           line = temp;
-                        } else {
-                          line = estrdup(pp);
-                        }
-                        line_width = new_width;
-                     } else if (line_width == 0) {
-                        /* can't fit single word in :/
-                           increase width limit to width of word
-                           and jam the bastard in anyhow */
-                        w = tw;
-                        line = estrdup(pp);
-                        line_width = new_width;
-                     } else {
-                        /* finish this line, start next and add word there */
-                        if (line) {
-                           list = gib_list_add_end(list, estrdup(line));
-                           free(line);
-                           line = NULL;
-                        }
-                        line = estrdup(pp);
-                        line_width = tw;
-                     }
-                  }
-                  ll = ll->next;
-               }
-               if (line) {
-                  /* finish last line */
-                  list = gib_list_add_end(list, estrdup(line));
-                  free(line);
-                  line = NULL;
-                  line_width = 0;
-               }
-               gib_list_free_and_data(words);
-            }
-         }
-         l = l->next;
-      }
-      gib_list_free_and_data(lines);
-      lines = list;
-   }
-   return lines;
+	weprintf(
+		"Cannot load image %s\nPlease recompile feh with libcurl support",
+		url
+	);
+	return NULL;
+}
+
+#endif				/* HAVE_LIBCURL */
+
+void feh_imlib_image_fill_text_bg(Imlib_Image im, int w, int h)
+{
+	gib_imlib_image_set_has_alpha(im, 1);
+
+	imlib_context_set_blend(0);
+
+	if (opt.text_bg == TEXT_BG_CLEAR)
+		gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 0, 0, 0, 0);
+	else
+		gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 0, 0, 0, 127);
+
+	imlib_context_set_blend(1);
+}
+
+static Imlib_Font feh_load_font(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+
+	if (opt.font)
+		fn = gib_imlib_load_font(opt.font);
+
+	if (!fn) {
+		if (w && w->full_screen)
+			fn = gib_imlib_load_font(DEFAULT_FONT_BIG);
+		else
+			fn = gib_imlib_load_font(DEFAULT_FONT);
+	}
+
+	if (!fn) {
+		eprintf("Couldn't load font to draw a message");
+	}
+
+	return fn;
 }
 
-void feh_edit_inplace_lossless_rotate(winwidget w, int orientation) {
-  FILE *input_file;
-  FILE *output_file;
-  struct jpeg_decompress_struct srcinfo;
-  struct jpeg_compress_struct dstinfo;
-  struct jpeg_error_mgr jsrcerr, jdsterr;
-  jvirt_barray_ptr * src_coef_arrays;
-  jvirt_barray_ptr * dst_coef_arrays;
-  JCOPY_OPTION copyoption;
-  jpeg_transform_info transformoption;
-  int len;
-  char *outfilename;
-  char *infilename = FEH_FILE(w->file->data)->filename;
-
-  copyoption = JCOPYOPT_ALL;
-  transformoption.transform = JXFORM_NONE;
-  transformoption.trim = FALSE;
-  transformoption.force_grayscale = FALSE;
-
-  if (orientation == 1) {
-    transformoption.transform = JXFORM_ROT_90;
-  } else if (orientation == 2) {
-    transformoption.transform = JXFORM_ROT_180;
-  } else {
-    transformoption.transform = JXFORM_ROT_270;
-  }
-  
-  if ((input_file = fopen(infilename, "rb")) == NULL) {
-    weprintf("couldn't open file for reading: %s\n", infilename);
-    D_RETURN_(4);
-  }
-  len = strlen(infilename) + sizeof(".tmp") + 1;
-  outfilename = emalloc(len);
-  snprintf(outfilename, len, "%s.tmp", infilename);
-
-  if ((output_file = fopen(outfilename, "wb")) == NULL) {
-    weprintf("couldn't open file for writing: %s\n", outfilename);
-    free(outfilename);
-    fclose(input_file);
-    D_RETURN_(4);
-  }
-
-  /* Initialize the JPEG decompression object with default error handling. */
-  srcinfo.err = jpeg_std_error(&jsrcerr);
-  jpeg_create_decompress(&srcinfo);
-
-  /* Initialize the JPEG compression object with default error handling. */
-  dstinfo.err = jpeg_std_error(&jdsterr);
-  jpeg_create_compress(&dstinfo);
-  jsrcerr.trace_level = jdsterr.trace_level;
-
-  /* Specify data source for decompression */
-  jpeg_stdio_src(&srcinfo, input_file);
-
-  /* Enable saving of extra markers that we want to copy */
-  jcopy_markers_setup(&srcinfo, copyoption);
-
-  /* Read file header */
-  (void) jpeg_read_header(&srcinfo, TRUE);
-
-  /* Any space needed by a transform option must be requested before
-   * jpeg_read_coefficients so that memory allocation will be done right.
-   */
-  jtransform_request_workspace(&srcinfo, &transformoption);
-
-  /* Read source file as DCT coefficients */
-  src_coef_arrays = jpeg_read_coefficients(&srcinfo);
-
-  /* Initialize destination compression parameters from source values */
-  jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
-
-  /* Adjust destination parameters if required by transform options;
-   * also find out which set of coefficient arrays will hold the output.
-   */
-  dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo,
-             src_coef_arrays,
-             &transformoption);
-
-  /* Specify data destination for compression */
-  jpeg_stdio_dest(&dstinfo, output_file);
-
-  /* Start compressor (note no image data is actually written here) */
-  jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
-
-  /* Copy to the output file any extra markers that we want to preserve */
-  jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
-
-  /* Execute image transformation */
-  jtransform_execute_transformation(&srcinfo, &dstinfo,
-            src_coef_arrays,
-            &transformoption);
-
-  /* Finish compression and release memory */
-  jpeg_finish_compress(&dstinfo);
-  jpeg_destroy_compress(&dstinfo);
-
-  (void) jpeg_finish_decompress(&srcinfo);
-  jpeg_destroy_decompress(&srcinfo);
-
-  fclose(input_file);
-  fclose(output_file);
-
-  /* TODO fix EXIF tags (orientation, width, height) */
-
-  /* rename outfilename to infilename.. if it worked */
-  if (jsrcerr.num_warnings > 0) {
-    weprintf("got errors from libjpeg (%d), not replacing file\n", jsrcerr.num_warnings);
-  } else {
-    if (rename(outfilename, infilename)) {
-      weprintf("failed to replace file %s with %s\n", infilename, outfilename);
-    }
-  }
-  free(outfilename);
+
+void feh_draw_zoom(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int tw = 0, th = 0;
+	Imlib_Image im = NULL;
+	char buf[100];
+
+	if (!w->im)
+		return;
+
+	fn = feh_load_font(w);
+
+	snprintf(buf, sizeof(buf), "%.0f%%, %dx%d", w->zoom * 100,
+			(int) (w->im_w * w->zoom), (int) (w->im_h * w->zoom));
+
+	/* Work out how high the font is */
+	gib_imlib_get_text_size(fn, buf, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+
+	tw += 3;
+	th += 3;
+	im = imlib_create_image(tw, th);
+	if (!im)
+		eprintf("Couldn't create image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, tw, th);
+
+	gib_imlib_text_draw(im, fn, NULL, 2, 2, buf, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+	gib_imlib_text_draw(im, fn, NULL, 1, 1, buf, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - th, 1, 1, 0);
+	gib_imlib_free_image_and_decache(im);
+	return;
 }
 
-void
-feh_draw_actions(winwidget w)
+void im_weprintf(winwidget w, char *fmt, ...)
 {
-   static Imlib_Font fn = NULL;
-   int tw = 0, th = 0;
-   int max_tw = 0;
-   int line_th = 0;
-   Imlib_Image im = NULL;
-   static DATA8 atab[256];
-   int i = 0;
-   int num_actions = 0;
-   
-   D_ENTER(4);
-
-// count the number of defined actions
-   for (num_actions=0;opt.actions[num_actions];num_actions++)
-   	;
-   if (num_actions == 0)
-      return;
-   
-   if ((!w->file) || (!FEH_FILE(w->file->data))
-       || (!FEH_FILE(w->file->data)->filename))
-      D_RETURN_(4);
-
-   if (!fn)
-   {
-      memset(atab, 0, sizeof(atab));
-      if (w->full_screen)
-         fn = gib_imlib_load_font(DEFAULT_FONT_BIG);
-      else
-         fn = gib_imlib_load_font(DEFAULT_FONT);
-   }
-
-   if (!fn)
-   {
-      weprintf("Couldn't load font for actions printing");
-      D_RETURN_(4);
-   }
-
-
-   gib_imlib_get_text_size(fn, "defined actions:", NULL, &tw, &th,
-                           IMLIB_TEXT_TO_RIGHT);
-// Check for the widest line
-   max_tw = tw; 
-   for (i=0;opt.actions[i];i++) {
-   gib_imlib_get_text_size(fn, opt.actions[i], NULL, &tw, &th,
-                           IMLIB_TEXT_TO_RIGHT);
-   	if (tw>max_tw) {
-	   max_tw = tw;
-	}
-   }
-
-   tw = max_tw;
-   tw += 3;
-   th += 3;
-   line_th = th;
-   th = (th*num_actions)+line_th;
-
-   im = imlib_create_image(tw, th);
-   if (!im)
-      eprintf("Couldn't create image. Out of memory?");
-
-   gib_imlib_image_set_has_alpha(im, 1);
-   gib_imlib_apply_color_modifier_to_rectangle(im, 0, 0, tw, th,
-                                               NULL, NULL, NULL, atab);
-   gib_imlib_image_fill_rectangle(im, 0, 0, tw, th, 0, 0, 0, 0);
-   
-   gib_imlib_text_draw(im, fn, NULL, 1, 1, "defined actions:",
-                       IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
-   gib_imlib_text_draw(im, fn, NULL, 2, 2, "defined actions:",
-                       IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-
-   for(i=0;i<num_actions;i++)
-   {
-//    compose a line containing an index, a colon followed by the
-//    action.
-      char index[1];
-      char line[strlen(opt.actions[i])+5];
-      sprintf(index, "%d", i);
-      strcpy(line, index);
-      strcat(line, ": ");
-      strcat(line, opt.actions[i]);
-
-      gib_imlib_text_draw(im, fn, NULL, 2, ((i+1)*line_th)+2, line,
-                          IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
-      gib_imlib_text_draw(im, fn, NULL, 1, ((i+1)*line_th)+1, line,
-                          IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-      free(line);
-   }
-
-   gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, 0, 1, 1, 0);
-
-   gib_imlib_free_image_and_decache(im);
-   D_RETURN_(4);
+	va_list args;
+	char *errstr = emalloc(1024);
+
+	fflush(stdout);
+	fputs(PACKAGE " WARNING: ", stderr);
+
+	va_start(args, fmt);
+	vsnprintf(errstr, 1024, fmt, args);
+	va_end(args);
+
+	if (w)
+		w->errstr = errstr;
+
+	fputs(errstr, stderr);
+	if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
+		fprintf(stderr, " %s", strerror(errno));
+	fputs("\n", stderr);
+	if (!w)
+		free(errstr);
+}
+
+
+void feh_draw_errstr(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int tw = 0, th = 0;
+	Imlib_Image im = NULL;
+
+	if (!w->im)
+		return;
+
+	fn = feh_load_font(NULL);
+
+	/* Work out how high the font is */
+	gib_imlib_get_text_size(fn, w->errstr, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+
+	tw += 3;
+	th += 3;
+	im = imlib_create_image(tw, th);
+	if (!im)
+		eprintf("Couldn't create errstr image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, tw, th);
+
+	gib_imlib_text_draw(im, fn, NULL, 2, 2, w->errstr, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+	gib_imlib_text_draw(im, fn, NULL, 1, 1, w->errstr, IMLIB_TEXT_TO_RIGHT, 255, 0, 0, 255);
+	free(w->errstr);
+	w->errstr = NULL;
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - th, 1, 1, 0);
+	gib_imlib_free_image_and_decache(im);
+}
+
+void feh_draw_filename(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int tw = 0, th = 0, nw = 0;
+	Imlib_Image im = NULL;
+	char *s = NULL;
+	int len = 0;
+
+	if ((!w->file) || (!FEH_FILE(w->file->data))
+			|| (!FEH_FILE(w->file->data)->filename))
+		return;
+
+	fn = feh_load_font(w);
+
+	/* Work out how high the font is */
+	gib_imlib_get_text_size(fn, FEH_FILE(w->file->data)->filename, NULL, &tw,
+			&th, IMLIB_TEXT_TO_RIGHT);
+
+	if (gib_list_length(filelist) > 1) {
+		len = snprintf(NULL, 0, "%d of %d",  gib_list_length(filelist),
+				gib_list_length(filelist)) + 1;
+		s = emalloc(len);
+		if (w->file)
+			snprintf(s, len, "%d of %d", gib_list_num(filelist, w->file) +
+					1, gib_list_length(filelist));
+		else
+			snprintf(s, len, "%d of %d", gib_list_num(filelist, current_file) +
+					1, gib_list_length(filelist));
+
+		gib_imlib_get_text_size(fn, s, NULL, &nw, NULL, IMLIB_TEXT_TO_RIGHT);
+
+		if (nw > tw)
+			tw = nw;
+	}
+
+	tw += 3;
+	th += 3;
+	im = imlib_create_image(tw, 2 * th);
+	if (!im)
+		eprintf("Couldn't create image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, tw, 2 * th);
+
+	gib_imlib_text_draw(im, fn, NULL, 2, 2, FEH_FILE(w->file->data)->filename,
+			IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+	gib_imlib_text_draw(im, fn, NULL, 1, 1, FEH_FILE(w->file->data)->filename,
+			IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+	if (s) {
+		gib_imlib_text_draw(im, fn, NULL, 2, th + 1, s, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+		gib_imlib_text_draw(im, fn, NULL, 1, th, s, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+		free(s);
+	}
+
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, 0, 1, 1, 0);
+
+	gib_imlib_free_image_and_decache(im);
+	return;
+}
+
+#ifdef HAVE_LIBEXIF
+void feh_draw_exif(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int width = 0, height = 0, line_width = 0, line_height = 0;
+	Imlib_Image im = NULL;
+	int no_lines = 0, i;
+	int pos = 0;
+	int pos2 = 0;
+	char info_line[256];
+	char *info_buf[128];
+	char buffer[EXIF_MAX_DATA];
+
+	if ( (!w->file) || (!FEH_FILE(w->file->data))
+			 || (!FEH_FILE(w->file->data)->filename) )
+	{
+		return;
+	}
+
+
+	buffer[0] = '\0';
+	exif_get_info(FEH_FILE(w->file->data)->ed, buffer, EXIF_MAX_DATA);
+
+	fn = feh_load_font(w);
+
+	if (buffer[0] == '\0')
+	{
+		snprintf(buffer, EXIF_MAX_DATA, "%s", "Failed to run exif command");
+		gib_imlib_get_text_size(fn, buffer, NULL, &width, &height, IMLIB_TEXT_TO_RIGHT);
+		info_buf[no_lines] = estrdup(buffer);
+		no_lines++;
+	}
+	else
+	{
+
+		while ( (no_lines < 128) && (pos < EXIF_MAX_DATA) )
+		{
+			/* max 128 lines */
+			pos2 = 0;
+			while ( pos2 < 255 ) /* max 255 chars + 1 null byte per line */
+			{
+				if ( (buffer[pos] != '\n')
+				      && (buffer[pos] != '\0') )
+				{
+					info_line[pos2] = buffer[pos];
+				}
+				else if ( buffer[pos] == '\0' )
+				{
+					pos = EXIF_MAX_DATA; /* all data seen */
+					break;
+				}
+				else
+				{
+					pos++; /* line finished, continue with next line*/
+					break;
+				}
+
+				pos++;
+				pos2++;
+			}
+			info_line[pos2] = '\0';
+
+			gib_imlib_get_text_size(fn, info_line, NULL, &line_width,
+                              &line_height, IMLIB_TEXT_TO_RIGHT);
+
+			if (line_height > height)
+				height = line_height;
+			if (line_width > width)
+				width = line_width;
+			info_buf[no_lines] = estrdup(info_line);
+
+			no_lines++;
+		}
+	}
+
+	if (no_lines == 0)
+		return;
+
+	height *= no_lines;
+	width += 4;
+
+	im = imlib_create_image(width, height);
+	if (!im)
+	{
+		eprintf("Couldn't create image. Out of memory?");
+	}
+
+	feh_imlib_image_fill_text_bg(im, width, height);
+
+	for (i = 0; i < no_lines; i++)
+	{
+		gib_imlib_text_draw(im, fn, NULL, 2, (i * line_height) + 2,
+				info_buf[i], IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+		gib_imlib_text_draw(im, fn, NULL, 1, (i * line_height) + 1,
+				info_buf[i], IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+		free(info_buf[i]);
+
+	}
+
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - height, 1, 1, 0);
+
+	gib_imlib_free_image_and_decache(im);
+	return;
+
+}
+#endif
+
+void feh_draw_info(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int width = 0, height = 0, line_width = 0, line_height = 0;
+	Imlib_Image im = NULL;
+	int no_lines = 0, i;
+	char *info_cmd;
+	char info_line[256];
+	char *info_buf[128];
+	FILE *info_pipe;
+
+	if ((!w->file) || (!FEH_FILE(w->file->data))
+			|| (!FEH_FILE(w->file->data)->filename))
+		return;
+
+	fn = feh_load_font(w);
+
+	info_cmd = feh_printf(opt.info_cmd, FEH_FILE(w->file->data), w);
+
+	info_pipe = popen(info_cmd, "r");
+
+	if (!info_pipe) {
+		info_buf[0] = estrdup("Failed to run info command");
+		gib_imlib_get_text_size(fn, info_buf[0], NULL, &width, &height, IMLIB_TEXT_TO_RIGHT);
+		no_lines = 1;
+	}
+	else {
+		while ((no_lines < 128) && fgets(info_line, 256, info_pipe)) {
+			if (info_line[strlen(info_line)-1] == '\n')
+				info_line[strlen(info_line)-1] = '\0';
+
+			gib_imlib_get_text_size(fn, info_line, NULL, &line_width,
+					&line_height, IMLIB_TEXT_TO_RIGHT);
+
+			if (line_height > height)
+				height = line_height;
+			if (line_width > width)
+				width = line_width;
+
+			info_buf[no_lines] = estrdup(info_line);
+
+			no_lines++;
+		}
+		pclose(info_pipe);
+	}
+
+	if (no_lines == 0)
+		return;
+
+	height *= no_lines;
+	width += 4;
+
+	im = imlib_create_image(width, height);
+	if (!im)
+		eprintf("Couldn't create image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, width, height);
+
+	for (i = 0; i < no_lines; i++) {
+		gib_imlib_text_draw(im, fn, NULL, 2, (i * line_height) + 2,
+				info_buf[i], IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+		gib_imlib_text_draw(im, fn, NULL, 1, (i * line_height) + 1,
+				info_buf[i], IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+		free(info_buf[i]);
+	}
+
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0,
+			w->h - height, 1, 1, 0);
+
+	gib_imlib_free_image_and_decache(im);
+	return;
+}
+
+char *build_caption_filename(feh_file * file, short create_dir)
+{
+	char *caption_filename;
+	char *s, *dir, *caption_dir;
+	struct stat cdir_stat;
+	s = strrchr(file->filename, '/');
+	if (s) {
+		dir = estrdup(file->filename);
+		s = strrchr(dir, '/');
+		*s = '\0';
+	} else {
+		dir = estrdup(".");
+	}
+
+	caption_dir = estrjoin("/", dir, opt.caption_path, NULL);
+
+	D(("dir %s, cp %s, cdir %s\n", dir, opt.caption_path, caption_dir))
+
+	if (stat(caption_dir, &cdir_stat) == -1) {
+		if (!create_dir)
+			return NULL;
+		if (mkdir(caption_dir, 0755) == -1)
+			eprintf("Failed to create caption directory %s:", caption_dir);
+	} else if (!S_ISDIR(cdir_stat.st_mode))
+		eprintf("Caption directory (%s) exists, but is not a directory.",
+			caption_dir);
+
+	free(caption_dir);
+
+	caption_filename = estrjoin("", dir, "/", opt.caption_path, "/", file->name, ".txt", NULL);
+	free(dir);
+	return caption_filename;
+}
+
+void feh_draw_caption(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int tw = 0, th = 0, ww, hh;
+	int x, y;
+	Imlib_Image im = NULL;
+	char *p;
+	gib_list *lines, *l;
+	static gib_style *caption_style = NULL;
+	feh_file *file;
+
+	if (!w->file) {
+		return;
+	}
+	file = FEH_FILE(w->file->data);
+	if (!file->filename) {
+		return;
+	}
+
+	if (!file->caption) {
+		char *caption_filename;
+		caption_filename = build_caption_filename(file, 0);
+		if (caption_filename)
+			/* read caption from file */
+			file->caption = ereadfile(caption_filename);
+		else
+			file->caption = estrdup("");
+		free(caption_filename);
+	}
+
+	if (file->caption == NULL) {
+		/* caption file is not there, we want to cache that, otherwise we'll stat
+		 * the damn file every time we render the image. Reloading an image will
+		 * always cause the caption to be reread though so we're safe to do so.
+		 * (Before this bit was added, when zooming a captionless image with
+		 * captions enabled, the captions file would be stat()d like 30 times a
+		 * second) - don't forget this function is called from
+		 * winwidget_render_image().
+		 */
+		file->caption = estrdup("");
+	}
+
+	if (*(file->caption) == '\0' && !w->caption_entry)
+		return;
+
+	caption_style = gib_style_new("caption");
+	caption_style->bits = gib_list_add_front(caption_style->bits,
+		gib_style_bit_new(0, 0, 0, 0, 0, 0));
+	caption_style->bits = gib_list_add_front(caption_style->bits,
+		gib_style_bit_new(1, 1, 0, 0, 0, 255));
+
+	fn = feh_load_font(w);
+
+	if (*(file->caption) == '\0') {
+		p = estrdup("Caption entry mode - Hit ESC to cancel");
+		lines = feh_wrap_string(p, w->w, fn, NULL);
+		free(p);
+	} else
+		lines = feh_wrap_string(file->caption, w->w, fn, NULL);
+
+	if (!lines)
+		return;
+
+	/* Work out how high/wide the caption is */
+	l = lines;
+	while (l) {
+		p = (char *) l->data;
+		gib_imlib_get_text_size(fn, p, caption_style, &ww, &hh, IMLIB_TEXT_TO_RIGHT);
+		if (ww > tw)
+			tw = ww;
+		th += hh;
+		if (l->next)
+			th += 1;	/* line spacing */
+		l = l->next;
+	}
+
+	/* we don't want the caption overlay larger than our window */
+	if (th > w->h)
+		th = w->h;
+	if (tw > w->w)
+		tw = w->w;
+
+	im = imlib_create_image(tw, th);
+	if (!im)
+		eprintf("Couldn't create image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, tw, th);
+
+	l = lines;
+	y = 0;
+	while (l) {
+		p = (char *) l->data;
+		gib_imlib_get_text_size(fn, p, caption_style, &ww, &hh, IMLIB_TEXT_TO_RIGHT);
+		x = (tw - ww) / 2;
+		if (w->caption_entry && (*(file->caption) == '\0'))
+			gib_imlib_text_draw(im, fn, caption_style, x, y, p,
+				IMLIB_TEXT_TO_RIGHT, 255, 255, 127, 255);
+		else if (w->caption_entry)
+			gib_imlib_text_draw(im, fn, caption_style, x, y, p,
+				IMLIB_TEXT_TO_RIGHT, 255, 255, 0, 255);
+		else
+			gib_imlib_text_draw(im, fn, caption_style, x, y, p,
+				IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+		y += hh + 1;	/* line spacing */
+		l = l->next;
+	}
+
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, (w->w - tw) / 2, w->h - th, 1, 1, 0);
+	gib_imlib_free_image_and_decache(im);
+	gib_list_free_and_data(lines);
+	return;
+}
+
+unsigned char reset_output = 0;
+
+void feh_display_status(char stat)
+{
+	static int i = 0;
+	static int init_len = 0;
+	int j = 0;
+
+	D(("filelist %p, filelist->next %p\n", filelist, filelist->next));
+
+	if (!stat) {
+		putc('\n', stderr);
+		init_len = 0;
+		i = 0;
+		return;
+	}
+
+	if (!init_len)
+		init_len = gib_list_length(filelist);
+
+	if (i) {
+		if (reset_output) {
+			/* There's just been an error message. Unfortunate ;) */
+			for (j = 0; j < (((i % 50) + ((i % 50) / 10)) + 7); j++)
+				putc(' ', stderr);
+		}
+
+		if (!(i % 50)) {
+			int len = gib_list_length(filelist);
+
+			fprintf(stderr, " %5d/%d (%d)\n[%3d%%] ",
+					i, init_len, len, ((int) ((float) i / init_len * 100)));
+
+		} else if ((!(i % 10)) && (!reset_output))
+			putc(' ', stderr);
+
+		reset_output = 0;
+	} else
+		fputs("[  0%] ", stderr);
+
+	fprintf(stderr, "%c", stat);
+	fflush(stderr);
+	i++;
+	return;
+}
+
+void feh_edit_inplace(winwidget w, int op)
+{
+	int tmp;
+	Imlib_Image old = NULL;
+	Imlib_Load_Error err = IMLIB_LOAD_ERROR_NONE;
+	if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)
+		return;
+
+	if (!opt.edit) {
+		imlib_context_set_image(w->im);
+		if (op == INPLACE_EDIT_FLIP)
+			imlib_image_flip_vertical();
+		else if (op == INPLACE_EDIT_MIRROR)
+			imlib_image_flip_horizontal();
+		else {
+			imlib_image_orientate(op);
+			if(op != 2) {
+				tmp = w->im_w;
+				w->im_w = w->im_h;
+				w->im_h = tmp;
+			}
+			if (FEH_FILE(w->file->data)->info) {
+				FEH_FILE(w->file->data)->info->width = w->im_w;
+				FEH_FILE(w->file->data)->info->height = w->im_h;
+			}
+		}
+		winwidget_render_image(w, 1, 0);
+		return;
+	}
+
+	// Imlib2 <= 1.5 returns "jpeg", Imlib2 >= 1.6 uses "jpg"
+	if ((!strcmp(gib_imlib_image_format(w->im), "jpeg")
+				|| !strcmp(gib_imlib_image_format(w->im), "jpg"))
+			&& !path_is_url(FEH_FILE(w->file->data)->filename)) {
+		feh_edit_inplace_lossless(w, op);
+		feh_reload_image(w, 1, 1);
+		return;
+	}
+
+	old = imlib_load_image_with_error_return(FEH_FILE(w->file->data)->filename, &err);
+
+	if ((old != NULL) && (err == IMLIB_LOAD_ERROR_NONE)) {
+		imlib_context_set_image(old);
+		if (op == INPLACE_EDIT_FLIP)
+			imlib_image_flip_vertical();
+		else if (op == INPLACE_EDIT_MIRROR)
+			imlib_image_flip_horizontal();
+		else
+			imlib_image_orientate(op);
+		gib_imlib_save_image_with_error_return(old,
+			FEH_FILE(w->file->data)->filename, &err);
+		gib_imlib_free_image(old);
+		if (err)
+			feh_print_load_error(FEH_FILE(w->file->data)->filename,
+				w, err, LOAD_ERROR_IMLIB);
+		feh_reload_image(w, 1, 1);
+	} else {
+		/*
+		 * Image was opened using curl/magick or has been deleted after
+		 * opening it
+		 */
+		imlib_context_set_image(w->im);
+		if (op == INPLACE_EDIT_FLIP)
+			imlib_image_flip_vertical();
+		else if (op == INPLACE_EDIT_MIRROR)
+			imlib_image_flip_horizontal();
+		else {
+			imlib_image_orientate(op);
+			tmp = w->im_w;
+			w->im_w = w->im_h;
+			w->im_h = tmp;
+			if (FEH_FILE(w->file->data)->info) {
+				FEH_FILE(w->file->data)->info->width = w->im_w;
+				FEH_FILE(w->file->data)->info->height = w->im_h;
+			}
+		}
+		im_weprintf(w, "unable to edit in place. Changes have not been saved.");
+		winwidget_render_image(w, 1, 0);
+	}
+
+	return;
+}
+
+gib_list *feh_wrap_string(char *text, int wrap_width, Imlib_Font fn, gib_style * style)
+{
+	gib_list *ll, *lines = NULL, *list = NULL, *words;
+	gib_list *l = NULL;
+	char delim[2] = { '\n', '\0' };
+	int w, line_width;
+	int tw, th;
+	char *p, *pp;
+	char *line = NULL;
+	char *temp;
+	int space_width = 0, m_width = 0, t_width = 0, new_width = 0;
+
+	lines = gib_string_split(text, delim);
+
+	if (wrap_width) {
+		gib_imlib_get_text_size(fn, "M M", style, &t_width, NULL, IMLIB_TEXT_TO_RIGHT);
+		gib_imlib_get_text_size(fn, "M", style, &m_width, NULL, IMLIB_TEXT_TO_RIGHT);
+		space_width = t_width - (2 * m_width);
+		w = wrap_width;
+		l = lines;
+		while (l) {
+			line_width = 0;
+			p = (char *) l->data;
+			/* quick check to see if whole line fits okay */
+			gib_imlib_get_text_size(fn, p, style, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+			if (tw <= w) {
+				list = gib_list_add_end(list, estrdup(p));
+			} else if (strlen(p) == 0) {
+				list = gib_list_add_end(list, estrdup(""));
+			} else if (!strcmp(p, " ")) {
+				list = gib_list_add_end(list, estrdup(" "));
+			} else {
+				words = gib_string_split(p, " ");
+				if (words) {
+					ll = words;
+					while (ll) {
+						pp = (char *) ll->data;
+						if (strcmp(pp, " ")) {
+							gib_imlib_get_text_size
+							    (fn, pp, style, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+							if (line_width == 0)
+								new_width = tw;
+							else
+								new_width = line_width + space_width + tw;
+							if (new_width <= w) {
+								/* add word to line */
+								if (line) {
+									int len;
+
+									len = strlen(line)
+									    + strlen(pp)
+									    + 2;
+									temp = emalloc(len);
+									snprintf(temp, len, "%s %s", line, pp);
+									free(line);
+									line = temp;
+								} else {
+									line = estrdup(pp);
+								}
+								line_width = new_width;
+							} else if (line_width == 0) {
+								/* can't fit single word in :/
+								   increase width limit to width of word
+								   and jam the bastard in anyhow */
+								w = tw;
+								line = estrdup(pp);
+								line_width = new_width;
+							} else {
+								/* finish this line, start next and add word there */
+								if (line) {
+									list = gib_list_add_end(list, estrdup(line));
+									free(line);
+									line = NULL;
+								}
+								line = estrdup(pp);
+								line_width = tw;
+							}
+						}
+						ll = ll->next;
+					}
+					if (line) {
+						/* finish last line */
+						list = gib_list_add_end(list, estrdup(line));
+						free(line);
+						line = NULL;
+					}
+					gib_list_free_and_data(words);
+				}
+			}
+			l = l->next;
+		}
+		gib_list_free_and_data(lines);
+		lines = list;
+	}
+	return lines;
+}
+
+void feh_edit_inplace_lossless(winwidget w, int op)
+{
+	char *filename = FEH_FILE(w->file->data)->filename;
+	int len = strlen(filename) + 1;
+	char *file_str = emalloc(len);
+	int pid, status;
+	int devnull = -1;
+	char op_name[]  = "rotate";     /* message */
+	char op_op[]    = "-rotate";    /* jpegtran option */
+	char op_value[] = "horizontal"; /* jpegtran option's value */
+
+	if (op == INPLACE_EDIT_FLIP) {
+		sprintf(op_name,  "flip");
+		sprintf(op_op,    "-flip");
+		sprintf(op_value, "vertical");
+	} else if (op == INPLACE_EDIT_MIRROR) {
+		sprintf(op_name,  "mirror");
+		sprintf(op_op,    "-flip");
+	} else
+		snprintf(op_value, 4, "%d", 90 * op);
+
+	snprintf(file_str, len, "%s", filename);
+
+	if ((pid = fork()) < 0) {
+		im_weprintf(w, "lossless %s: fork failed:", op_name);
+		free(file_str);
+		return;
+	}
+	else if (pid == 0) {
+
+		execlp("jpegtran", "jpegtran", "-copy", "all", op_op, op_value,
+				"-outfile", file_str, file_str, NULL);
+
+		weprintf("lossless %s: Is 'jpegtran' installed? Failed to exec:", op_name);
+		_exit(1);
+	}
+	else {
+		waitpid(pid, &status, 0);
+
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+			im_weprintf(w,
+					"lossless %s: Got exitcode %d from jpegtran."
+					" Commandline was: "
+					"jpegtran -copy all %s %s -outfile %s %s",
+					op_name, status >> 8, op_op, op_value, file_str, file_str);
+			free(file_str);
+			return;
+		}
+	}
+	if ((pid = fork()) < 0) {
+		im_weprintf(w, "lossless %s: fork failed while updating EXIF tags:", op_name);
+	}
+	else if (pid == 0) {
+
+		/* discard normal output */
+		devnull = open("/dev/null", O_WRONLY);
+		dup2(devnull, 1);
+
+		execlp("jpegexiforient", "jpegexiforient", "-1", file_str, NULL);
+		weprintf("lossless %s: Failed to exec jpegexiforient:", op_name);
+		_exit(1);
+	}
+	else {
+		waitpid(pid, &status, 0);
+
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+			im_weprintf(w,
+					"lossless %s: Failed to update EXIF orientation tag:"
+					" jpegexiforient returned %d",
+					op_name, status >> 8);
+		}
+	}
+	free(file_str);
+}
+
+void feh_draw_actions(winwidget w)
+{
+	static Imlib_Font fn = NULL;
+	int tw = 0, th = 0;
+	int th_offset = 0;
+	int max_tw = 0;
+	int line_th = 0;
+	Imlib_Image im = NULL;
+	int i = 0;
+	int num_actions = 0;
+	int cur_action = 0;
+	char index[3];
+	char *line;
+
+	/* Count number of defined actions. This method sucks a bit since it needs
+	 * to be changed if the number of actions changes, but at least it doesn't
+	 * miss actions 2 to 9 if action1 isn't defined
+	 */
+	for (i = 0; i < 10; i++) {
+		if (opt.actions[i])
+			num_actions++;
+	}
+
+	if (num_actions == 0)
+		return;
+
+	if ((!w->file) || (!FEH_FILE(w->file->data))
+			|| (!FEH_FILE(w->file->data)->filename))
+		return;
+
+	fn = feh_load_font(w);
+
+	gib_imlib_get_text_size(fn, "defined actions:", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+/* Check for the widest line */
+	max_tw = tw;
+
+	for (i = 0; i < 10; i++) {
+		if (opt.actions[i]) {
+			line = emalloc(strlen(opt.action_titles[i]) + 5);
+			strcpy(line, "0: ");
+			line = strcat(line, opt.action_titles[i]);
+			gib_imlib_get_text_size(fn, line, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+			free(line);
+			if (tw > max_tw)
+				max_tw = tw;
+		}
+	}
+
+	tw = max_tw;
+	tw += 3;
+	th += 3;
+	line_th = th;
+	th = (th * num_actions) + line_th;
+
+	/* This depends on feh_draw_filename internals...
+	 * should be fixed some time
+	 */
+	if (opt.draw_filename)
+		th_offset = line_th * 2;
+
+	im = imlib_create_image(tw, th);
+	if (!im)
+		eprintf("Couldn't create image. Out of memory?");
+
+	feh_imlib_image_fill_text_bg(im, tw, th);
+
+	gib_imlib_text_draw(im, fn, NULL, 2, 2, "defined actions:", IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+	gib_imlib_text_draw(im, fn, NULL, 1, 1, "defined actions:", IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+	for (i = 0; i < 10; i++) {
+		if (opt.action_titles[i]) {
+			cur_action++;
+			line = emalloc(strlen(opt.action_titles[i]) + 5);
+			sprintf(index, "%d", i);
+			strcpy(line, index);
+			strcat(line, ": ");
+			strcat(line, opt.action_titles[i]);
+
+			gib_imlib_text_draw(im, fn, NULL, 2,
+					(cur_action * line_th) + 2, line,
+					IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+			gib_imlib_text_draw(im, fn, NULL, 1,
+					(cur_action * line_th) + 1, line,
+					IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+			free(line);
+		}
+	}
+
+	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, 0 + th_offset, 1, 1, 0);
+
+	gib_imlib_free_image_and_decache(im);
+	return;
 }
diff --git a/src/index.c b/src/index.c
index 90f34f8..b0b6923 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1,6 +1,7 @@
 /* index.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -27,585 +28,456 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "filelist.h"
 #include "winwidget.h"
 #include "options.h"
+#include "index.h"
 
-static char *create_index_dimension_string(int w, int h);
-static char *create_index_size_string(char *file);
-static char *create_index_title_string(int num, int w, int h);
 
 /* TODO Break this up a bit ;) */
 /* TODO s/bit/lot */
-void
-init_index_mode(void)
+void init_index_mode(void)
 {
-   Imlib_Image im_main;
-   Imlib_Image im_temp;
-   int w = 800, h = 600, ww = 0, hh = 0, www, hhh, xxx, yyy;
-   int x = 0, y = 0;
-   int bg_w = 0, bg_h = 0;
-   winwidget winwid = NULL;
-   Imlib_Image bg_im = NULL, im_thumb = NULL;
-   int tot_thumb_h;
-   int text_area_h = 50;
-   int title_area_h = 0;
-   Imlib_Font fn = NULL;
-   Imlib_Font title_fn = NULL;
-   int text_area_w = 0;
-   int tw = 0, th = 0;
-   int fw_name, fw_size, fw_dim, fw, fh;
-   int vertical = 0;
-   int max_column_w = 0;
-   int thumbnailcount = 0;
-   gib_list *l = NULL, *last = NULL;
-   feh_file *file = NULL;
-   int lines;
-   unsigned char trans_bg = 0;
-   int index_image_width, index_image_height;
-   int x_offset_name = 0, x_offset_dim = 0, x_offset_size = 0;
-   char *s;
-
-   D_ENTER(3);
-
-   if (opt.montage) {
-     mode = "montage";
-   } else {
-     mode = "index";
-   }
-
-   fn = gib_imlib_load_font(opt.font);
-
-   if (opt.title_font)
-   {
-      int fh, fw;
-
-      title_fn = gib_imlib_load_font(opt.title_font);
-      if (!fn)
-         title_fn = gib_imlib_load_font(DEFAULT_FONT_TITLE);
-      gib_imlib_get_text_size(title_fn, "W", NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-      title_area_h = fh + 4;
-   }
-   else
-      title_fn = gib_imlib_load_font(DEFAULT_FONT_TITLE);
-
-   if ((!fn) || (!title_fn))
-      eprintf("Error loading fonts");
-
-   /* Work out how tall the font is */
-   gib_imlib_get_text_size(fn, "W", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-   /* For now, allow room for the right number of lines with small gaps */
-   text_area_h =
-      ((th + 2) * (opt.index_show_name + opt.index_show_size +
-                   opt.index_show_dim)) + 5;
-
-   /* This includes the text area for index data */
-   tot_thumb_h = opt.thumb_h + text_area_h;
-
-   /* Use bg image dimensions for default size */
-   if (opt.bg && opt.bg_file)
-   {
-      if (!strcmp(opt.bg_file, "trans"))
-         trans_bg = 1;
-      else
-      {
-         D(3, ("Time to apply a background to blend onto\n"));
-         if (feh_load_image_char(&bg_im, opt.bg_file) != 0)
-         {
-            bg_w = gib_imlib_image_get_width(bg_im);
-            bg_h = gib_imlib_image_get_height(bg_im);
-         }
-      }
-   }
-
-   if (!opt.limit_w && !opt.limit_h)
-   {
-      if (bg_im)
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for index.\n"
-                    " You did specify a background however, so the\n"
-                    " index size has defaulted to the size of the image\n");
-         opt.limit_w = bg_w;
-         opt.limit_h = bg_h;
-      }
-      else
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for index.\n"
-                    " Using defaults (width limited to 800)\n");
-         opt.limit_w = 800;
-      }
-   }
-
-
-   /* Here we need to whiz through the files, and look at the filenames and
-      info in the selected font, work out how much space we need, and
-      calculate the size of the image we will require */
-
-   if (opt.limit_w && opt.limit_h)
-   {
-      int rec_h = 0;
-
-      w = opt.limit_w;
-      h = opt.limit_h;
-
-      /* Work out if this is big enough, and give a warning if not */
-
-      /* Pretend we are limiting width by that specified, loop through, and
-         see it we fit in the height specified. If not, continue the loop,
-         and recommend the final value instead. Carry on and make the index
-         anyway. */
-
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         text_area_w = opt.thumb_w;
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(fn, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (text_area_w > opt.thumb_w)
-            text_area_w += 5;
-
-         if ((x > w - text_area_w))
-         {
-            x = 0;
-            y += tot_thumb_h;
-         }
-
-         x += text_area_w;
-      }
-      rec_h = y + tot_thumb_h;
-
-      if (h < rec_h)
-      {
-         weprintf("The image size you specified (%d by %d) is not large\n"
-                  "enough to hold all the thumnails you specified (%d). To fit all\n"
-                  "the thumnails, either decrease their size, choose a smaller font,\n"
-                  "or use a larger image (may I recommend %d by %d?)",
-                  opt.limit_w, opt.limit_h, filelist_len, opt.limit_w, rec_h);
-      }
-   }
-   else if (opt.limit_h)
-   {
-      vertical = 1;
-      h = opt.limit_h;
-      /* calc w */
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         text_area_w = opt.thumb_w;
-         /* Calc width of text */
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(fn, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (text_area_w > opt.thumb_w)
-            text_area_w += 5;
-
-         if (text_area_w > max_column_w)
-            max_column_w = text_area_w;
-
-         if ((y > h - tot_thumb_h))
-         {
-            y = 0;
-            x += max_column_w;
-            max_column_w = 0;
-         }
-
-         y += tot_thumb_h;
-      }
-      w = x + text_area_w;
-      max_column_w = 0;
-   }
-   else if (opt.limit_w)
-   {
-      w = opt.limit_w;
-      /* calc h */
-
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         text_area_w = opt.thumb_w;
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(fn, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > text_area_w)
-               text_area_w = fw;
-         }
-
-         if (text_area_w > opt.thumb_w)
-            text_area_w += 5;
-
-         if ((x > w - text_area_w))
-         {
-            x = 0;
-            y += tot_thumb_h;
-         }
-
-         x += text_area_w;
-      }
-      h = y + tot_thumb_h;
-   }
-
-   x = y = 0;
-
-   index_image_width = w;
-   index_image_height = h + title_area_h;
-   im_main = imlib_create_image(index_image_width, index_image_height);
-
-   if (!im_main)
-      eprintf("Imlib error creating index image, are you low on RAM?");
-
-   if (bg_im)
-      gib_imlib_blend_image_onto_image(im_main, bg_im,
-                                       gib_imlib_image_has_alpha(bg_im), 0, 0,
-                                       bg_w, bg_h, 0, 0, w, h, 1, 0, 0);
-   else if (trans_bg)
-   {
-      gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h + title_area_h, 0, 0,
-                                     0, 0);
-      gib_imlib_image_set_has_alpha(im_main, 1);
-   }
-   else
-   {
-      /* Colour the background */
-      gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h + title_area_h, 0, 0,
-                                     0, 255);
-   }
-
-   /* Create the window title at this point */
-
-   if (!opt.title)
-      s = estrdup(PACKAGE " [index mode]");
-   else
-      s = estrdup(feh_printf(opt.title, NULL));
-
-   if (opt.display)
-   {
-      winwid = winwidget_create_from_image(im_main, s, WIN_TYPE_SINGLE);
-      winwidget_show(winwid);
-   }
-
-   for (l = filelist; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      if (last)
-      {
-         filelist = feh_file_remove_from_list(filelist, last);
-         filelist_len--;
-         last = NULL;
-      }
-      D(4, ("About to load image %s\n", file->filename));
-      if (feh_load_image(&im_temp, file) != 0)
-      {
-         if (opt.verbose)
-            feh_display_status('.');
-         D(4, ("Successfully loaded %s\n", file->filename));
-         www = opt.thumb_w;
-         hhh = opt.thumb_h;
-         ww = gib_imlib_image_get_width(im_temp);
-         hh = gib_imlib_image_get_height(im_temp);
-         thumbnailcount++;
-
-         if (opt.aspect)
-         {
-            double ratio = 0.0;
-
-            /* Keep the aspect ratio for the thumbnail */
-            ratio = ((double) ww / hh) / ((double) www / hhh);
-
-            if (ratio > 1.0)
-               hhh = opt.thumb_h / ratio;
-            else if (ratio != 1.0)
-               www = opt.thumb_w * ratio;
-         }
-
-         if ((!opt.stretch) && ((www > ww) || (hhh > hh)))
-         {
-            /* Don't make the image larger unless stretch is specified */
-            www = ww;
-            hhh = hh;
-         }
-
-         im_thumb =
-            gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, ww, hh, www,
-                                                  hhh, 1);
-         gib_imlib_free_image_and_decache(im_temp);
-
-         if (opt.alpha)
-         {
-            DATA8 atab[256];
-
-            D(3, ("Applying alpha options\n"));
-            gib_imlib_image_set_has_alpha(im_thumb, 1);
-            memset(atab, opt.alpha_level, sizeof(atab));
-            gib_imlib_apply_color_modifier_to_rectangle(im_thumb, 0, 0, www,
-                                                        hhh, NULL, NULL, NULL,
-                                                        atab);
-         }
-
-         text_area_w = opt.thumb_w;
-         /* Now draw on the info text */
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(fn, file->name, NULL, &fw_name, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw_name > text_area_w)
-               text_area_w = fw_name;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(fn, create_index_dimension_string(ww, hh),
-                                    NULL, &fw_dim, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw_dim > text_area_w)
-               text_area_w = fw_dim;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(fn,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw_size, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw_size > text_area_w)
-               text_area_w = fw_size;
-         }
-         if (text_area_w > opt.thumb_w)
-            text_area_w += 5;
-
-         /* offsets for centering text */
-         x_offset_name = (text_area_w - fw_name) / 2;
-         x_offset_dim = (text_area_w - fw_dim) / 2;
-         x_offset_size = (text_area_w - fw_size) / 2;
-
-         if (vertical)
-         {
-            if (text_area_w > max_column_w)
-               max_column_w = text_area_w;
-            if (y > h - tot_thumb_h)
-            {
-               y = 0;
-               x += max_column_w;
-               max_column_w = 0;
-            }
-            if (x > w - text_area_w)
-               break;
-         }
-         else
-         {
-            if (x > w - text_area_w)
-            {
-               x = 0;
-               y += tot_thumb_h;
-            }
-            if (y > h - tot_thumb_h)
-               break;
-         }
-
-         if (opt.aspect)
-         {
-            xxx = x + ((opt.thumb_w - www) / 2);
-            yyy = y + ((opt.thumb_h - hhh) / 2);
-         }
-         else
-         {
-            /* Ignore the aspect ratio and squash the image in */
-            xxx = x;
-            yyy = y;
-         }
-
-         /* Draw now */
-         gib_imlib_blend_image_onto_image(im_main, im_thumb,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0, 0, www, hhh, xxx, yyy, www, hhh,
-                                          1,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0);
-
-         gib_imlib_free_image_and_decache(im_thumb);
-
-         lines = 0;
-         if (opt.index_show_name)
-            gib_imlib_text_draw(im_main, fn, NULL, x + x_offset_name,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                file->name, IMLIB_TEXT_TO_RIGHT, 255, 255,
-                                255, 255);
-         if (opt.index_show_dim)
-            gib_imlib_text_draw(im_main, fn, NULL, x + x_offset_dim,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                create_index_dimension_string(ww, hh),
-                                IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-         if (opt.index_show_size)
-            gib_imlib_text_draw(im_main, fn, NULL, x + x_offset_size,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                create_index_size_string(file->filename),
-                                IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-
-         if (vertical)
-            y += tot_thumb_h;
-         else
-            x += text_area_w;
-
-      }
-      else
-      {
-         if (opt.verbose)
-            feh_display_status('x');
-         last = l;
-      }
-      if (opt.display)
-      {
-         winwidget_render_image(winwid, 0, 0);
-         if (!feh_main_iteration(0))
-            exit(0);
-      }
-   }
-   if (opt.verbose)
-      fprintf(stdout, "\n");
-
-   if (opt.title_font)
-   {
-      int fw, fh, fx, fy;
-      char *s;
-
-      s = create_index_title_string(thumbnailcount, w, h);
-      gib_imlib_get_text_size(title_fn, s, NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-      fx = (index_image_width - fw) >> 1;
-      fy = index_image_height - fh - 2;
-      gib_imlib_text_draw(im_main, title_fn, NULL, fx, fy, s, IMLIB_TEXT_TO_RIGHT,
-                          255, 255, 255, 255);
-   }
-
-   if (opt.output && opt.output_file)
-   {
-      char output_buf[1024];
-
-      if (opt.output_dir)
-         snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
-      else
-         strncpy(output_buf, opt.output_file, 1024);
-
-      gib_imlib_save_image(im_main, output_buf);
-      if (opt.verbose)
-      {
-         int tw, th;
-
-         tw = gib_imlib_image_get_width(im_main);
-         th = gib_imlib_image_get_height(im_main);
-         fprintf(stdout, PACKAGE " - File saved as %s\n", output_buf);
-         fprintf(stdout,
-                 "    - Image is %dx%d pixels and contains %d thumbnails\n",
-                 tw, th, thumbnailcount);
-      }
-   }
-
-   if (!opt.display)
-      gib_imlib_free_image_and_decache(im_main);
-
-   free(s);
-   D_RETURN_(3);
+	Imlib_Load_Error err;
+	Imlib_Image im_main;
+	Imlib_Image im_temp;
+	int w = 800, h = 600, ww = 0, hh = 0, www, hhh, xxx, yyy;
+	int x = 0, y = 0;
+	int bg_w = 0, bg_h = 0;
+	winwidget winwid = NULL;
+	Imlib_Image bg_im = NULL, im_thumb = NULL;
+	int tot_thumb_h;
+	int text_area_h = 50;
+	int title_area_h = 0;
+	Imlib_Font fn = NULL;
+	Imlib_Font title_fn = NULL;
+	int text_area_w = 0;
+	int tw = 0, th = 0;
+	int fw, fh;
+	int vertical = 0;
+	int max_column_w = 0;
+	int thumbnailcount = 0;
+	gib_list *l = NULL, *last = NULL;
+	feh_file *file = NULL;
+	int lineno;
+	unsigned char trans_bg = 0;
+	int index_image_width, index_image_height;
+	gib_list *line, *lines;
+
+	if (opt.montage) {
+		mode = "montage";
+	} else {
+		mode = "index";
+	}
+
+	if (opt.font)
+		fn = gib_imlib_load_font(opt.font);
+
+	if (!fn)
+		fn = gib_imlib_load_font(DEFAULT_FONT);
+
+	if (opt.title_font) {
+
+		title_fn = gib_imlib_load_font(opt.title_font);
+		if (!title_fn)
+			title_fn = gib_imlib_load_font(DEFAULT_FONT_TITLE);
+
+		gib_imlib_get_text_size(title_fn, "W", NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
+		title_area_h = fh + 4;
+	} else
+		title_fn = gib_imlib_load_font(DEFAULT_FONT_TITLE);
+
+	if ((!fn) || (!title_fn))
+		eprintf("Error loading fonts");
+
+	/* Work out how tall the font is */
+	gib_imlib_get_text_size(fn, "W", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+	get_index_string_dim(NULL, fn, &fw, &fh);
+	/* For now, allow room for the right number of lines with small gaps */
+	text_area_h = fh + 5;
+
+	/* This includes the text area for index data */
+	tot_thumb_h = opt.thumb_h + text_area_h;
+
+	/* Use bg image dimensions for default size */
+	if (opt.bg && opt.bg_file) {
+		if (!strcmp(opt.bg_file, "trans"))
+			trans_bg = 1;
+		else {
+			D(("Time to apply a background to blend onto\n"));
+			if (feh_load_image_char(&bg_im, opt.bg_file) != 0) {
+				bg_w = gib_imlib_image_get_width(bg_im);
+				bg_h = gib_imlib_image_get_height(bg_im);
+			}
+		}
+	}
+
+	if (!opt.limit_w && !opt.limit_h) {
+		if (bg_im) {
+			opt.limit_w = bg_w;
+			opt.limit_h = bg_h;
+		} else
+			opt.limit_w = 800;
+	}
+
+	/* Here we need to whiz through the files, and look at the filenames and
+	   info in the selected font, work out how much space we need, and
+	   calculate the size of the image we will require */
+
+	if (opt.limit_w) {
+		w = opt.limit_w;
+
+		index_calculate_height(fn, w, &h, &tot_thumb_h);
+
+		if (opt.limit_h) {
+			if (h > opt.limit_h)
+				weprintf(
+					"The image size you specified (%dx%d) is not large\n"
+					"enough to hold all %d thumbnails. To fit all the thumbnails,\n"
+					"either decrease their size, choose a smaller font,\n"
+					"or use a larger image (like %dx%d)",
+					opt.limit_w, opt.limit_h, filelist_len, w, h);
+			h = opt.limit_h;
+		}
+	} else if (opt.limit_h) {
+		vertical = 1;
+		h = opt.limit_h;
+
+		index_calculate_width(fn, &w, h, &tot_thumb_h);
+	}
+
+	index_image_width = w;
+	index_image_height = h + title_area_h;
+	im_main = imlib_create_image(index_image_width, index_image_height);
+
+	if (!im_main) {
+		if (index_image_height >= 32768 || index_image_width >= 32768) {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image.\n"
+					"This is probably due to Imlib2 issues when dealing with images larger than 32k x 32k pixels.",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		} else {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image. Do you have enough RAM?",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		}
+	}
+
+	if (bg_im)
+		gib_imlib_blend_image_onto_image(im_main, bg_im,
+						 gib_imlib_image_has_alpha
+						 (bg_im), 0, 0, bg_w, bg_h, 0, 0, w, h, 1, 0, 0);
+	else if (trans_bg) {
+		gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h + title_area_h, 0, 0, 0, 0);
+		gib_imlib_image_set_has_alpha(im_main, 1);
+	} else {
+		/* Colour the background */
+		gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h + title_area_h, 0, 0, 0, 255);
+	}
+
+	if (opt.display) {
+		winwid = winwidget_create_from_image(im_main, WIN_TYPE_SINGLE);
+		winwidget_rename(winwid, PACKAGE " [index mode]");
+		winwidget_show(winwid);
+	}
+
+	for (l = filelist; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		if (last) {
+			filelist = feh_file_remove_from_list(filelist, last);
+			last = NULL;
+		}
+		D(("About to load image %s\n", file->filename));
+		if (feh_load_image(&im_temp, file) != 0) {
+			if (opt.verbose)
+				feh_display_status('.');
+			D(("Successfully loaded %s\n", file->filename));
+			www = opt.thumb_w;
+			hhh = opt.thumb_h;
+			ww = gib_imlib_image_get_width(im_temp);
+			hh = gib_imlib_image_get_height(im_temp);
+			thumbnailcount++;
+
+			if (opt.aspect) {
+				double ratio = 0.0;
+
+				/* Keep the aspect ratio for the thumbnail */
+				ratio = ((double) ww / hh) / ((double) www / hhh);
+
+				if (ratio > 1.0)
+					hhh = opt.thumb_h / ratio;
+				else if (ratio != 1.0)
+					www = opt.thumb_w * ratio;
+			}
+
+			if ((!opt.stretch) && ((www > ww) || (hhh > hh))) {
+				/* Don't make the image larger unless stretch is specified */
+				www = ww;
+				hhh = hh;
+			}
+
+			im_thumb = gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, ww, hh, www, hhh, 1);
+			gib_imlib_free_image_and_decache(im_temp);
+
+			if (opt.alpha) {
+				DATA8 atab[256];
+
+				D(("Applying alpha options\n"));
+				gib_imlib_image_set_has_alpha(im_thumb, 1);
+				memset(atab, opt.alpha_level, sizeof(atab));
+				gib_imlib_apply_color_modifier_to_rectangle
+				    (im_thumb, 0, 0, www, hhh, NULL, NULL, NULL, atab);
+			}
+
+			text_area_w = opt.thumb_w;
+			/* Now draw on the info text */
+			if (opt.index_info) {
+				get_index_string_dim(file, fn, &fw, &fh);
+				if (fw > text_area_w)
+					text_area_w = fw;
+			}
+			if (text_area_w > opt.thumb_w)
+				text_area_w += 5;
+
+			if (vertical) {
+				if (text_area_w > max_column_w)
+					max_column_w = text_area_w;
+				if (y > h - tot_thumb_h) {
+					y = 0;
+					x += max_column_w;
+					max_column_w = 0;
+				}
+				if (x > w - text_area_w)
+					break;
+			} else {
+				if (x > w - text_area_w) {
+					x = 0;
+					y += tot_thumb_h;
+				}
+				if (y > h - tot_thumb_h)
+					break;
+			}
+
+			/* center image relative to the text below it (if any) */
+			xxx = x + ((text_area_w - www) / 2);
+			yyy = y;
+
+			if (opt.aspect)
+				yyy += (opt.thumb_h - hhh) / 2;
+
+			/* Draw now */
+			gib_imlib_blend_image_onto_image(im_main, im_thumb,
+							 gib_imlib_image_has_alpha
+							 (im_thumb), 0, 0,
+							 www, hhh, xxx,
+							 yyy, www, hhh, 1, gib_imlib_image_has_alpha(im_thumb), 0);
+
+			gib_imlib_free_image_and_decache(im_thumb);
+
+			lineno = 0;
+			if (opt.index_info) {
+				line = lines = feh_wrap_string(create_index_string(file),
+						opt.thumb_w * 3, fn, NULL);
+
+				while (line) {
+					gib_imlib_get_text_size(fn, (char *) line->data,
+							NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
+					gib_imlib_text_draw(im_main, fn, NULL,
+							x + ((text_area_w - fw) >> 1),
+							y + opt.thumb_h + (lineno++ * (th + 2)) + 2,
+							(char *) line->data,
+							IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+					line = line->next;
+				}
+				gib_list_free_and_data(lines);
+			}
+
+			if (vertical)
+				y += tot_thumb_h;
+			else
+				x += text_area_w;
+
+		} else {
+			if (opt.verbose)
+				feh_display_status('x');
+			last = l;
+		}
+		if (opt.display) {
+			winwidget_render_image(winwid, 0, 0);
+			if (!feh_main_iteration(0))
+				exit(0);
+		}
+	}
+	if (opt.verbose)
+		putc('\n', stderr);
+
+	if (opt.title_font) {
+		int fw, fh, fx, fy;
+		char *s;
+
+		s = create_index_title_string(thumbnailcount, w, h);
+		gib_imlib_get_text_size(title_fn, s, NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
+		fx = (index_image_width - fw) >> 1;
+		fy = index_image_height - fh - 2;
+		gib_imlib_text_draw(im_main, title_fn, NULL, fx, fy, s, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+		if (opt.display)
+			winwidget_render_image(winwid, 0, 0);
+	}
+
+	if (opt.output && opt.output_file) {
+		char output_buf[1024];
+
+		if (opt.output_dir)
+			snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
+		else {
+			strncpy(output_buf, opt.output_file, 1023);
+			output_buf[1023] = '\0';
+		}
+
+		gib_imlib_save_image_with_error_return(im_main, output_buf, &err);
+		if (err) {
+			feh_print_load_error(output_buf, im_main, err, LOAD_ERROR_IMLIB);
+		}
+		else if (opt.verbose) {
+			int tw, th;
+
+			tw = gib_imlib_image_get_width(im_main);
+			th = gib_imlib_image_get_height(im_main);
+			fprintf(stderr, PACKAGE " - File saved as %s\n", output_buf);
+			fprintf(stderr,
+				"    - Image is %dx%d pixels and contains %d thumbnails\n", tw, th, thumbnailcount);
+		}
+	}
+
+	if (!opt.display)
+		gib_imlib_free_image_and_decache(im_main);
+
+	return;
 }
 
-
-char *
-chop_file_from_full_path(char *str)
+void index_calculate_height(Imlib_Font fn, int w, int *h, int *tot_thumb_h)
 {
-   D_ENTER(4);
-   D_RETURN(4, strrchr(str, '/') + 1);
+	gib_list *l;
+	feh_file *file = NULL;
+	int x = 0, y = 0;
+	int fw = 0, fh = 0;
+	int text_area_w = 0, text_area_h = 0;
+
+	for (l = filelist; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		text_area_w = opt.thumb_w;
+		if (opt.index_info) {
+			get_index_string_dim(file, fn, &fw, &fh);
+			if (fw > text_area_w)
+				text_area_w = fw;
+			if (fh > text_area_h) {
+				text_area_h = fh + 5;
+				*tot_thumb_h = opt.thumb_h + text_area_h;
+			}
+		}
+
+		if (text_area_w > opt.thumb_w)
+			text_area_w += 5;
+
+		if ((x > w - text_area_w)) {
+			x = 0;
+			y += *tot_thumb_h;
+		}
+
+		x += text_area_w;
+	}
+	*h = y + *tot_thumb_h;
 }
 
-static char *
-create_index_size_string(char *file)
+void index_calculate_width(Imlib_Font fn, int *w, int h, int *tot_thumb_h)
 {
-   static char str[50];
-   int size = 0;
-   double kbs = 0.0;
-   struct stat st;
-
-   D_ENTER(4);
-   if (stat(file, &st))
-      kbs = 0.0;
-   else
-   {
-      size = st.st_size;
-      kbs = (double) size / 1000;
-   }
-
-   snprintf(str, sizeof(str), "%.2fKb", kbs);
-   D_RETURN(4, str);
+	gib_list *l;
+	feh_file *file = NULL;
+	int x = 0, y = 0;
+	int fw = 0, fh = 0;
+	int text_area_w = 0, text_area_h = 0;
+	int max_column_w = 0;
+
+	for (l = filelist; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		text_area_w = opt.thumb_w;
+		/* Calc width of text */
+		if (opt.index_info) {
+			get_index_string_dim(file, fn, &fw, &fh);
+			if (fw > text_area_w)
+				text_area_w = fw;
+			if (fh > text_area_h) {
+				text_area_h = fh + 5;
+				*tot_thumb_h = opt.thumb_h + text_area_h;
+			}
+		}
+		if (text_area_w > opt.thumb_w)
+			text_area_w += 5;
+
+		if (text_area_w > max_column_w)
+			max_column_w = text_area_w;
+
+		if ((y > h - *tot_thumb_h)) {
+			y = 0;
+			x += max_column_w;
+			max_column_w = 0;
+		}
+
+		y += *tot_thumb_h;
+	}
+	*w = x + text_area_w;
 }
 
-static char *
-create_index_dimension_string(int w, int h)
+void get_index_string_dim(feh_file *file, Imlib_Font fn, int *fw, int *fh)
 {
-   static char str[50];
+	int line_w, line_h;
+	char fake_file = 0;
+	gib_list *line, *lines;
+	int max_w = 0, total_h = 0;
+
+	if (!opt.index_info) {
+		*fw = 0;
+		*fh = 0;
+		return;
+	}
+
+	/* called with file = NULL in the setup phase.
+	 * We need a fake file, otherwise feh_printf will remove format specifiers,
+	 * leading e.g. to a 0x0 report for index_dim = "%n".
+	 */
+	if (file == NULL) {
+		fake_file = 1;
+		file = feh_file_new("foo");
+		file->info = feh_file_info_new();
+	}
+
+	line = lines = feh_wrap_string(create_index_string(file), opt.thumb_w * 3, fn, NULL);
+
+	while (line) {
+		gib_imlib_get_text_size(fn, (char *) line->data,
+			NULL, &line_w, &line_h, IMLIB_TEXT_TO_RIGHT);
+
+		if (line_w > max_w)
+			max_w = line_w;
+		total_h += line_h + 2;
+
+		line = line->next;
+	}
+
+	gib_list_free_and_data(lines);
+	if (fake_file)
+		feh_file_free(file);
+
+	*fw = max_w;
+	*fh = total_h;
+	return;
+}
 
-   D_ENTER(4);
-   snprintf(str, sizeof(str), "%dx%d", w, h);
-   D_RETURN(4, str);
+char *create_index_string(feh_file * file)
+{
+	return feh_printf(opt.index_info, file, NULL);
 }
 
-static char *
-create_index_title_string(int num, int w, int h)
+char *create_index_title_string(int num, int w, int h)
 {
-   static char str[50];
+	static char str[50];
 
-   D_ENTER(4);
-   snprintf(str, sizeof(str),
-            PACKAGE " index - %d thumbnails, %d by %d pixels", num, w, h);
-   D_RETURN(4, str);
+	snprintf(str, sizeof(str), PACKAGE " index - %d thumbnails, %d by %d pixels", num, w, h);
+	return(str);
 }
diff --git a/src/index.h b/src/index.h
new file mode 100644
index 0000000..b805cc0
--- /dev/null
+++ b/src/index.h
@@ -0,0 +1,35 @@
+/* index.h
+
+Copyright (C) 2018 Birte Kristina Friesel.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef INDEX_H
+#define INDEX_H
+
+char *create_index_string(feh_file *file);
+char *create_index_title_string(int num, int w, int h);
+void get_index_string_dim(feh_file *file, Imlib_Font fn, int *w, int *h);
+void index_calculate_height(Imlib_Font fn, int w, int *h, int *tot_thumb_w);
+void index_calculate_width(Imlib_Font fn, int *w, int h, int *tot_thumb_h);
+
+#endif
diff --git a/src/ipc.c b/src/ipc.c
deleted file mode 100644
index 4cc38dc..0000000
--- a/src/ipc.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ipc.c
-
-Copyright (C) 1999-2003 Tom Gilbert.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its documentation and acknowledgment shall be
-given in the documentation and software packages that this Software was
-used.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include "feh.h"
-#include "debug.h"
-#include "options.h"
-
-static int session_id = 0;
-static char *socket_name;
-static int socket_fd = 0;
-
-int feh_ipc_create_socket(void) {
-  struct sockaddr_un saddr;
-  int i;
-
-  if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) {
-    for (i = 0; ; i++) {
-      saddr.sun_family = AF_UNIX;
-      snprintf(saddr.sun_path, 108, "%s/feh_%s.%d", feh_get_tmp_dir(), feh_get_user_name(), i);
-/*
-      if (!feh_remote_is_running(i)) {
-        if ((unlink(saddr.sun_path) == -1) && errno != ENOENT) {
-          close(socket_fd);
-          eprintf("feh_ipc_create_socket: failed to unlink %s:", saddr.sun_path);
-        }
-      } else {
-        continue;
-        }
-*/
-      if (bind(socket_fd, (struct sockaddr *) &saddr, sizeof(saddr)) != -1) {
-        session_id = i;
-        socket_name = estrdup(saddr.sun_path);
-        listen(socket_fd, 50);
-        break;
-      } else {
-        close(socket_fd);
-        eprintf("feh_ipc_create_socket: failed to bind %s to a socket:", saddr.sun_path);
-      }
-    }
-  } else {
-    eprintf("feh_ipc_create_socket: failed to open socket:");
-  }
-}
-
-int feh_ipc_get_session_id(void) {
-  return session_id;
-}
-
-void feh_ipc_cleanup(void) {
-  close(socket_fd);
-  unlink(socket_name);
-  free(socket_name);
-}
-
-static void feh_ipc_write_packet(int fd, void *data, int length) {
-  feh_ipc_server_header header;
-  header.version = FEH_IPC_VERSION;
-  header.data_length = length;
-  if (data && length > 0) {
-    write(fd, data, length);
-  }
-}
-
-static void feh_ipc_write_int(int fd, int val) {
-  feh_ipc_write_packet(fd, &val, sizeof(int));
-}
-
-static void feh_ipc_write_string(int fd, char *string) {
-  feh_ipc_write_packet(fd, &string, string ? strlen(string) + 1 : 0);
-}
-
-
diff --git a/src/jpegint.h b/src/jpegint.h
deleted file mode 100644
index 95b00d4..0000000
--- a/src/jpegint.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean call_pass_startup;	/* True if pass_startup must be called */
-  boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-			      jpeg_component_info * compptr,
-			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-			      JDIMENSION start_row, JDIMENSION start_col,
-			      JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  boolean has_multiple_scans;	/* True if file has multiple scans */
-  boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  boolean saw_SOI;		/* found SOI? */
-  boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  boolean insufficient_data;	/* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_phuff_encoder	jIPHEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_phuff_decoder	jIPHDecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/src/keyevents.c b/src/keyevents.c
index 376a33a..2f9b1d6 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -1,6 +1,7 @@
 /* keyevents.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -28,414 +29,781 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "filelist.h"
 #include "winwidget.h"
 #include "options.h"
+#include <termios.h>
 
-void
-feh_event_invoke_action(winwidget winwid, char *action)
+struct __fehkey keys[EVENT_LIST_END];
+struct termios old_term_settings;
+unsigned char control_via_stdin = 0;
+
+void setup_stdin(void) {
+	struct termios ctrl;
+
+	control_via_stdin = 1;
+
+	if (tcgetattr(STDIN_FILENO, &old_term_settings) == -1)
+		eprintf("tcgetattr failed");
+	if (tcgetattr(STDIN_FILENO, &ctrl) == -1)
+		eprintf("tcgetattr failed");
+
+	ctrl.c_iflag &= ~(PARMRK | ISTRIP
+			| INLCR | IGNCR | IXON);
+	ctrl.c_lflag &= ~(ECHO | ICANON | IEXTEN);
+	ctrl.c_cflag &= ~(CSIZE | PARENB);
+	ctrl.c_cflag |= CS8;
+
+	if (tcsetattr(STDIN_FILENO, TCSANOW, &ctrl) == -1)
+		eprintf("tcsetattr failed");
+}
+
+void restore_stdin(void) {
+	if (tcsetattr(STDIN_FILENO, TCSANOW, &old_term_settings) == -1)
+		eprintf("tcsetattr failed");
+}
+
+static void feh_set_kb(char *name, unsigned int s0, unsigned int y0,
+		unsigned int s1, unsigned int y1, unsigned int s2, unsigned int y2) {
+	static int key_index = 0;
+	fehkey *key = &keys[key_index];
+	key->keystates[0] = s0;
+	key->keystates[1] = s1;
+	key->keystates[2] = s2;
+	key->keysyms[0] = y0;
+	key->keysyms[1] = y1;
+	key->keysyms[2] = y2;
+	key->state = 0;
+	key->button = 0;
+	key->name = name;
+	key_index++;
+}
+
+static inline int ignore_space(int keysym) {
+	/*
+	 * Passing values which do not fit inside a signed 8bit char to isprint,
+	 * isspace and the likes is undefined behaviour... which glibc (for some
+	 * values) implements as a segmentation fault. So let's not do that.
+	 */
+	return ((keysym <= 127) && (keysym >= -128) && isprint(keysym) && !isspace(keysym));
+}
+
+static void feh_set_parse_kb_partial(fehkey *key, int index, char *ks) {
+	char *cur = ks;
+	int mod = 0;
+
+	if (!*ks) {
+		key->keysyms[index] = 0;
+		return;
+	}
+
+	while (cur[1] == '-') {
+		switch (cur[0]) {
+			case 'C':
+				mod |= ControlMask;
+				break;
+			case 'S':
+				mod |= ShiftMask;
+				break;
+			case '1':
+				mod |= Mod1Mask;
+				break;
+			case '4':
+				mod |= Mod4Mask;
+				break;
+			default:
+				weprintf("keys: invalid modifier %c in \"%s\"", cur[0], ks);
+				break;
+		}
+		cur += 2;
+	}
+
+	key->keysyms[index] = XStringToKeysym(cur);
+	if (ignore_space(key->keysyms[index]))
+		mod &= ~ShiftMask;
+	key->keystates[index] = mod;
+
+	if (key->keysyms[index] == NoSymbol)
+		weprintf("keys: Invalid keysym: %s", cur);
+}
+
+void init_keyevents(void) {
+	char *home = NULL;
+	char *confhome = NULL;
+	char *confpath = NULL;
+	char line[128];
+	char action[32], k1[32], k2[32], k3[32];
+	fehkey *cur_kb = NULL;
+	FILE *conf = NULL;
+	int read = 0;
+
+	/*
+	 * The feh_set_kb statements must have the same order as the key_action
+	 * enum.
+	 */
+
+	feh_set_kb("menu_close" , 0, XK_Escape    , 0, 0            , 0, 0);
+	feh_set_kb("menu_parent", 0, XK_Left      , 0, 0            , 0, 0);
+	feh_set_kb("menu_down", 0, XK_Down      , 0, 0            , 0, 0);
+	feh_set_kb("menu_up", 0, XK_Up        , 0, 0            , 0, 0);
+	feh_set_kb("menu_child", 0, XK_Right     , 0, 0            , 0, 0);
+	feh_set_kb("menu_select", 0, XK_Return    , 0, XK_space     , 0, 0);
+	feh_set_kb("scroll_left",0, XK_KP_Left   , 4, XK_Left      , 0, 0);
+	feh_set_kb("scroll_right", 0,XK_KP_Right  , 4, XK_Right     , 0, 0);
+	feh_set_kb("scroll_down",0, XK_KP_Down   , 4, XK_Down      , 0, 0);
+	feh_set_kb("scroll_up",  0, XK_KP_Up     , 4, XK_Up        , 0, 0);
+	feh_set_kb("scroll_left_page" , 8, XK_Left , 0, 0          , 0, 0);
+	feh_set_kb("scroll_right_page", 8, XK_Right, 0, 0          , 0, 0);
+	feh_set_kb("scroll_down_page" , 8, XK_Down , 0, 0          , 0, 0);
+	feh_set_kb("scroll_up_page" , 8, XK_Up   , 0, 0          , 0, 0);
+	feh_set_kb("prev_img"  , 0, XK_Left      , 0, XK_p         , 0, XK_BackSpace);
+	feh_set_kb("next_img"  , 0, XK_Right     , 0, XK_n         , 0, XK_space);
+	feh_set_kb("jump_back" , 0, XK_Page_Up   , 0, XK_KP_Page_Up, 0, 0);
+	feh_set_kb("jump_fwd"  , 0, XK_Page_Down , 0, XK_KP_Page_Down,0,0);
+	feh_set_kb("prev_dir"  , 0, XK_bracketleft, 0, 0           , 0, 0);
+	feh_set_kb("next_dir"  , 0, XK_bracketright, 0, 0          , 0, 0);
+	feh_set_kb("jump_random" ,0, XK_z         , 0, 0            , 0, 0);
+	feh_set_kb("quit"      , 0, XK_Escape    , 0, XK_q         , 0, 0);
+	feh_set_kb("close"     , 0, XK_x         , 0, 0            , 0, 0);
+	feh_set_kb("remove"    , 0, XK_Delete    , 0, 0            , 0, 0);
+	feh_set_kb("delete"    , 4, XK_Delete    , 0, 0            , 0, 0);
+	feh_set_kb("jump_first" , 0, XK_Home      , 0, XK_KP_Home   , 0, 0);
+	feh_set_kb("jump_last" , 0, XK_End       , 0, XK_KP_End    , 0, 0);
+	feh_set_kb("action_0"  , 0, XK_Return    , 0, XK_0         , 0, XK_KP_0);
+	feh_set_kb("action_1"  , 0, XK_1         , 0, XK_KP_1      , 0, 0);
+	feh_set_kb("action_2"  , 0, XK_2         , 0, XK_KP_2      , 0, 0);
+	feh_set_kb("action_3"  , 0, XK_3         , 0, XK_KP_3      , 0, 0);
+	feh_set_kb("action_4"  , 0, XK_4         , 0, XK_KP_4      , 0, 0);
+	feh_set_kb("action_5"  , 0, XK_5         , 0, XK_KP_5      , 0, 0);
+	feh_set_kb("action_6"  , 0, XK_6         , 0, XK_KP_6      , 0, 0);
+	feh_set_kb("action_7"  , 0, XK_7         , 0, XK_KP_7      , 0, 0);
+	feh_set_kb("action_8"  , 0, XK_8         , 0, XK_KP_8      , 0, 0);
+	feh_set_kb("action_9"  , 0, XK_9         , 0, XK_KP_9      , 0, 0);
+	feh_set_kb("zoom_in"   , 0, XK_Up        , 0, XK_KP_Add    , 0, 0);
+	feh_set_kb("zoom_out"  , 0, XK_Down      , 0, XK_KP_Subtract,0, 0);
+	feh_set_kb("zoom_default" , 0, XK_KP_Multiply, 0, XK_asterisk,0, 0);
+	feh_set_kb("zoom_fit"  , 0, XK_KP_Divide , 0, XK_slash     , 0, 0);
+	feh_set_kb("zoom_fill" , 0, XK_exclam    , 0, 0            , 0, 0);
+	feh_set_kb("size_to_image" , 0, XK_w      , 0, 0            , 0, 0);
+	feh_set_kb("render"    , 0, XK_KP_Begin  , 0, XK_R         , 0, 0);
+	feh_set_kb("toggle_actions" , 0, XK_a, 0, 0, 0, 0);
+	feh_set_kb("toggle_aliasing" , 0, XK_A, 0, 0, 0, 0);
+	feh_set_kb("toggle_auto_zoom" , 0, XK_Z, 0, 0, 0, 0);
+#ifdef HAVE_LIBEXIF
+	feh_set_kb("toggle_exif" , 0, XK_e, 0, 0, 0, 0);
+#endif
+	feh_set_kb("toggle_filenames" , 0, XK_d, 0, 0, 0, 0);
+	feh_set_kb("toggle_info" , 0, XK_i, 0, 0, 0, 0);
+	feh_set_kb("toggle_pointer" , 0, XK_o, 0, 0, 0, 0);
+	feh_set_kb("toggle_caption" , 0, XK_c, 0, 0, 0, 0);
+	feh_set_kb("toggle_pause" , 0, XK_h, 0, 0, 0, 0);
+	feh_set_kb("toggle_menu" , 0, XK_m, 0, 0, 0, 0);
+	feh_set_kb("toggle_fullscreen" , 0, XK_f, 0, 0, 0, 0);
+	feh_set_kb("reload_image" , 0, XK_r, 0, 0, 0, 0);
+	feh_set_kb("save_image" , 0, XK_s, 0, 0, 0, 0);
+	feh_set_kb("save_filelist" , 0, XK_L, 0, 0, 0, 0);
+	feh_set_kb("orient_1" , 0, XK_greater, 0, 0, 0, 0);
+	feh_set_kb("orient_3" , 0, XK_less, 0, 0, 0, 0);
+	feh_set_kb("flip" , 0, XK_underscore, 0, 0, 0, 0);
+	feh_set_kb("mirror" , 0, XK_bar, 0, 0, 0, 0);
+	feh_set_kb("reload_minus" , 0, XK_minus, 0, 0, 0, 0);
+	feh_set_kb("reload_plus" , 0, XK_plus, 0, 0, 0, 0);
+	feh_set_kb("toggle_keep_vp" , 0, XK_k, 0, 0, 0, 0);
+	feh_set_kb("toggle_fixed_geometry" , 0, XK_g, 0, 0, 0, 0);
+	feh_set_kb("pan" , 0, 0, 0, 0, 0, 0);
+	feh_set_kb("zoom" , 0, 0, 0, 0, 0, 0);
+	feh_set_kb("blur" , 0, 0, 0, 0, 0, 0);
+	feh_set_kb("rotate" , 0, 0, 0, 0, 0, 0);
+
+	home = getenv("HOME");
+	confhome = getenv("XDG_CONFIG_HOME");
+
+	if (confhome)
+		confpath = estrjoin("/", confhome, "feh/keys", NULL);
+	else if (home)
+		confpath = estrjoin("/", home, ".config/feh/keys", NULL);
+	else
+		return;
+
+	conf = fopen(confpath, "r");
+
+	free(confpath);
+
+	if (!conf && ((conf = fopen("/etc/feh/keys", "r")) == NULL))
+		return;
+
+	while (fgets(line, sizeof(line), conf)) {
+		*action = '\0';
+		*k1 = '\0';
+		*k2 = '\0';
+		*k3 = '\0';
+		cur_kb = NULL;
+
+		read = sscanf(line, "%31s %31s %31s %31s\n",
+			(char *) &action, (char *) &k1, (char* ) &k2, (char *) &k3);
+
+		if ((read == EOF) || (read == 0) || (line[0] == '#'))
+			continue;
+
+		cur_kb = feh_str_to_kb(action);
+
+		if (cur_kb) {
+			feh_set_parse_kb_partial(cur_kb, 0, k1);
+			feh_set_parse_kb_partial(cur_kb, 1, k2);
+			feh_set_parse_kb_partial(cur_kb, 2, k3);
+		} else {
+			weprintf("keys: Invalid action: %s", action);
+		}
+	}
+	fclose(conf);
+}
+
+static short feh_is_kp(unsigned int key_index, unsigned int state,
+		unsigned int sym, unsigned int button) {
+	int i;
+
+	if (sym != NoSymbol) {
+		for (i = 0; i < 3; i++) {
+			if (
+					(keys[key_index].keysyms[i] == sym) &&
+					(keys[key_index].keystates[i] == state))
+				return 1;
+			else if (keys[key_index].keysyms[i] == 0)
+				return 0;
+		}
+		return 0;
+	}
+	if ((keys[key_index].state == state)
+			&& (keys[key_index].button == button)) {
+		return 1;
+	}
+	return 0;
+}
+
+void feh_event_invoke_action(winwidget winwid, unsigned char action)
 {
-  D_ENTER(4);
-  D(4, ("action is '%s'\n", action));
-  D(4, ("winwid is '%p'\n", winwid));
-  if (action)
-  {
-     if (opt.slideshow)
-     {
-        feh_action_run(FEH_FILE(winwid->file->data),action);
-        slideshow_change_image(winwid, SLIDE_NEXT);
-     }
-     else if ((winwid->type == WIN_TYPE_SINGLE)
-              || (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER))
-     {
-        feh_action_run(FEH_FILE(winwid->file->data),action);
-        winwidget_destroy(winwid);
-     }
-     else if (winwid->type == WIN_TYPE_THUMBNAIL)
-     {
-       printf("actions from the main thumb window aren't currentl supported!\n");
-       printf("For now, open the image to perform the action on it.\n");
-     }
-  }
-  D_RETURN_(4);
+	struct stat st;
+	if (opt.actions[action]) {
+		if (opt.slideshow) {
+			feh_action_run(FEH_FILE(winwid->file->data), opt.actions[action], winwid);
+
+			if (opt.hold_actions[action])
+				feh_reload_image(winwid, 1, 1);
+			else if (stat(FEH_FILE(winwid->file->data)->filename, &st) == -1)
+				feh_filelist_image_remove(winwid, 0);
+			else
+				slideshow_change_image(winwid, SLIDE_NEXT, 1);
+
+		} else if ((winwid->type == WIN_TYPE_SINGLE)
+				|| (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)) {
+			feh_action_run(FEH_FILE(winwid->file->data), opt.actions[action], winwid);
+
+			if (opt.hold_actions[action])
+				feh_reload_image(winwid, 1, 1);
+			else
+				winwidget_destroy(winwid);
+		} else if (winwid->type == WIN_TYPE_THUMBNAIL) {
+			feh_file *thumbfile;
+			thumbfile = feh_thumbnail_get_selected_file();
+
+			if (thumbfile) {
+				feh_action_run(thumbfile, opt.actions[action], winwid);
+
+				if (!opt.hold_actions[action])
+					feh_thumbnail_mark_removed(thumbfile, 0);
+			}
+		}
+	}
+	return;
 }
 
-void
-feh_event_handle_keypress(XEvent * ev)
+void feh_event_handle_stdin(void)
 {
-   int len;
-   char kbuf[20];
-   KeySym keysym;
-   XKeyEvent *kev;
-   winwidget winwid = NULL;
-   int curr_screen = 0;
-   feh_menu_item *selected_item;
-   feh_menu *selected_menu;
-
-   D_ENTER(4);
-
-   winwid = winwidget_get_from_window(ev->xkey.window);
-   
-   /* nuke dupe events, unless we're typing text */
-   if (winwid && !winwid->caption_entry) {
-     while (XCheckTypedWindowEvent(disp, ev->xkey.window, KeyPress, ev));
-   }
-
-   kev = (XKeyEvent *) ev;
-   len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, NULL);
-
-   /* menus are showing, so this is a menu control keypress */
-   if (ev->xbutton.window == menu_cover) {
-     selected_item = feh_menu_find_selected_r(menu_root, &selected_menu);
-     switch (keysym) {
-       case XK_Escape:
-         feh_menu_hide(menu_root, True);
-         break;
-       case XK_Left:
-         feh_menu_select_parent(selected_menu, selected_item);
-         break;
-       case XK_Down:
-         feh_menu_select_next(selected_menu, selected_item);
-         break;
-       case XK_Up:
-         feh_menu_select_prev(selected_menu, selected_item);
-         break;
-       case XK_Right:
-         feh_menu_select_submenu(selected_menu, selected_item);
-         break;
-       case XK_Return:
-         feh_menu_item_activate(selected_menu, selected_item);
-         break;
-       default:
-         break;
-     }
-     if (len <= 0 || len > (int) sizeof(kbuf))
-        D_RETURN_(4);
-     kbuf[len] = '\0';
-
-     switch (*kbuf)
-     {
-       case 'h':
-         feh_menu_select_parent(selected_menu, selected_item);
-         break;
-       case 'j':
-         feh_menu_select_next(selected_menu, selected_item);
-         break;
-       case 'k':
-         feh_menu_select_prev(selected_menu, selected_item);
-         break;
-       case 'l':
-         feh_menu_select_submenu(selected_menu, selected_item);
-         break;
-       case ' ':
-         feh_menu_item_activate(selected_menu, selected_item);
-         break;
-       default:
-         break;
-     }
-     
-     D_RETURN_(4);
-   }
-
-   if (winwid == NULL)
-      D_RETURN_(4);
-
-   if (winwid->caption_entry) {
-     switch(keysym) {
-       case XK_Return:
-         if (kev->state & ControlMask) {
-           /* insert actual newline */
-           ESTRAPPEND(FEH_FILE(winwid->file->data)->caption, "\n");
-           winwidget_render_image_cached(winwid);
-         } else {
-           /* finish caption entry, write to captions file */
-           FILE *fp;
-           char *caption_filename;
-           caption_filename = build_caption_filename(FEH_FILE(winwid->file->data));
-           winwid->caption_entry = 0;
-           winwidget_render_image_cached(winwid);
-           XFreePixmap(disp, winwid->bg_pmap_cache);
-           winwid->bg_pmap_cache = 0;
-           fp = fopen(caption_filename, "w");
-           if (!fp) {
-             weprintf("couldn't write to captions file %s:", caption_filename);
-             D_RETURN_(4);
-           }
-           fprintf(fp, "%s", FEH_FILE(winwid->file->data)->caption);
-           free(caption_filename);
-           fclose(fp);
-         }
-         break;
-       case XK_Escape:
-         /* cancel, revert caption */
-         winwid->caption_entry = 0;
-         free(FEH_FILE(winwid->file->data)->caption);
-         FEH_FILE(winwid->file->data)->caption = NULL;
-         winwidget_render_image_cached(winwid);
-         XFreePixmap(disp, winwid->bg_pmap_cache);
-         winwid->bg_pmap_cache = 0;
-         break;
-       case XK_BackSpace:
-         /* backspace */
-         ESTRTRUNC(FEH_FILE(winwid->file->data)->caption, 1);
-         winwidget_render_image_cached(winwid);
-         break;
-       default:
-         if(isascii(keysym)) {
-           /* append to caption */
-           ESTRAPPEND_CHAR(FEH_FILE(winwid->file->data)->caption, keysym);
-           winwidget_render_image_cached(winwid);
-         }
-         break;
-     }
-     D_RETURN_(4);
-   }
-   
-   
-   switch (keysym)
-   {
-     case XK_Left:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_PREV);
-        break;
-     case XK_Right:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_NEXT);
-        break;
-     case XK_Page_Up:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_JUMP_BACK);
-        break;
-     case XK_Escape:
-        winwidget_destroy_all();
-        break;
-     case XK_Page_Down:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_JUMP_FWD);
-        break;
-     case XK_Delete:
-        /* Holding ctrl gets you a filesystem deletion and removal from the * 
-           filelist. Just DEL gets you filelist removal only. */
-        if (kev->state & ControlMask)
-        {
-           if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)
-              feh_thumbnail_mark_removed(FEH_FILE(winwid->file->data), 1);
-           feh_filelist_image_remove(winwid, 1);
-        }
-        else
-        {
-           if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)
-              feh_thumbnail_mark_removed(FEH_FILE(winwid->file->data), 0);
-           feh_filelist_image_remove(winwid, 0);
-        }
-        break;
-     case XK_Home:
-     case XK_KP_Home:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_FIRST);
-        break;
-     case XK_End:
-     case XK_KP_End:
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_LAST);
-        break;
-     case XK_Tab:
-	if (opt.draw_actions) 
-        {
-	   opt.draw_actions = 0;
-	   winwidget_rerender_all(0, 1);
-        }
+	char stdin_buf[2];
+	static char is_esc = 0;
+	KeySym keysym = NoSymbol;
+	if (read(STDIN_FILENO, &stdin_buf, 1) <= 0) {
+		control_via_stdin = 0;
+		if (isatty(STDIN_FILENO) && getpgrp() == (tcgetpgrp(STDIN_FILENO))) {
+			weprintf("reading a command from stdin failed - disabling control via stdin");
+			restore_stdin();
+		}
+		return;
+	}
+	stdin_buf[1] = '\0';
+
+	// escape?
+	if (stdin_buf[0] == 0x1b) {
+		is_esc = 1;
+		return;
+	}
+	if ((is_esc == 1) && (stdin_buf[0] == '[')) {
+		is_esc = 2;
+		return;
+	}
+
+	if (stdin_buf[0] == ' ')
+		keysym = XK_space;
+	else if (stdin_buf[0] == '\n')
+		keysym = XK_Return;
+	else if ((stdin_buf[0] == '\b') || (stdin_buf[0] == 127))
+		keysym = XK_BackSpace;
+	else if (is_esc == 2) {
+		if (stdin_buf[0] == 'A')
+			keysym = XK_Up;
+		else if (stdin_buf[0] == 'B')
+			keysym = XK_Down;
+		else if (stdin_buf[0] == 'C')
+			keysym = XK_Right;
+		else if (stdin_buf[0] == 'D')
+			keysym = XK_Left;
+		is_esc = 0;
+	}
 	else
-        {
-	   opt.draw_actions = 1;
-	   winwidget_rerender_all(0, 1);
-        }
-	break;
-     case XK_Return:
-         feh_event_invoke_action(winwid,opt.actions[0]);
-         break;
-     case XK_0:
-         feh_event_invoke_action(winwid,opt.actions[0]);
-         break;
-     case XK_1:
-         feh_event_invoke_action(winwid,opt.actions[1]);
-         break;
-     case XK_2:
-         feh_event_invoke_action(winwid,opt.actions[2]);
-         break;
-     case XK_3:
-         feh_event_invoke_action(winwid,opt.actions[3]);
-         break;
-     case XK_4:
-         feh_event_invoke_action(winwid,opt.actions[4]);
-         break;
-     case XK_5:
-         feh_event_invoke_action(winwid,opt.actions[5]);
-         break;
-     case XK_6:
-         feh_event_invoke_action(winwid,opt.actions[6]);
-         break;
-     case XK_7:
-         feh_event_invoke_action(winwid,opt.actions[7]);
-         break;
-     case XK_8:
-         feh_event_invoke_action(winwid,opt.actions[8]);
-         break;
-     case XK_9:
-         feh_event_invoke_action(winwid,opt.actions[9]);
-         break;
-     case XK_KP_Left:
-        winwid->im_x = winwid->im_x - 10;
-        winwidget_render_image(winwid, 0, 0);
-        break;
-     case XK_KP_Right:
-        winwid->im_x = winwid->im_x + 10;
-        winwidget_render_image(winwid, 0, 0);
-        break;
-     case XK_KP_Up:
-        winwid->im_y = winwid->im_y - 10;
-        winwidget_render_image(winwid, 0, 0);
-        break;
-     case XK_KP_Down:
-        winwid->im_y = winwid->im_y + 10;
-        winwidget_render_image(winwid, 0, 0);
-        break;
-     case XK_KP_Add:
-        winwid->zoom = winwid->zoom * 1.25;
-        winwidget_render_image(winwid, 0, 0);
-        break;
-     case XK_KP_Subtract:
-        winwid->zoom = winwid->zoom * 0.75;
-        winwidget_render_image(winwid, 0, 0);
-	break;
-     case XK_KP_Multiply:
-        winwid->zoom = 1;
-        winwidget_render_image(winwid, 0, 0);
-	break;
-     case XK_KP_Divide:
-        feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);
-        winwidget_render_image(winwid, 0, 0);
-	break;
-     default:
-        break;
-   }
-
-   if (len <= 0 || len > (int) sizeof(kbuf))
-      D_RETURN_(4);
-   kbuf[len] = '\0';
-
-   switch (*kbuf)
-   {
-     case 'n':
-     case 'N':
-     case ' ':
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_NEXT);
-        break;
-     case 'p':
-     case 'P':
-     case '\b':
-        if (opt.slideshow)
-           slideshow_change_image(winwid, SLIDE_PREV);
-        break;
-     case 'q':
-     case 'Q':
-        winwidget_destroy_all();
-        break;
-     case 'c':
-     case 'C':
-        if (opt.caption_path)
-          winwid->caption_entry = 1;
-          winwidget_render_image(winwid, 0, 0);
-        break;
-     case 'r':
-     case 'R':
-        feh_reload_image(winwid, 0, 0);
-        break;
-     case 'h':
-     case 'H':
-        slideshow_pause_toggle(winwid);
-        break;
-     case 's':
-     case 'S':
-        slideshow_save_image(winwid);
-        break;
-     case 'f':
-     case 'F':
-        feh_save_filelist();
-        break;
-     case 'w':
-     case 'W':
-        winwidget_size_to_image(winwid);
-        break;
-     case 'm':
-     case 'M':
-        winwidget_show_menu(winwid);
-        break;
-     case 'x':
-     case 'X':
-        winwidget_destroy(winwid);
-        break;
-     case '>':
-        feh_edit_inplace_orient(winwid, 1);
-        break;
-     case '<':
-        feh_edit_inplace_orient(winwid, 3);
-        break;
-     case 'v':
-     case 'V':
+		keysym = XStringToKeysym(stdin_buf);
+
+	if (window_num && keysym)
+		feh_event_handle_generic(windows[0], is_esc * Mod1Mask, keysym, 0);
+
+	is_esc = 0;
+}
+
+void feh_event_handle_keypress(XEvent * ev)
+{
+	int state;
+	char kbuf[20];
+	KeySym keysym;
+	XKeyEvent *kev;
+	winwidget winwid = NULL;
+	feh_menu_item *selected_item;
+	feh_menu *selected_menu;
+
+	winwid = winwidget_get_from_window(ev->xkey.window);
+
+	/* nuke dupe events, unless we're typing text */
+	if (winwid && !winwid->caption_entry) {
+		while (XCheckTypedWindowEvent(disp, ev->xkey.window, KeyPress, ev));
+	}
+
+	kev = (XKeyEvent *) ev;
+	XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, NULL);
+	state = kev->state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);
+
+	if (ignore_space(keysym))
+		state &= ~ShiftMask;
+
+	/* menus are showing, so this is a menu control keypress */
+	if (ev->xbutton.window == menu_cover) {
+		selected_item = feh_menu_find_selected_r(menu_root, &selected_menu);
+		if (feh_is_kp(EVENT_menu_close, state, keysym, 0))
+			feh_menu_hide(menu_root, True);
+		else if (feh_is_kp(EVENT_menu_parent, state, keysym, 0))
+			feh_menu_select_parent(selected_menu);
+		else if (feh_is_kp(EVENT_menu_down, state, keysym, 0))
+			feh_menu_select_next(selected_menu, selected_item);
+		else if (feh_is_kp(EVENT_menu_up, state, keysym, 0))
+			feh_menu_select_prev(selected_menu, selected_item);
+		else if (feh_is_kp(EVENT_menu_child, state, keysym, 0))
+			feh_menu_select_submenu(selected_menu);
+		else if (feh_is_kp(EVENT_menu_select, state, keysym, 0))
+			feh_menu_item_activate(selected_menu, selected_item);
+		return;
+	}
+
+	if (winwid == NULL)
+		return;
+
+	feh_event_handle_generic(winwid, state, keysym, 0);
+}
+
+fehkey *feh_str_to_kb(char *action)
+{
+	for (unsigned int i = 0; i < EVENT_LIST_END; i++) {
+		if (!strcmp(action, keys[i].name)) {
+			return &keys[i];
+		}
+	}
+	return NULL;
+}
+
+void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysym, unsigned int button) {
+	int curr_screen = 0;
+
+	if (winwid->caption_entry && (keysym != NoSymbol)) {
+		switch (keysym) {
+		case XK_Return:
+			if (state & ControlMask) {
+				/* insert actual newline */
+				ESTRAPPEND(FEH_FILE(winwid->file->data)->caption, "\n");
+				winwidget_render_image_cached(winwid);
+			} else {
+				/* finish caption entry, write to captions file */
+				FILE *fp;
+				char *caption_filename;
+				caption_filename =
+					build_caption_filename(FEH_FILE(winwid->file->data), 1);
+				winwid->caption_entry = 0;
+				winwidget_render_image_cached(winwid);
+				XFreePixmap(disp, winwid->bg_pmap_cache);
+				winwid->bg_pmap_cache = 0;
+				fp = fopen(caption_filename, "w");
+				if (!fp) {
+					eprintf("couldn't write to captions file %s:", caption_filename);
+					return;
+				}
+				fprintf(fp, "%s", FEH_FILE(winwid->file->data)->caption);
+				free(caption_filename);
+				fclose(fp);
+			}
+			break;
+		case XK_Escape:
+			/* cancel, revert caption */
+			winwid->caption_entry = 0;
+			free(FEH_FILE(winwid->file->data)->caption);
+			FEH_FILE(winwid->file->data)->caption = NULL;
+			winwidget_render_image_cached(winwid);
+			XFreePixmap(disp, winwid->bg_pmap_cache);
+			winwid->bg_pmap_cache = 0;
+			break;
+		case XK_BackSpace:
+			/* backspace */
+			ESTRTRUNC(FEH_FILE(winwid->file->data)->caption, 1);
+			winwidget_render_image_cached(winwid);
+			break;
+		default:
+			if (isascii(keysym)) {
+				/* append to caption */
+				ESTRAPPEND_CHAR(FEH_FILE(winwid->file->data)->caption, keysym);
+				winwidget_render_image_cached(winwid);
+			}
+			break;
+		}
+		return;
+	}
+
+	if (feh_is_kp(EVENT_next_img, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_NEXT, 1);
+		else if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_select_next(winwid, 1);
+	}
+	else if (feh_is_kp(EVENT_prev_img, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_PREV, 1);
+		else if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_select_prev(winwid, 1);
+	}
+	else if (feh_is_kp(EVENT_scroll_right, state, keysym, button)) {
+		winwid->im_x -= opt.scroll_step;;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 1);
+	}
+	else if (feh_is_kp(EVENT_scroll_left, state, keysym, button)) {
+		winwid->im_x += opt.scroll_step;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 1);
+	}
+	else if (feh_is_kp(EVENT_scroll_down, state, keysym, button)) {
+		winwid->im_y -= opt.scroll_step;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 1);
+	}
+	else if (feh_is_kp(EVENT_scroll_up, state, keysym, button)) {
+		winwid->im_y += opt.scroll_step;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 1);
+	}
+	else if (feh_is_kp(EVENT_scroll_right_page, state, keysym, button)) {
+		winwid->im_x -= winwid->w;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_scroll_left_page, state, keysym, button)) {
+		winwid->im_x += winwid->w;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_scroll_down_page, state, keysym, button)) {
+		winwid->im_y -= winwid->h;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_scroll_up_page, state, keysym, button)) {
+		winwid->im_y += winwid->h;
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_jump_back, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_JUMP_BACK, 1);
+		else if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_select_prev(winwid, 10);
+	}
+	else if (feh_is_kp(EVENT_jump_fwd, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_JUMP_FWD, 1);
+		else if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_select_next(winwid, 10);
+	}
+	else if (feh_is_kp(EVENT_next_dir, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_JUMP_NEXT_DIR, 1);
+	}
+	else if (feh_is_kp(EVENT_prev_dir, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_JUMP_PREV_DIR, 1);
+	}
+	else if (feh_is_kp(EVENT_quit, state, keysym, button)) {
+		winwidget_destroy_all();
+	}
+	else if (feh_is_kp(EVENT_delete, state, keysym, button)) {
+		if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)
+			feh_thumbnail_mark_removed(FEH_FILE(winwid->file->data), 1);
+		feh_filelist_image_remove(winwid, 1);
+	}
+	else if (feh_is_kp(EVENT_remove, state, keysym, button)) {
+		if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)
+			feh_thumbnail_mark_removed(FEH_FILE(winwid->file->data), 0);
+		feh_filelist_image_remove(winwid, 0);
+	}
+	else if (feh_is_kp(EVENT_jump_first, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_FIRST, 1);
+	}
+	else if (feh_is_kp(EVENT_jump_last, state, keysym, button)) {
+		if (opt.slideshow)
+			slideshow_change_image(winwid, SLIDE_LAST, 1);
+	}
+	else if (feh_is_kp(EVENT_action_0, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 0);
+	}
+	else if (feh_is_kp(EVENT_action_1, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 1);
+	}
+	else if (feh_is_kp(EVENT_action_2, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 2);
+	}
+	else if (feh_is_kp(EVENT_action_3, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 3);
+	}
+	else if (feh_is_kp(EVENT_action_4, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 4);
+	}
+	else if (feh_is_kp(EVENT_action_5, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 5);
+	}
+	else if (feh_is_kp(EVENT_action_6, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 6);
+	}
+	else if (feh_is_kp(EVENT_action_7, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 7);
+	}
+	else if (feh_is_kp(EVENT_action_8, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 8);
+	}
+	else if (feh_is_kp(EVENT_action_9, state, keysym, button)) {
+		feh_event_invoke_action(winwid, 9);
+	}
+	else if (feh_is_kp(EVENT_zoom_in, state, keysym, button)) {
+		winwid->old_zoom = winwid->zoom;
+		winwid->zoom = winwid->zoom * opt.zoom_rate;
+
+		if (winwid->zoom > ZOOM_MAX)
+			winwid->zoom = ZOOM_MAX;
+
+		winwid->im_x = (winwid->w / 2) - (((winwid->w / 2) - winwid->im_x) /
+			winwid->old_zoom * winwid->zoom);
+		winwid->im_y = (winwid->h / 2) - (((winwid->h / 2) - winwid->im_y) /
+			winwid->old_zoom * winwid->zoom);
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_zoom_out, state, keysym, button)) {
+		winwid->old_zoom = winwid->zoom;
+		winwid->zoom = winwid->zoom / opt.zoom_rate;
+
+		if (winwid->zoom < ZOOM_MIN)
+			winwid->zoom = ZOOM_MIN;
+
+		winwid->im_x = (winwid->w / 2) - (((winwid->w / 2) - winwid->im_x) /
+			winwid->old_zoom * winwid->zoom);
+		winwid->im_y = (winwid->h / 2) - (((winwid->h / 2) - winwid->im_y) /
+			winwid->old_zoom * winwid->zoom);
+		winwidget_sanitise_offsets(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_zoom_default, state, keysym, button)) {
+		winwid->zoom = 1.0;
+		winwidget_center_image(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_zoom_fit, state, keysym, button)) {
+		feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);
+		winwidget_center_image(winwid);
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_zoom_fill, state, keysym, button)) {
+		int save_zoom = opt.zoom_mode;
+		opt.zoom_mode = ZOOM_MODE_FILL;
+		feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);
+		winwidget_center_image(winwid);
+		winwidget_render_image(winwid, 0, 0);
+		opt.zoom_mode = save_zoom;
+	}
+	else if (feh_is_kp(EVENT_render, state, keysym, button)) {
+		if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_show_selected();
+		else
+			winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_toggle_actions, state, keysym, button)) {
+		opt.draw_actions = !opt.draw_actions;
+		winwidget_rerender_all(0);
+	}
+	else if (feh_is_kp(EVENT_toggle_aliasing, state, keysym, button)) {
+		opt.force_aliasing = !opt.force_aliasing;
+		winwid->force_aliasing = !winwid->force_aliasing;
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_toggle_auto_zoom, state, keysym, button)) {
+		opt.zoom_mode = (opt.zoom_mode == 0 ? ZOOM_MODE_MAX : 0);
+		winwidget_rerender_all(1);
+	}
+	else if (feh_is_kp(EVENT_toggle_filenames, state, keysym, button)) {
+		opt.draw_filename = !opt.draw_filename;
+		winwidget_rerender_all(0);
+	}
+#ifdef HAVE_LIBEXIF
+	else if (feh_is_kp(EVENT_toggle_exif, state, keysym, button)) {
+		opt.draw_exif = !opt.draw_exif;
+		winwidget_rerender_all(0);
+	}
+#endif
+	else if (feh_is_kp(EVENT_toggle_info, state, keysym, button)) {
+		opt.draw_info = !opt.draw_info;
+		winwidget_rerender_all(0);
+	}
+	else if (feh_is_kp(EVENT_toggle_pointer, state, keysym, button)) {
+		winwidget_set_pointer(winwid, opt.hide_pointer);
+		opt.hide_pointer = !opt.hide_pointer;
+	}
+	else if (feh_is_kp(EVENT_jump_random, state, keysym, button)) {
+		if (winwid->type == WIN_TYPE_THUMBNAIL)
+			feh_thumbnail_select_next(winwid, random() % (filelist_len - 1));
+		else
+			slideshow_change_image(winwid, SLIDE_RAND, 1);
+	}
+	else if (feh_is_kp(EVENT_toggle_caption, state, keysym, button)) {
+		if (opt.caption_path && path_is_url(FEH_FILE(winwid->file->data)->filename)) {
+			im_weprintf(winwid, "Caption entry is not supported on URLs");
+		}
+		else if (opt.caption_path) {
+			/*
+			 * editing captions in slideshow mode does not make any sense
+			 * at all; this is just in case someone accidentally does it...
+			 */
+			if (opt.slideshow_delay)
+				opt.paused = 1;
+			winwid->caption_entry = 1;
+		}
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_reload_image, state, keysym, button)) {
+		feh_reload_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_toggle_pause, state, keysym, button)) {
+		slideshow_pause_toggle(winwid);
+		/* We need to re-render the image to update the info string immediately. */
+		winwidget_render_image(winwid, 0, 0);
+	}
+	else if (feh_is_kp(EVENT_save_image, state, keysym, button)) {
+		slideshow_save_image(winwid);
+	}
+	else if (feh_is_kp(EVENT_save_filelist, state, keysym, button)) {
+		if ((winwid->type == WIN_TYPE_THUMBNAIL)
+				|| (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER))
+			weprintf("Filelist saving is not supported in thumbnail mode");
+		else
+			feh_save_filelist();
+	}
+	else if (feh_is_kp(EVENT_size_to_image, state, keysym, button)) {
+		winwidget_size_to_image(winwid);
+	}
+	else if (!opt.no_menus && feh_is_kp(EVENT_toggle_menu, state, keysym, button)) {
+		winwidget_show_menu(winwid);
+	}
+	else if (feh_is_kp(EVENT_close, state, keysym, button)) {
+		winwidget_destroy(winwid);
+	}
+	else if (feh_is_kp(EVENT_orient_1, state, keysym, button)) {
+		feh_edit_inplace(winwid, 1);
+	}
+	else if (feh_is_kp(EVENT_orient_3, state, keysym, button)) {
+		feh_edit_inplace(winwid, 3);
+	}
+	else if (feh_is_kp(EVENT_flip, state, keysym, button)) {
+		feh_edit_inplace(winwid, INPLACE_EDIT_FLIP);
+	}
+	else if (feh_is_kp(EVENT_mirror, state, keysym, button)) {
+		feh_edit_inplace(winwid, INPLACE_EDIT_MIRROR);
+	}
+	else if (feh_is_kp(EVENT_toggle_fullscreen, state, keysym, button)) {
 #ifdef HAVE_LIBXINERAMA
-        if (opt.xinerama && xinerama_screens) {
-          int i, rect[4];
-
-          winwidget_get_geometry(winwid, rect);
-          /* printf("window: (%d, %d)\n", rect[0], rect[1]);
-          printf("found %d screens.\n", num_xinerama_screens); */
-          for (i = 0; i < num_xinerama_screens; i++) {
-            xinerama_screen = 0;
-            /* printf("%d: [%d, %d, %d, %d] (%d, %d)\n",
-                   i,
-                   xinerama_screens[i].x_org, xinerama_screens[i].y_org,
-                   xinerama_screens[i].width, xinerama_screens[i].height,
-                   rect[0], rect[1]);*/
-            if (XY_IN_RECT(rect[0], rect[1],
-                  xinerama_screens[i].x_org, xinerama_screens[i].y_org,
-                  xinerama_screens[i].width, xinerama_screens[i].height)) {
-              curr_screen = xinerama_screen = i;
-              break;
-            }
-          }
-        }
-#endif /* HAVE_LIBXINERAMA */
-        winwid->full_screen = !winwid->full_screen;
-        winwidget_destroy_xwin(winwid);
-        winwidget_create_window(winwid, winwid->im_w, winwid->im_h);
-        winwidget_render_image(winwid, 1, 1);
-        winwidget_show(winwid);
+		if (opt.xinerama && xinerama_screens) {
+			int i, rect[4];
+
+			winwidget_get_geometry(winwid, rect);
+			for (i = 0; i < num_xinerama_screens; i++) {
+				xinerama_screen = 0;
+				if (XY_IN_RECT(rect[0], rect[1],
+							xinerama_screens[i].x_org,
+							xinerama_screens[i].y_org,
+							xinerama_screens[i].width,
+							xinerama_screens[i].height)) {
+					curr_screen = xinerama_screen = i;
+					break;
+				}
+			}
+			if (opt.xinerama_index >= 0)
+				curr_screen = xinerama_screen = opt.xinerama_index;
+		}
+#endif				/* HAVE_LIBXINERAMA */
+		winwid->full_screen = !winwid->full_screen;
+		winwidget_destroy_xwin(winwid);
+		winwidget_create_window(winwid, winwid->im_w, winwid->im_h);
+		winwidget_render_image(winwid, 1, 0);
+		winwidget_show(winwid);
 #ifdef HAVE_LIBXINERAMA
-        /* if we have xinerama and we're using it, then full screen the window
-         * on the head that the window was active on */
-        if (winwid->full_screen == TRUE &&
-            opt.xinerama && xinerama_screens) {
-          xinerama_screen = curr_screen;
-          winwidget_move(winwid,
-                         xinerama_screens[curr_screen].x_org,
-                         xinerama_screens[curr_screen].y_org);
-        }
-#endif /* HAVE_LIBXINERAMA */
-	   case '=':
-     case '+':
-        if (opt.reload < SLIDESHOW_RELOAD_MAX)
-           opt.reload++;
-        else if (opt.verbose)
-           weprintf("Cannot set RELOAD higher than %d seconds.", opt.reload);
-        break;
-     case '-':
-     case '_':
-        if (opt.reload > 1)
-           opt.reload--;
-        else if (opt.verbose)
-           weprintf("Cannot set RELOAD lower than 1 second.");
-        break;
-     default:
-        break;
-   }
-   D_RETURN_(4);
+		/* if we have xinerama and we're using it, then full screen the window
+		 * on the head that the window was active on */
+		if (winwid->full_screen == TRUE && opt.xinerama && xinerama_screens) {
+			xinerama_screen = curr_screen;
+			winwidget_move(winwid,
+					xinerama_screens[curr_screen].x_org, xinerama_screens[curr_screen].y_org);
+		}
+#endif				/* HAVE_LIBXINERAMA */
+	}
+	else if (feh_is_kp(EVENT_reload_plus, state, keysym, button)){
+		if (opt.reload < SLIDESHOW_RELOAD_MAX)
+			opt.reload++;
+		else if (opt.verbose)
+			weprintf("Cannot set RELOAD higher than %f seconds.", opt.reload);
+	}
+	else if (feh_is_kp(EVENT_reload_minus, state, keysym, button)) {
+		if (opt.reload > 1)
+			opt.reload--;
+		else if (opt.verbose)
+			weprintf("Cannot set RELOAD lower than 1 second.");
+	}
+	else if (feh_is_kp(EVENT_toggle_keep_vp, state, keysym, button)) {
+		opt.keep_zoom_vp = !opt.keep_zoom_vp;
+	}
+	else if (feh_is_kp(EVENT_toggle_fixed_geometry, state, keysym, button)) {
+		if (opt.geom_flags & ((WidthValue | HeightValue))) {
+			opt.geom_flags &= ~(WidthValue | HeightValue);
+		} else {
+			opt.geom_flags |= (WidthValue | HeightValue);
+			opt.geom_w = winwid->w;
+			opt.geom_h = winwid->h;
+		}
+		winwidget_render_image(winwid, 1, 0);
+	}
+	return;
 }
diff --git a/src/list.c b/src/list.c
index 98f9fe7..0fdc6a5 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,6 +1,7 @@
 /* list.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -27,90 +28,96 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "filelist.h"
 #include "options.h"
 
-void
-init_list_mode(void)
+void init_list_mode(void)
 {
-   gib_list *l;
-   feh_file *file = NULL;
-   int j = 0;
-
-   D_ENTER(4);
-
-   mode = "list";
-
-   if (!opt.customlist)
-      printf
-         ("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE(bytes)\tALPHA\tFILENAME\n");
-
-   for (l = filelist; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      if (opt.customlist)
-         printf("%s\n", feh_printf(opt.customlist, file));
-      else
-         printf("%d\t%s\t%d\t%d\t%d\t%d\t\t%c\t%s\n", ++j, file->info->format,
-                file->info->width, file->info->height, file->info->pixels,
-                file->info->size, file->info->has_alpha ? 'X' : '-',
-                file->filename);
-
-      feh_action_run(file,opt.actions[0]);
-   }
-   exit(0);
+	gib_list *l;
+	feh_file *file = NULL;
+	int j = 0;
+
+	mode = "list";
+
+	if (!opt.customlist)
+		fputs("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE\tALPHA\tFILENAME\n",
+				stdout);
+
+	for (l = filelist; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		if (opt.customlist)
+			printf("%s\n", feh_printf(opt.customlist, file, NULL));
+		else {
+			printf("%d\t%s\t%d\t%d\t%s", ++j,
+					file->info->format, file->info->width,
+					file->info->height,
+					format_size(file->info->pixels));
+			printf("\t%s\t%c\t%s\n",
+					format_size(file->size),
+					file->info->has_alpha ? 'X' : '-', file->filename);
+		}
+
+		feh_action_run(file, opt.actions[0], NULL);
+	}
+	exit(0);
 }
 
-void
-init_loadables_mode(void)
+void init_loadables_mode(void)
 {
-   D_ENTER(4);
-   mode = "loadables";
-   real_loadables_mode(1);
-   D_RETURN_(4);
+	mode = "loadables";
+	real_loadables_mode(1);
+	return;
 }
 
-void
-init_unloadables_mode(void)
+void init_unloadables_mode(void)
 {
-   D_ENTER(4);
-   mode = "unloadables";
-   real_loadables_mode(0);
-   D_RETURN_(4);
+	mode = "unloadables";
+	real_loadables_mode(0);
+	return;
 }
 
-
-void
-real_loadables_mode(int loadable)
+void real_loadables_mode(int loadable)
 {
-   feh_file *file;
-   gib_list *l;
-
-   D_ENTER(4);
-   opt.quiet = 1;
-
-   for (l = filelist; l; l = l->next)
-   {
-      Imlib_Image im = NULL;
-
-      file = FEH_FILE(l->data);
-
-      if (feh_load_image(&im, file))
-      {
-         /* loaded ok */
-         if (loadable)
-         {
-            fprintf(stdout, "%s\n", file->filename);
-            feh_action_run(file,opt.actions[0]);
-         }
-         gib_imlib_free_image_and_decache(im);
-      }
-      else
-      {
-         /* Oh dear. */
-         if (!loadable)
-         {
-            fprintf(stdout, "%s\n", file->filename);
-            feh_action_run(file,opt.actions[0]);
-         }
-      }
-   }
-   exit(0);
+	feh_file *file;
+	gib_list *l;
+	char ret = 0;
+
+	opt.quiet = 1;
+
+	for (l = filelist; l; l = l->next) {
+		Imlib_Image im = NULL;
+
+		file = FEH_FILE(l->data);
+
+		if (feh_load_image(&im, file)) {
+			/* loaded ok */
+			if (loadable) {
+				if (opt.verbose)
+					feh_display_status('.');
+				puts(file->filename);
+				fflush(stdout);
+				feh_action_run(file, opt.actions[0], NULL);
+			}
+			else {
+				if (opt.verbose)
+					feh_display_status('s');
+				ret = 1;
+			}
+			gib_imlib_free_image_and_decache(im);
+		} else {
+			/* Oh dear. */
+			if (!loadable) {
+				if (opt.verbose)
+					feh_display_status('.');
+				puts(file->filename);
+				fflush(stdout);
+				feh_action_run(file, opt.actions[0], NULL);
+			}
+			else {
+				if (opt.verbose)
+					feh_display_status('s');
+				ret = 1;
+			}
+		}
+	}
+	if (opt.verbose)
+		feh_display_status(0);
+	exit(ret);
 }
diff --git a/src/main.c b/src/main.c
index 74a4144..2503773 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,7 @@
 /* main.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2023 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -29,194 +30,294 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "timers.h"
 #include "options.h"
 #include "events.h"
-#include "support.h"
+#include "signals.h"
+#include "wallpaper.h"
+#include <termios.h>
+
+#ifdef HAVE_INOTIFY
+#include <sys/inotify.h>
+#endif
 
 char **cmdargv = NULL;
 int cmdargc = 0;
-int call_level = 0;
 char *mode = NULL;
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-   D_ENTER(4);
-   atexit(feh_clean_exit);
-
-   init_parse_options(argc, argv);
-
-   init_imlib_fonts();
-
-   if (opt.display)
-      init_x_and_imlib();
-
-   feh_event_init();
-
-   if (opt.index)
-      init_index_mode();
-   else if (opt.collage)
-      init_collage_mode();
-   else if (opt.multiwindow)
-      init_multiwindow_mode();
-   else if (opt.list || opt.customlist)
-      init_list_mode();
-   else if (opt.loadables)
-      init_loadables_mode();
-   else if (opt.unloadables)
-      init_unloadables_mode();
-   else if (opt.thumbs)
-      init_thumbnail_mode();
-   else if(opt.bgmode)
-   {
-      feh_wm_set_bg_file(opt.output_file, opt.bgmode);
-      exit(0);
-   }
-/*   else if (opt.fmmode)
-   {
-      fmmode();
-      opt.slideshow = 1;
-      init_slideshow_mode(); 
-   }
- */
-   else
-   {
-      /* Slideshow mode is the default. Because it's spiffy */
-      opt.slideshow = 1;
-      init_slideshow_mode();
-   }
-
-   /* main event loop */
-   while (feh_main_iteration(1));
-
-   D_RETURN(4,0);
+	atexit(feh_clean_exit);
+
+	srandom(getpid() * time(NULL) % ((unsigned int) -1));
+
+	setup_signal_handlers();
+
+#ifdef HAVE_LIBMAGIC
+	init_magic();
+#endif
+
+	init_parse_options(argc, argv);
+
+	init_imlib_fonts();
+
+	if (opt.display) {
+		init_x_and_imlib();
+		init_keyevents();
+		init_buttonbindings();
+#ifdef HAVE_INOTIFY
+        if (opt.auto_reload) {
+            opt.inotify_fd = inotify_init();
+            if (opt.inotify_fd < 0) {
+                opt.auto_reload = 0;
+                weprintf("inotify_init failed:");
+                weprintf("Disabling inotify-based auto-reload");
+            }
+        }
+#endif
+	}
+
+	feh_event_init();
+
+	if (opt.index)
+		init_index_mode();
+	else if (opt.multiwindow)
+		init_multiwindow_mode();
+	else if (opt.list || opt.customlist)
+		init_list_mode();
+	else if (opt.loadables)
+		init_loadables_mode();
+	else if (opt.unloadables)
+		init_unloadables_mode();
+	else if (opt.thumbs)
+		init_thumbnail_mode();
+	else if (opt.bgmode) {
+		feh_wm_set_bg_filelist(opt.bgmode);
+		exit(0);
+	}
+	else if (opt.display){
+		/* Slideshow mode is the default. Because it's spiffy */
+		opt.slideshow = 1;
+		init_slideshow_mode();
+	}
+	else {
+		eprintf("Invalid option combination");
+	}
+
+	/* main event loop */
+	while (feh_main_iteration(1));
+
+	return(sig_exit);
 }
 
+static void feh_process_signal(void)
+{
+	winwidget winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW);
+	int i;
+	int signo = sig_received;
+	sig_received = 0;
+
+	if (winwid) {
+		if (filelist_len > 1) {
+			if (signo == SIGUSR1)
+				slideshow_change_image(winwid, SLIDE_NEXT, 1);
+			else if (signo == SIGUSR2)
+				slideshow_change_image(winwid, SLIDE_PREV, 1);
+		} else {
+			feh_reload_image(winwid, 0, 0);
+		}
+	} else if (opt.multiwindow) {
+		for (i = window_num - 1; i >= 0; i--)
+			feh_reload_image(windows[i], 0, 0);
+	}
+}
 
 /* Return 0 to stop iterating, 1 if ok to continue. */
-int
-feh_main_iteration(int block)
+int feh_main_iteration(int block)
 {
-   static int first = 1;
-   static int xfd = 0;
-   static int fdsize = 0;
-   static double pt = 0.0;
-   XEvent ev;
-   struct timeval tval;
-   fd_set fdset;
-   int count = 0;
-   double t1 = 0.0, t2 = 0.0;
-   fehtimer ft;
-
-   D_ENTER(5);
-
-   if (window_num == 0)
-      D_RETURN(5,0);
-
-   if (first)
-   {
-      /* Only need to set these up the first time */
-      xfd = ConnectionNumber(disp);
-      fdsize = xfd + 1;
-      pt = feh_get_time();
-      first = 0;
-   }
-
-   /* Timers */
-   t1 = feh_get_time();
-   t2 = t1 - pt;
-   pt = t1;
-   while (XPending(disp))
-   {
-      XNextEvent(disp, &ev);
-      if (ev_handler[ev.type])
-         (*(ev_handler[ev.type])) (&ev);
-
-      if (window_num == 0)
-         D_RETURN(5,0);
-   }
-   XFlush(disp);
-
-   feh_redraw_menus();
-
-   FD_ZERO(&fdset);
-   FD_SET(xfd, &fdset);
-
-   /* Timers */
-   ft = first_timer;
-   /* Don't do timers if we're zooming/panning/etc or if we are paused*/
-   if (ft && (opt.mode == MODE_NORMAL) && !opt.paused)
-   {
-      D(5,("There are timers in the queue\n"));
-      if (ft->just_added)
-      {
-         D(5,("The first timer has just been added\n"));
-         D(5,("ft->in = %f\n", ft->in));
-         ft->just_added = 0;
-         t1 = ft->in;
-      }
-      else
-      {
-         D(5,("The first timer was not just added\n"));
-         t1 = ft->in - t2;
-         if (t1 < 0.0)
-            t1 = 0.0;
-         ft->in = t1;
-      }
-      
-      XSync(disp, False);
-      D(5,("I next need to action a timer in %f seconds\n", t1));
-      /* Only do a blocking select if there's a timer due, or no events
-         waiting */
-      if (t1 == 0.0 || (block && !XPending(disp)))
-      {
-         tval.tv_sec = (long) t1;
-         tval.tv_usec = (long) ((t1 - ((double) tval.tv_sec)) * 1000000);
-         if (tval.tv_sec < 0)
-            tval.tv_sec = 0;
-         if (tval.tv_usec <= 1000)
-            tval.tv_usec = 1000;
-         errno = 0;
-         D(5,("Performing blocking select - waiting for timer or event\n"));
-         count = select(fdsize, &fdset, NULL, NULL, &tval);
-         if ((count < 0)
-             && ((errno == ENOMEM) || (errno == EINVAL) || (errno == EBADF)))
-            eprintf("Connection to X display lost");
-         if ((ft) && (count == 0))
-         {
-            /* This means the timer is due to be executed. If count was > 0,
-               that would mean an X event had woken us, we're not interested
-               in that */
-            feh_handle_timer();
-         }
-      }
-   }
-   else
-   {
-      /* Don't block if there are events in the queue. That's a bit rude ;-) */
-      if (block && !XPending(disp))
-      {
-         errno = 0;
-         D(5,("Performing blocking select - no timers, or zooming\n"));
-         count = select(fdsize, &fdset, NULL, NULL, NULL);
-         if ((count < 0)
-             && ((errno == ENOMEM) || (errno == EINVAL) || (errno == EBADF)))
-            eprintf("Connection to X display lost");
-      }
-   }
-   if (window_num == 0)
-      D_RETURN(5,0);
-   D_RETURN(5,1);
-}
+	static int first = 1;
+	static int xfd = 0;
+	static int fdsize = 0;
+	static double pt = 0.0;
+	XEvent ev;
+	struct timeval tval;
+	fd_set fdset;
+	int count = 0;
+	double t1 = 0.0, t2 = 0.0;
+	fehtimer ft;
+
+	if (window_num == 0 || sig_exit != 0)
+		return(0);
 
+	if (sig_received) {
+		feh_process_signal();
+	}
 
-void
-feh_clean_exit(void)
+	if (first) {
+		/* Only need to set these up the first time */
+		xfd = ConnectionNumber(disp);
+		fdsize = xfd + 1;
+		pt = feh_get_time();
+		first = 0;
+		/*
+		 * Only accept commands from stdin if
+		 * - stdin is a terminal (otherwise it's probably used as an image / filelist)
+		 * - we aren't running in multiwindow mode (cause it's not clear which
+		 *   window commands should be applied to in that case)
+		 * - we're in the same process group as stdin, AKA we're not running
+		 *   in the background. Background processes are stopped with SIGTTOU
+		 *   if they try to write to stdout or change terminal attributes. They
+		 *   also don't get input from stdin anyway.
+		 */
+		if (isatty(STDIN_FILENO) && !opt.multiwindow && getpgrp() == (tcgetpgrp(STDIN_FILENO))) {
+			setup_stdin();
+		}
+	}
+
+	/* Timers */
+	t1 = feh_get_time();
+	t2 = t1 - pt;
+	pt = t1;
+	while (XPending(disp)) {
+		XNextEvent(disp, &ev);
+		if (ev_handler[ev.type])
+			(*(ev_handler[ev.type])) (&ev);
+
+		if (window_num == 0 || sig_exit != 0)
+			return(0);
+
+		if (sig_received) {
+			feh_process_signal();
+		}
+	}
+	XFlush(disp);
+
+	feh_redraw_menus();
+
+	FD_ZERO(&fdset);
+	FD_SET(xfd, &fdset);
+	if (control_via_stdin) {
+		FD_SET(STDIN_FILENO, &fdset);
+	}
+#ifdef HAVE_INOTIFY
+    if (opt.auto_reload) {
+        FD_SET(opt.inotify_fd, &fdset);
+        if (opt.inotify_fd >= fdsize)
+            fdsize = opt.inotify_fd + 1;
+    }
+#endif
+
+	/* Timers */
+	ft = first_timer;
+	/* Don't do timers if we're zooming/panning/etc or if we are paused */
+	if (ft && (opt.mode == MODE_NORMAL) && !opt.paused) {
+		D(("There are timers in the queue\n"));
+		if (ft->just_added) {
+			D(("The first timer has just been added\n"));
+			D(("ft->in = %f\n", ft->in));
+			ft->just_added = 0;
+			t1 = ft->in;
+		} else {
+			D(("The first timer was not just added\n"));
+			t1 = ft->in - t2;
+			if (t1 < 0.0)
+				t1 = 0.0;
+			ft->in = t1;
+		}
+
+		XSync(disp, False);
+		D(("I next need to action a timer in %f seconds\n", t1));
+		/* Only do a blocking select if there's a timer due, or no events
+		   waiting */
+		if (t1 == 0.0 || (block && !XPending(disp))) {
+			tval.tv_sec = (long) t1;
+			tval.tv_usec = (long) ((t1 - ((double) tval.tv_sec)) * 1000000);
+			if (tval.tv_sec < 0)
+				tval.tv_sec = 0;
+			if (tval.tv_usec <= 1000)
+				tval.tv_usec = 1000;
+			errno = 0;
+			D(("Performing blocking select - waiting for timer or event\n"));
+			count = select(fdsize, &fdset, NULL, NULL, &tval);
+			if ((count < 0)
+					&& ((errno == ENOMEM) || (errno == EINVAL)
+						|| (errno == EBADF)))
+				eprintf("Connection to X display lost");
+			if (count == 0) {
+				/* This means the timer is due to be executed. If count was > 0,
+				   that would mean an X event had woken us, we're not interested
+				   in that */
+				feh_handle_timer();
+			}
+			/*
+			 * Beware: If stdin is not connected, we may end up with xfd == 0.
+			 * However, STDIN_FILENO == 0 holds as well in most cases. So we must
+			 * check control_via_stdin to avoid mistaking an X11 event for stdin.
+			 */
+			else if ((count > 0) && control_via_stdin && (FD_ISSET(STDIN_FILENO, &fdset)))
+				feh_event_handle_stdin();
+#ifdef HAVE_INOTIFY
+			else if ((count > 0) && (FD_ISSET(opt.inotify_fd, &fdset)))
+                feh_event_handle_inotify();
+#endif
+		}
+	} else {
+		/* Don't block if there are events in the queue. That's a bit rude ;-) */
+		if (block && !XPending(disp)) {
+			errno = 0;
+			D(("Performing blocking select - no timers, or zooming\n"));
+			count = select(fdsize, &fdset, NULL, NULL, NULL);
+			if ((count < 0)
+					&& ((errno == ENOMEM) || (errno == EINVAL)
+						|| (errno == EBADF)))
+				eprintf("Connection to X display lost");
+			else if ((count > 0) && control_via_stdin && (FD_ISSET(STDIN_FILENO, &fdset)))
+				feh_event_handle_stdin();
+#ifdef HAVE_INOTIFY
+			else if ((count > 0) && (FD_ISSET(opt.inotify_fd, &fdset)))
+                feh_event_handle_inotify();
+#endif
+		}
+	}
+	if (window_num == 0 || sig_exit != 0)
+		return(0);
+
+	if (sig_received) {
+		feh_process_signal();
+	}
+
+	return(1);
+}
+
+void feh_clean_exit(void)
 {
-   D_ENTER(4);
+	delete_rm_files();
+
+	free(opt.menu_font);
+
+#ifdef HAVE_INOTIFY
+    if (opt.auto_reload)
+        if (close(opt.inotify_fd))
+            eprintf("inotify close failed");
+#endif
+
+	if(disp)
+		XCloseDisplay(disp);
+
+#ifdef HAVE_LIBMAGIC
+	uninit_magic();
+#endif
 
-   delete_rm_files();
+	/*
+	 * Only restore the old terminal settings if
+	 * - we changed them in the first place
+	 * - stdin still is a terminal (it might have been closed)
+	 * - stdin still belongs to us (we might have been detached from the
+	 *   controlling terminal, in that case we probably shouldn't be messing
+	 *   around with it) <https://github.com/derf/feh/issues/324>
+	 */
+	if (control_via_stdin && isatty(STDIN_FILENO) && getpgrp() == (tcgetpgrp(STDIN_FILENO)))
+		restore_stdin();
 
-   if (opt.filelistfile)
-      feh_write_filelist(filelist, opt.filelistfile);
+	if (opt.filelistfile)
+		feh_write_filelist(filelist, opt.filelistfile);
 
-   D_RETURN_(4);
+	return;
 }
diff --git a/src/md5.c b/src/md5.c
index d6f78b8..d221713 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -39,6 +39,7 @@
  */
 
 #include "md5.h"
+#include <string.h>
 
 #ifdef TEST
 /*
@@ -46,38 +47,36 @@
  * The test program should print out the same values as given in section
  * A.5 of RFC 1321, reproduced below.
  */
-#include <string.h>
 main()
 {
-    static const char *const test[7] = {
-	"", /*d41d8cd98f00b204e9800998ecf8427e*/
-	"a", /*0cc175b9c0f1b6a831c399e269772661*/
-	"abc", /*900150983cd24fb0d6963f7d28e17f72*/
-	"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
-	"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-				/*d174ab98d277d9f5a5611c2c9f419d9f*/
-	"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
-    };
-    int i;
-
-    for (i = 0; i < 7; ++i) {
-	md5_state_t state;
-	md5_byte_t digest[16];
-	int di;
-
-	md5_init(&state);
-	md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
-	md5_finish(&state, digest);
-	printf("MD5 (\"%s\") = ", test[i]);
-	for (di = 0; di < 16; ++di)
-	    printf("%02x", digest[di]);
-	printf("\n");
-    }
-    return 0;
+	static const char *const test[7] = {
+		"",		/*d41d8cd98f00b204e9800998ecf8427e */
+		"a",		/*0cc175b9c0f1b6a831c399e269772661 */
+		"abc",		/*900150983cd24fb0d6963f7d28e17f72 */
+		"message digest",	/*f96b697d7cb7938d525a2f31aaf161d0 */
+		"abcdefghijklmnopqrstuvwxyz",	/*c3fcd3d76192e4007dfb496cca67e13b */
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+		/*d174ab98d277d9f5a5611c2c9f419d9f */
+		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"	/*57edf4a22be3c955ac49da2e2107b67a */
+	};
+	int i;
+
+	for (i = 0; i < 7; ++i) {
+		md5_state_t state;
+		md5_byte_t digest[16];
+		int di;
+
+		md5_init(&state);
+		md5_append(&state, (const md5_byte_t *) test[i], strlen(test[i]));
+		md5_finish(&state, digest);
+		printf("MD5 (\"%s\") = ", test[i]);
+		for (di = 0; di < 16; ++di)
+			printf("%02x", digest[di]);
+		printf("\n");
+	}
+	return 0;
 }
-#endif /* TEST */
-
+#endif				/* TEST */
 
 /*
  * For reference, here is the program that computed the T values.
@@ -86,12 +85,12 @@ main()
 #include <math.h>
 main()
 {
-    int i;
-    for (i = 1; i <= 64; ++i) {
-	unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
-	printf("#define T%d 0x%08lx\n", i, v);
-    }
-    return 0;
+	int i;
+	for (i = 1; i <= 64; ++i) {
+		unsigned long v = (unsigned long) (4294967296.0 * fabs(sin((double) i)));
+		printf("#define T%d 0x%08lx\n", i, v);
+	}
+	return 0;
 }
 #endif
 /*
@@ -162,231 +161,225 @@ main()
 #define T63 0x2ad7d2bb
 #define T64 0xeb86d391
 
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+static void md5_process(md5_state_t * pms, const md5_byte_t * data /*[64] */ )
 {
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
+	md5_word_t a = pms->abcd[0], b = pms->abcd[1], c = pms->abcd[2], d = pms->abcd[3];
+	md5_word_t t;
 
 #ifndef ARCH_IS_BIG_ENDIAN
 # define ARCH_IS_BIG_ENDIAN 1	/* slower, default implementation */
 #endif
 #if ARCH_IS_BIG_ENDIAN
 
-    /*
-     * On big-endian machines, we must arrange the bytes in the right
-     * order.  (This also works on machines of unknown byte order.)
-     */
-    md5_word_t X[16];
-    const md5_byte_t *xp = data;
-    int i;
-
-    for (i = 0; i < 16; ++i, xp += 4)
-	X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-
-#else  /* !ARCH_IS_BIG_ENDIAN */
-
-    /*
-     * On little-endian machines, we can process properly aligned data
-     * without copying it.
-     */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-
-    if (!((data - (const md5_byte_t *)0) & 3)) {
-	/* data are properly aligned */
-	X = (const md5_word_t *)data;
-    } else {
-	/* not aligned */
-	memcpy(xbuf, data, 64);
-	X = xbuf;
-    }
+	/*
+	 * On big-endian machines, we must arrange the bytes in the right
+	 * order.  (This also works on machines of unknown byte order.)
+	 */
+	md5_word_t X[16];
+	const md5_byte_t *xp = data;
+	int i;
+
+	for (i = 0; i < 16; ++i, xp += 4)
+		X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+
+#else				/* !ARCH_IS_BIG_ENDIAN */
+
+	/*
+	 * On little-endian machines, we can process properly aligned data
+	 * without copying it.
+	 */
+	md5_word_t xbuf[16];
+	const md5_word_t *X;
+
+	if (!((data - (const md5_byte_t *) 0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *) data;
+	} else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	}
 #endif
 
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
 
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 1. */
+	/* Let [abcd k s i] denote the operation
+	   a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
 #define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + F(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
+	/* Do the following 16 operations. */
+	SET(a, b, c, d, 0, 7, T1);
+	SET(d, a, b, c, 1, 12, T2);
+	SET(c, d, a, b, 2, 17, T3);
+	SET(b, c, d, a, 3, 22, T4);
+	SET(a, b, c, d, 4, 7, T5);
+	SET(d, a, b, c, 5, 12, T6);
+	SET(c, d, a, b, 6, 17, T7);
+	SET(b, c, d, a, 7, 22, T8);
+	SET(a, b, c, d, 8, 7, T9);
+	SET(d, a, b, c, 9, 12, T10);
+	SET(c, d, a, b, 10, 17, T11);
+	SET(b, c, d, a, 11, 22, T12);
+	SET(a, b, c, d, 12, 7, T13);
+	SET(d, a, b, c, 13, 12, T14);
+	SET(c, d, a, b, 14, 17, T15);
+	SET(b, c, d, a, 15, 22, T16);
 #undef SET
 
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 2. */
+	/* Let [abcd k s i] denote the operation
+	   a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
 #define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + G(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
+	/* Do the following 16 operations. */
+	SET(a, b, c, d, 1, 5, T17);
+	SET(d, a, b, c, 6, 9, T18);
+	SET(c, d, a, b, 11, 14, T19);
+	SET(b, c, d, a, 0, 20, T20);
+	SET(a, b, c, d, 5, 5, T21);
+	SET(d, a, b, c, 10, 9, T22);
+	SET(c, d, a, b, 15, 14, T23);
+	SET(b, c, d, a, 4, 20, T24);
+	SET(a, b, c, d, 9, 5, T25);
+	SET(d, a, b, c, 14, 9, T26);
+	SET(c, d, a, b, 3, 14, T27);
+	SET(b, c, d, a, 8, 20, T28);
+	SET(a, b, c, d, 13, 5, T29);
+	SET(d, a, b, c, 2, 9, T30);
+	SET(c, d, a, b, 7, 14, T31);
+	SET(b, c, d, a, 12, 20, T32);
 #undef SET
 
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 3. */
+	/* Let [abcd k s t] denote the operation
+	   a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
 #define H(x, y, z) ((x) ^ (y) ^ (z))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + H(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
+	/* Do the following 16 operations. */
+	SET(a, b, c, d, 5, 4, T33);
+	SET(d, a, b, c, 8, 11, T34);
+	SET(c, d, a, b, 11, 16, T35);
+	SET(b, c, d, a, 14, 23, T36);
+	SET(a, b, c, d, 1, 4, T37);
+	SET(d, a, b, c, 4, 11, T38);
+	SET(c, d, a, b, 7, 16, T39);
+	SET(b, c, d, a, 10, 23, T40);
+	SET(a, b, c, d, 13, 4, T41);
+	SET(d, a, b, c, 0, 11, T42);
+	SET(c, d, a, b, 3, 16, T43);
+	SET(b, c, d, a, 6, 23, T44);
+	SET(a, b, c, d, 9, 4, T45);
+	SET(d, a, b, c, 12, 11, T46);
+	SET(c, d, a, b, 15, 16, T47);
+	SET(b, c, d, a, 2, 23, T48);
 #undef SET
 
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 4. */
+	/* Let [abcd k s t] denote the operation
+	   a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
 #define I(x, y, z) ((y) ^ ((x) | ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + I(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
+	/* Do the following 16 operations. */
+	SET(a, b, c, d, 0, 6, T49);
+	SET(d, a, b, c, 7, 10, T50);
+	SET(c, d, a, b, 14, 15, T51);
+	SET(b, c, d, a, 5, 21, T52);
+	SET(a, b, c, d, 12, 6, T53);
+	SET(d, a, b, c, 3, 10, T54);
+	SET(c, d, a, b, 10, 15, T55);
+	SET(b, c, d, a, 1, 21, T56);
+	SET(a, b, c, d, 8, 6, T57);
+	SET(d, a, b, c, 15, 10, T58);
+	SET(c, d, a, b, 6, 15, T59);
+	SET(b, c, d, a, 13, 21, T60);
+	SET(a, b, c, d, 4, 6, T61);
+	SET(d, a, b, c, 11, 10, T62);
+	SET(c, d, a, b, 2, 15, T63);
+	SET(b, c, d, a, 9, 21, T64);
 #undef SET
 
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
+	/* Then perform the following additions. (That is increment each
+	   of the four registers by the value it had before this block
+	   was started.) */
+	pms->abcd[0] += a;
+	pms->abcd[1] += b;
+	pms->abcd[2] += c;
+	pms->abcd[3] += d;
 }
 
-void
-md5_init(md5_state_t *pms)
+void md5_init(md5_state_t * pms)
 {
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = 0xefcdab89;
-    pms->abcd[2] = 0x98badcfe;
-    pms->abcd[3] = 0x10325476;
+	pms->count[0] = pms->count[1] = 0;
+	pms->abcd[0] = 0x67452301;
+	pms->abcd[1] = 0xefcdab89;
+	pms->abcd[2] = 0x98badcfe;
+	pms->abcd[3] = 0x10325476;
 }
 
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+void md5_append(md5_state_t * pms, const md5_byte_t * data, int nbytes)
 {
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
+	const md5_byte_t *p = data;
+	int left = nbytes;
+	int offset = (pms->count[0] >> 3) & 63;
+	md5_word_t nbits = (md5_word_t) (nbytes << 3);
+
+	if (nbytes <= 0)
+		return;
+
+	/* Update the message length. */
+	pms->count[1] += nbytes >> 29;
+	pms->count[0] += nbits;
+	if (pms->count[0] < nbits)
+		pms->count[1]++;
+
+	/* Process an initial partial block. */
+	if (offset) {
+		int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+		memcpy(pms->buf + offset, p, copy);
+		if (offset + copy < 64)
+			return;
+		p += copy;
+		left -= copy;
+		md5_process(pms, pms->buf);
+	}
+
+	/* Process full blocks. */
+	for (; left >= 64; p += 64, left -= 64)
+		md5_process(pms, p);
+
+	/* Process a final partial block. */
+	if (left)
+		memcpy(pms->buf, p, left);
 }
 
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+void md5_finish(md5_state_t * pms, md5_byte_t digest[16])
 {
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+	static const md5_byte_t pad[64] = {
+		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	};
+	md5_byte_t data[8];
+	int i;
+
+	/* Save the length before padding. */
+	for (i = 0; i < 8; ++i)
+		data[i] = (md5_byte_t) (pms->count[i >> 2] >> ((i & 3) << 3));
+	/* Pad to 56 bytes mod 64. */
+	md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+	/* Append the length. */
+	md5_append(pms, data, 8);
+	for (i = 0; i < 16; ++i)
+		digest[i] = (md5_byte_t) (pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
diff --git a/src/md5.h b/src/md5.h
index 0193f5d..fd03011 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -51,44 +51,42 @@
  * ARCH_IS_BIG_ENDIAN.
  */
 
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
+typedef unsigned char md5_byte_t;	/* 8-bit byte */
+typedef unsigned int md5_word_t;	/* 32-bit word */
 
 /* Define the state of the MD5 Algorithm. */
 typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
+	md5_word_t count[2];	/* message length in bits, lsw first */
+	md5_word_t abcd[4];	/* digest buffer */
+	md5_byte_t buf[64];	/* accumulate block */
 } md5_state_t;
 
 #ifdef __cplusplus
-extern "C" 
-{
+extern "C" {
 #endif
 
 /* Initialize the algorithm. */
 #ifdef P1
-void md5_init(P1(md5_state_t *pms));
+	void md5_init(P1(md5_state_t * pms));
 #else
-void md5_init(md5_state_t *pms);
+	void md5_init(md5_state_t * pms);
 #endif
 
 /* Append a string to the message. */
 #ifdef P3
-void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes));
+	void md5_append(P3(md5_state_t * pms, const md5_byte_t * data, int nbytes));
 #else
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+	void md5_append(md5_state_t * pms, const md5_byte_t * data, int nbytes);
 #endif
 
 /* Finish the message and return the digest. */
 #ifdef P2
-void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16]));
+	void md5_finish(P2(md5_state_t * pms, md5_byte_t digest[16]));
 #else
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+	void md5_finish(md5_state_t * pms, md5_byte_t digest[16]);
 #endif
 
 #ifdef __cplusplus
-}  /* end extern "C" */
+}				/* end extern "C" */
 #endif
-
-#endif /* md5_INCLUDED */
+#endif				/* md5_INCLUDED */
diff --git a/src/menu.c b/src/menu.c
index d1d9b1b..96173a4 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,6 +1,7 @@
 /* menu.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -24,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "feh.h"
-#include "support.h"
 #include "thumbnail.h"
+#include "wallpaper.h"
 #include "winwidget.h"
 #include "filelist.h"
 #include "options.h"
@@ -34,2107 +35,1420 @@ Window menu_cover = 0;
 feh_menu *menu_root = NULL;
 feh_menu *menu_main = NULL;
 feh_menu *menu_single_win = NULL;
-feh_menu *menu_about_win = NULL;
 feh_menu *menu_thumbnail_viewer = NULL;
 feh_menu *menu_thumbnail_win = NULL;
 feh_menu *menu_bg = NULL;
 static feh_menu_list *menus = NULL;
 static int common_menus = 0;
 
-static void feh_menu_cb_about(feh_menu * m,
-                              feh_menu_item * i,
-                              void *data);
-static void feh_menu_cb_close(feh_menu * m,
-                              feh_menu_item * i,
-                              void *data);
-static void feh_menu_cb_exit(feh_menu * m,
-                             feh_menu_item * i,
-                             void *data);
-static void feh_menu_cb_reload(feh_menu * m,
-                               feh_menu_item * i,
-                               void *data);
-static void feh_menu_cb_remove(feh_menu * m,
-                               feh_menu_item * i,
-                               void *data);
-static void feh_menu_cb_delete(feh_menu * m,
-                               feh_menu_item * i,
-                               void *data);
-static void feh_menu_cb_reset(feh_menu * m,
-                              feh_menu_item * i,
-                              void *data);
-
-static void feh_menu_cb_remove_thumb(feh_menu * m,
-                                     feh_menu_item * i,
-                                     void *data);
-static void feh_menu_cb_delete_thumb(feh_menu * m,
-                                     feh_menu_item * i,
-                                     void *data);
-static void feh_menu_cb_background_set_tiled(feh_menu * m,
-                                             feh_menu_item * i,
-                                             void *data);
-static void feh_menu_cb_background_set_scaled(feh_menu * m,
-                                              feh_menu_item * i,
-                                              void *data);
-static void feh_menu_cb_background_set_seamless(feh_menu * m,
-                                                feh_menu_item * i,
-                                                void *data);
-static void feh_menu_cb_background_set_centered(feh_menu * m,
-                                                feh_menu_item * i,
-                                                void *data);
-static void feh_menu_cb_background_set_tiled_no_file(feh_menu * m,
-                                                     feh_menu_item * i,
-                                                     void *data);
-static void feh_menu_cb_background_set_scaled_no_file(feh_menu * m,
-                                                      feh_menu_item * i,
-                                                      void *data);
-static void feh_menu_cb_background_set_centered_no_file(feh_menu * m,
-                                                        feh_menu_item * i,
-                                                        void *data);
-
-static void feh_menu_cb_sort_filename(feh_menu * m,
-                                      feh_menu_item * i,
-                                      void *data);
-static void feh_menu_cb_sort_imagename(feh_menu * m,
-                                       feh_menu_item * i,
-                                       void *data);
-static void feh_menu_cb_sort_filesize(feh_menu * m,
-                                      feh_menu_item * i,
-                                      void *data);
-static void feh_menu_cb_sort_randomize(feh_menu * m,
-                                       feh_menu_item * i,
-                                       void *data);
-static void feh_menu_cb_jump_to(feh_menu * m,
-                                feh_menu_item * i,
-                                void *data);
-static feh_menu *feh_menu_func_gen_jump(feh_menu * m,
-                                        feh_menu_item * i,
-                                        void *data);
-static feh_menu *feh_menu_func_gen_info(feh_menu * m,
-                                        feh_menu_item * i,
-                                        void *data);
-static void feh_menu_func_free_info(feh_menu * m,
-                                    void *data);
-static void feh_menu_cb_save_image(feh_menu * m,
-                                   feh_menu_item * i,
-                                   void *data);
-static void feh_menu_cb_save_filelist(feh_menu * m,
-                                      feh_menu_item * i,
-                                      void *data);
-static void feh_menu_cb_fit(feh_menu * m,
-                            feh_menu_item * i,
-                            void *data);
-static void feh_menu_cb_opt_draw_filename(feh_menu * m,
-                                          feh_menu_item * i,
-                                          void *data);
-static void feh_menu_cb_opt_keep_http(feh_menu * m,
-                                      feh_menu_item * i,
-                                      void *data);
-static void feh_menu_cb_opt_freeze_window(feh_menu * m,
-                                          feh_menu_item * i,
-                                          void *data);
-static void feh_menu_cb_opt_fullscreen(feh_menu * m,
-                                       feh_menu_item * i,
-                                       void *data);
-static void feh_menu_func_free_options(feh_menu * m,
-                                       void *data);
-static feh_menu *feh_menu_func_gen_options(feh_menu * m,
-                                           feh_menu_item * i,
-                                           void *data);
-static void feh_menu_cb_edit_rotate(feh_menu * m,
-                                    feh_menu_item * i,
-                                    void *data);
-static void feh_menu_cb_opt_auto_zoom(feh_menu * m,
-                                      feh_menu_item * i,
-                                      void *data);
-#ifdef HAVE_LIBXINERAMA
-static void feh_menu_cb_opt_xinerama(feh_menu * m,
-                                     feh_menu_item * i,
-                                     void *data);
-#endif /* HAVE_LIBXINERAMA */
-
-
-feh_menu *
-feh_menu_new(void)
-{
-  feh_menu *m;
-  XSetWindowAttributes attr;
-  feh_menu_list *l;
-  static Imlib_Image bg = NULL;
-  static Imlib_Border border;
-
-  D_ENTER(4);
-
-  m = (feh_menu *) emalloc(sizeof(feh_menu));
-
-  attr.backing_store = NotUseful;
-  attr.override_redirect = True;
-  attr.colormap = cm;
-  attr.border_pixel = 0;
-  attr.background_pixmap = None;
-  attr.save_under = False;
-  attr.do_not_propagate_mask = True;
-
-  m->win =
-    XCreateWindow(disp, root, 1, 1, 1, 1, 0, depth, InputOutput, vis,
-                  CWOverrideRedirect | CWSaveUnder | CWBackingStore |
-                  CWColormap | CWBackPixmap | CWBorderPixel | CWDontPropagate,
-                  &attr);
-  XSelectInput(disp, m->win,
-               ButtonPressMask | ButtonReleaseMask | EnterWindowMask |
-               LeaveWindowMask | PointerMotionMask | ButtonMotionMask);
-
-  m->name = NULL;
-  m->fehwin = NULL;
-  m->pmap = 0;
-  m->x = 0;
-  m->y = 0;
-  m->w = 0;
-  m->h = 0;
-  m->visible = 0;
-  m->items = NULL;
-  m->next = NULL;
-  m->prev = NULL;
-  m->updates = NULL;
-  m->needs_redraw = 1;
-  m->func_free = NULL;
-  m->data = NULL;
-  m->calc = 0;
-  m->bg = NULL;
-
-  l = emalloc(sizeof(feh_menu_list));
-  l->menu = m;
-  l->next = menus;
-  menus = l;
-
-  if (!bg) {
-    feh_load_image_char(&bg, opt.menu_bg);
-    if (bg) {
-      border.left = opt.menu_border;
-      border.right = opt.menu_border;
-      border.top = opt.menu_border;
-      border.bottom = opt.menu_border;
-      imlib_context_set_image(bg);
-      imlib_image_set_border(&border);
-    }
-  }
-
-  if (bg)
-    m->bg = gib_imlib_clone_image(bg);
-
-  D_RETURN(4, m);
-}
-
-void
-feh_menu_free(feh_menu * m)
-{
-  feh_menu_item *i;
-  feh_menu_list *l, *pl = NULL;
-
-  D_ENTER(4);
-
-  if (m->name)
-    free(m->name);
-  XDestroyWindow(disp, m->win);
-  if (m->pmap)
-    XFreePixmap(disp, m->pmap);
-  if (m->updates)
-    imlib_updates_free(m->updates);
-  for (i = m->items; i;) {
-    feh_menu_item *ii;
-
-    ii = i;
-    i = i->next;
-    if (ii->func_free)
-      (ii->func_free) (ii->data);
-    if (ii->text)
-      free(ii->text);
-    if (ii->submenu)
-      free(ii->submenu);
-    free(ii);
-  }
-
-  for (l = menus; l; l = l->next) {
-    if (l->menu == m) {
-      if (pl)
-        pl->next = l->next;
-      else
-        menus = l->next;
-      free(l);
-      break;
-    }
-    pl = l;
-  }
-  free(m);
-
-  D_RETURN_(4);
-}
-
-feh_menu_item *
-feh_menu_find_selected(feh_menu * m)
-{
-  feh_menu_item *i;
-
-  D_ENTER(4);
-
-  D(5, ("menu %p\n", m));
-
-  for (i = m->items; i; i = i->next) {
-    if (MENU_ITEM_IS_SELECTED(i))
-      D_RETURN(4, i);
-  }
-  D_RETURN(4, NULL);
-}
-
-feh_menu_item *
-feh_menu_find_selected_r(feh_menu * m, feh_menu **parent)
-{
-  feh_menu_item *i, *ii;
-  feh_menu *mm;
-
-  D_ENTER(4);
-
-  D(5, ("menu %p\n", m));
-
-  for (i = m->items; i; i = i->next) {
-    if (MENU_ITEM_IS_SELECTED(i)) {
-      if (parent)
-        *parent = m;
-      D_RETURN(4, i);
-    } else if (i->submenu) {
-      mm = feh_menu_find(i->submenu);
-      if (mm) {
-        ii = feh_menu_find_selected_r(mm, parent);
-      	if (ii)
-       		D_RETURN(4, ii);
-      }
-    }
-  }
-  if (parent)
-    *parent = m;
-  D_RETURN(4, NULL);
-}
-
-void
-feh_menu_select_next(feh_menu *selected_menu, feh_menu_item *selected_item) {
-  feh_menu_item *i;
-  if (!selected_item) {
-    /* jump to first item, select it */
-    feh_menu_select(selected_menu, selected_menu->items);
-  } else {
-    i = selected_item;
-    while (1) {
-      i = i->next;
-      if (!i)
-        i = selected_menu->items;
-      if (i->func || i->submenu || i->func_gen_sub || i->text) {
-        break;
-      }
-    }
-    feh_menu_deselect_selected(selected_menu);
-    feh_menu_select(selected_menu, i);
-  }
-}
-
-void
-feh_menu_select_prev(feh_menu *selected_menu, feh_menu_item *selected_item) {
-  feh_menu_item *i, *ii;
-  if (!selected_item) {
-    /* jump to last item, select it */
-    for (i = selected_menu->items; i->next; i = i->next);
-    feh_menu_select(selected_menu, i);
-  } else {
-    i = selected_item;
-    while (1) {
-      i = i->prev;
-      if (!i) {
-        i = selected_menu->items;
-        for (ii = selected_menu->items; ii->next; ii = ii->next);
-        i = ii;
-      }
-      if (i->func || i->submenu || i->func_gen_sub || i->text) {
-        break;
-      }
-    }
-    feh_menu_deselect_selected(selected_menu);
-    feh_menu_select(selected_menu, i);
-  }
-}
-
-void
-feh_menu_select_parent(feh_menu *selected_menu, feh_menu_item *selected_item) {
-  feh_menu *m;
-  feh_menu_item *i;
-  /* find the parent menu's item which refers to this menu's name */
-  if (selected_menu->prev) {
-    m = selected_menu->prev;
-    for (i = m->items; i; i = i->next) {
-      if(i->submenu && !strcmp(i->submenu, selected_menu->name))
-        break;
-    }
-    /* shouldn't ever happen */
-    if (i == NULL)
-      i = m->items;
-    feh_menu_deselect_selected(selected_menu);
-    feh_menu_select(m, i);
-  }
-}
-
-void
-feh_menu_select_submenu(feh_menu *selected_menu, feh_menu_item *selected_item) {
-  if (selected_menu->next) {
-    feh_menu_deselect_selected(selected_menu);
-    feh_menu_select(selected_menu->next, selected_menu->next->items);
-  }
-}
-
-void feh_menu_item_activate(feh_menu *m, 
-                            feh_menu_item *i) {
-  /* watch out for this. I put it this way around so the menu
-      goes away *before* we perform the action, if we start
-      freeing menus on hiding, it will break ;-) */
-  if ((i) && (i->func)) {
-    feh_menu_hide(menu_root, False);
-    feh_main_iteration(0);
-    (i->func) (m, i, i->data);
-    if(m->func_free)
-        m->func_free(m, m->data);
-  }
-}
+static feh_menu *feh_menu_func_gen_info(feh_menu * m);
+static void feh_menu_func_free_info(feh_menu * m);
+static void feh_menu_func_free_options(feh_menu * m);
+static feh_menu *feh_menu_func_gen_options(feh_menu * m);
+void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, unsigned short data);
+void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i);
+
+enum {
+	CB_CLOSE = 1,
+	CB_EXIT,
+	CB_RELOAD,
+	CB_REMOVE,
+	CB_DELETE,
+	CB_RESET,
+	CB_REMOVE_THUMB,
+	CB_DELETE_THUMB,
+	CB_BG_TILED,
+	CB_BG_SCALED,
+	CB_BG_CENTERED,
+	CB_BG_FILLED,
+	CB_BG_TILED_NOFILE,
+	CB_BG_SCALED_NOFILE,
+	CB_BG_CENTERED_NOFILE,
+	CB_BG_FILLED_NOFILE,
+	CB_SORT_FILENAME,
+	CB_SORT_IMAGENAME,
+	CB_SORT_DIRNAME,
+	CB_SORT_MTIME,
+	CB_SORT_FILESIZE,
+	CB_SORT_RANDOMIZE,
+	CB_SAVE_IMAGE,
+	CB_SAVE_FILELIST,
+	CB_FIT,
+	CB_OPT_DRAW_FILENAME,
+	CB_OPT_DRAW_ACTIONS,
+	CB_OPT_KEEP_HTTP,
+	CB_OPT_FREEZE_WINDOW,
+	CB_OPT_FULLSCREEN,
+	CB_EDIT_ROTATE,
+	CB_EDIT_MIRROR,
+	CB_EDIT_FLIP,
+	CB_OPT_AUTO_ZOOM,
+	CB_OPT_KEEP_ZOOM_VP
+};
+
+feh_menu *feh_menu_new(void)
+{
+	feh_menu *m;
+	XSetWindowAttributes attr;
+	feh_menu_list *l;
+	static Imlib_Image bg = NULL;
+	static Imlib_Border border;
+
+	m = (feh_menu *) emalloc(sizeof(feh_menu));
+
+	attr.backing_store = NotUseful;
+	attr.override_redirect = True;
+	attr.colormap = cm;
+	attr.border_pixel = 0;
+	attr.background_pixmap = None;
+	attr.save_under = False;
+	attr.do_not_propagate_mask = True;
+
+	m->win = XCreateWindow(
+			disp, root, 1, 1, 1, 1, 0, depth, InputOutput, vis,
+			CWOverrideRedirect | CWSaveUnder | CWBackingStore
+			| CWColormap | CWBackPixmap | CWBorderPixel | CWDontPropagate, &attr);
+	XSelectInput(disp, m->win,
+			ButtonPressMask | ButtonReleaseMask | EnterWindowMask
+			| LeaveWindowMask | PointerMotionMask | ButtonMotionMask);
+
+	m->name = NULL;
+	m->fehwin = NULL;
+	m->pmap = 0;
+	m->x = 0;
+	m->y = 0;
+	m->w = 0;
+	m->h = 0;
+	m->visible = 0;
+	m->items = NULL;
+	m->next = NULL;
+	m->prev = NULL;
+	m->updates = NULL;
+	m->needs_redraw = 1;
+	m->func_free = NULL;
+	m->data = 0;
+	m->calc = 0;
+	m->bg = NULL;
+
+	l = emalloc(sizeof(feh_menu_list));
+	l->menu = m;
+	l->next = menus;
+	menus = l;
+
+	if (!bg) {
+		feh_load_image_char(&bg, PREFIX "/share/feh/images/menubg_default.png");
+		if (bg) {
+			border.left = border.right = border.top = border.bottom
+				= 4;
+			imlib_context_set_image(bg);
+			imlib_image_set_border(&border);
+		}
+	}
+
+	if (bg)
+		m->bg = gib_imlib_clone_image(bg);
+
+	return(m);
+}
+
+void feh_menu_free(feh_menu * m)
+{
+	feh_menu_item *i;
+	feh_menu_list *l, *pl = NULL;
+
+	if (m->name)
+		free(m->name);
+	XDestroyWindow(disp, m->win);
+	if (m->pmap)
+		XFreePixmap(disp, m->pmap);
+	if (m->updates)
+		imlib_updates_free(m->updates);
+	for (i = m->items; i;) {
+		feh_menu_item *ii;
+
+		ii = i;
+		i = i->next;
+		if (ii->text)
+			free(ii->text);
+		if (ii->submenu)
+			free(ii->submenu);
+		free(ii);
+	}
+
+	for (l = menus; l; l = l->next) {
+		if (l->menu == m) {
+			if (pl)
+				pl->next = l->next;
+			else
+				menus = l->next;
+			free(l);
+			break;
+		}
+		pl = l;
+	}
+	if (m->bg)
+		gib_imlib_free_image_and_decache(m->bg);
+
+	free(m);
+
+	return;
+}
+
+feh_menu_item *feh_menu_find_selected(feh_menu * m)
+{
+	feh_menu_item *i;
+
+	D(("menu %p\n", m));
+
+	for (i = m->items; i; i = i->next) {
+		if (MENU_ITEM_IS_SELECTED(i))
+			return(i);
+	}
+	return(NULL);
+}
+
+feh_menu_item *feh_menu_find_selected_r(feh_menu * m, feh_menu ** parent)
+{
+	feh_menu_item *i, *ii;
+	feh_menu *mm;
+
+	D(("menu %p\n", m));
+
+	for (i = m->items; i; i = i->next) {
+		if (MENU_ITEM_IS_SELECTED(i)) {
+			if (parent)
+				*parent = m;
+			return(i);
+		} else if (i->submenu) {
+			mm = feh_menu_find(i->submenu);
+			if (mm) {
+				ii = feh_menu_find_selected_r(mm, parent);
+				if (ii)
+					return(ii);
+			}
+		}
+	}
+	if (parent)
+		*parent = m;
+	return(NULL);
+}
+
+void feh_menu_select_next(feh_menu * selected_menu, feh_menu_item * selected_item)
+{
+	feh_menu_item *i;
+	if (!selected_item) {
+		/* jump to first item, select it */
+		feh_menu_select(selected_menu, selected_menu->items);
+	} else {
+		i = selected_item;
+		while (1) {
+			i = i->next;
+			if (!i)
+				i = selected_menu->items;
+			if (i->action || i->submenu || i->func_gen_sub || i->text) {
+				break;
+			}
+		}
+		feh_menu_deselect_selected(selected_menu);
+		feh_menu_select(selected_menu, i);
+	}
+}
+
+void feh_menu_select_prev(feh_menu * selected_menu, feh_menu_item * selected_item)
+{
+	feh_menu_item *i, *ii;
+	if (!selected_item) {
+		/* jump to last item, select it */
+		for (i = selected_menu->items; i->next; i = i->next);
+		feh_menu_select(selected_menu, i);
+	} else {
+		i = selected_item;
+		while (1) {
+			i = i->prev;
+			if (!i) {
+				for (ii = selected_menu->items; ii->next; ii = ii->next);
+				i = ii;
+			}
+			if (i->action || i->submenu || i->func_gen_sub || i->text) {
+				break;
+			}
+		}
+		feh_menu_deselect_selected(selected_menu);
+		feh_menu_select(selected_menu, i);
+	}
+}
+
+void feh_menu_select_parent(feh_menu * selected_menu)
+{
+	feh_menu *m;
+	feh_menu_item *i;
+	/* find the parent menu's item which refers to this menu's name */
+	if (selected_menu->prev) {
+		m = selected_menu->prev;
+		for (i = m->items; i; i = i->next) {
+			if (i->submenu && !strcmp(i->submenu, selected_menu->name))
+				break;
+		}
+		/* shouldn't ever happen */
+		if (i == NULL)
+			i = m->items;
+		feh_menu_deselect_selected(selected_menu);
+		feh_menu_select(m, i);
+	}
+}
+
+void feh_menu_select_submenu(feh_menu * selected_menu)
+{
+	if (selected_menu->next) {
+		feh_menu_deselect_selected(selected_menu);
+		feh_menu_select(selected_menu->next, selected_menu->next->items);
+	}
+}
+
+void feh_menu_item_activate(feh_menu * m, feh_menu_item * i)
+{
+	/* watch out for this. I put it this way around so the menu
+	   goes away *before* we perform the action, if we start
+	   freeing menus on hiding, it will break ;-) */
+	if ((i) && (i->action)) {
+		feh_menu_hide(menu_root, False);
+		feh_main_iteration(0);
+		feh_menu_cb(m, i, i->action, i->data);
+		if (m->func_free)
+			m->func_free(m);
+	}
+}
+
+feh_menu_item *feh_menu_find_at_xy(feh_menu * m, int x, int y)
+{
+	feh_menu_item *i;
+
+	D(("looking for menu item at %d,%d\n", x, y));
+	for (i = m->items; i; i = i->next) {
+		if (XY_IN_RECT(x, y, i->x, i->y, i->w, i->h)) {
+			D(("Found an item\n"));
+			return(i);
+		}
+	}
+	D(("didn't find an item\n"));
+	return(NULL);
+}
+
+void feh_menu_deselect_selected(feh_menu * m)
+{
+	feh_menu_item *i;
+
+	if (!m)
+		return;
+
+	i = feh_menu_find_selected(m);
+	if (i) {
+		D(("found a selected menu, deselecting it\n"));
+		MENU_ITEM_SET_NORMAL(i);
+		m->updates = imlib_update_append_rect(m->updates, i->x, i->y, i->w, i->h);
+		m->needs_redraw = 1;
+	}
+	return;
+}
+
+void feh_menu_select(feh_menu * m, feh_menu_item * i)
+{
+	MENU_ITEM_SET_SELECTED(i);
+	m->updates = imlib_update_append_rect(m->updates, i->x, i->y, i->w, i->h);
+	m->needs_redraw = 1;
+	if (m->next) {
+		m->next->prev = NULL;
+		feh_menu_hide(m->next, TRUE);
+		m->next = NULL;
+	}
+	if (i->submenu) {
+		feh_menu *mm;
+
+		mm = feh_menu_find(i->submenu);
+		if (mm)
+			feh_menu_show_at_submenu(mm, m, i);
+		else if (i->func_gen_sub)
+			feh_menu_show_at_submenu(i->func_gen_sub(m), m, i);
+	}
+	return;
+}
+
+void feh_menu_show_at(feh_menu * m, int x, int y)
+{
+	if (m->calc)
+		feh_menu_calc_size(m);
+	if (!menu_cover) {
+		XSetWindowAttributes attr;
+
+		D(("creating menu cover window\n"));
+		attr.override_redirect = True;
+		attr.do_not_propagate_mask = True;
+		menu_cover = XCreateWindow(
+				disp, root, 0, 0, scr->width,
+				scr->height, 0, 0, InputOnly, vis,
+				CWOverrideRedirect | CWDontPropagate, &attr);
+		XSelectInput(disp, menu_cover,
+				KeyPressMask | ButtonPressMask |
+				ButtonReleaseMask | EnterWindowMask |
+				LeaveWindowMask | PointerMotionMask | ButtonMotionMask);
+
+		XRaiseWindow(disp, menu_cover);
+		XMapWindow(disp, menu_cover);
+		menu_root = m;
+		XUngrabPointer(disp, CurrentTime);
+		XSetInputFocus(disp, menu_cover, RevertToPointerRoot, CurrentTime);
+	}
+	m->visible = 1;
+	XMoveWindow(disp, m->win, x, y);
+	m->x = x;
+	m->y = y;
+	XRaiseWindow(disp, m->win);
+	feh_menu_redraw(m);
+	XMapWindow(disp, m->win);
+	return;
+}
+
+void feh_menu_show_at_xy(feh_menu * m, winwidget winwid, int x, int y)
+{
+	if (!m)
+		return;
+
+	if (m->calc)
+		feh_menu_calc_size(m);
+	m->fehwin = winwid;
+	if ((x + m->w) > scr->width)
+		x = scr->width - m->w;
+	if ((y + m->h) > scr->height)
+		y = scr->height - m->h;
 
-feh_menu_item *
-feh_menu_find_at_xy(feh_menu * m,
-                    int x,
-                    int y)
-{
-  feh_menu_item *i;
-
-  D_ENTER(4);
-  D(4, ("looking for menu item at %d,%d\n", x, y));
-  for (i = m->items; i; i = i->next) {
-    if (XY_IN_RECT(x, y, i->x, i->y, i->w, i->h)) {
-      D(4, ("Found an item\n"));
-      D_RETURN(4, i);
-    }
-  }
-  D(4, ("didn't find an item\n"));
-  D_RETURN(4, NULL);
-}
-
-void
-feh_menu_deselect_selected(feh_menu * m)
-{
-  feh_menu_item *i;
-
-  D_ENTER(4);
-
-  if (!m)
-    D_RETURN_(4);
-
-  i = feh_menu_find_selected(m);
-  if (i) {
-    D(4, ("found a selected menu, deselecting it\n"));
-    MENU_ITEM_SET_NORMAL(i);
-    m->updates = imlib_update_append_rect(m->updates, i->x, i->y, i->w, i->h);
-    m->needs_redraw = 1;
-  }
-  D_RETURN_(4);
-}
-
-void
-feh_menu_select(feh_menu * m,
-                feh_menu_item * i)
-{
-  D_ENTER(4);
-  MENU_ITEM_SET_SELECTED(i);
-  m->updates = imlib_update_append_rect(m->updates, i->x, i->y, i->w, i->h);
-  m->needs_redraw = 1;
-  if (m->next) {
-    m->next->prev = NULL;
-    feh_menu_hide(m->next, TRUE);
-    m->next = NULL;
-  }
-  if (i->submenu) {
-    feh_menu *mm;
-
-    mm = feh_menu_find(i->submenu);
-    if (mm)
-      feh_menu_show_at_submenu(mm, m, i);
-    else if (i->func_gen_sub)
-      feh_menu_show_at_submenu(i->func_gen_sub(m, i, i->data), m, i);
-  }
-  D_RETURN_(4);
-}
-
-void
-feh_menu_show_at(feh_menu * m, int x, int y)
-{
-  D_ENTER(4);
-
-  if (m->calc)
-    feh_menu_calc_size(m);
-  if (!menu_cover) {
-    XSetWindowAttributes attr;
-
-    D(4, ("creating menu cover window\n"));
-    attr.override_redirect = True;
-    attr.do_not_propagate_mask = True;
-    menu_cover =
-      XCreateWindow(disp, root, 0, 0, scr->width, scr->height, 0, 0,
-                    InputOnly, vis, CWOverrideRedirect | CWDontPropagate,
-                    &attr);
-    XSelectInput(disp, menu_cover,
-      KeyPressMask | ButtonPressMask | ButtonReleaseMask | 
-      EnterWindowMask | LeaveWindowMask | PointerMotionMask | 
-      ButtonMotionMask);
-
-    XRaiseWindow(disp, menu_cover);
-    XMapWindow(disp, menu_cover);
-    menu_root = m;
-    XUngrabPointer(disp, CurrentTime);
-    XSetInputFocus(disp, menu_cover, RevertToPointerRoot, CurrentTime);
-  }
-  m->visible = 1;
-  XMoveWindow(disp, m->win, x, y);
-  m->x = x;
-  m->y = y;
-  XRaiseWindow(disp, m->win);
-  feh_menu_redraw(m);
-  XMapWindow(disp, m->win);
-  D_RETURN_(4);
-}
-
-void
-feh_menu_show_at_xy(feh_menu * m,
-                    winwidget winwid,
-                    int x,
-                    int y)
-{
-  D_ENTER(4);
-
-  if (!m)
-    D_RETURN_(4);
-
-  if (m->calc)
-    feh_menu_calc_size(m);
-  m->fehwin = winwid;
-  if ((x + m->w) > scr->width)
-    x = scr->width - m->w;
-  if ((y + m->h) > scr->height)
-    y = scr->height - m->h;
-
-#if 0 
+#if 0
 /* #ifdef HAVE_LIBXINERAMA */
 /* this doesn't work correctly :( -- pabs */
-  if (opt.xinerama && xinerama_screens) {
-    if ((x + m->w) > xinerama_screens[xinerama_screen].width)
-      x = xinerama_screens[xinerama_screen].width - m->w;
-    if ((y + m->h) > xinerama_screens[xinerama_screen].height)
-      y = xinerama_screens[xinerama_screen].height - m->h;
-
-  }
-#endif /* HAVE_LIBXINERAMA */
-
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
-  feh_menu_move(m, x, y);
-  feh_menu_show(m);
-  D_RETURN_(4);
-}
-
-void
-feh_menu_show_at_submenu(feh_menu * m,
-                         feh_menu * parent_m,
-                         feh_menu_item * i)
-{
-  int mx, my;
-
-  D_ENTER(4);
-
-  if (!m)
-    D_RETURN_(4);
-
-  if (m->calc)
-    feh_menu_calc_size(m);
-  mx = parent_m->x + parent_m->w;
-  my = parent_m->y + i->y - FEH_MENU_PAD_TOP;
-  m->fehwin = parent_m->fehwin;
-  parent_m->next = m;
-  m->prev = parent_m;
-  feh_menu_move(m, mx, my);
-  feh_menu_show(m);
-  D_RETURN_(4);
-}
-
-void
-feh_menu_move(feh_menu * m,
-              int x,
-              int y)
-{
-  int dx, dy;
-
-  D_ENTER(4);
-
-  if (!m)
-    D_RETURN_(4);
-  dx = x - m->x;
-  dy = y - m->y;
-  if (m->visible)
-    XMoveWindow(disp, m->win, x, y);
-  m->x = x;
-  m->y = y;
-  D_RETURN_(4);
-}
-
-void
-feh_menu_slide_all_menus_relative(int dx,
-                                  int dy)
-{
-  int i;
-  feh_menu_list *m;
-  double vector_len = 0;
-  int stepx = 0;
-  int stepy = 0;
-
-  D_ENTER(4);
-  vector_len = sqrt(dx * dx + dy * dy);
-  if (vector_len) {
-    if (dx)
-      stepx = rint(dx / vector_len);
-
-    if (dy)
-      stepy = rint(dy / vector_len);
-
-  }
-  for (i = 0; i < vector_len; i++) {
-    for (m = menus; m; m = m->next) {
-      if (m->menu->visible)
-        feh_menu_move(m->menu, m->menu->x + stepx, m->menu->y + stepy);
-
-    }
-    XWarpPointer(disp, None, None, 0, 0, 0, 0, stepx, stepy);
-  }
-  D_RETURN_(4);
-}
-
-void
-feh_menu_hide(feh_menu * m,
-              int func_free)
-{
-  D_ENTER(4);
-
-  if (!m->visible)
-    D_RETURN_(4);
-  if (m->next) {
-    m->next->prev = NULL;
-    feh_menu_hide(m->next, func_free);
-    m->next = NULL;
-  }
-  if (m == menu_root) {
-    if (menu_cover) {
-      D(4, ("DESTROYING menu cover\n"));
-      XDestroyWindow(disp, menu_cover);
-      menu_cover = 0;
-    }
-    menu_root = NULL;
-  }
-  m->visible = 0;
-  XUnmapWindow(disp, m->win);
-  if (func_free && m->func_free)
-    m->func_free(m, m->data);
-  else
-    feh_menu_deselect_selected(m);
-  D_RETURN_(4);
-}
-
-void
-feh_menu_show(feh_menu * m)
-{
-  D_ENTER(4);
-  if (!m)
-    D_RETURN_(4);
-  feh_menu_show_at(m, m->x, m->y);
-  D_RETURN_(4);
-}
-
-feh_menu_item *
-feh_menu_add_toggle_entry(feh_menu * m,
-                          char *text,
-                          Imlib_Image icon,
-                          char *submenu,
-                          menu_func func,
-                          void *data,
-                          void (*func_free) (void *data),
-                          int setting)
-{
-  feh_menu_item *mi;
-
-  D_ENTER(4);
-  mi = feh_menu_add_entry(m, text, icon, submenu, func, data, func_free);
-  mi->is_toggle = TRUE;
-  MENU_ITEM_TOGGLE_SET(mi, setting);
-  D_RETURN(4, mi);
-}
-
-feh_menu_item *
-feh_menu_add_entry(feh_menu * m,
-                   char *text,
-                   Imlib_Image icon,
-                   char *submenu,
-                   menu_func func,
-                   void *data,
-                   void (*func_free) (void *data))
-{
-  feh_menu_item *mi, *ptr;
-
-  D_ENTER(4);
-
-  mi = (feh_menu_item *) emalloc(sizeof(feh_menu_item));
-  mi->state = MENU_ITEM_STATE_NORMAL;
-  mi->icon = icon;
-  mi->is_toggle = FALSE;
-  if (text)
-    mi->text = estrdup(text);
-  else
-    mi->text = NULL;
-  if (submenu)
-    mi->submenu = estrdup(submenu);
-  else
-    mi->submenu = NULL;
-  mi->func = func;
-  mi->func_free = func_free;
-  mi->data = data;
-  mi->func_gen_sub = NULL;
-  mi->next = NULL;
-  mi->prev = NULL;
-
-  if (!m->items)
-    m->items = mi;
-  else {
-    for (ptr = m->items; ptr; ptr = ptr->next) {
-      if (!ptr->next) {
-        ptr->next = mi;
-        mi->prev = ptr;
-        break;
-      }
-    }
-  }
-  m->calc = 1;
-  D_RETURN(4, mi);
-}
-
-
-void
-feh_menu_entry_get_size(feh_menu * m,
-                        feh_menu_item * i,
-                        int *w,
-                        int *h)
-{
-  int tw, th;
-
-  D_ENTER(4);
-
-  if (i->text) {
-    gib_imlib_get_text_size(opt.menu_fn, i->text, opt.menu_style_l, &tw, &th,
-                            IMLIB_TEXT_TO_RIGHT);
-    *w =
-      tw + FEH_MENUITEM_PAD_LEFT + FEH_MENUITEM_PAD_RIGHT;
-    *h =
-      th + FEH_MENUITEM_PAD_TOP + FEH_MENUITEM_PAD_BOTTOM;
-  } else {
-    *w = FEH_MENUITEM_PAD_LEFT + FEH_MENUITEM_PAD_RIGHT;
-    *h = FEH_MENUITEM_PAD_TOP + FEH_MENUITEM_PAD_BOTTOM;
-  }
-
-  D_RETURN_(4);
-  m = NULL;
-}
-
-void
-feh_menu_calc_size(feh_menu * m)
-{
-  int prev_w, prev_h;
-  feh_menu_item *i;
-  int j = 0, count = 0, max_w = 0, max_h = 0, icon_w = 0, next_w = 0;
-  int toggle_w = 0;
-
-  D_ENTER(4);
-
-  prev_w = m->w;
-  prev_h = m->h;
-  m->calc = 0;
-
-  for (i = m->items; i; i = i->next) {
-    int w, h;
-
-    feh_menu_entry_get_size(m, i, &w, &h);
-    if (w > max_w)
-      max_w = w;
-    if (h > max_h)
-      max_h = h;
-    if (i->submenu) {
-      next_w = FEH_MENU_SUBMENU_W;
-      if (FEH_MENU_SUBMENU_H > max_h)
-        max_h = FEH_MENU_SUBMENU_H;
-    }
-    if (i->is_toggle) {
-      toggle_w = FEH_MENU_TOGGLE_W + FEH_MENU_TOGGLE_PAD;
-      if (FEH_MENU_TOGGLE_H > max_h)
-        max_h = FEH_MENU_TOGGLE_H;
-    }
-    count++;
-  }
-
-  for (i = m->items; i; i = i->next) {
-    if (i->icon) {
-      Imlib_Image im;
-
-      im = i->icon;
-      if (im) {
-        int iw, ih, ow, oh;
-
-        iw = gib_imlib_image_get_width(im);
-        ih = gib_imlib_image_get_height(im);
-        if (ih <= max_h) {
-          ow = iw;
-          oh = ih;
-        } else {
-          ow = (iw * max_h) / ih;
-          oh = max_h;
-        }
-        if (ow > icon_w)
-          icon_w = ow;
-      }
-    }
-  }
-  m->h = FEH_MENU_PAD_TOP;
-  for (i = m->items; i; i = i->next) {
-    i->x = FEH_MENU_PAD_LEFT;
-    i->y = m->h;
-    i->w = max_w + icon_w + toggle_w + next_w;
-    i->icon_x = FEH_MENUITEM_PAD_LEFT;
-    i->toggle_x = i->icon_x + icon_w;
-    i->text_x = i->toggle_x + toggle_w;
-    i->sub_x = i->text_x + max_w;
-    if (i->text)
-      i->h = max_h;
-    else
-      i->h = FEH_MENU_SEP_MAX_H;
-    m->h += i->h;
-    j++;
-  }
-  m->h += FEH_MENU_PAD_BOTTOM;
-  m->w =
-    next_w + toggle_w + icon_w + max_w + FEH_MENU_PAD_LEFT +
-    FEH_MENU_PAD_RIGHT;
-
-  if ((prev_w != m->w) || (prev_h != m->h)) {
-    if (m->pmap)
-      XFreePixmap(disp, m->pmap);
-    m->pmap = 0;
-    m->needs_redraw = 1;
-    XResizeWindow(disp, m->win, m->w, m->h);
-    m->updates = imlib_update_append_rect(m->updates, 0, 0, m->w, m->h);
-  }
-  D(4, ("menu size calculated. w=%d h=%d\n", m->w, m->h));
-
-  /* Make sure bg is same size */
-  if (m->bg) {
-    int bg_w, bg_h;
-
-    bg_w = gib_imlib_image_get_width(m->bg);
-    bg_h = gib_imlib_image_get_height(m->bg);
-
-    if (m->w != bg_w || m->h != bg_h) {
-      Imlib_Image newim = imlib_create_image(m->w, m->h);
-
-      D(3, ("resizing bg to %dx%d\n", m->w, m->h));
-
-      gib_imlib_blend_image_onto_image(newim, m->bg, 0, 0, 0, bg_w, bg_h, 0,
-                                       0, m->w, m->h, 0, 0, 1);
-      gib_imlib_free_image_and_decache(m->bg);
-      m->bg = newim;
-    }
-  }
-
-  D_RETURN_(4);
-}
-
-void
-feh_menu_draw_item(feh_menu * m,
-                   feh_menu_item * i,
-                   Imlib_Image im,
-                   int ox,
-                   int oy)
-{
-  D_ENTER(5);
-
-  D(5,
-    ("drawing item %p (text %s) on menu %p (name %s)\n", i, i->text, m,
-     m->name));
-
-  if (i->text) {
-    D(5, ("text item\n"));
-    if (MENU_ITEM_IS_SELECTED(i)) {
-      D(5, ("selected item\n"));
-      /* draw selected image */
-      feh_menu_item_draw_at(i->x, i->y, i->w, i->h, im, ox, oy, 1);
-    } else {
-      D(5, ("unselected item\n"));
-      /* draw unselected image */
-      feh_menu_item_draw_at(i->x, i->y, i->w, i->h, im, ox, oy, 0);
-    }
-
-    /* draw text */
-    gib_imlib_text_draw(im, opt.menu_fn, opt.menu_style_l,
-                        i->x - ox + i->text_x,
-                        i->y - oy + FEH_MENUITEM_PAD_TOP, i->text,
-                        IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
-    if (i->icon) {
-      Imlib_Image im2;
-
-      D(5, ("icon item\n"));
-
-      im2 = i->icon;
-      if (im2) {
-        int iw, ih, ow, oh;
-
-        iw = gib_imlib_image_get_width(im2);
-        ih = gib_imlib_image_get_height(im2);
-        if (ih <= (i->h - FEH_MENUITEM_PAD_TOP - FEH_MENUITEM_PAD_BOTTOM)) {
-          ow = iw;
-          oh = ih;
-        } else {
-          ow =
-            (iw * (i->h - FEH_MENUITEM_PAD_TOP - FEH_MENUITEM_PAD_BOTTOM)) /
-            ih;
-          oh = i->h - FEH_MENUITEM_PAD_TOP - FEH_MENUITEM_PAD_BOTTOM;
-        }
-        gib_imlib_blend_image_onto_image(im, im2, 0, 0, 0, iw, ih,
-                                         i->x + i->icon_x - ox,
-                                         i->y + FEH_MENUITEM_PAD_TOP +
-                                         (((i->h - FEH_MENUITEM_PAD_TOP -
-                                            FEH_MENUITEM_PAD_BOTTOM) -
-                                           oh) / 2) - oy, ow, oh, 1, 1, 1);
-        gib_imlib_free_image(im2);
-      }
-    }
-    if (i->submenu) {
-      D(5, ("submenu item\n"));
-      feh_menu_draw_submenu_at(i->x + i->sub_x,
-                               i->y + FEH_MENUITEM_PAD_TOP +
-                               ((i->h - FEH_MENUITEM_PAD_TOP -
-                                 FEH_MENUITEM_PAD_BOTTOM -
-                                 FEH_MENU_SUBMENU_H) / 2), FEH_MENU_SUBMENU_W,
-                               FEH_MENU_SUBMENU_H, im, ox, oy,
-                               MENU_ITEM_IS_SELECTED(i));
-    }
-    if (i->is_toggle) {
-      D(5, ("toggleable item\n"));
-      feh_menu_draw_toggle_at(i->x + i->toggle_x,
-                              i->y + FEH_MENUITEM_PAD_TOP +
-                              ((i->h - FEH_MENUITEM_PAD_TOP -
-                                FEH_MENUITEM_PAD_BOTTOM -
-                                FEH_MENU_TOGGLE_H) / 2), FEH_MENU_TOGGLE_W,
-                              FEH_MENU_TOGGLE_H, im, ox, oy,
-                              MENU_ITEM_IS_ON(i));
-    }
-  } else {
-    D(5, ("separator item\n"));
-    feh_menu_draw_separator_at(i->x, i->y, i->w, i->h, im, ox, oy);
-  }
-  D_RETURN_(5);
-  m = NULL;
-}
-
-void
-feh_menu_redraw(feh_menu * m)
-{
-  Imlib_Updates u, uu;
-
-  D_ENTER(5);
-
-  if ((!m->needs_redraw) || (!m->visible) || (!m->updates))
-    D_RETURN_(5);
-  m->needs_redraw = 0;
-  if (!m->pmap)
-    m->pmap = XCreatePixmap(disp, m->win, m->w, m->h, depth);
-  XSetWindowBackgroundPixmap(disp, m->win, m->pmap);
-
-  u = imlib_updates_merge_for_rendering(m->updates, m->w, m->h);
-  m->updates = NULL;
-  if (u) {
-    D(5, ("I have updates to render\n"));
-    for (uu = u; u; u = imlib_updates_get_next(u)) {
-      int x, y, w, h;
-      Imlib_Image im;
-
-      imlib_updates_get_coordinates(u, &x, &y, &w, &h);
-      D(5, ("update coords %d,%d %d*%d\n", x, y, w, h));
-      im = imlib_create_image(w, h);
-      gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 0, 0, 0, 0);
-      if (im) {
-        feh_menu_draw_to_buf(m, im, x, y);
-        gib_imlib_render_image_on_drawable(m->pmap, im, x, y, 1, 0, 0);
-        gib_imlib_free_image(im);
-        XClearArea(disp, m->win, x, y, w, h, False);
-      }
-    }
-    imlib_updates_free(uu);
-  }
-  D_RETURN_(5);
-}
-
-feh_menu *
-feh_menu_find(char *name)
-{
-  feh_menu_list *l;
-
-  D_ENTER(4);
-  for (l = menus; l; l = l->next) {
-    if ((l->menu->name) && (!strcmp(l->menu->name, name)))
-      D_RETURN(4, l->menu);
-  }
-  D_RETURN(4, NULL);
-}
-
-void
-feh_menu_draw_to_buf(feh_menu * m,
-                     Imlib_Image im,
-                     int ox,
-                     int oy)
-{
-  feh_menu_item *i;
-  int w, h;
-
-  D_ENTER(5);
-  w = gib_imlib_image_get_width(im);
-  h = gib_imlib_image_get_height(im);
-
-  feh_menu_draw_menu_bg(m, im, ox, oy);
-
-  for (i = m->items; i; i = i->next) {
-    if (RECTS_INTERSECT(i->x, i->y, i->w, i->h, ox, oy, w, h))
-      feh_menu_draw_item(m, i, im, ox, oy);
-  }
-  D_RETURN_(5);
-}
-
-void
-feh_menu_draw_menu_bg(feh_menu * m,
-                      Imlib_Image im,
-                      int ox,
-                      int oy)
-{
-  int w, h;
-
-  D_ENTER(5);
-
-  w = gib_imlib_image_get_width(im);
-  h = gib_imlib_image_get_height(im);
-
-  if (m->bg)
-    gib_imlib_blend_image_onto_image(im, m->bg, 0, ox, oy, w, h, 0, 0, w, h,
-                                     0, 0, 0);
-  else
-    gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 205, 203, 176, 255);
-
-  D_RETURN_(5);
-}
-
-void
-feh_menu_draw_toggle_at(int x,
-                        int y,
-                        int w,
-                        int h,
-                        Imlib_Image dst,
-                        int ox,
-                        int oy,
-                        int on)
-{
-  D_ENTER(5);
-  x -= ox;
-  y -= oy;
-  if (on)
-    gib_imlib_image_fill_rectangle(dst, x, y, w, h, 0, 0, 0, 255);
-  else
-    gib_imlib_image_draw_rectangle(dst, x, y, w, h, 0, 0, 0, 255);
-  D_RETURN_(5);
-}
-
-void
-feh_menu_draw_submenu_at(int x,
-                         int y,
-                         int w,
-                         int h,
-                         Imlib_Image dst,
-                         int ox,
-                         int oy,
-                         int selected)
-{
-  ImlibPolygon poly;
-
-  D_ENTER(5);
-
-  x -= ox;
-  y -= oy;
-
-  imlib_context_set_image(dst);
-  poly = imlib_polygon_new();
-  imlib_polygon_add_point(poly, x + 2, y + 5);
-  imlib_polygon_add_point(poly, x + 5, y + 7);
-  imlib_polygon_add_point(poly, x + 2, y + 11);
-  imlib_context_set_color(0, 0, 0, 60);
-  imlib_image_fill_polygon(poly);
-  imlib_polygon_free(poly);
-
-  poly = imlib_polygon_new();
-  imlib_polygon_add_point(poly, x, y + 3);
-  imlib_polygon_add_point(poly, x + 3, y + 6);
-  imlib_polygon_add_point(poly, x, y + 9);
-  imlib_context_set_color(0, 0, 0, 255);
-  imlib_image_fill_polygon(poly);
-  imlib_polygon_free(poly);
-
-  D_RETURN_(5);
-  selected = 0;
-}
+	if (opt.xinerama && xinerama_screens) {
+		if ((x + m->w) > xinerama_screens[xinerama_screen].width)
+			x = xinerama_screens[xinerama_screen].width - m->w;
+		if ((y + m->h) > xinerama_screens[xinerama_screen].height)
+			y = xinerama_screens[xinerama_screen].height - m->h;
+
+	}
+#endif				/* HAVE_LIBXINERAMA */
+
+	if (x < 0)
+		x = 0;
+	if (y < 0)
+		y = 0;
+	feh_menu_move(m, x, y);
+	feh_menu_show(m);
+	return;
+}
 
+void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * i)
+{
+	int mx, my;
+
+	if (!m)
+		return;
 
-void
-feh_menu_draw_separator_at(int x,
-                           int y,
-                           int w,
-                           int h,
-                           Imlib_Image dst,
-                           int ox,
-                           int oy)
-{
-  D_ENTER(5);
-  gib_imlib_image_fill_rectangle(dst, x - ox + 2, y - oy + 2, w - 4, h - 4, 0,
-                                 0, 0, 255);
-  D_RETURN_(5);
-}
-
-void
-feh_menu_item_draw_at(int x,
-                      int y,
-                      int w,
-                      int h,
-                      Imlib_Image dst,
-                      int ox,
-                      int oy,
-                      int selected)
-{
-  D_ENTER(5);
-  imlib_context_set_image(dst);
-  if (selected)
-    gib_imlib_image_fill_rectangle(dst, x - ox, y - oy, w, h, 255, 255, 255,
-                                   178);
-  D_RETURN_(5);
-}
-
-
-void
-feh_raise_all_menus(void)
-{
-  feh_menu_list *l;
-
-  D_ENTER(5);
-
-  for (l = menus; l; l = l->next) {
-    if (l->menu->visible)
-      XRaiseWindow(disp, l->menu->win);
-  }
-  D_RETURN_(5);
+	if (m->calc)
+		feh_menu_calc_size(m);
+	mx = parent_m->x + parent_m->w;
+	my = parent_m->y + i->y - FEH_MENU_PAD_TOP;
+	m->fehwin = parent_m->fehwin;
+	parent_m->next = m;
+	m->prev = parent_m;
+	feh_menu_move(m, mx, my);
+	feh_menu_show(m);
+	return;
 }
 
-void
-feh_redraw_menus(void)
+void feh_menu_move(feh_menu * m, int x, int y)
 {
-  feh_menu_list *l;
-
-  D_ENTER(5);
+	if (!m)
+		return;
+
+	if (m->visible)
+		XMoveWindow(disp, m->win, x, y);
+
+	m->x = x;
+	m->y = y;
+	return;
+}
+
+void feh_menu_slide_all_menus_relative(int dx, int dy)
+{
+	int i;
+	feh_menu_list *m;
+	double vector_len = 0;
+	int stepx = 0;
+	int stepy = 0;
+
+	vector_len = sqrt(dx * dx + dy * dy);
+	if (vector_len) {
+		if (dx)
+			stepx = rint(dx / vector_len);
+
+		if (dy)
+			stepy = rint(dy / vector_len);
+
+	}
+	for (i = 0; i < vector_len; i++) {
+		for (m = menus; m; m = m->next) {
+			if (m->menu->visible)
+				feh_menu_move(m->menu, m->menu->x + stepx, m->menu->y + stepy);
+
+		}
+		XWarpPointer(disp, None, None, 0, 0, 0, 0, stepx, stepy);
+	}
+	return;
+}
+
+void feh_menu_hide(feh_menu * m, int func_free)
+{
+	if (!m->visible)
+		return;
+	if (m->next) {
+		m->next->prev = NULL;
+		feh_menu_hide(m->next, func_free);
+		m->next = NULL;
+	}
+	if (m == menu_root) {
+		if (menu_cover) {
+			D(("DESTROYING menu cover\n"));
+			XDestroyWindow(disp, menu_cover);
+			menu_cover = 0;
+		}
+		menu_root = NULL;
+	}
+	m->visible = 0;
+	XUnmapWindow(disp, m->win);
+	if (func_free && m->func_free)
+		m->func_free(m);
+	else
+		feh_menu_deselect_selected(m);
+	return;
+}
+
+void feh_menu_show(feh_menu * m)
+{
+	if (!m)
+		return;
+	feh_menu_show_at(m, m->x, m->y);
+	return;
+}
+
+feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text,
+		char *submenu, int action,
+		unsigned short data, void (*func_free) (void *data), int setting)
+{
+	feh_menu_item *mi;
+
+	mi = feh_menu_add_entry(m, text, submenu, action, data, func_free);
+	mi->is_toggle = TRUE;
+	MENU_ITEM_TOGGLE_SET(mi, setting);
+	return(mi);
+}
+
+feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text, char *submenu,
+	int action, unsigned short data, void (*func_free) (void *data))
+{
+	feh_menu_item *mi, *ptr;
+
+
+	mi = (feh_menu_item *) emalloc(sizeof(feh_menu_item));
+	mi->state = MENU_ITEM_STATE_NORMAL;
+	mi->is_toggle = FALSE;
+	if (text)
+		mi->text = estrdup(text);
+	else
+		mi->text = NULL;
+	if (submenu)
+		mi->submenu = estrdup(submenu);
+	else
+		mi->submenu = NULL;
+	mi->action = action;
+	mi->func_free = func_free;
+	mi->data = data;
+	mi->func_gen_sub = NULL;
+	mi->next = NULL;
+	mi->prev = NULL;
+
+	if (!m->items)
+		m->items = mi;
+	else {
+		for (ptr = m->items; ptr; ptr = ptr->next) {
+			if (!ptr->next) {
+				ptr->next = mi;
+				mi->prev = ptr;
+				break;
+			}
+		}
+	}
+	m->calc = 1;
+	return(mi);
+}
+
+void feh_menu_entry_get_size(feh_menu_item * i, int *w, int *h)
+{
+	int tw, th;
+
+	if (i->text) {
+		gib_imlib_get_text_size(opt.menu_fn, i->text, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+		*w = tw + FEH_MENUITEM_PAD_LEFT + FEH_MENUITEM_PAD_RIGHT;
+		*h = th + FEH_MENUITEM_PAD_TOP + FEH_MENUITEM_PAD_BOTTOM;
+	} else {
+		*w = FEH_MENUITEM_PAD_LEFT + FEH_MENUITEM_PAD_RIGHT;
+		*h = FEH_MENUITEM_PAD_TOP + FEH_MENUITEM_PAD_BOTTOM;
+	}
+
+	return;
+}
+
+void feh_menu_calc_size(feh_menu * m)
+{
+	int prev_w, prev_h;
+	feh_menu_item *i;
+	int j = 0, count = 0, max_w = 0, max_h = 0, next_w = 0;
+	int toggle_w = 1;
+
+	prev_w = m->w;
+	prev_h = m->h;
+	m->calc = 0;
+
+	for (i = m->items; i; i = i->next) {
+		int w, h;
+
+		feh_menu_entry_get_size(i, &w, &h);
+		if (w > max_w)
+			max_w = w;
+		if (h > max_h)
+			max_h = h;
+		if (i->submenu) {
+			next_w = FEH_MENU_SUBMENU_W;
+			if (FEH_MENU_SUBMENU_H > max_h)
+				max_h = FEH_MENU_SUBMENU_H;
+		}
+		if (i->is_toggle) {
+			toggle_w = FEH_MENU_TOGGLE_W + FEH_MENU_TOGGLE_PAD;
+			if (FEH_MENU_TOGGLE_H > max_h)
+				max_h = FEH_MENU_TOGGLE_H;
+		}
+		count++;
+	}
+
+	m->h = FEH_MENU_PAD_TOP;
+	for (i = m->items; i; i = i->next) {
+		i->x = FEH_MENU_PAD_LEFT;
+		i->y = m->h;
+		i->w = max_w + toggle_w + next_w;
+		i->toggle_x = 1;
+		i->text_x = i->toggle_x + toggle_w;
+		i->sub_x = i->text_x + max_w;
+		if (i->text)
+			i->h = max_h;
+		else
+			i->h = FEH_MENU_SEP_MAX_H;
+		m->h += i->h;
+		j++;
+	}
+	m->h += FEH_MENU_PAD_BOTTOM;
+	m->w = next_w + toggle_w + max_w + FEH_MENU_PAD_LEFT + FEH_MENU_PAD_RIGHT;
+
+	if ((prev_w != m->w) || (prev_h != m->h)) {
+		if (m->pmap)
+			XFreePixmap(disp, m->pmap);
+		m->pmap = 0;
+		m->needs_redraw = 1;
+		XResizeWindow(disp, m->win, m->w, m->h);
+		m->updates = imlib_update_append_rect(m->updates, 0, 0, m->w, m->h);
+	}
+	D(("menu size calculated. w=%d h=%d\n", m->w, m->h));
+
+	/* Make sure bg is same size */
+	if (m->bg) {
+		int bg_w, bg_h;
+
+		bg_w = gib_imlib_image_get_width(m->bg);
+		bg_h = gib_imlib_image_get_height(m->bg);
+
+		if (m->w != bg_w || m->h != bg_h) {
+			Imlib_Image newim = imlib_create_image(m->w, m->h);
+
+			D(("resizing bg to %dx%d\n", m->w, m->h));
+
+			gib_imlib_blend_image_onto_image(newim, m->bg, 0, 0, 0, bg_w, bg_h, 0, 0, m->w, m->h, 0, 0, 1);
+			gib_imlib_free_image_and_decache(m->bg);
+			m->bg = newim;
+		}
+	}
+
+	return;
+}
+
+void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy)
+{
+	D(("drawing item %p (text %s)\n", i, i->text));
+
+	if (i->text) {
+		D(("text item\n"));
+		if (MENU_ITEM_IS_SELECTED(i)) {
+			D(("selected item\n"));
+			/* draw selected image */
+			feh_menu_item_draw_at(i->x, i->y, i->w, i->h, im, ox, oy, 1);
+		} else {
+			D(("unselected item\n"));
+			/* draw unselected image */
+			feh_menu_item_draw_at(i->x, i->y, i->w, i->h, im, ox, oy, 0);
+		}
+
+		/* draw text */
+		gib_imlib_text_draw(im, opt.menu_fn, NULL,
+				i->x - ox + i->text_x, i->y - oy + FEH_MENUITEM_PAD_TOP,
+				i->text, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
+		if (i->submenu) {
+			D(("submenu item\n"));
+			feh_menu_draw_submenu_at(i->x + i->sub_x,
+						 i->y +
+						 FEH_MENUITEM_PAD_TOP +
+						 ((i->h -
+						   FEH_MENUITEM_PAD_TOP -
+						   FEH_MENUITEM_PAD_BOTTOM
+						   -
+						   FEH_MENU_SUBMENU_H) /
+						  2), im, ox, oy);
+		}
+		if (i->is_toggle) {
+			D(("toggleable item\n"));
+			feh_menu_draw_toggle_at(i->x + i->toggle_x,
+						i->y +
+						FEH_MENUITEM_PAD_TOP +
+						((i->h -
+						  FEH_MENUITEM_PAD_TOP -
+						  FEH_MENUITEM_PAD_BOTTOM -
+						  FEH_MENU_TOGGLE_H) / 2),
+						FEH_MENU_TOGGLE_W, FEH_MENU_TOGGLE_H, im, ox, oy, MENU_ITEM_IS_ON(i));
+		}
+	} else {
+		D(("separator item\n"));
+		feh_menu_draw_separator_at(i->x, i->y, i->w, i->h, im, ox, oy);
+	}
+	return;
+}
+
+void feh_menu_redraw(feh_menu * m)
+{
+	Imlib_Updates u, uu;
+
+	if ((!m->needs_redraw) || (!m->visible) || (!m->updates))
+		return;
+	m->needs_redraw = 0;
+	if (!m->pmap)
+		m->pmap = XCreatePixmap(disp, m->win, m->w, m->h, depth);
+	XSetWindowBackgroundPixmap(disp, m->win, m->pmap);
+
+	u = imlib_updates_merge_for_rendering(m->updates, m->w, m->h);
+	m->updates = NULL;
+	if (u) {
+		D(("I have updates to render\n"));
+		for (uu = u; u; u = imlib_updates_get_next(u)) {
+			int x, y, w, h;
+			Imlib_Image im;
 
-  for (l = menus; l; l = l->next) {
-    if (l->menu->needs_redraw)
-      feh_menu_redraw(l->menu);
-  }
-
-  D_RETURN_(5);
+			imlib_updates_get_coordinates(u, &x, &y, &w, &h);
+			D(("update coords %d,%d %d*%d\n", x, y, w, h));
+			im = imlib_create_image(w, h);
+			gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 0, 0, 0, 0);
+			if (im) {
+				feh_menu_draw_to_buf(m, im, x, y);
+				gib_imlib_render_image_on_drawable(m->pmap, im, x, y, 1, 0, 0);
+				gib_imlib_free_image(im);
+				XClearArea(disp, m->win, x, y, w, h, False);
+			}
+		}
+		imlib_updates_free(uu);
+	}
+	return;
 }
 
-feh_menu *
-feh_menu_get_from_window(Window win)
+feh_menu *feh_menu_find(char *name)
 {
-  feh_menu_list *l;
+	feh_menu_list *l;
 
-  D_ENTER(5);
-  for (l = menus; l; l = l->next)
-    if (l->menu->win == win)
-      D_RETURN(5, l->menu);
-  D_RETURN(5, NULL);
+	for (l = menus; l; l = l->next) {
+		if ((l->menu->name) && (!strcmp(l->menu->name, name)))
+			return(l->menu);
+	}
+	return(NULL);
 }
 
-void
-feh_menu_init_main(void)
+void feh_menu_draw_to_buf(feh_menu * m, Imlib_Image im, int ox, int oy)
 {
-  feh_menu *m;
-  feh_menu_item *mi;
+	feh_menu_item *i;
+	int w, h;
 
-  D_ENTER(4);
-  if (!common_menus)
-    feh_menu_init_common();
+	w = gib_imlib_image_get_width(im);
+	h = gib_imlib_image_get_height(im);
 
-  menu_main = feh_menu_new();
-  menu_main->name = estrdup("MAIN");
+	feh_menu_draw_menu_bg(m, im, ox, oy);
 
-  feh_menu_add_entry(menu_main, "File", NULL, "FILE", NULL, NULL, NULL);
-  if (opt.slideshow || opt.multiwindow) {
-#if 0
-    feh_menu_item *mi;
-
-    mi =
-      feh_menu_add_entry(menu_main, "Jump to", NULL, "JUMP", NULL, NULL,
-                         NULL);
-    mi->func_gen_sub = feh_menu_func_gen_jump;
-#endif
-
-    feh_menu_add_entry(menu_main, "Sort List", NULL, "SORT", NULL, NULL,
-                       NULL);
-    mi =
-      feh_menu_add_entry(menu_main, "Image Info", NULL, "INFO", NULL, NULL,
-                         NULL);
-    mi->func_gen_sub = feh_menu_func_gen_info;
-    feh_menu_add_entry(menu_main, NULL, NULL, NULL, NULL, NULL, NULL);
-  }
-  mi =
-    feh_menu_add_entry(menu_main, "Options", NULL, "OPTIONS", NULL, NULL,
-                       NULL);
-  mi->func_gen_sub = feh_menu_func_gen_options;
-
-  if (!opt.full_screen)
-    feh_menu_add_entry(menu_main, "About " PACKAGE, NULL, NULL,
-                       feh_menu_cb_about, NULL, NULL);
-  if (opt.multiwindow)
-    feh_menu_add_entry(menu_main, "Close", NULL, NULL, feh_menu_cb_close,
-                       NULL, NULL);
-  feh_menu_add_entry(menu_main, "Exit", NULL, NULL, feh_menu_cb_exit, NULL,
-                     NULL);
-
-  m = feh_menu_new();
-  m->name = estrdup("FILE");
-  feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL);
-  feh_menu_add_entry(m, "Resize Window", NULL, NULL, feh_menu_cb_fit, NULL,
-                     NULL);
-  feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL);
-  feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image,
-                     NULL, NULL);
-  feh_menu_add_entry(m, "Save List", NULL, NULL,
-                     feh_menu_cb_save_filelist, NULL, NULL);
-  feh_menu_add_entry(m, "Edit in Place", NULL, "EDIT", NULL, NULL, NULL);
-  feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL);
-  feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL);
-  feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, NULL);
-  feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL);
-
-  D_RETURN_(4);
+	for (i = m->items; i; i = i->next) {
+		if (RECTS_INTERSECT(i->x, i->y, i->w, i->h, ox, oy, w, h))
+			feh_menu_draw_item(i, im, ox, oy);
+	}
+	return;
 }
 
-
-void
-feh_menu_init_common()
+void feh_menu_draw_menu_bg(feh_menu * m, Imlib_Image im, int ox, int oy)
 {
-  int num_desks, i;
-  char buf[30];
-  feh_menu *m;
-
-  D_ENTER(4);
-
-  if (!opt.menu_fn) {
-    opt.menu_fn = gib_imlib_load_font(opt.menu_font);
-    if (!opt.menu_fn)
-      eprintf
-        ("couldn't load menu font %s, did you make install?\nAre you specifying a nonexistant font?\nDid you tell feh where to find it with --fontpath?",
-         opt.menu_font);
-  }
-  if (!opt.menu_style_l) {
-    opt.menu_style_l = gib_style_new_from_ascii(opt.menu_style); 
-    if (!opt.menu_style_l) {
-      weprintf
-        ("couldn't load style file for menu fonts, (%s).\nDid you make install? Menus will look boring without the style file.",
-         opt.menu_style);
-    }
-  }
-
-  m = feh_menu_new();
-  m->name = estrdup("SORT");
-
-  feh_menu_add_entry(m, "By File Name", NULL, NULL, feh_menu_cb_sort_filename,
-                     NULL, NULL);
-  feh_menu_add_entry(m, "By Image Name", NULL, NULL,
-                     feh_menu_cb_sort_imagename, NULL, NULL);
-  if (opt.preload || (opt.sort > SORT_FILENAME))
-    feh_menu_add_entry(m, "By File Size", NULL, NULL,
-                       feh_menu_cb_sort_filesize, NULL, NULL);
-  feh_menu_add_entry(m, "Randomize", NULL, NULL, feh_menu_cb_sort_randomize,
-                     NULL, NULL);
-
-  m = feh_menu_new();
-  m->name = estrdup("CONFIRM");
-  feh_menu_add_entry(m, "Confirm", NULL, NULL, feh_menu_cb_delete, NULL,
-                     NULL);
-
-  m = feh_menu_new();
-  m->name = estrdup("EDIT");
-  feh_menu_add_entry(m, "Rotate 90 CW", NULL, NULL, feh_menu_cb_edit_rotate,
-                     (void *) 1, NULL);
-  feh_menu_add_entry(m, "Rotate 180", NULL, NULL, feh_menu_cb_edit_rotate,
-                     (void *) 2, NULL);
-  feh_menu_add_entry(m, "Rotate 90 CCW", NULL, NULL, feh_menu_cb_edit_rotate,
-                     (void *) 3, NULL);
-
-  menu_bg = feh_menu_new();
-  menu_bg->name = estrdup("BACKGROUND");
-
-  num_desks = feh_wm_get_num_desks();
-  if (num_desks > 1) {
-    feh_menu_add_entry(menu_bg, "Set Tiled", NULL, "TILED", NULL, NULL, NULL);
-    feh_menu_add_entry(menu_bg, "Set Seamless", NULL, "SEAMLESS", NULL, NULL,
-                       NULL);
-    feh_menu_add_entry(menu_bg, "Set Scaled", NULL, "SCALED", NULL, NULL,
-                       NULL);
-    feh_menu_add_entry(menu_bg, "Set Centered", NULL, "CENTERED", NULL, NULL,
-                       NULL);
-
-    m = feh_menu_new();
-    m->name = estrdup("TILED");
-    for (i = 0; i < num_desks; i++) {
-      snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
-      if (opt.slideshow || opt.multiwindow)
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_tiled, (void *) i,
-                           NULL);
-      else
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_tiled_no_file,
-                           (void *) i, NULL);
-    }
-
-    m = feh_menu_new();
-    m->name = estrdup("SEAMLESS");
-    for (i = 0; i < num_desks; i++) {
-      snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
-      feh_menu_add_entry(m, buf, NULL, NULL,
-                         feh_menu_cb_background_set_seamless, (void *) i,
-                         NULL);
-    }
-
-
-    m = feh_menu_new();
-    m->name = estrdup("SCALED");
-    for (i = 0; i < num_desks; i++) {
-      snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
-
-      if (opt.slideshow || opt.multiwindow)
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_scaled, (void *) i,
-                           NULL);
-      else
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_scaled_no_file,
-                           (void *) i, NULL);
-    }
-
-    m = feh_menu_new();
-    m->name = estrdup("CENTERED");
-    for (i = 0; i < num_desks; i++) {
-      snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
-      if (opt.slideshow || opt.multiwindow)
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_centered, (void *) i,
-                           NULL);
-      else
-        feh_menu_add_entry(m, buf, NULL, NULL,
-                           feh_menu_cb_background_set_centered_no_file,
-                           (void *) i, NULL);
-    }
-  } else {
-    if (opt.slideshow || opt.multiwindow) {
-      feh_menu_add_entry(menu_bg, "Set Tiled", NULL, NULL,
-                         feh_menu_cb_background_set_tiled, NULL, NULL);
-      feh_menu_add_entry(menu_bg, "Set Seamless", NULL, NULL,
-                         feh_menu_cb_background_set_seamless, NULL, NULL);
-      feh_menu_add_entry(menu_bg, "Set Scaled", NULL, NULL,
-                         feh_menu_cb_background_set_scaled, NULL, NULL);
-      feh_menu_add_entry(menu_bg, "Set Centered", NULL, NULL,
-                         feh_menu_cb_background_set_centered, NULL, NULL);
-    } else {
-      feh_menu_add_entry(menu_bg, "Set Tiled", NULL, NULL,
-                         feh_menu_cb_background_set_tiled_no_file, NULL,
-                         NULL);
-      feh_menu_add_entry(menu_bg, "Set Seamless", NULL, NULL,
-                         feh_menu_cb_background_set_seamless, NULL, NULL);
-      feh_menu_add_entry(menu_bg, "Set Scaled", NULL, NULL,
-                         feh_menu_cb_background_set_scaled_no_file, NULL,
-                         NULL);
-      feh_menu_add_entry(menu_bg, "Set Centered", NULL, NULL,
-                         feh_menu_cb_background_set_centered_no_file, NULL,
-                         NULL);
-    }
-  }
-  common_menus = 1;
-
-  D_RETURN_(4);
-}
-
-void
-feh_menu_init_about_win(void)
-{
-  D_ENTER(4);
+	int w, h;
 
-  menu_about_win = feh_menu_new();
-  menu_about_win->name = estrdup("ABOUTWIN");
+	w = gib_imlib_image_get_width(im);
+	h = gib_imlib_image_get_height(im);
 
-  feh_menu_add_entry(menu_about_win, "Close", NULL, NULL, feh_menu_cb_close,
-                     NULL, NULL);
-  feh_menu_add_entry(menu_about_win, "Exit", NULL, NULL, feh_menu_cb_exit,
-                     NULL, NULL);
+	if (m->bg)
+		gib_imlib_blend_image_onto_image(im, m->bg, 0, ox, oy, w, h, 0, 0, w, h, 0, 0, 0);
+	else
+		gib_imlib_image_fill_rectangle(im, 0, 0, w, h, 205, 203, 176, 255);
 
-  D_RETURN_(4);
+	return;
 }
 
-void
-feh_menu_init_single_win(void)
+void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int on)
 {
-  feh_menu *m;
-  feh_menu_item *mi;
-
-  D_ENTER(4);
-  if (!common_menus)
-    feh_menu_init_common();
-
-  menu_single_win = feh_menu_new();
-  menu_single_win->name = estrdup("SINGLEWIN");
-
-  feh_menu_add_entry(menu_single_win, "File", NULL, "SINGLEWIN_FILE", NULL,
-                     NULL, NULL);
-  m = feh_menu_new();
-  m->name = estrdup("SINGLEWIN_FILE");
-  feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL);
-  feh_menu_add_entry(m, "Resize Window", NULL, NULL, feh_menu_cb_fit, NULL,
-                     NULL);
-  feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL);
-  feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image,
-                     NULL, NULL);
-  feh_menu_add_entry(m, "Save List", NULL, NULL,
-                     feh_menu_cb_save_filelist, NULL, NULL);
-  feh_menu_add_entry(m, "Edit in Place", NULL, "EDIT", NULL, NULL, NULL);
-  feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL);
-  if (opt.multiwindow || opt.slideshow) {
-    feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL);
-    feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove, NULL, NULL);
-    feh_menu_add_entry(m, "Delete", NULL, "CONFIRM", NULL, NULL, NULL);
-  }
-
-  mi =
-    feh_menu_add_entry(menu_single_win, "Image Info", NULL, "INFO", NULL,
-                       NULL, NULL);
-  mi->func_gen_sub = feh_menu_func_gen_info;
-  feh_menu_add_entry(menu_single_win, NULL, NULL, NULL, NULL, NULL, NULL);
-  mi =
-    feh_menu_add_entry(menu_single_win, "Options", NULL, "OPTIONS", NULL,
-                       NULL, NULL);
-  mi->func_gen_sub = feh_menu_func_gen_options;
-  feh_menu_add_entry(menu_single_win, "About " PACKAGE, NULL, NULL,
-                     feh_menu_cb_about, NULL, NULL);
-  feh_menu_add_entry(menu_single_win, "Close", NULL, NULL, feh_menu_cb_close,
-                     NULL, NULL);
-  feh_menu_add_entry(menu_single_win, "Exit", NULL, NULL, feh_menu_cb_exit,
-                     NULL, NULL);
-
-  D_RETURN_(4);
+	x -= ox;
+	y -= oy;
+	if (on)
+		gib_imlib_image_fill_rectangle(dst, x, y, w, h, 0, 0, 0, 255);
+	else
+		gib_imlib_image_draw_rectangle(dst, x, y, w, h, 0, 0, 0, 255);
+	return;
 }
 
-void
-feh_menu_init_thumbnail_win(void)
+void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy)
 {
-  feh_menu *m;
-  feh_menu_item *mi;
-
-  D_ENTER(4);
-  if (!common_menus)
-    feh_menu_init_common();
-
-  menu_thumbnail_win = feh_menu_new();
-  menu_thumbnail_win->name = estrdup("THUMBWIN");
-
-  feh_menu_add_entry(menu_thumbnail_win, "File", NULL, "THUMBWIN_FILE", NULL,
-                     NULL, NULL);
-  m = feh_menu_new();
-  m->name = estrdup("THUMBWIN_FILE");
-  feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL);
-  feh_menu_add_entry(m, "Resize Window", NULL, NULL, feh_menu_cb_fit, NULL,
-                     NULL);
-  feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image,
-                     NULL, NULL);
-  feh_menu_add_entry(m, "Save List", NULL, NULL,
-                     feh_menu_cb_save_filelist, NULL, NULL);
-  feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL);
-  feh_menu_add_entry(menu_thumbnail_win, NULL, NULL, NULL, NULL, NULL, NULL);
-  mi =
-    feh_menu_add_entry(menu_thumbnail_win, "Options", NULL, "OPTIONS", NULL,
-                       NULL, NULL);
-  mi->func_gen_sub = feh_menu_func_gen_options;
-  feh_menu_add_entry(menu_thumbnail_win, "About " PACKAGE, NULL, NULL,
-                     feh_menu_cb_about, NULL, NULL);
-  feh_menu_add_entry(menu_thumbnail_win, "Close", NULL, NULL,
-                     feh_menu_cb_close, NULL, NULL);
-  feh_menu_add_entry(menu_thumbnail_win, "Exit", NULL, NULL, feh_menu_cb_exit,
-                     NULL, NULL);
-  D_RETURN_(4);
-}
+        // Draw filled triangle
+        x -= ox;
+	y -= oy;
 
+	imlib_context_set_image(dst);
+	imlib_context_set_color(0, 0, 0, 255);
 
-void
-feh_menu_init_thumbnail_viewer(void)
-{
-  feh_menu *m;
-  feh_menu_item *mi;
-
-  D_ENTER(4);
-  if (!common_menus)
-    feh_menu_init_common();
-
-  menu_thumbnail_viewer = feh_menu_new();
-  menu_thumbnail_viewer->name = estrdup("THUMBVIEW");
-
-  feh_menu_add_entry(menu_thumbnail_viewer, "File", NULL, "THUMBVIEW_FILE",
-                     NULL, NULL, NULL);
-  m = feh_menu_new();
-  m->name = estrdup("THUMBVIEW_FILE");
-  feh_menu_add_entry(m, "Reset", NULL, NULL, feh_menu_cb_reset, NULL, NULL);
-  feh_menu_add_entry(m, "Resize Window", NULL, NULL, feh_menu_cb_fit, NULL,
-                     NULL);
-  feh_menu_add_entry(m, "Reload", NULL, NULL, feh_menu_cb_reload, NULL, NULL);
-  feh_menu_add_entry(m, "Save Image", NULL, NULL, feh_menu_cb_save_image,
-                     NULL, NULL);
-  feh_menu_add_entry(m, "Save List", NULL, NULL,
-                     feh_menu_cb_save_filelist, NULL, NULL);
-  feh_menu_add_entry(m, "Edit in Place", NULL, "EDIT", NULL, NULL, NULL);
-  feh_menu_add_entry(m, "Background", NULL, "BACKGROUND", NULL, NULL, NULL);
-  feh_menu_add_entry(m, NULL, NULL, NULL, NULL, NULL, NULL);
-  feh_menu_add_entry(m, "Hide", NULL, NULL, feh_menu_cb_remove_thumb, NULL,
-                     NULL);
-  feh_menu_add_entry(m, "Delete", NULL, "THUMBVIEW_CONFIRM", NULL, NULL,
-                     NULL);
-  mi =
-    feh_menu_add_entry(menu_thumbnail_viewer, "Image Info", NULL, "INFO",
-                       NULL, NULL, NULL);
-  mi->func_gen_sub = feh_menu_func_gen_info;
-  feh_menu_add_entry(menu_thumbnail_viewer, NULL, NULL, NULL, NULL, NULL,
-                     NULL);
-  mi =
-    feh_menu_add_entry(menu_thumbnail_viewer, "Options", NULL, "OPTIONS",
-                       NULL, NULL, NULL);
-  mi->func_gen_sub = feh_menu_func_gen_options;
-  feh_menu_add_entry(menu_thumbnail_viewer, "About " PACKAGE, NULL, NULL,
-                     feh_menu_cb_about, NULL, NULL);
-  feh_menu_add_entry(menu_thumbnail_viewer, "Close", NULL, NULL,
-                     feh_menu_cb_close, NULL, NULL);
-  feh_menu_add_entry(menu_thumbnail_viewer, "Exit", NULL, NULL,
-                     feh_menu_cb_exit, NULL, NULL);
-  m = feh_menu_new();
-  m->name = estrdup("THUMBVIEW_CONFIRM");
-  feh_menu_add_entry(m, "Confirm", NULL, NULL, feh_menu_cb_delete_thumb, NULL,
-                     NULL);
-  D_RETURN_(4);
-}
+	for (int i= 0; i <= 3; i++) {
+	  imlib_image_draw_line(x+i, y+3+i, x+i, y+9-i, 0);
+	}
 
-static void
-feh_menu_cb_background_set_tiled(feh_menu * m,
-                                 feh_menu_item * i,
-                                 void *data)
-{
-  char *path;
-
-  D_ENTER(4);
-  path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename);
-  feh_wm_set_bg(path, m->fehwin->im, 0, 0, (int) data, 1);
-  free(path);
-  D_RETURN_(4);
-  i = NULL;
+	return;
 }
 
-static void
-feh_menu_cb_background_set_seamless(feh_menu * m,
-                                    feh_menu_item * i,
-                                    void *data)
+void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy)
 {
-  Imlib_Image im;
-
-  D_ENTER(4);
-  im = gib_imlib_clone_image(m->fehwin->im);
-  gib_imlib_image_tile(im);
-  feh_wm_set_bg(NULL, im, 0, 0, (int) data, 1);
-  gib_imlib_free_image_and_decache(im);
-  D_RETURN_(4);
-  i = NULL;
+	gib_imlib_image_fill_rectangle(dst, x - ox + 2, y - oy + 2, w - 4, h - 4, 0, 0, 0, 255);
+	return;
 }
 
-static void
-feh_menu_cb_background_set_scaled(feh_menu * m,
-                                  feh_menu_item * i,
-                                  void *data)
+void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int selected)
 {
-  char *path;
-
-  D_ENTER(4);
-  path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename);
-  feh_wm_set_bg(path, m->fehwin->im, 0, 1, (int) data, 1);
-  free(path);
-  D_RETURN_(4);
-  i = NULL;
+	imlib_context_set_image(dst);
+	if (selected)
+		gib_imlib_image_fill_rectangle(dst, x - ox, y - oy, w, h, 127, 127, 127, 178);
+	return;
 }
 
-static void
-feh_menu_cb_background_set_centered(feh_menu * m,
-                                    feh_menu_item * i,
-                                    void *data)
+void feh_raise_all_menus(void)
 {
-  char *path;
-
-  D_ENTER(4);
-  path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename);
-  feh_wm_set_bg(path, m->fehwin->im, 1, 0, (int) data, 1);
-  free(path);
-  D_RETURN_(4);
-  i = NULL;
-}
+	feh_menu_list *l;
 
-static void
-feh_menu_cb_background_set_tiled_no_file(feh_menu * m,
-                                         feh_menu_item * i,
-                                         void *data)
-{
-  D_ENTER(4);
-  feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, (int) data, 1);
-  D_RETURN_(4);
-  i = NULL;
+	for (l = menus; l; l = l->next) {
+		if (l->menu->visible)
+			XRaiseWindow(disp, l->menu->win);
+	}
+	return;
 }
 
-static void
-feh_menu_cb_background_set_scaled_no_file(feh_menu * m,
-                                          feh_menu_item * i,
-                                          void *data)
+void feh_redraw_menus(void)
 {
-  D_ENTER(4);
-  feh_wm_set_bg(NULL, m->fehwin->im, 0, 1, (int) data, 1);
-  D_RETURN_(4);
-  i = NULL;
-}
+	feh_menu_list *l;
 
-static void
-feh_menu_cb_background_set_centered_no_file(feh_menu * m,
-                                            feh_menu_item * i,
-                                            void *data)
-{
-  D_ENTER(4);
-  feh_wm_set_bg(NULL, m->fehwin->im, 1, 0, (int) data, 1);
-  D_RETURN_(4);
-  i = NULL;
-}
+	for (l = menus; l; l = l->next) {
+		if (l->menu->needs_redraw)
+			feh_menu_redraw(l->menu);
+	}
 
-static void
-feh_menu_cb_about(feh_menu * m,
-                  feh_menu_item * i,
-                  void *data)
-{
-  Imlib_Image im;
-  winwidget winwid;
-
-  D_ENTER(4);
-  if (feh_load_image_char(&im, PREFIX "/share/feh/images/about.png") != 0) {
-    winwid =
-      winwidget_create_from_image(im, "About " PACKAGE, WIN_TYPE_ABOUT);
-    winwid->file =
-      gib_list_add_front(NULL,
-                         feh_file_new(PREFIX "/share/feh/images/about.png"));
-    winwidget_show(winwid);
-  }
-  D_RETURN_(4);
-  m = NULL;
-  i = NULL;
-  data = NULL;
+	return;
 }
 
-static void
-feh_menu_cb_close(feh_menu * m,
-                  feh_menu_item * i,
-                  void *data)
+feh_menu *feh_menu_get_from_window(Window win)
 {
-  D_ENTER(4);
-  winwidget_destroy(m->fehwin);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_cb_exit(feh_menu * m,
-                 feh_menu_item * i,
-                 void *data)
-{
-  D_ENTER(4);
-  winwidget_destroy_all();
-  D_RETURN_(4);
-  m = NULL;
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_cb_reset(feh_menu * m,
-                  feh_menu_item * i,
-                  void *data)
-{
-  D_ENTER(4);
-  if (m->fehwin->has_rotated) {
-    m->fehwin->im_w = gib_imlib_image_get_width(m->fehwin->im);
-    m->fehwin->im_h = gib_imlib_image_get_height(m->fehwin->im);
-    winwidget_resize(m->fehwin, m->fehwin->im_w, m->fehwin->im_h);
-  }
-  winwidget_reset_image(m->fehwin);
-  winwidget_render_image(m->fehwin, 1, 1);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
-
-
-static void
-feh_menu_cb_reload(feh_menu * m,
-                   feh_menu_item * i,
-                   void *data)
-{
-  D_ENTER(4);
-  feh_reload_image(m->fehwin, 0, 0);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_cb_remove(feh_menu * m,
-                   feh_menu_item * i,
-                   void *data)
-{
-  D_ENTER(4);
-  feh_filelist_image_remove(m->fehwin, 0);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
+	feh_menu_list *l;
 
-static void
-feh_menu_cb_delete(feh_menu * m,
-                   feh_menu_item * i,
-                   void *data)
-{
-  D_ENTER(4);
-  feh_filelist_image_remove(m->fehwin, 1);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
+	for (l = menus; l; l = l->next)
+		if (l->menu->win == win)
+			return(l->menu);
+	return(NULL);
 }
 
-static void
-feh_menu_cb_remove_thumb(feh_menu * m,
-                         feh_menu_item * i,
-                         void *data)
+void feh_menu_init_main(void)
 {
-  D_ENTER(4);
-  feh_thumbnail_mark_removed(FEH_FILE(m->fehwin->file->data), 0);
-  feh_filelist_image_remove(m->fehwin, 0);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
+	feh_menu *m;
+	feh_menu_item *mi;
 
-static void
-feh_menu_cb_delete_thumb(feh_menu * m,
-                         feh_menu_item * i,
-                         void *data)
-{
-  D_ENTER(4);
-  feh_thumbnail_mark_removed(FEH_FILE(m->fehwin->file->data), 1);
-  feh_filelist_image_remove(m->fehwin, 1);
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
+	if (!common_menus)
+		feh_menu_init_common();
 
+	menu_main = feh_menu_new();
+	menu_main->name = estrdup("MAIN");
 
-static void
-feh_menu_cb_sort_filename(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  D_ENTER(4);
-  filelist = gib_list_sort(filelist, feh_cmp_filename);
-  if(!opt.no_jump_on_resort){
-    slideshow_change_image(m->fehwin, SLIDE_FIRST);
-  };
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
+	feh_menu_add_entry(menu_main, "File", "FILE", 0, 0, NULL);
+	if (opt.slideshow || opt.multiwindow) {
+		feh_menu_add_entry(menu_main, "Sort List", "SORT", 0, 0, NULL);
+		mi = feh_menu_add_entry(menu_main, "Image Info", "INFO", 0, 0, NULL);
+		mi->func_gen_sub = feh_menu_func_gen_info;
+		feh_menu_add_entry(menu_main, NULL, NULL, 0, 0, NULL);
+	}
+	mi = feh_menu_add_entry(menu_main, "Options", "OPTIONS", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_options;
 
-static void
-feh_menu_cb_sort_imagename(feh_menu * m,
-                           feh_menu_item * i,
-                           void *data)
-{
-  D_ENTER(4);
-  filelist = gib_list_sort(filelist, feh_cmp_name);
-  if(!opt.no_jump_on_resort){
-    slideshow_change_image(m->fehwin, SLIDE_FIRST);
-  };
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
+	if (opt.multiwindow)
+		feh_menu_add_entry(menu_main, "Close", NULL, CB_CLOSE, 0, NULL);
+	feh_menu_add_entry(menu_main, "Exit", NULL, CB_EXIT, 0, NULL);
 
-static void
-feh_menu_cb_sort_filesize(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  D_ENTER(4);
-  filelist = gib_list_sort(filelist, feh_cmp_size);
-  if(!opt.no_jump_on_resort){
-    slideshow_change_image(m->fehwin, SLIDE_FIRST);
-  };
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_cb_sort_randomize(feh_menu * m,
-                           feh_menu_item * i,
-                           void *data)
-{
-  D_ENTER(4);
-  filelist = gib_list_randomize(filelist);
-  if(!opt.no_jump_on_resort){
-    slideshow_change_image(m->fehwin, SLIDE_FIRST);
-  };
-  D_RETURN_(4);
-  i = NULL;
-  data = NULL;
-}
-
-static feh_menu *
-feh_menu_func_gen_jump(feh_menu * m,
-                       feh_menu_item * i,
-                       void *data)
-{
-  feh_menu *mm;
-  gib_list *l;
-
-  D_ENTER(4);
-  mm = feh_menu_new();
-  mm->name = estrdup("JUMP");
-  for (l = filelist; l; l = l->next) {
-    feh_menu_add_entry(mm, FEH_FILE(l->data)->name, NULL, NULL,
-                       feh_menu_cb_jump_to, l, NULL);
-  }
-  D_RETURN(4, mm);
-  m = NULL;
-  i = NULL;
-  data = NULL;
-}
-
-static feh_menu *
-feh_menu_func_gen_info(feh_menu * m,
-                       feh_menu_item * i,
-                       void *data)
-{
-  Imlib_Image im;
-  feh_menu *mm;
-  feh_file *file;
-  char buffer[400];
-
-  D_ENTER(4);
-  if (!m->fehwin->file)
-    D_RETURN(4, NULL);
-  file = FEH_FILE(m->fehwin->file->data);
-  im = m->fehwin->im;
-  if (!im)
-    D_RETURN(4, NULL);
-  mm = feh_menu_new();
-  mm->name = estrdup("INFO");
-  snprintf(buffer, sizeof(buffer), "Filename: %s", file->name);
-  feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL);
-  if (!file->info)
-    feh_file_info_load(file, im);
-  if (file->info) {
-    snprintf(buffer, sizeof(buffer), "Size: %dKb", file->info->size / 1024);
-    feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL);
-    snprintf(buffer, sizeof(buffer), "Dimensions: %dx%d", file->info->width,
-             file->info->height);
-    feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL);
-    snprintf(buffer, sizeof(buffer), "Type: %s", file->info->format);
-    feh_menu_add_entry(mm, buffer, NULL, NULL, NULL, NULL, NULL);
-  }
-
-  mm->func_free = feh_menu_func_free_info;
-  D_RETURN(4, mm);
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_func_free_info(feh_menu * m,
-                        void *data)
-{
-  D_ENTER(4);
-  feh_menu_free(m);
-  D_RETURN_(4);
-  data = NULL;
-}
-
-
-static feh_menu *
-feh_menu_func_gen_options(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  feh_menu *mm;
-
-  D_ENTER(4);
-  mm = feh_menu_new();
-  mm->name = estrdup("OPTIONS");
-  mm->fehwin = m->fehwin;
-  feh_menu_add_toggle_entry(mm, "Auto-Zoom", NULL, NULL,
-                            feh_menu_cb_opt_auto_zoom, NULL, NULL,
-                            opt.auto_zoom);
-  feh_menu_add_toggle_entry(mm, "Freeze Window Size", NULL, NULL,
-                            feh_menu_cb_opt_freeze_window, NULL, NULL,
-                            opt.geom_flags);
-  feh_menu_add_toggle_entry(mm, "Fullscreen", NULL, NULL,
-                            feh_menu_cb_opt_fullscreen, NULL, NULL,
-                            m->fehwin->full_screen);
-#ifdef HAVE_LIBXINERAMA
-  feh_menu_add_toggle_entry(mm, "Use Xinerama", NULL, NULL,
-                            feh_menu_cb_opt_xinerama, NULL, NULL,
-                            opt.xinerama);
-#endif /* HAVE_LIBXINERAMA */
-  feh_menu_add_entry(mm, NULL, NULL, NULL, NULL, NULL, NULL);
-  feh_menu_add_toggle_entry(mm, "Draw Filename", NULL, NULL,
-                            feh_menu_cb_opt_draw_filename, NULL, NULL,
-                            opt.draw_filename);
-  feh_menu_add_toggle_entry(mm, "Keep HTTP Files", NULL, NULL,
-                            feh_menu_cb_opt_keep_http, NULL, NULL,
-                            opt.keep_http);
-  mm->func_free = feh_menu_func_free_options;
-  D_RETURN(4, mm);
-  i = NULL;
-  data = NULL;
-}
-
-static void
-feh_menu_func_free_options(feh_menu * m,
-                           void *data)
-{
-  D_ENTER(4);
-  feh_menu_free(m);
-  D_RETURN_(4);
-  data = NULL;
-}
-
-static void
-feh_menu_cb_jump_to(feh_menu * m,
-                    feh_menu_item * i,
-                    void *data)
-{
-  gib_list *l;
-
-  D_ENTER(4);
-  l = (gib_list *) data;
-  if (l->prev) {
-    current_file = l->prev;
-    slideshow_change_image(m->fehwin, SLIDE_NEXT);
-  } else if (l->next) {
-    current_file = l->next;
-    slideshow_change_image(m->fehwin, SLIDE_PREV);
-  }
-
-  D_RETURN_(4);
-  i = NULL;
-  m = NULL;
-}
-
-static void
-feh_menu_cb_fit(feh_menu * m,
-                feh_menu_item * i,
-                void *data)
-{
-  D_ENTER(4);
-  winwidget_size_to_image(m->fehwin);
-  D_RETURN_(4);
-  data = NULL;
-}
-
-static void
-feh_menu_cb_edit_rotate(feh_menu * m,
-                        feh_menu_item * i,
-                        void *data)
-{
-  D_ENTER(4);
-  feh_edit_inplace_orient(m->fehwin, (int) data);
-  D_RETURN_(4);
-}
-
-static void
-feh_menu_cb_save_image(feh_menu * m,
-                       feh_menu_item * i,
-                       void *data)
-{
-  slideshow_save_image(m->fehwin);
-}
-
-static void
-feh_menu_cb_save_filelist(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  feh_save_filelist();
-}
-
-static void
-feh_menu_cb_opt_draw_filename(feh_menu * m,
-                              feh_menu_item * i,
-                              void *data)
-{
-  MENU_ITEM_TOGGLE(i);
-  if (MENU_ITEM_IS_ON(i))
-    opt.draw_filename = TRUE;
-  else
-    opt.draw_filename = FALSE;
-  winwidget_rerender_all(0, 1);
-}
-
-static void
-feh_menu_cb_opt_keep_http(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  MENU_ITEM_TOGGLE(i);
-  if (MENU_ITEM_IS_ON(i))
-    opt.keep_http = TRUE;
-  else
-    opt.keep_http = FALSE;
-}
-
-static void
-feh_menu_cb_opt_freeze_window(feh_menu * m,
-                              feh_menu_item * i,
-                              void *data)
-{
-  MENU_ITEM_TOGGLE(i);
-  if (MENU_ITEM_IS_ON(i)) {
-    opt.geom_flags = (WidthValue | HeightValue);
-    opt.geom_w = m->fehwin->w;
-    opt.geom_h = m->fehwin->h;
-  } else {
-    opt.geom_flags = 0;
-  }
-}
-
-static void
-feh_menu_cb_opt_fullscreen(feh_menu * m,
-                           feh_menu_item * i,
-                           void *data)
-{
-  int curr_screen = 0;
-
-  MENU_ITEM_TOGGLE(i);
-  if (MENU_ITEM_IS_ON(i))
-    m->fehwin->full_screen = TRUE;
-  else
-    m->fehwin->full_screen = FALSE;
+	m = feh_menu_new();
+	m->name = estrdup("FILE");
+	feh_menu_add_entry(m, "Reset", NULL, CB_RESET, 0, NULL);
+	feh_menu_add_entry(m, "Resize Window", NULL, CB_FIT, 0, NULL);
+	feh_menu_add_entry(m, "Reload", NULL, CB_RELOAD, 0, NULL);
+	feh_menu_add_entry(m, "Save Image", NULL, CB_SAVE_IMAGE, 0, NULL);
+	feh_menu_add_entry(m, "Save List", NULL, CB_SAVE_FILELIST, 0, NULL);
+	if (opt.edit) {
+		feh_menu_add_entry(m, "Edit in Place", "EDIT", 0, 0, NULL);
+	}
+	else {
+		feh_menu_add_entry(m, "Change View", "EDIT", 0, 0, NULL);
+	}
+	feh_menu_add_entry(m, "Background", "BACKGROUND", 0, 0, NULL);
+	feh_menu_add_entry(m, NULL, NULL, 0, 0, NULL);
+	feh_menu_add_entry(m, "Hide", NULL, CB_REMOVE, 0, NULL);
+	feh_menu_add_entry(m, "Delete", "CONFIRM", 0, 0, NULL);
+
+	return;
+}
+
+void feh_menu_init_common(void)
+{
+	int num_desks, i;
+	char buf[30];
+	feh_menu *m;
+
+	if (!opt.menu_fn) {
+		opt.menu_fn = gib_imlib_load_font(opt.menu_font);
+		if (!opt.menu_fn)
+			eprintf
+			    ("couldn't load menu font %s, did you make install?\nAre you specifying a nonexistent font?\nDid you tell feh where to find it with --fontpath?",
+			     opt.menu_font);
+	}
+
+	m = feh_menu_new();
+	m->name = estrdup("SORT");
+
+	feh_menu_add_entry(m, "By File Name", NULL, CB_SORT_FILENAME, 0, NULL);
+	feh_menu_add_entry(m, "By Image Name", NULL, CB_SORT_IMAGENAME, 0, NULL);
+	feh_menu_add_entry(m, "By Directory Name", NULL, CB_SORT_DIRNAME, 0, NULL);
+	feh_menu_add_entry(m, "By Modification Date", NULL, CB_SORT_MTIME, 0, NULL);
+	if (opt.preload || (opt.sort > SORT_MTIME))
+		feh_menu_add_entry(m, "By File Size", NULL, CB_SORT_FILESIZE, 0, NULL);
+	feh_menu_add_entry(m, "Randomize", NULL, CB_SORT_RANDOMIZE, 0, NULL);
+
+	m = feh_menu_new();
+	m->name = estrdup("CONFIRM");
+	feh_menu_add_entry(m, "Confirm", NULL, CB_DELETE, 0, NULL);
+
+	m = feh_menu_new();
+	m->name = estrdup("EDIT");
+	feh_menu_add_entry(m, "Rotate 90 CW", NULL, CB_EDIT_ROTATE, 1, NULL);
+	feh_menu_add_entry(m, "Rotate 180", NULL, CB_EDIT_ROTATE, 2, NULL);
+	feh_menu_add_entry(m, "Rotate 90 CCW", NULL, CB_EDIT_ROTATE, 3, NULL);
+	feh_menu_add_entry(m, "Mirror", NULL, CB_EDIT_MIRROR, 0, NULL);
+	feh_menu_add_entry(m, "Flip", NULL, CB_EDIT_FLIP, 0, NULL);
+
+	menu_bg = feh_menu_new();
+	menu_bg->name = estrdup("BACKGROUND");
+
+	num_desks = feh_wm_get_num_desks();
+	if (num_desks > 1) {
+		feh_menu_add_entry(menu_bg, "Set Tiled", "TILED", 0, 0, NULL);
+		feh_menu_add_entry(menu_bg, "Set Scaled", "SCALED", 0, 0, NULL);
+		feh_menu_add_entry(menu_bg, "Set Centered", "CENTERED", 0, 0, NULL);
+		feh_menu_add_entry(menu_bg, "Set Filled", "FILLED", 0, 0, NULL);
+
+		m = feh_menu_new();
+		m->name = estrdup("TILED");
+		for (i = 0; i < num_desks; i++) {
+			snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
+			if (opt.slideshow || opt.multiwindow)
+				feh_menu_add_entry(m, buf, NULL, CB_BG_TILED,
+						i, NULL);
+			else
+				feh_menu_add_entry(m, buf, NULL, CB_BG_TILED_NOFILE,
+						i, NULL);
+		}
+
+		m = feh_menu_new();
+		m->name = estrdup("SCALED");
+		for (i = 0; i < num_desks; i++) {
+			snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
+
+			if (opt.slideshow || opt.multiwindow)
+				feh_menu_add_entry(m, buf, NULL, CB_BG_SCALED,
+						i, NULL);
+			else
+				feh_menu_add_entry(m, buf, NULL, CB_BG_SCALED_NOFILE,
+						i, NULL);
+		}
+
+		m = feh_menu_new();
+		m->name = estrdup("CENTERED");
+		for (i = 0; i < num_desks; i++) {
+			snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
+			if (opt.slideshow || opt.multiwindow)
+				feh_menu_add_entry(m, buf, NULL,
+						CB_BG_CENTERED, i, NULL);
+			else
+				feh_menu_add_entry(m, buf, NULL,
+						CB_BG_CENTERED_NOFILE, i, NULL);
+		}
+
+		m = feh_menu_new();
+		m->name = estrdup("FILLED");
+		for (i = 0; i < num_desks; i++) {
+			snprintf(buf, sizeof(buf), "Desktop %d", i + 1);
+			if (opt.slideshow || opt.multiwindow)
+				feh_menu_add_entry(m, buf, NULL,
+						CB_BG_FILLED,
+						i, NULL);
+			else
+				feh_menu_add_entry(m, buf, NULL,
+						CB_BG_FILLED_NOFILE,
+						i, NULL);
+		}
+	} else {
+		if (opt.slideshow || opt.multiwindow) {
+			feh_menu_add_entry(menu_bg, "Set Tiled",
+					NULL, CB_BG_TILED, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Scaled",
+					NULL, CB_BG_SCALED, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Centered",
+					NULL, CB_BG_CENTERED, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Filled",
+					NULL, CB_BG_FILLED, 0, NULL);
+		} else {
+			feh_menu_add_entry(menu_bg, "Set Tiled",
+					NULL, CB_BG_TILED_NOFILE, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Scaled",
+					NULL, CB_BG_SCALED_NOFILE, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Centered",
+					NULL, CB_BG_CENTERED_NOFILE, 0, NULL);
+			feh_menu_add_entry(menu_bg, "Set Filled",
+					NULL, CB_BG_FILLED_NOFILE, 0, NULL);
+		}
+	}
+	common_menus = 1;
+
+	return;
+}
+
+void feh_menu_init_single_win(void)
+{
+	feh_menu *m;
+	feh_menu_item *mi;
+
+	if (!common_menus)
+		feh_menu_init_common();
+
+	menu_single_win = feh_menu_new();
+	menu_single_win->name = estrdup("SINGLEWIN");
+
+	feh_menu_add_entry(menu_single_win, "File", "SINGLEWIN_FILE", 0, 0, NULL);
+	m = feh_menu_new();
+	m->name = estrdup("SINGLEWIN_FILE");
+	feh_menu_add_entry(m, "Reset", NULL, CB_RESET, 0, NULL);
+	feh_menu_add_entry(m, "Resize Window", NULL, CB_FIT, 0, NULL);
+	feh_menu_add_entry(m, "Reload", NULL, CB_RELOAD, 0, NULL);
+	feh_menu_add_entry(m, "Save Image", NULL, CB_SAVE_IMAGE, 0, NULL);
+	feh_menu_add_entry(m, "Save List", NULL, CB_SAVE_FILELIST, 0, NULL);
+	feh_menu_add_entry(m, "Edit in Place", "EDIT", 0, 0, NULL);
+	feh_menu_add_entry(m, "Background", "BACKGROUND", 0, 0, NULL);
+	if (opt.multiwindow || opt.slideshow) {
+		feh_menu_add_entry(m, NULL, NULL, 0, 0, NULL);
+		feh_menu_add_entry(m, "Hide", NULL, CB_REMOVE, 0, NULL);
+		feh_menu_add_entry(m, "Delete", "CONFIRM", 0, 0, NULL);
+	}
+
+	mi = feh_menu_add_entry(menu_single_win, "Image Info", "INFO", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_info;
+	feh_menu_add_entry(menu_single_win, NULL, NULL, 0, 0, NULL);
+	mi = feh_menu_add_entry(menu_single_win, "Options", "OPTIONS", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_options;
+	feh_menu_add_entry(menu_single_win, "Close", NULL, CB_CLOSE, 0, NULL);
+	feh_menu_add_entry(menu_single_win, "Exit", NULL, CB_EXIT, 0, NULL);
+
+	return;
+}
+
+void feh_menu_init_thumbnail_win(void)
+{
+	feh_menu *m;
+	feh_menu_item *mi;
+
+	if (!common_menus)
+		feh_menu_init_common();
+
+	menu_thumbnail_win = feh_menu_new();
+	menu_thumbnail_win->name = estrdup("THUMBWIN");
+
+	feh_menu_add_entry(menu_thumbnail_win, "File", "THUMBWIN_FILE", 0, 0, NULL);
+	m = feh_menu_new();
+	m->name = estrdup("THUMBWIN_FILE");
+	feh_menu_add_entry(m, "Reset", NULL, CB_RESET, 0, NULL);
+	feh_menu_add_entry(m, "Resize Window", NULL, CB_FIT, 0, NULL);
+	feh_menu_add_entry(m, "Save Image", NULL, CB_SAVE_IMAGE, 0, NULL);
+	feh_menu_add_entry(m, "Save List", NULL, CB_SAVE_FILELIST, 0, NULL);
+	feh_menu_add_entry(m, "Background", "BACKGROUND", 0, 0, NULL);
+	feh_menu_add_entry(menu_thumbnail_win, NULL, NULL, 0, 0, NULL);
+	mi = feh_menu_add_entry(menu_thumbnail_win, "Options", "OPTIONS", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_options;
+	feh_menu_add_entry(menu_thumbnail_win, "Close", NULL, CB_CLOSE, 0, NULL);
+	feh_menu_add_entry(menu_thumbnail_win, "Exit", NULL, CB_EXIT, 0, NULL);
+	return;
+}
+
+void feh_menu_init_thumbnail_viewer(void)
+{
+	feh_menu *m;
+	feh_menu_item *mi;
+
+	if (!common_menus)
+		feh_menu_init_common();
+
+	menu_thumbnail_viewer = feh_menu_new();
+	menu_thumbnail_viewer->name = estrdup("THUMBVIEW");
+
+	feh_menu_add_entry(menu_thumbnail_viewer, "File", "THUMBVIEW_FILE",
+			0, 0, NULL);
+	m = feh_menu_new();
+	m->name = estrdup("THUMBVIEW_FILE");
+	feh_menu_add_entry(m, "Reset", NULL, CB_RESET, 0, NULL);
+	feh_menu_add_entry(m, "Resize Window", NULL, CB_FIT, 0, NULL);
+	feh_menu_add_entry(m, "Reload", NULL, CB_RELOAD, 0, NULL);
+	feh_menu_add_entry(m, "Save Image", NULL, CB_SAVE_IMAGE, 0, NULL);
+	feh_menu_add_entry(m, "Save List", NULL, CB_SAVE_FILELIST, 0, NULL);
+	feh_menu_add_entry(m, "Edit in Place", "EDIT", 0, 0, NULL);
+	feh_menu_add_entry(m, "Background", "BACKGROUND", 0, 0, NULL);
+	feh_menu_add_entry(m, NULL, NULL, 0, 0, NULL);
+	feh_menu_add_entry(m, "Hide", NULL, CB_REMOVE_THUMB, 0, NULL);
+	feh_menu_add_entry(m, "Delete", "THUMBVIEW_CONFIRM", 0, 0, NULL);
+	mi = feh_menu_add_entry(menu_thumbnail_viewer, "Image Info",
+			"INFO", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_info;
+	feh_menu_add_entry(menu_thumbnail_viewer, NULL, NULL, 0, 0, NULL);
+	mi = feh_menu_add_entry(menu_thumbnail_viewer, "Options",
+			"OPTIONS", 0, 0, NULL);
+	mi->func_gen_sub = feh_menu_func_gen_options;
+	feh_menu_add_entry(menu_thumbnail_viewer, "Close", NULL, CB_CLOSE, 0, NULL);
+	feh_menu_add_entry(menu_thumbnail_viewer, "Exit", NULL, CB_EXIT, 0, NULL);
+	m = feh_menu_new();
+	m->name = estrdup("THUMBVIEW_CONFIRM");
+	feh_menu_add_entry(m, "Confirm", NULL, CB_DELETE_THUMB, 0, NULL);
+	return;
+}
+
+void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i)
+{
+	int curr_screen = 0;
+
+	MENU_ITEM_TOGGLE(i);
+	if (MENU_ITEM_IS_ON(i))
+		m->fehwin->full_screen = TRUE;
+	else
+		m->fehwin->full_screen = FALSE;
 
 #ifdef HAVE_LIBXINERAMA
-  if (opt.xinerama && xinerama_screens) {
-    int i, rect[4];
-
-    winwidget_get_geometry(m->fehwin, rect);
-    /* printf("window: (%d, %d)\n", rect[0], rect[1]);
-    printf("found %d screens.\n", num_xinerama_screens); */
-    for (i = 0; i < num_xinerama_screens; i++) {
-      xinerama_screen = 0;
-      /* printf("%d: [%d, %d, %d, %d] (%d, %d)\n",
-             i,
-             xinerama_screens[i].x_org, xinerama_screens[i].y_org,
-             xinerama_screens[i].width, xinerama_screens[i].height,
-             rect[0], rect[1]);*/
-      if (XY_IN_RECT(rect[0], rect[1],
-            xinerama_screens[i].x_org, xinerama_screens[i].y_org,
-            xinerama_screens[i].width, xinerama_screens[i].height)) {
-        curr_screen = xinerama_screen = i;
-        break;
-      }
-
-    }
-  }
-#endif /* HAVE_LIBXINERAMA */
-
-  winwidget_destroy_xwin(m->fehwin);
-  winwidget_create_window(m->fehwin, m->fehwin->im_w, m->fehwin->im_h);
-
-  winwidget_render_image(m->fehwin, 1, 1);
-  winwidget_show(m->fehwin);
+	if (opt.xinerama && xinerama_screens) {
+		int i, rect[4];
+
+		winwidget_get_geometry(m->fehwin, rect);
+		for (i = 0; i < num_xinerama_screens; i++) {
+			xinerama_screen = 0;
+			if (XY_IN_RECT(rect[0], rect[1],
+				       xinerama_screens[i].x_org,
+				       xinerama_screens[i].y_org,
+				       xinerama_screens[i].width, xinerama_screens[i].height)) {
+				curr_screen = xinerama_screen = i;
+				break;
+			}
+
+		}
+		if (opt.xinerama_index >= 0)
+			curr_screen = xinerama_screen = opt.xinerama_index;
+	}
+#endif				/* HAVE_LIBXINERAMA */
+
+	winwidget_destroy_xwin(m->fehwin);
+	winwidget_create_window(m->fehwin, m->fehwin->im_w, m->fehwin->im_h);
+
+	winwidget_render_image(m->fehwin, 1, 0);
+	winwidget_show(m->fehwin);
 
 #ifdef HAVE_LIBXINERAMA
-  /* if we have xinerama and we're using it, then full screen the window
-   * on the head that the window was active on */
-  if (m->fehwin->full_screen == TRUE && opt.xinerama && xinerama_screens) {
-    xinerama_screen = curr_screen;
-    winwidget_move(m->fehwin,
-                   xinerama_screens[curr_screen].x_org,
-                   xinerama_screens[curr_screen].y_org);
-  }
-#endif /* HAVE_LIBXINERAMA */
-}
-
-static void
-feh_menu_cb_opt_auto_zoom(feh_menu * m,
-                          feh_menu_item * i,
-                          void *data)
-{
-  MENU_ITEM_TOGGLE(i);
-  opt.auto_zoom = MENU_ITEM_IS_ON(i) ? 1 : 0;
-  winwidget_rerender_all(1, 1);
-}
-
-#ifdef HAVE_LIBXINERAMA
-static void
-feh_menu_cb_opt_xinerama(feh_menu * m,
-                         feh_menu_item * i,
-                         void *data)
-{
-  MENU_ITEM_TOGGLE(i);
-  opt.xinerama = MENU_ITEM_IS_ON(i) ? 1 : 0;
-
-  if (opt.xinerama) {
-    init_xinerama();
-  } else {
-    XFree(xinerama_screens);
-    xinerama_screens = NULL;
-  }
-  winwidget_rerender_all(1, 1);
+	/* if we have xinerama and we're using it, then full screen the window
+	 * on the head that the window was active on */
+	if (m->fehwin->full_screen == TRUE && opt.xinerama && xinerama_screens) {
+		xinerama_screen = curr_screen;
+		winwidget_move(m->fehwin, xinerama_screens[curr_screen].x_org, xinerama_screens[curr_screen].y_org);
+	}
+#endif				/* HAVE_LIBXINERAMA */
+}
+
+void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, unsigned short data)
+{
+	char *path;
+
+	switch (action) {
+		case CB_BG_TILED:
+			path = FEH_FILE(m->fehwin->file->data)->filename;
+			feh_wm_set_bg(path, m->fehwin->im, 0, 0, 0, data, 0);
+			break;
+		case CB_BG_SCALED:
+			path = FEH_FILE(m->fehwin->file->data)->filename;
+			feh_wm_set_bg(path, m->fehwin->im, 0, 1, 0, data, 0);
+			break;
+		case CB_BG_CENTERED:
+			path = FEH_FILE(m->fehwin->file->data)->filename;
+			feh_wm_set_bg(path, m->fehwin->im, 1, 0, 0, data, 0);
+			break;
+		case CB_BG_FILLED:
+			path = FEH_FILE(m->fehwin->file->data)->filename;
+			feh_wm_set_bg(path, m->fehwin->im, 0, 0, 1, data, 0);
+			break;
+		case CB_BG_TILED_NOFILE:
+			feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 0, data, 0);
+			break;
+		case CB_BG_SCALED_NOFILE:
+			feh_wm_set_bg(NULL, m->fehwin->im, 0, 1, 0, data, 0);
+			break;
+		case CB_BG_CENTERED_NOFILE:
+			feh_wm_set_bg(NULL, m->fehwin->im, 1, 0, 0, data, 0);
+			break;
+		case CB_BG_FILLED_NOFILE:
+			feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 1, data, 0);
+			break;
+		case CB_CLOSE:
+			winwidget_destroy(m->fehwin);
+			break;
+		case CB_EXIT:
+			winwidget_destroy_all();
+			break;
+		case CB_RESET:
+			if (m->fehwin->has_rotated) {
+				m->fehwin->im_w = gib_imlib_image_get_width(m->fehwin->im);
+				m->fehwin->im_h = gib_imlib_image_get_height(m->fehwin->im);
+				winwidget_resize(m->fehwin, m->fehwin->im_w, m->fehwin->im_h, 0);
+			}
+			winwidget_reset_image(m->fehwin);
+			winwidget_render_image(m->fehwin, 1, 0);
+			break;
+		case CB_RELOAD:
+			feh_reload_image(m->fehwin, 0, 1);
+			break;
+		case CB_REMOVE:
+			feh_filelist_image_remove(m->fehwin, 0);
+			break;
+		case CB_DELETE:
+			feh_filelist_image_remove(m->fehwin, 1);
+			break;
+		case CB_REMOVE_THUMB:
+			feh_thumbnail_mark_removed(FEH_FILE(m->fehwin->file->data), 0);
+			feh_filelist_image_remove(m->fehwin, 0);
+			break;
+		case CB_DELETE_THUMB:
+			feh_thumbnail_mark_removed(FEH_FILE(m->fehwin->file->data), 1);
+			feh_filelist_image_remove(m->fehwin, 1);
+			break;
+		case CB_SORT_FILENAME:
+			filelist = gib_list_sort(filelist, feh_cmp_filename);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_SORT_IMAGENAME:
+			filelist = gib_list_sort(filelist, feh_cmp_name);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_SORT_DIRNAME:
+			filelist = gib_list_sort(filelist, feh_cmp_dirname);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_SORT_MTIME:
+			filelist = gib_list_sort(filelist, feh_cmp_mtime);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_SORT_FILESIZE:
+			filelist = gib_list_sort(filelist, feh_cmp_size);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_SORT_RANDOMIZE:
+			filelist = gib_list_randomize(filelist);
+			if (opt.jump_on_resort) {
+				slideshow_change_image(m->fehwin, SLIDE_FIRST, 1);
+			}
+			break;
+		case CB_FIT:
+			winwidget_size_to_image(m->fehwin);
+			break;
+		case CB_EDIT_ROTATE:
+			feh_edit_inplace(m->fehwin, data);
+			break;
+		case CB_EDIT_MIRROR:
+			feh_edit_inplace(m->fehwin, INPLACE_EDIT_MIRROR);
+			break;
+		case CB_EDIT_FLIP:
+			feh_edit_inplace(m->fehwin, INPLACE_EDIT_FLIP);
+			break;
+		case CB_SAVE_IMAGE:
+			slideshow_save_image(m->fehwin);
+			break;
+		case CB_SAVE_FILELIST:
+			feh_save_filelist();
+			break;
+		case CB_OPT_DRAW_FILENAME:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i))
+				opt.draw_filename = TRUE;
+			else
+				opt.draw_filename = FALSE;
+			winwidget_rerender_all(0);
+			break;
+		case CB_OPT_DRAW_ACTIONS:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i))
+				opt.draw_actions = TRUE;
+			else
+				opt.draw_actions = FALSE;
+			winwidget_rerender_all(0);
+			break;
+		case CB_OPT_KEEP_HTTP:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i))
+				opt.keep_http = TRUE;
+			else
+				opt.keep_http = FALSE;
+			break;
+		case CB_OPT_FREEZE_WINDOW:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i)) {
+				opt.geom_flags = (WidthValue | HeightValue);
+				opt.geom_w = m->fehwin->w;
+				opt.geom_h = m->fehwin->h;
+			} else {
+				opt.geom_flags = 0;
+			}
+			break;
+		case CB_OPT_FULLSCREEN:
+			feh_menu_cb_opt_fullscreen(m, i);
+			break;
+		case CB_OPT_AUTO_ZOOM:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i))
+				opt.zoom_mode = ZOOM_MODE_MAX;
+			else
+				opt.zoom_mode = 0;
+			winwidget_rerender_all(1);
+			break;
+		case CB_OPT_KEEP_ZOOM_VP:
+			MENU_ITEM_TOGGLE(i);
+			if (MENU_ITEM_IS_ON(i))
+				opt.keep_zoom_vp = 1;
+			else
+				opt.keep_zoom_vp = 0;
+			break;
+	}
+	return;
+}
+
+static feh_menu *feh_menu_func_gen_info(feh_menu * m)
+{
+	Imlib_Image im;
+	feh_menu *mm;
+	feh_file *file;
+	char buffer[400];
+
+	if (!m->fehwin->file)
+		return(NULL);
+	file = FEH_FILE(m->fehwin->file->data);
+	im = m->fehwin->im;
+	if (!im)
+		return(NULL);
+	mm = feh_menu_new();
+	mm->name = estrdup("INFO");
+	snprintf(buffer, sizeof(buffer), "Filename: %s", file->name);
+	feh_menu_add_entry(mm, buffer, NULL, 0, 0, NULL);
+	if (!file->info)
+		feh_file_info_load(file, im);
+	if (file->info) {
+		snprintf(buffer, sizeof(buffer), "Size: %dKb", file->size / 1024);
+		feh_menu_add_entry(mm, buffer, NULL, 0, 0, NULL);
+		snprintf(buffer, sizeof(buffer), "Dimensions: %dx%d", file->info->width, file->info->height);
+		feh_menu_add_entry(mm, buffer, NULL, 0, 0, NULL);
+		snprintf(buffer, sizeof(buffer), "Type: %s", file->info->format);
+		feh_menu_add_entry(mm, buffer, NULL, 0, 0, NULL);
+	}
+
+	mm->func_free = feh_menu_func_free_info;
+	return(mm);
+}
+
+static void feh_menu_func_free_info(feh_menu * m)
+{
+	feh_menu_free(m);
+	return;
+}
+
+static feh_menu *feh_menu_func_gen_options(feh_menu * m)
+{
+	feh_menu *mm;
+
+	mm = feh_menu_new();
+	mm->name = estrdup("OPTIONS");
+	mm->fehwin = m->fehwin;
+	feh_menu_add_toggle_entry(mm, "Auto-Zoom", NULL, CB_OPT_AUTO_ZOOM,
+				0, NULL, opt.zoom_mode);
+	feh_menu_add_toggle_entry(mm, "Freeze Window Size", NULL,
+				CB_OPT_FREEZE_WINDOW, 0, NULL, opt.geom_flags);
+	feh_menu_add_toggle_entry(mm, "Fullscreen", NULL,
+				CB_OPT_FULLSCREEN, 0, NULL, m->fehwin->full_screen);
+	feh_menu_add_toggle_entry(mm, "Keep viewport zoom & pos", NULL,
+				CB_OPT_KEEP_ZOOM_VP, 0, NULL, opt.keep_zoom_vp);
+
+	feh_menu_add_entry(mm, NULL, NULL, 0, 0, NULL);
+
+	feh_menu_add_toggle_entry(mm, "Draw Filename", NULL,
+				CB_OPT_DRAW_FILENAME, 0, NULL, opt.draw_filename);
+	feh_menu_add_toggle_entry(mm, "Draw Actions", NULL,
+				CB_OPT_DRAW_ACTIONS, 0, NULL, opt.draw_actions);
+	feh_menu_add_toggle_entry(mm, "Keep HTTP Files", NULL,
+				CB_OPT_KEEP_HTTP, 0, NULL, opt.keep_http);
+	mm->func_free = feh_menu_func_free_options;
+	return(mm);
+}
+
+static void feh_menu_func_free_options(feh_menu * m)
+{
+	feh_menu_free(m);
+	return;
 }
-#endif /* HAVE_LIBXINERAMA */
diff --git a/src/menu.h b/src/menu.h
index 214e8a2..5bad00c 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,6 +1,7 @@
 /* menu.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -30,7 +31,6 @@ typedef struct _feh_menu feh_menu;
 typedef struct _feh_menu_item feh_menu_item;
 typedef struct _feh_menu_list feh_menu_list;
 
-
 #define MENU_ITEM_STATE_NORMAL   0x00
 #define MENU_ITEM_STATE_SELECTED 0x01
 #define MENU_ITEM_STATE_ON       0x02
@@ -53,13 +53,11 @@ typedef struct _feh_menu_list feh_menu_list;
 #define MENU_ITEM_TOGGLE(item) \
 (((item)->state & MENU_ITEM_STATE_ON) ? MENU_ITEM_TOGGLE_OFF(item) : MENU_ITEM_TOGGLE_ON(item))
 
-
 #define RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh) \
 ((SPANS_COMMON((x), (w), (xx), (ww))) && (SPANS_COMMON((y), (h), (yy), (hh))))
 #define SPANS_COMMON(x1, w1, x2, w2) \
 (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
 
-
 #define FEH_MENU_PAD_LEFT 3
 #define FEH_MENU_PAD_RIGHT 3
 #define FEH_MENU_PAD_TOP 3
@@ -79,51 +77,45 @@ typedef struct _feh_menu_list feh_menu_list;
 #define FEH_MENU_TOGGLE_W 7
 #define FEH_MENU_TOGGLE_PAD 3
 
-typedef void (*menu_func) (feh_menu * m, feh_menu_item * i, void *data);
-typedef feh_menu *(*menuitem_func_gen) (feh_menu * m, feh_menu_item * i,
-                                        void *data);
+typedef feh_menu *(*menuitem_func_gen) (feh_menu * m);
 
-struct _feh_menu_list
-{
-   feh_menu *menu;
-   feh_menu_list *next;
+struct _feh_menu_list {
+	feh_menu *menu;
+	feh_menu_list *next;
 };
 
-struct _feh_menu_item
-{
-   int state;
-   Imlib_Image icon;
-   char *text;
-   char *submenu;
-   menu_func func;
-   void (*func_free) (void *data);
-   void *data;
-   feh_menu_item *next;
-   feh_menu_item *prev;
-   unsigned char is_toggle;
-   int text_x, icon_x, sub_x, toggle_x;
-   int x, y, w, h;
-   menuitem_func_gen func_gen_sub;
+struct _feh_menu_item {
+	int state;
+	char *text;
+	char *submenu;
+	int action;
+	void (*func_free) (void *data);
+	unsigned short data;
+	feh_menu_item *next;
+	feh_menu_item *prev;
+	unsigned char is_toggle;
+	int text_x, icon_x, sub_x, toggle_x;
+	int x, y, w, h;
+	menuitem_func_gen func_gen_sub;
 };
 
-struct _feh_menu
-{
-   char *name;
-   winwidget fehwin;
-   Window win;
-   Pixmap pmap;
-   int x, y, w, h;
-   int item_w, item_h;
-   int visible;
-   feh_menu_item *items;
-   feh_menu *next;
-   feh_menu *prev;
-   Imlib_Updates updates;
-   Imlib_Image bg;
-   int needs_redraw;
-   void *data;
-   int calc;
-   void (*func_free) (feh_menu * m, void *data);
+struct _feh_menu {
+	char *name;
+	winwidget fehwin;
+	Window win;
+	Pixmap pmap;
+	int x, y, w, h;
+	int item_w, item_h;
+	int visible;
+	feh_menu_item *items;
+	feh_menu *next;
+	feh_menu *prev;
+	Imlib_Updates updates;
+	Imlib_Image bg;
+	int needs_redraw;
+	void *data;
+	int calc;
+	void (*func_free) (feh_menu * m);
 };
 
 feh_menu *feh_menu_new(void);
@@ -134,57 +126,47 @@ void feh_menu_deselect_selected(feh_menu * m);
 void feh_menu_select(feh_menu * m, feh_menu_item * i);
 void feh_menu_show_at(feh_menu * m, int x, int y);
 void feh_menu_show_at_xy(feh_menu * m, winwidget winwin, int x, int y);
-void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m,
-                              feh_menu_item * i);
+void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * i);
 void feh_menu_hide(feh_menu * m, int func_free);
 void feh_menu_show(feh_menu * m);
-feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text, Imlib_Image icon,
-                                  char *submenu, menu_func func, void *data,
-                                  void (*func_free) (void *data));
-feh_menu_item *
-feh_menu_add_toggle_entry(feh_menu * m, char *text, Imlib_Image icon,
-                          char *submenu, menu_func func, void *data,
-                          void (*func_free) (void *data), int setting);
-void feh_menu_entry_get_size(feh_menu * m, feh_menu_item * i, int *w, int *h);
+feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text,
+	char *submenu,
+	int action, unsigned short data, void (*func_free) (void *data));
+feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text,
+	char *submenu,
+	int action, unsigned short data, void (*func_free) (void *data), int setting);
+void feh_menu_entry_get_size(feh_menu_item * i, int *w, int *h);
 void feh_menu_calc_size(feh_menu * m);
-void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im,
-                        int ox, int oy);
+void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy);
 void feh_menu_redraw(feh_menu * m);
 void feh_menu_move(feh_menu * m, int x, int y);
 void feh_menu_slide_all_menus_relative(int dx, int dy);
 void feh_menu_init_main(void);
 void feh_menu_init_single_win(void);
-void feh_menu_init_about_win(void);
 void feh_menu_init_common(void);
 void feh_menu_init_thumbnail_viewer(void);
 void feh_menu_init_thumbnail_win(void);
 void feh_menu_draw_to_buf(feh_menu * m, Imlib_Image im, int ox, int oy);
 void feh_menu_draw_menu_bg(feh_menu * m, Imlib_Image im, int ox, int oy);
-void feh_menu_draw_submenu_at(int x, int y, int w, int h, Imlib_Image dst,
-                              int ox, int oy, int selected);
-void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst,
-                                int ox, int oy);
-void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst,
-                           int ox, int oy, int selected);
-void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst,
-                             int ox, int oy, int on);
+void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy);
+void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy);
+void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int selected);
+void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int on);
 void feh_redraw_menus(void);
 feh_menu *feh_menu_find(char *name);
 void feh_redraw_menus(void);
 feh_menu *feh_menu_get_from_window(Window win);
 void feh_raise_all_menus(void);
 void feh_menu_free(feh_menu * m);
-feh_menu_item *feh_menu_find_selected_r(feh_menu *m, feh_menu **parent);
-void feh_menu_select_prev(feh_menu *selected_menu, feh_menu_item *selected_item);
-void feh_menu_select_next(feh_menu *selected_menu, feh_menu_item *selected_item);
-void feh_menu_item_activate(feh_menu *selected_menu, 
-                            feh_menu_item *selected_item);
-void feh_menu_select_parent(feh_menu *selected_menu, feh_menu_item *selected_item);
-void feh_menu_select_submenu(feh_menu *selected_menu, feh_menu_item *selected_item);
+feh_menu_item *feh_menu_find_selected_r(feh_menu * m, feh_menu ** parent);
+void feh_menu_select_prev(feh_menu * selected_menu, feh_menu_item * selected_item);
+void feh_menu_select_next(feh_menu * selected_menu, feh_menu_item * selected_item);
+void feh_menu_item_activate(feh_menu * selected_menu, feh_menu_item * selected_item);
+void feh_menu_select_parent(feh_menu * selected_menu);
+void feh_menu_select_submenu(feh_menu * selected_menu);
 
 extern feh_menu *menu_root;
 extern feh_menu *menu_single_win;
-extern feh_menu *menu_about_win;
 extern feh_menu *menu_thumbnail_viewer;
 extern feh_menu *menu_thumbnail_win;
 extern Window menu_cover;
diff --git a/src/menubg_aluminium.png b/src/menubg_aluminium.png
deleted file mode 100644
index eed00f1..0000000
--- a/src/menubg_aluminium.png
+++ /dev/null
diff --git a/src/menubg_aqua.png b/src/menubg_aqua.png
deleted file mode 100644
index 3a72590..0000000
--- a/src/menubg_aqua.png
+++ /dev/null
diff --git a/src/menubg_black.png b/src/menubg_black.png
deleted file mode 100644
index 08b4c2b..0000000
--- a/src/menubg_black.png
+++ /dev/null
diff --git a/src/menubg_brushed.png b/src/menubg_brushed.png
deleted file mode 100644
index 32fad47..0000000
--- a/src/menubg_brushed.png
+++ /dev/null
diff --git a/src/menubg_chrome.png b/src/menubg_chrome.png
deleted file mode 100644
index 24f3025..0000000
--- a/src/menubg_chrome.png
+++ /dev/null
diff --git a/src/menubg_default.png b/src/menubg_default.png
deleted file mode 100644
index dd21188..0000000
--- a/src/menubg_default.png
+++ /dev/null
diff --git a/src/menubg_pastel.png b/src/menubg_pastel.png
deleted file mode 100644
index ec96566..0000000
--- a/src/menubg_pastel.png
+++ /dev/null
diff --git a/src/menubg_sky.png b/src/menubg_sky.png
deleted file mode 100644
index e0be8ca..0000000
--- a/src/menubg_sky.png
+++ /dev/null
diff --git a/src/menubg_wood.png b/src/menubg_wood.png
deleted file mode 100644
index 4dc7440..0000000
--- a/src/menubg_wood.png
+++ /dev/null
diff --git a/src/multiwindow.c b/src/multiwindow.c
index 60d5660..abbf6c9 100644
--- a/src/multiwindow.c
+++ b/src/multiwindow.c
@@ -28,51 +28,30 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "timers.h"
 #include "filelist.h"
 #include "options.h"
+#include "signals.h"
 
-void
-init_multiwindow_mode(void)
+void init_multiwindow_mode(void)
 {
-   winwidget w = NULL;
-   gib_list *l;
-   feh_file *file = NULL;
-
-   D_ENTER(2);
-
-   mode = "multiwindow";
-
-   for (l = filelist; l; l = l->next)
-   {
-      char *s = NULL;
-      int len = 0;
-      file = FEH_FILE(l->data);
-	  current_file = l;
-
-	  if (!opt.title)
-	  {
-	     len = strlen(PACKAGE " - ") + strlen(file->filename) + 1;
-         s = emalloc(len);
-         snprintf(s, len, PACKAGE " - %s", file->filename);
-	  }
-	  else
-	  {
-		 s = estrdup(feh_printf(opt.title, file));
-	  }
-
-      if ((w = winwidget_create_from_file(l, s, WIN_TYPE_SINGLE)) != NULL)
-      {
-         winwidget_show(w);
-         if (opt.reload > 0)
-            feh_add_unique_timer(cb_reload_timer, w, opt.reload);
-         if (!feh_main_iteration(0))
-            exit(0);
-      }
-      else
-      {
-         D(3,
-           ("EEEK. Couldn't load image in multiwindow mode. "
-            "I 'm not sure if this is a problem\n"));
-      }
-      free(s);
-   }
-   D_RETURN_(2);
+	winwidget w = NULL;
+	gib_list *l;
+
+	if (!opt.title)
+		opt.title = PACKAGE " - %f";
+
+	mode = "multiwindow";
+
+	for (l = filelist; l; l = l->next) {
+		if ((w = winwidget_create_from_file(l, WIN_TYPE_SINGLE)) != NULL) {
+			winwidget_show(w);
+			if (opt.reload > 0)
+				feh_add_unique_timer(cb_reload_timer, w, opt.reload);
+			if (!feh_main_iteration(0))
+				exit(0);
+		} else {
+			D(("EEEK. Couldn't load image in multiwindow mode. "
+						"I 'm not sure if this is a problem\n"));
+		}
+	}
+
+	return;
 }
diff --git a/src/options.c b/src/options.c
index cd96613..d38ce45 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,6 +1,7 @@
 /* options.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -23,1195 +24,1005 @@ 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"
 
 static void check_options(void);
-static void feh_parse_option_array(int argc, char **argv);
-static void feh_parse_environment_options(void);
-static void feh_check_theme_options(int arg, char **argv);
+static void feh_getopt_theme(int argc, char **argv);
+static void feh_parse_option_array(int argc, char **argv, int finalrun);
+static void feh_check_theme_options(char **argv);
 static void feh_parse_options_from_string(char *opts);
 static void feh_load_options_for_theme(char *theme);
+static void show_usage(void);
+static void show_version(void);
 static char *theme;
 
 fehoptions opt;
 
-void
-init_parse_options(int argc, char **argv)
+void init_parse_options(int argc, char **argv)
 {
-   D_ENTER(4);
-
-   /* For setting the command hint on X windows */
-   cmdargc = argc;
-   cmdargv = argv;
-
-   /* Set default options */
-   memset(&opt, 0, sizeof(fehoptions));
-   opt.display = 1;
-   opt.aspect = 1;
-   opt.slideshow_delay = -1.0;
-   opt.thumb_w = 60;
-   opt.thumb_h = 60;
-   opt.menu_font = estrdup(DEFAULT_MENU_FONT);
-   opt.font = estrdup(DEFAULT_FONT);
-   opt.image_bg = estrdup("default");
-   opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg_default.png");
-   opt.menu_style = estrdup(PREFIX "/share/feh/fonts/menu.style");
-   opt.menu_border = 4;
-
-   opt.next_button = 1;
-   opt.zoom_button = 2;
-   opt.menu_button = 3;
-   opt.menu_ctrl_mask = 0;
-   opt.reload_button = 0;
-
-   opt.rotate_button = 2;
-   opt.no_rotate_ctrl_mask = 0;
-   opt.blur_button = 1;
-   opt.no_blur_ctrl_mask = 0;
-
-   opt.no_jump_on_resort = 0;
-
-   opt.builtin_http = 0;
-
-   opt.xinerama = 0;
-   opt.screen_clip = 1;
+	/* TODO: sort these to match declaration of __fehoptions */
+
+	/* For setting the command hint on X windows */
+	cmdargc = argc;
+	cmdargv = argv;
+
+	/* Set default options */
+	memset(&opt, 0, sizeof(fehoptions));
+	opt.display = 1;
+	opt.aspect = 1;
+	opt.slideshow_delay = 0.0;
+	opt.conversion_timeout = -1;
+	opt.thumb_w = 60;
+	opt.thumb_h = 60;
+	opt.thumb_redraw = 10;
+	opt.scroll_step = 20;
+	opt.menu_font = estrdup(DEFAULT_MENU_FONT);
+	opt.font = NULL;
+	opt.max_height = opt.max_width = UINT_MAX;
+
+	opt.zoom_rate = 1.25;
+
+	opt.start_list_at = NULL;
+	opt.jump_on_resort = 1;
+
+	opt.screen_clip = 1;
+	opt.cache_size = 4;
 #ifdef HAVE_LIBXINERAMA
-   /* if we're using xinerama, then enable it by default */
-   opt.xinerama = 1;
-#endif /* HAVE_LIBXINERAMA */
-
-   opt.fmmode = 0;
-   
-   D(3, ("About to parse env options (if any)\n"));
-   /* Check for and parse any options in FEH_OPTIONS */
-   feh_parse_environment_options();
-
-   D(3, ("About to parse commandline options\n"));
-   /* Parse the cmdline args */
-   feh_parse_option_array(argc, argv);
-
-   D(3, ("About to check for theme configuration\n"));
-   feh_check_theme_options(argc, argv);
-
-   /* If we have a filelist to read, do it now */
-   if (opt.filelistfile)
-   {
-      /* joining two reverse-sorted lists in this manner works nicely for us
-         here, as files specified on the commandline end up at the *end* of
-         the combined filelist, in the specified order. */
-      D(3, ("About to load filelist from file\n"));
-      filelist = gib_list_cat(filelist, feh_read_filelist(opt.filelistfile));
-   }
-
-   D(4, ("Options parsed\n"));
-
-   if(opt.bgmode)
-      D_RETURN_(4);
-
-   filelist_len = gib_list_length(filelist);
-   if (!filelist_len)
-      show_mini_usage();
-
-   check_options();
-
-   feh_prepare_filelist();
-   D_RETURN_(4);
+	/* if we're using xinerama, then enable it by default */
+	opt.xinerama = 1;
+	opt.xinerama_index = -1;
+#endif				/* HAVE_LIBXINERAMA */
+#ifdef HAVE_INOTIFY
+	opt.auto_reload = 1;
+#endif				/* HAVE_INOTIFY */
+	opt.use_conversion_cache = 1;
+
+	feh_getopt_theme(argc, argv);
+
+	D(("About to check for theme configuration\n"));
+	feh_check_theme_options(argv);
+
+	D(("About to parse commandline options\n"));
+	/* Parse the cmdline args */
+	feh_parse_option_array(argc, argv, 1);
+
+	/* If we have a filelist to read, do it now */
+	if (opt.filelistfile) {
+		/* joining two reverse-sorted lists in this manner works nicely for us
+		   here, as files specified on the commandline end up at the *end* of
+		   the combined filelist, in the specified order. */
+		D(("About to load filelist from file\n"));
+		filelist = gib_list_cat(filelist, feh_read_filelist(opt.filelistfile));
+	}
+
+	D(("Options parsed\n"));
+
+	filelist_len = gib_list_length(filelist);
+	if (!filelist_len)
+		show_mini_usage();
+
+	check_options();
+
+	feh_prepare_filelist();
+	return;
 }
 
-static void
-feh_check_theme_options(int arg, char **argv)
+static void feh_check_theme_options(char **argv)
 {
-   D_ENTER(4);
-   if (!theme)
-   {
-      /* This prevents screw up when running src/feh or ./feh */
-      char *pos = strrchr(argv[0], '/');
-
-      if (pos)
-         theme = estrdup(pos + 1);
-      else
-         theme = estrdup(argv[0]);
-   }
-   D(3, ("Theme name is %s\n", theme));
-
-   feh_load_options_for_theme(theme);
-
-   free(theme);
-   D_RETURN_(4);
-   arg = 0;
-}
-
-static void
-feh_load_options_for_theme(char *theme)
-{
-   FILE *fp = NULL;
-   char *home;
-   char *rcpath = NULL;
-   char s[1024], s1[1024], s2[1024];
-
-   D_ENTER(4);
-
-   if (opt.rcfile)
-   {
-      if ((fp = fopen(opt.rcfile, "r")) == NULL)
-      {
-         weprintf("couldn't load the specified rcfile %s\n", opt.rcfile);
-         D_RETURN_(4);
-      }
-   }
-   else
-   {
-      home = getenv("HOME");
-      if (!home)
-         eprintf("D'oh! Please define HOME in your environment!"
-                 "It would really help me out...\n");
-      rcpath = estrjoin("/", home, ".fehrc", NULL);
-      D(3, ("Trying %s for config\n", rcpath));
-      fp = fopen(rcpath, "r");
-
-      if (!fp && ((fp = fopen("/etc/fehrc", "r")) == NULL))
-      {
-         feh_create_default_config(rcpath);
-
-         if ((fp = fopen(rcpath, "r")) == NULL)
-            D_RETURN_(4);
-      }
-
-      free(rcpath);
-   }
-
-   /* Oooh. We have an options file :) */
-   for (; fgets(s, sizeof(s), fp);)
-   {
-      s1[0] = '\0';
-      s2[0] = '\0';
-      sscanf(s, "%s %[^\n]\n", (char *) &s1, (char *) &s2);
-      if (!(*s1) || (!*s2) || (*s1 == '\n') || (*s1 == '#'))
-         continue;
-      D(5, ("Got theme/options pair %s/%s\n", s1, s2));
-      if (!strcmp(s1, theme))
-      {
-         D(4, ("A match. Using options %s\n", s2));
-         feh_parse_options_from_string(s2);
-         break;
-      }
-   }
-   fclose(fp);
-   D_RETURN_(4);
-}
-
-static void
-feh_parse_environment_options(void)
-{
-   char *opts;
+	if (!theme) {
+		/* This prevents screw up when running src/feh or ./feh */
+		char *pos = strrchr(argv[0], '/');
 
-   D_ENTER(4);
+		if (pos)
+			theme = estrdup(pos + 1);
+		else
+			theme = estrdup(argv[0]);
+	}
+	D(("Theme name is %s\n", theme));
 
-   if ((opts = getenv("FEH_OPTIONS")) == NULL)
-      D_RETURN_(4);
+	feh_load_options_for_theme(theme);
 
-   weprintf
-      ("The FEH_OPTIONS configuration method is depreciated and will soon die.\n"
-       "Use the .fehrc configuration file instead.");
+	free(theme);
+	return;
+}
 
-   /* We definitely have some options to parse */
-   feh_parse_options_from_string(opts);
-   D_RETURN_(4);
+static void feh_load_options_for_theme(char *theme)
+{
+	FILE *fp = NULL;
+	char *home = getenv("HOME");
+	char *rcpath = NULL;
+	char *oldrcpath = NULL;
+	char *confbase = getenv("XDG_CONFIG_HOME");
+	// s, s1 and s2 must always have identical size
+	char s[1024], s1[1024], s2[1024];
+	int cont = 0;
+	int bspos;
+
+	if (confbase)
+		rcpath = estrjoin("/", confbase, "feh/themes", NULL);
+	else if (home)
+		rcpath = estrjoin("/", home, ".config/feh/themes", NULL);
+	else {
+		weprintf("You have no HOME, cannot read configuration");
+		return;
+	}
+
+	oldrcpath = estrjoin("/", home, ".fehrc", NULL);
+
+	fp = fopen(rcpath, "r");
+
+	free(rcpath);
+
+	if (!fp && ((fp = fopen(oldrcpath, "r")) != NULL))
+		weprintf("The theme config file was moved from ~/.fehrc to "
+			"~/.config/feh/themes. Run\n"
+			"    mkdir -p ~/.config/feh; mv ~/.fehrc ~/.config/feh/themes\n"
+			"to fix this.");
+
+	free(oldrcpath);
+
+	if (!fp && ((fp = fopen("/etc/feh/themes", "r")) == NULL))
+		return;
+
+	/* Oooh. We have an options file :) */
+	for (; fgets(s, sizeof(s), fp);) {
+		s1[0] = '\0';
+		s2[0] = '\0';
+
+		if (cont) {
+			/*
+			 * fgets ensures that s contains no more than 1023 characters
+			 * (+ 1 null byte)
+			 */
+			sscanf(s, " %[^\n]\n", (char *) &s2);
+			if (!*s2)
+				break;
+			D(("Got continued options %s\n", s2));
+		} else {
+			/*
+			 * fgets ensures that s contains no more than 1023 characters
+			 * (+ 1 null byte)
+			 */
+			sscanf(s, "%s %[^\n]\n", (char *) &s1, (char *) &s2);
+			if (!(*s1) || (!*s2) || (*s1 == '\n') || (*s1 == '#')) {
+				cont = 0;
+				continue;
+			}
+			D(("Got theme/options pair %s/%s\n", s1, s2));
+		}
+
+		if (!strcmp(s1, theme) || cont) {
+
+			bspos = strlen(s2)-1;
+
+			if (s2[bspos] == '\\') {
+				D(("Continued line\n"));
+				s2[bspos] = '\0';
+				cont = 1;
+				/* A trailing whitespace confuses the option parser */
+				if (bspos && (s2[bspos-1] == ' '))
+					s2[bspos-1] = '\0';
+			} else
+				cont = 0;
+
+			D(("A match. Using options %s\n", s2));
+			feh_parse_options_from_string(s2);
+
+			if (!cont)
+				break;
+		}
+	}
+	fclose(fp);
+	return;
 }
 
 /* FIXME This function is a crufty bitch ;) */
-static void
-feh_parse_options_from_string(char *opts)
+static void feh_parse_options_from_string(char *opts)
 {
-   char **list = NULL;
-   int num = 0;
-   char *s;
-   char *t;
-   char last = 0;
-   int inquote = 0;
-   int i = 0;
-
-   D_ENTER(4);
-
-   /* So we don't reinvent the wheel (not again, anyway), we use the
-      getopt_long function to do this parsing as well. This means it has to
-      look like the real argv ;) */
-
-   list = malloc(sizeof(char *));
-
-   list[num++] = estrdup(PACKAGE);
-
-   for (s = opts, t = opts;; t++)
-   {
-      if ((*t == ' ') && !(inquote))
-      {
-         *t = '\0';
-         num++;
-         list = erealloc(list, sizeof(char *) * num);
-
-         list[num - 1] = feh_string_normalize(s);
-         s = t + 1;
-      }
-      else if (*t == '\0')
-      {
-         num++;
-         list = erealloc(list, sizeof(char *) * num);
-
-         list[num - 1] = feh_string_normalize(s);
-         break;
-      }
-      else if (*t == '\"' && last != '\\')
-         inquote = !(inquote);
-      last = *t;
-   }
-
-   feh_parse_option_array(num, list);
-
-   for (i = 0; i < num; i++)
-      if (list[i])
-         free(list[i]);
-   if (list)
-      free(list);
-   D_RETURN_(4);
+	char *list[sizeof(char *) * 64];
+	int num = 0;
+	char *s;
+	char *t;
+	char last = 0;
+	char inquote = 0;
+	int i = 0;
+
+	/* So we don't reinvent the wheel (not again, anyway), we use the
+	   getopt_long function to do this parsing as well. This means it has to
+	   look like the real argv ;) */
+
+	list[num++] = estrdup(PACKAGE);
+
+	for (s = opts, t = opts;; t++) {
+
+		if (num > 64)
+			eprintf(PACKAGE " does not support more than 64 words per "
+					"theme definition.\n Please shorten your lines.");
+
+		if ((*t == ' ') && !inquote) {
+			*t = '\0';
+			num++;
+
+			list[num - 1] = feh_string_normalize(s);
+			s = t + 1;
+		} else if (*t == '\0') {
+			num++;
+
+			list[num - 1] = feh_string_normalize(s);
+			break;
+		} else if ((*t == inquote) && (last != '\\')) {
+			inquote = 0;
+		} else if (((*t == '\"') || (*t == '\'')) && (last != '\\') && !inquote)
+			inquote = *t;
+		last = *t;
+	}
+
+	feh_parse_option_array(num, list, 0);
+
+	for (i = 0; i < num; i++)
+		if (list[i])
+			free(list[i]);
+	return;
 }
 
-char *
-feh_string_normalize(char *str)
+char *feh_string_normalize(char *str)
 {
-   char ret[4096];
-   char *s;
-   int i = 0;
-   char last = 0;
-
-   D_ENTER(4);
-   D(4, ("normalizing %s\n", str));
-   ret[0] = '\0';
-
-   for (s = str;; s++)
-   {
-      if (*s == '\0')
-         break;
-      else if ((*s == '\"') && (last == '\\'))
-         ret[i++] = '\"';
-      else if ((*s == '\"') && (last == 0))
-         ;
-      else if ((*s == ' ') && (last == '\\'))
-         ret[i++] = ' ';
-      else
-         ret[i++] = *s;
-
-      last = *s;
-   }
-   if (i && ret[i - 1] == '\"')
-      ret[i - 1] = '\0';
-   else
-      ret[i] = '\0';
-   D(4, ("normalized to %s\n", ret));
-
-   D_RETURN(4, estrdup(ret));
+	char ret[4096];
+	char *s;
+	int i = 0;
+	char last = 0;
+
+	D(("normalizing %s\n", str));
+	ret[0] = '\0';
+
+	for (s = str;; s++) {
+		if (*s == '\0')
+			break;
+		else if ((*s == '\"') && (last == '\\'))
+			ret[i++] = '\"';
+		else if ((*s == '\"') && (last == 0));
+		else if ((*s == '\'') && (last == '\\'))
+			ret[i++] = '\'';
+		else if ((*s == '\'') && (last == 0));
+		else if ((*s == ' ') && (last == '\\'))
+			ret[i++] = ' ';
+		else
+			ret[i++] = *s;
+
+		last = *s;
+	}
+	if (i && ((ret[i - 1] == '\"') || (ret[i - 1] == '\'')))
+		ret[i - 1] = '\0';
+	else
+		ret[i] = '\0';
+	D(("normalized to %s\n", ret));
+
+	return(estrdup(ret));
 }
 
-static void
-feh_parse_option_array(int argc, char **argv)
+static void feh_getopt_theme(int argc, char **argv)
 {
-   static char stropts[] =
-      "a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:klL:mM:nNo:O:pqQrR:sS:tT:uUvVwW:xXy:zZ1:2:4:56:78:90:.@:^:~:):|:_:+:";
-   static struct option lopts[] = {
-      /* actions */
-      {"help", 0, 0, 'h'},                  /* okay */
-      {"version", 0, 0, 'v'},               /* okay */
-      /* toggles */
-      {"montage", 0, 0, 'm'},               /* okay */
-      {"collage", 0, 0, 'c'},               /* okay */
-      {"index", 0, 0, 'i'},                 /* okay */
-      {"fullindex", 0, 0, 'I'},             /* okay */
-      {"verbose", 0, 0, 'V'},               /* okay */
-      {"borderless", 0, 0, 'x'},            /* okay */
-      {"keep-http", 0, 0, 'k'},             /* okay */
-      {"stretch", 0, 0, 's'},               /* okay */
-      {"multiwindow", 0, 0, 'w'},           /* okay */
-      {"recursive", 0, 0, 'r'},             /* okay */
-      {"randomize", 0, 0, 'z'},             /* okay */
-      {"list", 0, 0, 'l'},                  /* okay */
-      {"quiet", 0, 0, 'q'},                 /* okay */
-      {"loadables", 0, 0, 'U'},             /* okay */
-      {"unloadables", 0, 0, 'u'},           /* okay */
-      {"no-menus", 0, 0, 'N'},
-      {"full-screen", 0, 0, 'F'},
-      {"auto-zoom", 0, 0, 'Z'},
-      {"ignore-aspect", 0, 0, 'X'},
-      {"draw-filename", 0, 0, 'd'},
-      {"preload", 0, 0, 'p'},
-      {"reverse", 0, 0, 'n'},
-      {"thumbnails", 0, 0, 't'},
-      {"wget-timestamp", 0, 0, 'G'},
-      {"builtin", 0, 0, 'Q'},
-      {"menu-ctrl-mask", 0, 0, '5'},        /* okay */
-      {"scale-down", 0, 0, '.'},            /* okay */
-      {"no-rotate-ctrl-mask", 0, 0, '7'},
-      {"no-blur-ctrl-mask", 0, 0, '9'},
-      {"no-xinerama", 0, 0, 225},
-      {"no-jump-on-resort",0,0,220},
-      {"hide-pointer",0,0,221},
-      /* options with values */
-      {"output", 1, 0, 'o'},                /* okay */
-      {"output-only", 1, 0, 'O'},           /* okay */
-      {"action", 1, 0, 'A'},                /* okay */
-      {"limit-width", 1, 0, 'W'},           /* okay */
-      {"limit-height", 1, 0, 'H'},          /* okay */
-      {"reload", 1, 0, 'R'},                /* okay */
-      {"alpha", 1, 0, 'a'},                 /* okay */
-      {"sort", 1, 0, 'S'},                  /* okay */
-      {"theme", 1, 0, 'T'},                 /* okay */
-      {"filelist", 1, 0, 'f'},              /* okay */
-      {"customlist", 1, 0, 'L'},            /* okay */
-      {"geometry", 1, 0, 'g'},              /* okay */
-      {"menu-font", 1, 0, 'M'},
-      {"thumb-width", 1, 0, 'y'},
-      {"thumb-height", 1, 0, 'E'},
-      {"slideshow-delay", 1, 0, 'D'},
-      {"font", 1, 0, 'e'},
-      {"title-font", 1, 0, '@'},
-      {"title", 1, 0, '^'},
-      {"thumb-title", 1, 0, '~'},
-      {"bg", 1, 0, 'b'},
-      {"fontpath", 1, 0, 'C'},
-      {"menu-bg", 1, 0, ')'},
-      {"image-bg", 1, 0, 'B'},
-      {"next-button", 1, 0, '1'},
-      {"zoom-button", 1, 0, '2'},
-      {"menu-button", 1, 0, '4'},
-      {"rotate-button", 1, 0, '6'},
-      {"blur-button", 1, 0, '8'},
-      {"reload-button", 1, 0, '0'},
-      {"start-at", 1, 0, '|'},
-      {"rcfile", 1, 0, '_'},
-      {"debug-level", 1, 0, '+'},
-      {"output-dir", 1, 0, 'j'},
-      {"bg-tile", 1, 0, 200},
-      {"bg-center", 1, 0, 201},
-      {"bg-scale", 1, 0, 202},
-      {"bg-seamless", 1, 0, 203},
-      {"menu-style", 1, 0, 204},
-      {"zoom", 1, 0, 205},
-      {"xinerama", 1, 0, 206},
-      {"screen-clip", 1, 0, 207},
-      {"menu-border", 1, 0, 208},
-      {"caption-path", 1, 0, 209},
-      {"action1", 1, 0, 210},
-      {"action2", 1, 0, 211},
-      {"action3", 1, 0, 212},
-      {"action4", 1, 0, 213},
-      {"action5", 1, 0, 214},
-      {"action6", 1, 0, 215},
-      {"action7", 1, 0, 216},
-      {"action8", 1, 0, 217},
-      {"action9", 1, 0, 218},
-      {"fmmode", 0, 0, 219},
-      {"draw-actions", 0, 0, 222},
-      {"cache-thumbnails", 0, 0, 223},
-      {"cycle-once", 0, 0, 224},
-      {0, 0, 0, 0}
-   };
-   int optch = 0, cmdx = 0, i = 0;
-   int geomret;
-
-   D_ENTER(4);
-
-   /* Now to pass some optionarinos */
-   while ((optch = getopt_long(argc, argv, stropts, lopts, &cmdx)) != EOF)
-   {
-      D(5, ("Got option, getopt calls it %d, or %c\n", optch, optch));
-      switch (optch)
-      {
-        case 0:
-           break;
-        case 'h':
-           show_usage();
-           break;
-        case 'v':
-           show_version();
-           break;
-        case 'm':
-           opt.index = 1;
-           opt.index_show_name = 0;
-           opt.index_show_size = 0;
-           opt.index_show_dim = 0;
-           break;
-        case 'c':
-           opt.collage = 1;
-           break;
-        case 'i':
-           opt.index = 1;
-           opt.index_show_name = 1;
-           opt.index_show_size = 0;
-           opt.index_show_dim = 0;
-           break;
-        case '.':
-           opt.scale_down = 1;
-           break;
-        case 'I':
-           opt.index = 1;
-           opt.index_show_name = 1;
-           opt.index_show_size = 1;
-           opt.index_show_dim = 1;
-           break;
-        case 'l':
-           opt.list = 1;
-           opt.display = 0;
-           break;
-        case 'G':
-           opt.wget_timestamp = 1;
-           break;
-        case 'Q':
-           opt.builtin_http = 1;
-           break;
-        case 'L':
-           opt.customlist = estrdup(optarg);
-           break;
-        case 'M':
-           free(opt.menu_font);
-           opt.menu_font = estrdup(optarg);
-           break;
-        case '+':
-           opt.debug_level = atoi(optarg);
-           break;
-        case 'n':
-           opt.reverse = 1;
-           break;
-        case 'g':
-           opt.geom_flags = XParseGeometry(optarg, &opt.geom_x, &opt.geom_y, &opt.geom_w, &opt.geom_h);
-           break;
-        case 'N':
-           opt.no_menus = 1;
-           break;
-        case 'V':
-           opt.verbose = 1;
-           break;
-        case 'q':
-           opt.quiet = 1;
-           break;
-        case 'x':
-           opt.borderless = 1;
-           break;
-        case 'k':
-           opt.keep_http = 1;
-           break;
-        case 's':
-           opt.stretch = 1;
-           break;
-        case 'w':
-           opt.multiwindow = 1;
-           break;
-        case 'r':
-           opt.recursive = 1;
-           break;
-        case 'z':
-           opt.randomize = 1;
-           break;
-        case 'd':
-           opt.draw_filename = 1;
-           break;
-        case 'F':
-           opt.full_screen = 1;
-           break;
-        case 'Z':
-           opt.auto_zoom = 1;
-           break;
-        case 'U':
-           opt.loadables = 1;
-           break;
-        case 'u':
-           opt.unloadables = 1;
-           break;
-        case 'p':
-           opt.preload = 1;
-           break;
-        case 'X':
-           opt.aspect = 0;
-           break;
-        case 'S':
-           if (!strcasecmp(optarg, "name"))
-              opt.sort = SORT_NAME;
-           else if (!strcasecmp(optarg, "filename"))
-              opt.sort = SORT_FILENAME;
-           else if (!strcasecmp(optarg, "width"))
-              opt.sort = SORT_WIDTH;
-           else if (!strcasecmp(optarg, "height"))
-              opt.sort = SORT_HEIGHT;
-           else if (!strcasecmp(optarg, "pixels"))
-              opt.sort = SORT_PIXELS;
-           else if (!strcasecmp(optarg, "size"))
-              opt.sort = SORT_SIZE;
-           else if (!strcasecmp(optarg, "format"))
-              opt.sort = SORT_FORMAT;
-           else
-           {
-              weprintf
-                 ("Unrecognised sort mode \"%s\". Defaulting to sort by filename",
-                  optarg);
-              opt.sort = SORT_FILENAME;
-           }
-           break;
-        case 'o':
-           opt.output = 1;
-           opt.output_file = estrdup(optarg);
-           break;
-        case 'O':
-           opt.output = 1;
-           opt.output_file = estrdup(optarg);
-           opt.display = 0;
-           break;
-        case 'T':
-           theme = estrdup(optarg);
-           break;
-        case 'C':
-           D(3, ("adding fontpath %s\n", optarg));
-           imlib_add_path_to_font_path(optarg);
-           break;
-        case 'e':
-           opt.font = estrdup(optarg);
-           break;
-        case '@':
-           opt.title_font = estrdup(optarg);
-           break;
-        case '^':
-           opt.title = estrdup(optarg);
-           break;
-        case '~':
-           opt.thumb_title = estrdup(optarg);
-           break;
-        case 'b':
-           opt.bg = 1;
-           opt.bg_file = estrdup(optarg);
-           break;
-        case '_':
-           opt.rcfile = estrdup(optarg);
-           break;
-        case 'A':
-           opt.actions[0] = estrdup(optarg);
-           break;
-        case 'W':
-           opt.limit_w = atoi(optarg);
-           break;
-        case 'H':
-           opt.limit_h = atoi(optarg);
-           break;
-        case 'y':
-           opt.thumb_w = atoi(optarg);
-           break;
-        case 'E':
-           opt.thumb_h = atoi(optarg);
-           break;
-        case ')':
-           free(opt.menu_bg);
-           opt.menu_bg = estrdup(optarg);
-           break;
-        case 'B':
-           free(opt.image_bg);
-           opt.image_bg = estrdup(optarg);
-           break;
-        case 'D':
-           opt.slideshow_delay = atof(optarg);
-           break;
-        case 'R':
-           opt.reload = atoi(optarg);
-           break;
-        case 'a':
-           opt.alpha = 1;
-           opt.alpha_level = 255 - atoi(optarg);
-           break;
-        case 'f':
-           opt.filelistfile = estrdup(optarg);
-           break;
-        case '1':
-           opt.next_button = atoi(optarg);
-           break;
-        case '2':
-           opt.zoom_button = atoi(optarg);
-           break;
-        case '4':
-           opt.menu_button = atoi(optarg);
-           break;
-        case '5':
-           opt.menu_ctrl_mask = 1;
-           break;
-        case '6':
-           opt.rotate_button = atoi(optarg);
-           break;
-        case '7':
-           opt.no_rotate_ctrl_mask = 1;
-           break;
-        case '8':
-           opt.blur_button = atoi(optarg);
-           break;
-        case '9':
-           opt.no_blur_ctrl_mask = 1;
-           break;
-        case '|':
-           opt.start_list_at = atoi(optarg);
-           break;
-        case '0':
-           opt.reload_button = atoi(optarg);
-           break;
-        case 't':
-           opt.thumbs = 1;
-           opt.index_show_name = 1;
-           opt.index_show_size = 0;
-           opt.index_show_dim = 0;
-           break;
-        case 'j':
-           opt.output_dir = estrdup(optarg);
-           break;
-        case 200:
-           opt.bgmode = BG_MODE_TILE;
-           opt.output_file = estrdup(optarg);
-           break;
-        case 201:
-           opt.bgmode = BG_MODE_CENTER;
-           opt.output_file = estrdup(optarg);
-           break;
-        case 202:
-           opt.bgmode = BG_MODE_SCALE;
-           opt.output_file = estrdup(optarg);
-           break;
-        case 203:
-           opt.bgmode = BG_MODE_SEAMLESS;
-           opt.output_file = estrdup(optarg);
-           break;
-        case 204:
-           free(opt.menu_style);
-           opt.menu_style = estrdup(optarg);
-           break;
-        case 205:
-           opt.default_zoom = atoi(optarg);
-           break;
-        case 206:
-           opt.xinerama = atoi(optarg);
-           weprintf("Option --xinerama is deprecated, use --no-xinerama (or nothing) instead");
-           break;
-        case 207:
-           opt.screen_clip = atoi(optarg);
-           break;
-        case 208:
-           opt.menu_border = atoi(optarg);
-           break; 
-        case 209:
-           opt.caption_path = estrdup(optarg);
-           break; 
-        case 210:
-           opt.actions[1] = estrdup(optarg);
-           break; 
-        case 211:
-           opt.actions[2] = estrdup(optarg);
-           break; 
-        case 212:
-           opt.actions[3] = estrdup(optarg);
-           break; 
-        case 213:
-           opt.actions[4] = estrdup(optarg);
-           break; 
-        case 214:
-           opt.actions[5] = estrdup(optarg);
-           break; 
-        case 215:
-           opt.actions[6] = estrdup(optarg);
-           break; 
-        case 216:
-           opt.actions[7] = estrdup(optarg);
-           break; 
-        case 217:
-           opt.actions[8] = estrdup(optarg);
-           break; 
-        case 218:
-           opt.actions[9] = estrdup(optarg);
-           break; 
-        case 220:
-           opt.no_jump_on_resort = 1;
-           break;
-        case 221:
-           opt.hide_pointer = 1;
-           break;
-        case 219:
-           opt.fmmode = 1; 
-           opt.sort = SORT_FILENAME;
-           break;
-        case 222:
-           opt.draw_actions = 1; 
-           break;
-        case 223:
-           opt.cache_thumbnails = 1;
-           break;
-        case 224:
-           opt.cycle_once = 1;
-           break;
-        case 225:
-           opt.xinerama = 0;
-           break;
-        default:
-           break;
-      }
-   }
-
-   /* Now the leftovers, which must be files */
-   if (optind < argc)
-   {
-      while (optind < argc)
-      {
-         /* If recursive is NOT set, but the only argument is a directory
-            name, we grab all the files in there, but not subdirs */
-         add_file_to_filelist_recursively(argv[optind++], FILELIST_FIRST);
-      }
-   }
-
-   /* So that we can safely be called again */
-   optind = 1;
-   D_RETURN_(4);
+	static char stropts[] = "-T:";
+	static struct option lopts[] = {
+		{"theme", 1, 0, 'T'},
+		{0, 0, 0, 0}
+	};
+	int optch = 0, cmdx = 0;
+
+	opterr = 0;
+
+	while ((optch = getopt_long(argc, argv, stropts, lopts, &cmdx)) != EOF) {
+		if (optch == 'T')
+			theme = estrdup(optarg);
+	}
+
+	opterr = 1;
+	optind = 0;
 }
 
-
-static void
-check_options(void)
+static void feh_parse_option_array(int argc, char **argv, int finalrun)
 {
-   D_ENTER(4);
-   if ((opt.index + opt.collage) > 1)
-   {
-      weprintf("you can't use collage mode and index mode together.\n"
-               "   I'm going with index");
-      opt.collage = 0;
-   }
-
-   if (opt.full_screen && opt.multiwindow)
-   {
-      weprintf
-         ("you shouldn't combine multiwindow mode with full-screen mode,\n"
-          "   Multiwindow mode has been disabled.");
-      opt.multiwindow = 0;
-   }
-
-   if (opt.list && (opt.multiwindow || opt.index || opt.collage))
-   {
-      weprintf("list mode can't be combined with other processing modes,\n"
-               "   list mode disabled.");
-      opt.list = 0;
-   }
-
-   if (opt.sort && opt.randomize)
-   {
-      weprintf("You cant sort AND randomize the filelist...\n"
-               "randomize mode has been unset\n");
-      opt.randomize = 0;
-   }
-
-   if (opt.loadables && opt.unloadables)
-   {
-      weprintf("You cant show loadables AND unloadables...\n"
-               "you might as well use ls ;)\n"
-               "loadables only will be shown\n");
-      opt.unloadables = 0;
-   }
-
-   if (opt.thumb_title && (!opt.thumbs))
-   {
-      weprintf("Doesn't make sense to set thumbnail title when not in\n"
-               "thumbnail mode.\n");
-      free(opt.thumb_title);
-      opt.thumb_title = NULL;
-   }
-   D_RETURN_(4);
+	int discard;
+	static char stropts[] =
+		"a:A:b:B:C:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPqrR:sS:tT:uUvVwW:xXy:YzZ"
+		".@:^:~:|:+:<:>:";
+
+	/* (*name, has_arg, *flag, val) See: struct option in getopts.h */
+	static struct option lopts[] = {
+		{"debug"         , 0, 0, OPTION_debug},
+		{"scale-down"    , 0, 0, OPTION_scale_down},
+		{"max-dimension" , 1, 0, OPTION_max_dimension},
+		{"min-dimension" , 1, 0, OPTION_min_dimension},
+		{"title-font"    , 1, 0, OPTION_title_font},
+		{"action"        , 1, 0, OPTION_action},
+		{"image-bg"      , 1, 0, OPTION_image_bg},
+		{"fontpath"      , 1, 0, OPTION_fontpath},
+		{"slideshow-delay",1, 0, OPTION_slideshow_delay},
+		{"thumb-height"  , 1, 0, OPTION_thumb_height},
+		{"full-screen"   , 0, 0, OPTION_fullscreen}, /* deprecated */
+		{"fullscreen"    , 0, 0, OPTION_fullscreen},
+		{"draw-actions"  , 0, 0, OPTION_draw_actions},
+		{"limit-height"  , 1, 0, OPTION_limit_height},
+		{"fullindex"     , 0, 0, OPTION_fullindex},
+		{"thumb-redraw"  , 1, 0, OPTION_thumb_redraw},
+		{"caption-path"  , 1, 0, OPTION_caption_path},
+		{"customlist"    , 1, 0, OPTION_customlist},
+		{"menu-font"     , 1, 0, OPTION_menu_font},
+		{"no-menus"      , 0, 0, OPTION_no_menus},
+		{"output-only"   , 1, 0, OPTION_output_only},
+		{"cache-thumbnails", 0, 0, OPTION_cache_thumbnails},
+		{"reload"        , 1, 0, OPTION_reload},
+		{"sort"          , 1, 0, OPTION_sort},
+		{"theme"         , 1, 0, OPTION_theme},
+		{"loadable"      , 0, 0, OPTION_loadable},
+		{"verbose"       , 0, 0, OPTION_verbose},
+		{"limit-width"   , 1, 0, OPTION_limit_width},
+		{"ignore-aspect" , 0, 0, OPTION_ignore_aspect},
+		{"hide-pointer"  , 0, 0, OPTION_hide_pointer},
+		{"auto-zoom"     , 0, 0, OPTION_auto_zoom},
+		{"title"         , 1, 0, OPTION_title},
+		{"alpha"         , 1, 0, OPTION_alpha},
+		{"bg"            , 1, 0, OPTION_bg},
+		{"draw-filename" , 0, 0, OPTION_draw_filename},
+		{"font"          , 1, 0, OPTION_font},
+		{"filelist"      , 1, 0, OPTION_filelist},
+		{"geometry"      , 1, 0, OPTION_geometry},
+		{"help"          , 0, 0, OPTION_help},
+		{"index"         , 0, 0, OPTION_index},
+		{"output-dir"    , 1, 0, OPTION_output_dir},
+		{"keep-http"     , 0, 0, OPTION_keep_http},
+		{"list"          , 0, 0, OPTION_list},
+		{"montage"       , 0, 0, OPTION_montage},
+		{"reverse"       , 0, 0, OPTION_reverse},
+		{"output"        , 1, 0, OPTION_output},
+		{"preload"       , 0, 0, OPTION_preload},
+		{"quiet"         , 0, 0, OPTION_quiet},
+		{"recursive"     , 0, 0, OPTION_recursive},
+		{"stretch"       , 0, 0, OPTION_stretch},
+		{"thumbnails"    , 0, 0, OPTION_thumbnails},
+		{"unloadable"    , 0, 0, OPTION_unloadable},
+		{"version"       , 0, 0, OPTION_version},
+		{"multiwindow"   , 0, 0, OPTION_multiwindow},
+		{"borderless"    , 0, 0, OPTION_borderless},
+		{"thumb-width"   , 1, 0, OPTION_thumb_width},
+		{"randomize"     , 0, 0, OPTION_randomize},
+		{"start-at"      , 1, 0, OPTION_start_at},
+		{"thumb-title"   , 1, 0, OPTION_thumb_title},
+		{"bg-tile"       , 0, 0, OPTION_bg_title},
+		{"bg-center"     , 0, 0, OPTION_bg_center},
+		{"bg-scale"      , 0, 0, OPTION_bg_scale},
+		{"zoom"          , 1, 0, OPTION_zoom},
+		{"zoom-step"     , 1, 0, OPTION_zoom_step},
+		{"no-screen-clip", 0, 0, OPTION_no_screen_clip},
+		{"index-info"    , 1, 0, OPTION_index_info},
+		{"magick-timeout", 1, 0, OPTION_magick_timeout},
+		{"action1"       , 1, 0, OPTION_action1},
+		{"action2"       , 1, 0, OPTION_action2},
+		{"action3"       , 1, 0, OPTION_action3},
+		{"action4"       , 1, 0, OPTION_action4},
+		{"action5"       , 1, 0, OPTION_action5},
+		{"action6"       , 1, 0, OPTION_action6},
+		{"action7"       , 1, 0, OPTION_action7},
+		{"action8"       , 1, 0, OPTION_action8},
+		{"action9"       , 1, 0, OPTION_action9},
+		{"bg-fill"       , 0, 0, OPTION_bg_fill},
+		{"bg-max"        , 0, 0, OPTION_bg_max},
+		{"no-jump-on-resort", 0, 0, OPTION_no_jump_on_resort},
+		{"edit"          , 0, 0, OPTION_edit},
+#ifdef HAVE_LIBEXIF
+		{"draw-exif"     , 0, 0, OPTION_draw_exif},
+		{"auto-rotate"   , 0, 0, OPTION_auto_rotate},
+#endif
+		{"no-xinerama"   , 0, 0, OPTION_no_xinerama},
+		{"draw-tinted"   , 0, 0, OPTION_draw_tinted},
+		{"info"          , 1, 0, OPTION_info},
+		{"tap-zones"     , 0, 0, OPTION_tap_zones},
+		{"force-aliasing", 0, 0, OPTION_force_aliasing},
+		{"no-fehbg"      , 0, 0, OPTION_no_fehbg},
+		{"keep-zoom-vp"  , 0, 0, OPTION_keep_zoom_vp},
+		{"scroll-step"   , 1, 0, OPTION_scroll_step},
+		{"xinerama-index", 1, 0, OPTION_xinerama_index},
+		{"insecure"      , 0, 0, OPTION_insecure},
+		{"no-recursive"  , 0, 0, OPTION_no_recursive},
+		{"cache-size"    , 1, 0, OPTION_cache_size},
+		{"on-last-slide" , 1, 0, OPTION_on_last_slide},
+		{"conversion-timeout" , 1, 0, OPTION_conversion_timeout},
+		{"version-sort"  , 0, 0, OPTION_version_sort},
+		{"offset"        , 1, 0, OPTION_offset},
+#ifdef HAVE_INOTIFY
+		{"auto-reload"   , 0, 0, OPTION_auto_reload},
+#endif
+		{"class"         , 1, 0, OPTION_class},
+		{"no-conversion-cache", 0, 0, OPTION_no_conversion_cache},
+		{"window-id", 1, 0, OPTION_window_id},
+		{0, 0, 0, 0}
+	};
+	int optch = 0, cmdx = 0;
+
+	while ((optch = getopt_long(argc, argv, stropts, lopts, &cmdx)) != EOF) {
+		D(("Got option, getopt calls it %d, or %c\n", optch, optch));
+		switch (optch) {
+		case 0:
+			break;
+		case OPTION_debug:
+			opt.debug = 1;
+			break;
+		case OPTION_max_dimension:
+			opt.filter_by_dimensions = 1;
+			XParseGeometry(optarg, &discard, &discard, &opt.max_width, &opt.max_height);
+			if (opt.max_width == 0)
+				opt.max_width = UINT_MAX;
+			if (opt.max_height == 0)
+				opt.max_height = UINT_MAX;
+			break;
+		case OPTION_min_dimension:
+			opt.filter_by_dimensions = 1;
+			XParseGeometry(optarg, &discard, &discard, &opt.min_width, &opt.min_height);
+			break;
+		case OPTION_scale_down:
+			opt.scale_down = 1;
+			break;
+		case OPTION_title_font:
+			opt.title_font = estrdup(optarg);
+			break;
+		case OPTION_action:
+			opt.actions[0] = estrdup(optarg);
+			break;
+		case OPTION_image_bg:
+			opt.image_bg = estrdup(optarg);
+			break;
+		case OPTION_fontpath:
+			D(("adding fontpath %s\n", optarg));
+			imlib_add_path_to_font_path(optarg);
+			break;
+		case OPTION_slideshow_delay:
+			opt.slideshow_delay = atof(optarg);
+			if (opt.slideshow_delay < 0.0) {
+				opt.slideshow_delay *= (-1);
+				opt.paused = 1;
+			} else {
+				opt.paused = 0;
+			}
+			break;
+		case OPTION_thumb_height:
+			opt.thumb_h = atoi(optarg);
+			break;
+		case OPTION_fullscreen:
+			opt.full_screen = 1;
+			break;
+		case OPTION_draw_actions:
+			opt.draw_actions = 1;
+			break;
+		case OPTION_limit_height:
+			opt.limit_h = atoi(optarg);
+			break;
+		case OPTION_fullindex:
+			opt.index = 1;
+			opt.index_info = estrdup("%n\n%S\n%wx%h");
+			break;
+		case OPTION_thumb_redraw:
+			opt.thumb_redraw = atoi(optarg);
+			break;
+		case OPTION_caption_path:
+			opt.caption_path = estrdup(optarg);
+			break;
+		case OPTION_customlist:
+			opt.customlist = estrdup(optarg);
+			opt.display = 0;
+			break;
+		case OPTION_menu_font:
+			free(opt.menu_font);
+			opt.menu_font = estrdup(optarg);
+			break;
+		case OPTION_no_menus:
+			opt.no_menus = 1;
+			break;
+		case OPTION_output_only:
+			opt.output = 1;
+			opt.output_file = estrdup(optarg);
+			opt.display = 0;
+			break;
+		case OPTION_cache_thumbnails:
+			opt.cache_thumbnails = 1;
+			break;
+		case OPTION_reload:
+			opt.reload = atof(optarg);
+			opt.use_conversion_cache = 0;
+#ifdef HAVE_INOTIFY
+			opt.auto_reload = 0;
+#endif
+			break;
+		case OPTION_sort:
+			if (!strcasecmp(optarg, "name"))
+				opt.sort = SORT_NAME;
+			else if (!strcasecmp(optarg, "none"))
+				opt.sort = SORT_NONE;
+			else if (!strcasecmp(optarg, "filename"))
+				opt.sort = SORT_FILENAME;
+			else if (!strcasecmp(optarg, "dirname"))
+				opt.sort = SORT_DIRNAME;
+			else if (!strcasecmp(optarg, "mtime"))
+				opt.sort = SORT_MTIME;
+			else if (!strcasecmp(optarg, "width"))
+				opt.sort = SORT_WIDTH;
+			else if (!strcasecmp(optarg, "height"))
+				opt.sort = SORT_HEIGHT;
+			else if (!strcasecmp(optarg, "pixels"))
+				opt.sort = SORT_PIXELS;
+			else if (!strcasecmp(optarg, "size"))
+				opt.sort = SORT_SIZE;
+			else if (!strcasecmp(optarg, "format"))
+				opt.sort = SORT_FORMAT;
+			else {
+				weprintf("Unrecognised sort mode \"%s\". Defaulting to "
+						"sort by filename", optarg);
+				opt.sort = SORT_FILENAME;
+			}
+			if (opt.randomize) {
+				weprintf("commandline contains --randomize and --sort. "
+						"--randomize has been unset");
+				opt.randomize = 0;
+			}
+			break;
+		case OPTION_theme:
+			theme = estrdup(optarg);
+			break;
+		case OPTION_loadable:
+			opt.loadables = 1;
+			opt.display = 0;
+			break;
+		case OPTION_verbose:
+			opt.verbose = 1;
+			break;
+		case OPTION_limit_width:
+			opt.limit_w = atoi(optarg);
+			break;
+		case OPTION_ignore_aspect:
+			opt.aspect = 0;
+			break;
+		case OPTION_hide_pointer:
+			opt.hide_pointer = 1;
+			break;
+		case OPTION_auto_zoom:
+			opt.zoom_mode = ZOOM_MODE_MAX;
+			break;
+		case OPTION_title:
+			opt.title = estrdup(optarg);
+			break;
+		case OPTION_alpha:
+			opt.alpha = 1;
+			opt.alpha_level = 255 - atoi(optarg);
+			break;
+		case OPTION_bg:
+			opt.bg = 1;
+			opt.bg_file = estrdup(optarg);
+			break;
+		case OPTION_draw_filename:
+			opt.draw_filename = 1;
+			break;
+		case OPTION_font:
+			opt.font = estrdup(optarg);
+			break;
+		case OPTION_filelist:
+			if (!strcmp(optarg, "-"))
+				opt.filelistfile = estrdup("/dev/stdin");
+			else
+				opt.filelistfile = estrdup(optarg);
+			break;
+		case OPTION_geometry:
+			opt.geom_enabled = 1;
+			opt.geom_flags = XParseGeometry(optarg, &opt.geom_x,
+					&opt.geom_y, &opt.geom_w, &opt.geom_h);
+			break;
+		case OPTION_help:
+			show_usage();
+			break;
+		case OPTION_index:
+			opt.index = 1;
+			opt.index_info = estrdup("%n");
+			break;
+		case OPTION_output_dir:
+			opt.output_dir = estrdup(optarg);
+			break;
+		case OPTION_keep_http:
+			opt.keep_http = 1;
+			break;
+		case OPTION_list:
+			opt.list = 1;
+			opt.display = 0;
+			break;
+		case OPTION_montage:
+			opt.index = 1;
+			break;
+		case OPTION_reverse:
+			opt.reverse = 1;
+			break;
+		case OPTION_output:
+			opt.output = 1;
+			opt.output_file = estrdup(optarg);
+			break;
+		case OPTION_preload:
+			opt.preload = 1;
+			break;
+		case OPTION_quiet:
+			opt.quiet = 1;
+			break;
+		case OPTION_recursive:
+			opt.recursive = 1;
+			break;
+		case OPTION_stretch:
+			opt.stretch = 1;
+			break;
+		case OPTION_thumbnails:
+			opt.thumbs = 1;
+			opt.index_info = estrdup("%n");
+			break;
+		case OPTION_unloadable:
+			opt.unloadables = 1;
+			opt.display = 0;
+			break;
+		case OPTION_version:
+			show_version();
+			break;
+		case OPTION_multiwindow:
+			opt.multiwindow = 1;
+			break;
+		case OPTION_borderless:
+			opt.borderless = 1;
+			break;
+		case OPTION_thumb_width:
+			opt.thumb_w = atoi(optarg);
+			break;
+		case OPTION_randomize:
+			opt.randomize = 1;
+			if (opt.sort != SORT_NONE) {
+				weprintf("commandline contains --sort and --randomize. "
+						"--sort has been unset");
+				opt.sort = SORT_NONE;
+			}
+			break;
+		case OPTION_start_at:
+			opt.start_list_at = estrdup(optarg);
+			break;
+		case OPTION_thumb_title:
+			opt.thumb_title = estrdup(optarg);
+			break;
+		case OPTION_bg_title:
+			opt.bgmode = BG_MODE_TILE;
+			break;
+		case OPTION_bg_center:
+			opt.bgmode = BG_MODE_CENTER;
+			break;
+		case OPTION_bg_scale:
+			opt.bgmode = BG_MODE_SCALE;
+			break;
+		case OPTION_zoom:
+			if (!strcmp("fill", optarg))
+				opt.zoom_mode = ZOOM_MODE_FILL;
+			else if (!strcmp("max", optarg))
+				opt.zoom_mode = ZOOM_MODE_MAX;
+			else
+				opt.default_zoom = atoi(optarg);
+			break;
+		case OPTION_no_screen_clip:
+			opt.screen_clip = 0;
+			break;
+		case OPTION_index_info:
+			opt.index_info = estrdup(optarg);
+			break;
+		case OPTION_magick_timeout:
+			weprintf("--magick-timeout is deprecated, please use --conversion-timeout instead");
+			opt.conversion_timeout = atoi(optarg);
+			break;
+		case OPTION_action1:
+			opt.actions[1] = estrdup(optarg);
+			break;
+		case OPTION_action2:
+			opt.actions[2] = estrdup(optarg);
+			break;
+		case OPTION_action3:
+			opt.actions[3] = estrdup(optarg);
+			break;
+		case OPTION_action4:
+			opt.actions[4] = estrdup(optarg);
+			break;
+		case OPTION_action5:
+			opt.actions[5] = estrdup(optarg);
+			break;
+		case OPTION_action6:
+			opt.actions[6] = estrdup(optarg);
+			break;
+		case OPTION_action7:
+			opt.actions[7] = estrdup(optarg);
+			break;
+		case OPTION_action8:
+			opt.actions[8] = estrdup(optarg);
+			break;
+		case OPTION_action9:
+			opt.actions[9] = estrdup(optarg);
+			break;
+		case OPTION_bg_fill:
+			opt.bgmode = BG_MODE_FILL;
+			break;
+		case OPTION_bg_max:
+			opt.bgmode = BG_MODE_MAX;
+			break;
+		case OPTION_no_jump_on_resort:
+			opt.jump_on_resort = 0;
+			break;
+		case OPTION_edit:
+			opt.edit = 1;
+			break;
+#ifdef HAVE_LIBEXIF
+		case OPTION_draw_exif:
+			opt.draw_exif = 1;
+			break;
+		case OPTION_auto_rotate:
+#if defined(IMLIB2_VERSION_MAJOR) && defined(IMLIB2_VERSION_MINOR) && defined(IMLIB2_VERSION_MICRO) && (IMLIB2_VERSION_MAJOR > 1 || IMLIB2_VERSION_MINOR > 7 || IMLIB2_VERSION_MICRO >= 5)
+			weprintf("This feh release was built with Imlib2 version %d.%d.%d, which transparently adjusts for image orientation according to EXIF data.", IMLIB2_VERSION_MAJOR, IMLIB2_VERSION_MINOR, IMLIB2_VERSION_MICRO);
+			weprintf("--auto-rotate would rotate an already correctly oriented image, resulting in incorrect orientation. It has been disabled in this build. Rebuild feh with Imlib2 <1.7.5 to enable --auto-rotate.");
+#else
+			opt.auto_rotate = 1;
+#endif
+			break;
+#endif
+		case OPTION_no_xinerama:
+			opt.xinerama = 0;
+			break;
+		case OPTION_draw_tinted:
+			opt.text_bg = TEXT_BG_TINTED;
+			break;
+		case OPTION_info:
+			opt.info_cmd = estrdup(optarg);
+			if (opt.info_cmd[0] == ';') {
+				opt.draw_info = 0;
+				opt.info_cmd++;
+			} else {
+				opt.draw_info = 1;
+			}
+			break;
+		case OPTION_tap_zones:
+			opt.tap_zones = 1;
+			break;
+		case OPTION_force_aliasing:
+			opt.force_aliasing = 1;
+			break;
+		case OPTION_no_fehbg:
+			opt.no_fehbg = 1;
+			break;
+		case OPTION_keep_zoom_vp:
+			opt.keep_zoom_vp = 1;
+			break;
+		case OPTION_scroll_step:
+			opt.scroll_step = atoi(optarg);
+			break;
+		case OPTION_xinerama_index:
+			opt.xinerama_index = atoi(optarg);
+			break;
+		case OPTION_insecure:
+			opt.insecure_ssl = 1;
+			break;
+		case OPTION_no_recursive:
+			opt.recursive = 0;
+			break;
+		case OPTION_cache_size:
+			opt.cache_size = atoi(optarg);
+			if (opt.cache_size < 0)
+				opt.cache_size = 0;
+			if (opt.cache_size > 2048)
+				opt.cache_size = 2048;
+			break;
+		case OPTION_on_last_slide:
+			if (!strcmp(optarg, "quit")) {
+				opt.on_last_slide = ON_LAST_SLIDE_QUIT;
+			} else if (!strcmp(optarg, "hold")) {
+				opt.on_last_slide = ON_LAST_SLIDE_HOLD;
+			} else if (!strcmp(optarg, "resume")) {
+				opt.on_last_slide = ON_LAST_SLIDE_RESUME;
+			} else {
+				weprintf("Unrecognized on-last-slide action \"%s\"."
+						"Supported actions: hold, resume, quit\n", optarg);
+			}
+			break;
+		case OPTION_conversion_timeout:
+			opt.conversion_timeout = atoi(optarg);
+			break;
+		case OPTION_version_sort:
+			opt.version_sort = 1;
+			break;
+		case OPTION_offset:
+			opt.offset_flags = XParseGeometry(optarg, &opt.offset_x,
+					&opt.offset_y, (unsigned int *)&discard, (unsigned int *)&discard);
+			break;
+#ifdef HAVE_INOTIFY
+		case OPTION_auto_reload:
+			opt.auto_reload = 1;
+			break;
+#endif
+		case OPTION_class:
+			opt.x11_class = estrdup(optarg);
+			break;
+		case OPTION_no_conversion_cache:
+			opt.use_conversion_cache = 0;
+			break;
+		case OPTION_window_id:
+			opt.x11_windowid = strtol(optarg, NULL, 0);
+			break;
+		case OPTION_zoom_step:
+			opt.zoom_rate = atof(optarg);
+			if ((opt.zoom_rate <= 0)) {
+				weprintf("Zooming disabled due to --zoom-step=%f", opt.zoom_rate);
+				opt.zoom_rate = 1.0;
+			} else {
+				opt.zoom_rate = 1 + ((float)opt.zoom_rate / 100);
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	/* Now the leftovers, which must be files */
+	if (optind < argc) {
+		while (optind < argc) {
+			if (opt.reload)
+				original_file_items = gib_list_add_front(original_file_items, estrdup(argv[optind]));
+			/* If recursive is NOT set, but the only argument is a directory
+			   name, we grab all the files in there, but not subdirs */
+			add_file_to_filelist_recursively(argv[optind++], FILELIST_FIRST);
+		}
+	}
+	else if (finalrun && !opt.filelistfile && !opt.bgmode) {
+		/*
+		 * if --start-at is a non-local URL (i.e., does not start with file:///),
+		 * behave as if "feh URL" was called (there is no directory we can load)
+		 */
+		if (opt.start_list_at && path_is_url(opt.start_list_at) && (strlen(opt.start_list_at) <= 8 || strncmp(opt.start_list_at, "file:///", 8) != 0)) {
+			add_file_to_filelist_recursively(opt.start_list_at, FILELIST_FIRST);
+		/*
+		 * Otherwise, make "feh --start-at dir/file.jpg" behave like
+		 * "feh --start-at dir/file.jpg dir".
+		 */
+		} else if (opt.start_list_at && strrchr(opt.start_list_at, '/')) {
+			/*
+			 * feh can't candle urlencoded path components ("some%20dir" etc).
+			 * Use libcurl to unescape them if --start-at is file://...
+			 */
+			if (strlen(opt.start_list_at) > 8 && strncmp(opt.start_list_at, "file:///", 8) == 0) {
+				char *unescaped_path = feh_http_unescape(opt.start_list_at);
+				if (unescaped_path != NULL) {
+					free(opt.start_list_at);
+					opt.start_list_at = estrdup(unescaped_path + 7);
+					free(unescaped_path);
+				} else {
+					char *new_path = estrdup(opt.start_list_at + 7);
+					free(opt.start_list_at);
+					opt.start_list_at = new_path;
+				}
+			}
+			char *target_directory = estrdup(opt.start_list_at);
+			char *filename_start = strrchr(target_directory, '/');
+			if (filename_start) {
+				*filename_start = '\0';
+			}
+			add_file_to_filelist_recursively(target_directory, FILELIST_FIRST);
+			original_file_items = gib_list_add_front(original_file_items, estrdup(target_directory));
+			free(target_directory);
+		} else {
+			add_file_to_filelist_recursively(".", FILELIST_FIRST);
+		}
+	}
+
+	/* So that we can safely be called again */
+	optind = 0;
+	return;
 }
 
-void
-show_version(void)
+static void check_options(void)
 {
-   printf(PACKAGE " version " VERSION "\n");
-   exit(0);
+	int i;
+	char *endptr;
+
+	for (i = 0; i < 10; i++) {
+		if (opt.actions[i] && !opt.hold_actions[i] && (opt.actions[i][0] == ';')) {
+			opt.hold_actions[i] = 1;
+			opt.actions[i] = opt.actions[i] + 1;
+		}
+		opt.action_titles[i] = opt.actions[i];
+		if (opt.actions[i] && (opt.actions[i][0] == '[')) {
+			if (((endptr = strchr(opt.actions[i], ']')) != NULL)
+					&& (opt.actions[i][1] != ' ')) {
+				opt.action_titles[i] = opt.actions[i] + 1;
+				opt.actions[i] = endptr + 1;
+				*endptr = 0;
+			}
+		}
+	}
+
+	if (opt.full_screen && opt.multiwindow) {
+		eprintf("You cannot combine --fullscreen with --multiwindow");
+	}
+
+	if (opt.list && (opt.multiwindow || opt.index)) {
+		eprintf("You cannot combine --list with other modes");
+	}
+
+	if (opt.loadables && opt.unloadables) {
+		eprintf("You cannot combine --loadable with --unloadable");
+	}
+
+	return;
 }
 
-void
-show_mini_usage(void)
+static void show_version(void)
 {
-   fprintf(stdout,
-           PACKAGE " - No loadable images specified.\nUse " PACKAGE
-           " --help for detailed usage information\n");
-   exit(0);
+	puts(PACKAGE " version " VERSION);
+	puts("Compile-time switches: "
+
+#ifdef HAVE_LIBCURL
+		"curl "
+#endif
+
+#ifdef DEBUG
+		"debug "
+#endif
+
+#ifdef HAVE_LIBEXIF
+		"exif "
+#endif
+
+#ifdef HAVE_INOTIFY
+		"inotify "
+#endif
+
+#ifdef INCLUDE_HELP
+		"help "
+#endif
+
+#ifdef HAVE_LIBMAGIC
+		"magic "
+#endif
+
+#if _FILE_OFFSET_BITS == 64
+		"stat64 "
+#endif
+
+#ifdef HAVE_STRVERSCMP
+         "verscmp "
+#endif
+
+#ifdef HAVE_LIBXINERAMA
+		"xinerama "
+#endif
+
+	);
+
+	exit(0);
 }
 
-void
-show_usage(void)
+void show_mini_usage(void)
 {
-   fprintf(stdout,
-"Usage : " PACKAGE " [OPTIONS]... FILES...\n"
-" Where a FILE is an image file or a directory.\n"
-" Multiple files are supported.\n"
-" Urls are supported. They must begin with http:// or ftp:// and you must\n"
-" have wget installed to download the files for viewing.\n"
-" Options can also be specified in the in the feh configuration file. See\n"
-" man feh for more details\n"
-" -h, --help                display this help and exit\n"
-" -v, --version             output version information and exit\n"
-" -V, --verbose             output useful information, progress bars, etc\n"
-" -q, --quiet               Don't report non-fatal errors for failed loads\n"
-"                           Verbose and quiet modes are not mutually exclusive,\n"
-"                           the first controls informational messages, the\n"
-"                           second only errors.\n"
-" -T, --theme THEME         Load options from config file with name THEME\n"
-"                           see man feh for more info.\n"
-"     --rcfile FILE         Use FILE to parse themes and options from,\n"
-"                           instead of the default ~/.fehrc, /etc/fehrc files.\n"
-" -r, --recursive           Recursively expand any directories in FILE to\n"
-"                           the content of those directories. (Take it easy)\n"
-" -z, --randomize           When viewing multiple files in a slideshow,\n"
-"                           randomise the file list before displaying\n"
-" --no-jump-on-resort       Don't jump to the first image when the filelist\n"
-"                           is resorted.\n"
-" -g, --geometry STRING     Limit (and don't change) the window size. Takes\n"
-"                           an X-style geometry string like 640x480.\n"
-"                           Note that larger images will be zoomed out to fit\n"
-"                           but you can see them at 1:1 by clicking the zoom\n"
-"                           button.\n"
-" -f, --filelist FILE       This option is similar to the playlists used by\n"
-"                           music software. If FILE exists, it will be read\n"
-"                           for a list of files to load, in the order they\n"
-"                           appear. The format is a list of image filenames,\n"
-"                           absolute or relative to the current directory,\n"
-"                           one filename per line.\n"
-"                           If FILE doesn't exist, it will be created from the\n"
-"                           internal filelist at the end of a viewing session.\n"
-"                           This is best used to store the results of complex\n"
-"                           sorts (-Spixels for example) for later viewing.\n"
-"                           Any changes to the internal filelist (such as\n"
-"                           deleting a file or it being pruned for being\n"
-"                           unloadable) will be saved to FILE when feh exits.\n"
-"                           You can add files to filelists by specifying them\n"
-"                           on the commandline when also specifying the list.\n"
-" -p, --preload             Preload images. This doesn't mean hold them in\n"
-"                           RAM, it means run through and eliminate unloadable\n"
-"                           images first. Otherwise they will be removed as you\n"
-"                           flick through.\n"
-"     --scale-down          Automatically scale down images too big for the\n"
-"                           screen. Currently only works with -P\n"
-" -F, --full-screen         Make the window fullscreen\n"
-" -Z, --auto-zoom           Zoom picture to screen size in fullscreen mode,\n"
-"                           is affected by the option --stretch\n"
-"     --zoom PERCENT        Zooms images by a PERCENT, when in full screen\n"
-"                           mode or when window geometry is fixed. If combined\n"
-"                           with --auto-zoom, zooming will be limited to the\n"
-"                           the size.\n"
-" -w, --multiwindow         Disable slideshow mode. With this setting,\n"
-"                           instead of opening multiple files in slideshow\n"
-"                           mode, multiple windows will be opened.\n"
-" -x, --borderless          Create borderless windows\n"
-" -d, --draw-filename       Draw the filename at the top-left of the image.\n"
-"     --title TITLE         Use TITLE as the window title in slideshow mode.\n"
-" -D, --slideshow-delay NUM For slideshow mode, specifies time delay (seconds,\n"
-"                           can be a decimal) between automatically changing\n"
-"                           slides.\n"
-"     --cycle-once          exit feh after one loop through a slideshow\n"
-" -R, --reload NUM          Use this option to tell feh to reload an image\n"
-"                           after NUM seconds. Useful for viewing webcams\n"
-"                           via http, or even on your local machine.\n"
-" -Q, --builtin             Use builtin http grabber to grab remote files\n"
-"                           instead of wget.\n"
-"                           mechanism, useful if don't have wget.\n"
-" -k, --keep-http           When viewing files using http, feh normally\n"
-"                           deletes the local copies after viewing, or,\n"
-"                           if caching, on exit. This option prevents this\n"
-"                           so that you get to keep the local copies.\n"
-"                           They will be in the current working directory\n"
-"                           with \"feh\" in the name.\n"
-"     --caption-path PATH   Path to directory containing image captions.\n"
-"                           This turns on caption viewing, and if captions\n"
-"                           are found in PATH, which is relative to the\n"
-"                           directory of each image, they are overlayed\n"
-"                           on the displayed image.\n"
-"                           e.g with caption path \"captions\", and viewing\n"
-"                           image images/foo.jpg, caption will be looked for\n"
-"                           as \"images/captions/foo.jpg.txt\"\n"
-" -j, --output-dir          Output directory for saved files.  Really only\n"
-"                           useful with the -k flag.\n"
-" -G, --wget-timestamp      When viewing http images with reload set (eg\n"
-"                           webcams), try to only reload the image if the\n"
-"                           remote file has changed.\n"
-" -l, --list                Don't display images. Analyse them and display an\n"
-"                           'ls' style listing. Useful in scripts hunt out\n"
-"                           images of a certain size/resolution/type etc.\n"
-" -L, --customlist FORMAT   Use FORMAT as the format specifier for list\n"
-"                           output. FORMAT is a printf-like string containing\n"
-"                           image info specifiers. See FORMAT SPECIFIERS.\n"
-" -U, --loadable            Don't display images. Just print out their name\n"
-"                           if imlib2 can successfully load them.\n"
-" -u, --unloadable          Don't display images. Just print out their name\n"
-"                           if imlib2 can NOT successfully load them.\n"
-" -S, --sort SORT_TYPE      The file list may be sorted according to image\n"
-"                           parameters. Allowed sort types are: name,\n"
-"                           filename, width, height, pixels, size, format.\n"
-"                           For sort modes other than name or filename, a\n"
-"                           preload run will be necessary, causing a delay\n"
-"                           proportional to the number of images in the list\n"
-" -n, --reverse             Reverse the sort order. Use this to invert the order\n"
-"                           of the filelist. Eg to sort in reverse width order,\n"
-"                           use -nSwidth\n"
-" -A, --action ACTION       Specify a string as an action to perform on the\n"
-"                           image. In slideshow or multiwindow modes, the action\n"
-"                           in list mode, or loadable|unloadable modes, the\n"
-"                           action will be run for each file.\n"
-"                           The action will be executed by /bin/sh. Use\n"
-"                           format specifiers to refer to image info. See\n"
-"                           FORMAT SPECIFIERS for examples\n"
-"                           Eg. -A \"mv %%f ~/images/%%n\"\n"
-"                           In slideshow mode, the next image will be shown\n"
-"                           after running the command, in multiwindow mode,\n"
-"                           the window will be closed.\n"
-"     --action1 ACTION      These extra action options allow you to specify\n"
-"     --action2 ACTION      multiple additional actions which can be invoked\n"
-"     ...                   using the appropriate number key 1-9\n"
-"     --action9 ACTION\n"
-" -m, --montage             Enable montage mode. Montage mode creates a new\n"
-"                           image consisting of a grid of thumbnails of the\n"
-"                           images specified using FILE... When montage mode\n"
-"                           is selected, certain other options become\n"
-"                           available. See MONTAGE MODE OPTIONS\n"
-" -c, --collage             Same as montage mode, but the thumbnails are\n"
-"                           distributed randomly. You must specify width and\n"
-"                           height or supply a background image or both\n"
-" -i, --index               Enable Index mode. Index mode is similar to\n"
-"                           montage mode, and accepts the same options. It\n"
-"                           creates an index print of thumbails, printing the\n"
-"                           images name beneath each thumbnail. Index mode\n"
-"                           enables certain other options, see INDEX MODE\n"
-"                           OPTIONS\n"
-" -t, --thumbnails          As --index, but clicking an image will open it in\n"
-"                           a new viewing window\n"
-"     --cache-thumbnails    Enable thumbnail caching\n"
-" -I, --fullindex           Same as index mode, but below each thumbnail you\n"
-"                           get image name, size and dimensions\n"
-"     --bg-tile FILE\n"
-"     --bg-center FILE\n"
-"     --bg-scale FILE\n"
-"     --bg-seamless FILE    Set your desktop background to FILE. Feh can\n"
-"                           use enlightenment IPC if you are running it,\n"
-"                           or will fall back to X methods.\n"
-"                           Feh stores the commandline necessary to restore\n"
-"                           the background you chose in ~/.fehbg. So to have\n"
-"                           feh-set backgrounds restored when you restart X,\n"
-"                           add the line \"eval `cat $HOME/.fehbg`\" to your\n"
-"                           X startup script (e.g. ~/.xsession). Note that\n"
-"                           you only need to do this for non E window\n"
-"                           managers.\n"
-"     --fontpath PATH       Specify an extra directory to look in for fonts,\n"
-"                           can be used multiple times to add multiple paths.\n"
-" -M, --menu-font FONT      Use FONT for the font in menus.\n"
-"     --menu-style FILE     Use FILE as the style descriptor for menu text.\n"
-"     --menu-bg BG          Use BG for the background image in menus.\n"
-"     --menu-border INT     Specify number of pixels that define the menu\n"
-"                           background's border. Borders are not stretched\n"
-"                           when images are scaled.\n"
-" -B, --image-bg STYLE      Set background for transparent images and the like.\n"
-"                           Accepted values: white, black, default\n"
-" -N, --no-menus            Don't load or show any menus.\n"
-" -1, --next-button B       Use button B to advance to the next image in any\n"
-"                           mode (defaults to 1, usually the left button).\n"
-" -2, --zoom-button B       Use button B to zoom the current image in any\n"
-"                           mode (defaults to 2, usually the middle button).\n"
-" -4, --menu-button B       Use CTRL+Button B to activate the menu in any\n"
-"                           mode.  Set to 0 for any button.  This option\n"
-"                           is disabled if the -N or --no-menus option is set\n"
-"                           (defaults to 3, usually the right button).\n"
-" -5, --menu-ctrl-mask      Require CTRL+Button for menu activation in\n"
-"                           any mode (default=off).\n"
-" -6, --rotate-button B     Use CTRL+Button B to rotate the current image in\n"
-"                           any mode (default=2).\n"
-" -7, --no-rotate-ctrl-mask Don't require CTRL+Button for rotation in\n"
-"                           any mode -- just use the button (default=off).\n"
-" -8, --blur-button B       Use CTRL+Button B to blur the current image in\n"
-"                           any mode (default=1).\n"
-" -9, --no-blur-ctrl-mask   Don't require CTRL+Button for blurring in\n"
-"                           any mode -- just use the button (default=off).\n"
-"     --no-xinerama         Disable Xinerama support.  Only useful if\n"
-"                           you have Xinerama compiled in.\n"
-"     --screen-clip [0|1]   Enable/disable window clipping based on screen\n"
-"                           size.  WARNING: with this option disabled,\n"
-"                           image windows could become very large, making\n"
-"                           them unmanageable in certain window managers.\n"
-"     --hide-pointer        In full screen mode, hide the X mouse pointer.\n"
-" FORMAT SPECIFIERS\n"
-"                           %%f image path/filename\n"
-"                           %%n image name\n"
-"                           %%s image size (bytes)\n"
-"                           %%p image pixel size\n"
-"                           %%w image width\n"
-"                           %%h image height\n"
-"                           %%t image format\n"
-"                           %%P prints feh\n"
-"                           %%v prints the version\n"
-"                           %%m prints the mode (slideshow, multiwindow...)\n"
-"                           %%l prints the total number of files in the filelist\n"
-"                           %%u prints the current file number\n"
-"                           \\n prints a newline\n"
-"                           Eg. feh -A \"mv %%f ~/images/%%n\" *\n"
-" MONTAGE MODE OPTIONS\n"
-" -X, --ignore-aspect       By default, the montage thumbnails will retain\n"
-"                           their aspect ratios, while fitting in --thumb-width\n"
-"                           and --thumb-height. This option will force them to\n"
-"                           be the size set by --thumb-width and --thumb-height\n"
-"                           This will prevent any whitespace in the final\n"
-"                           montage\n"
-" -s, --stretch             Normally, if an image is smaller than the specified\n"
-"                           thumbnail size, it will not be enlarged. If this\n"
-"                           option is set, the image will be scaled up to fit\n"
-"                           the thumbnail size. (Aspect ratio will be maintained\n"
-"                           unless --ignore-aspect is specified)\n"
-" -y, --thumb-width NUM     Set thumbnail width in pixels\n"
-" -E, --thumb-height NUM    Set thumbnail height in pixels\n"
-"                           Thumbnails default to 20x20 pixels\n"
-" -W, --limit-width NUM     Limit the width of the montage in pixels\n"
-" -H, --limit-height NUM    Limit the height of the montage in pixels\n"
-"                           These options can be used together (to define the\n"
-"                           image size exactly), or separately. If only one is\n"
-"                           specified, theother is calculated from the number\n"
-"                           of files specified and the size of the thumbnails.\n"
-"                           The default is to limit width to 800 pixels and\n"
-"                           calculate the height\n"
-" -b, --bg FILE|trans       Use FILE as a background for your montage. With\n"
-"                           this option specified, the size of the montage will\n"
-"                           default to the size of FILE if no size restrictions\n"
-"                           are specified. Alternatively, if FILE is \"trans\",\n"
-"                           make the background transparent.\n"
-" -a, --alpha NUM           When drawing thumbnails onto the background, apply\n"
-"                           them with a transparency level of NUM (0-255).\n"
-" -o FILE                   Save the created montage to FILE\n"
-" -O FILE                   Just save the created montage to FILE\n"
-"                           WITHOUT displaying it (use in scripts)\n"
-" INDEX MODE OPTIONS\n"
-" -e FONT                   Use FONT to print the information under each\n"
-"                           thumbnail. FONT should be defined in the form\n"
-"                           fontname/size(points). eg -e myfont/12\n"
-" -t, --title-font FONT     Use FONT to print a title on the index, if no\n"
-"                           font is specified, a title will not be printed\n"
-" SLIDESHOW KEYS\n"
-" The default mode for viewing mulitple images is Slideshow mode\n"
-" When viewing a slideshow, the following keys may be used:\n"
-" p, P, <BACKSPACE>, <LEFT>  Goto previous slide\n"
-" n, N, <SPACE>, <RIGHT>     Goto next slide\n"
-" r, R                       Reload image (good for webcams)\n"
-" v, V                       Toggle fullscreen\n"
-" m, M                       Show popup menu\n"
-" c, C                       Caption entry mode. If --caption-path has been\n"
-"                            specified, then this enables caption editing.\n"
-"                            The caption will turn yellow and be editable,\n"
-"                            hit enter to confirm and save the caption, or\n"
-"                            hit escape to cancel and revert the caption.\n"
-" w, W                       Size window to current image dimensions\n"
-" h, H                       Pause the slideshow (only useful when using\n"
-" s, S                       Save current image to unique filename\n"
-" f, F                       Save current filelist to unique filename\n"
-"                            timed reloading or image changes)\n"
-" <, >                       In place editing, rotate 90 degrees right/left\n"
-" <HOME>                     Goto first slide\n"
-" <END>                      Goto last slide\n"
-" <ESCAPE>                   Quit the slideshow\n"
-" +, =                       Increase reload delay\n"
-" -, _                       Decrease reload delay\n"
-" <DELETE>                   Remove the currently viewed file from the filelist\n"
-" <CTRL+DELETE>              Delete the currently viewed file and remove it\n"
-"                            from the filelist\n"
-" x, X                       Close current window\n"
-" q, Q                       Quit the slideshow\n"
-" <KEYPAD LEFT>              Move the image to the left\n"
-" <KEYPAD RIGHT>             Move the image to the right\n"
-" <KEYPAD +>                 Zoom in\n"
-" <KEYPAD ->                 Zoom out\n"
-" <KEYPAD *>                 Zoom to 100%%\n"
-" <KEYPAD />                 Zoom to fit the window\n"
-" <ENTER>,0                  Run action specified by --action option\n"
-" 1-9                        Run action 1-9 specified by --action[1-9] options\n"
-"\n"
-" MOUSE ACTIONS\n"
-" When viewing an image, a click of mouse button 1 moves to the next image\n"
-" (slideshow mode only), a drag of mouse button 1 pans the image, if the\n"
-" viewable window is smaller than the image, button 2 zooms (click and drag\n"
-" left->right to zoom in, right->left to zoom out, click once to restore\n"
-" 1x zoom), and mouse button 3 pans.\n"
-" Ctrl+button 1 blurs or sharpens the image (drag left to blur and right to\n"
-" sharpen).  Ctrl+button 2 rotates the image around the center point.\n"
-" Button 3 activates the context-sensitive menu.  Buttons can be redefined\n"
-" with the -1 through -9 (or --*-button) cmdline flags.  All you people\n"
-" with million button mice can remove the ctrl mask with the --no-*-ctrl-mask\n"
-" options.\n" "\n" "See 'man feh' for more detailed information\n"
-"\n"
-"This program is free software see the file COPYING for licensing info.\n"
-"Copyright Tom Gilbert (and various contributors) 1999-2003\n"
-"Email bugs to <feh_sucks@linuxbrit.co.uk>\n");
-   exit(0);
+	fputs(PACKAGE ": No loadable images specified.\n"
+#ifdef INCLUDE_HELP
+		"See '" PACKAGE " --help' or 'man " PACKAGE "' for detailed usage information\n",
+#else
+		"See 'man " PACKAGE "' for detailed usage information\n",
+#endif
+		stderr);
+	exit(1);
 }
 
-void
-feh_create_default_config(char *rcfile)
+static void show_usage(void)
 {
-   FILE *fp;
-
-   D_ENTER(4);
-
-   if ((fp = fopen(rcfile, "w")) == NULL)
-   {
-      weprintf("Unable to create default config file %s\n", rcfile);
-      D_RETURN_(4);
-   }
-
-   fprintf(fp,
-           "# Feh configuration file.\n"
-           "# Lines starting with # are comments. Don't use comments mid-line.\n"
-           "\n" "# Feh expects to find this as ~/.fehrc or /etc/fehrc\n"
-           "# If both are available, ~/.fehrc will be used\n" "\n"
-           "# Options defined in theme_name/options pairs.\n"
-           "# Separate themename and options by whitespace.\n" "\n"
-           "# There are two ways of specifying the theme. Either use feh -Tthemename,\n"
-           "# or use a symbolic link to feh with the name of the theme. eg\n"
-           "# ln -s `which feh` ~/bin/mkindex\n"
-           "# Now when you run 'mkindex', feh will load the config specified for the\n"
-           "# mkindex theme.\n" "\n" "# ======================\n"
-           "# Some examples of usage\n" "# ======================\n" "\n"
-           "# Set the default feh options to be recursive and verbose\n"
-           "# feh -rV\n" "\n"
-           "# Multiple options can of course be used. They should all be on one line\n"
-           "# imagemap -rV --quiet -W 400 -H 300 --thumb-width 40 --thumb-height 30\n"
-           "\n" "# ================================================\n"
-           "# Here I set some useful themes for you to try out\n"
-           "# ================================================\n" "\n"
-           "# Webcam mode, simply specify the url(s).\n"
-           "# e.g. feh -Twebcam http://cam1 http://cam2\n"
-           "webcam --multiwindow --reload 20\n" "\n"
-           "# Create an index of the current directory. This version uses . as the\n"
-           "# current dir, so you don't even need any commandline arguments.\n"
-           "mkindex -iVO index.jpg .\n" "\n" "# More ambitious version...\n"
-           "imgidx -iVO .fehindex.jpg --limit-width 1200 --thumb-width 90 --thumb-height 90 .\n"
-           "\n" "# Show a presentation\n"
-           "present --full-screen --sort name\n"
-           "\n"
-           "# Booth mode ;-)\n"
-           "booth --full-screen --hide-pointer --slideshow-delay 20\n"
-           "\n"
-           "# Screw xscreensaver, use feh =)\n"
-           "screensave --full-screen --randomize --slideshow-delay 5\n" "\n"
-           "# Add <img> tags to your html with ease :-)\n"
-           "newimg -q -L \"<img src=\\\"%%f\\\" alt=\\\"%%n\\\" border=\\\"0\\\" width=\\\"%%w\\\" height=\\\"%%h\\\">\"\n"
-           "\n"
-           "# Different menus\n"
-           "chrome --menu-bg " PREFIX" /share/feh/images/menubg_chrome.png\n"
-           "brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png\n"
-           "pastel --menu-bg " PREFIX "/share/feh/images/menubg_pastel.png\n"
-           "aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png\n"
-           "wood --menu-bg " PREFIX "/share/feh/images/menubg_wood.png\n"
-           "aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png\n"
-           "sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png\n"
-           "orange --menu-bg " PREFIX "/share/feh/images/menubg_orange.png\n"
-           "light --menu-bg " PREFIX "/share/feh/images/menubg_light.png\n"
-           "black --menu-bg " PREFIX "/share/feh/images/menubg_black.png --menu-style " PREFIX "/share/feh/fonts/black.style\n"
-   );
-   fclose(fp);
-
-   D_RETURN_(4);
+	fputs(
+#ifdef INCLUDE_HELP
+#include "help.inc"
+#else
+	"See 'man " PACKAGE "'\n"
+#endif
+	, stdout);
+	exit(0);
 }
diff --git a/src/options.h b/src/options.h
index 0c60c9b..74c12cd 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,6 +1,7 @@
 /* options.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -26,112 +27,325 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
-struct __fehoptions
-{
-   unsigned char multiwindow;
-   unsigned char montage;
-   unsigned char collage;
-   unsigned char index;
-   unsigned char index_show_name;
-   unsigned char index_show_dim;
-   unsigned char index_show_size;
-   unsigned char thumbs;
-   unsigned char slideshow;
-   unsigned char recursive;
-   unsigned char output;
-   unsigned char verbose;
-   unsigned char display;
-   unsigned char bg;
-   unsigned char alpha;
-   unsigned char alpha_level;
-   unsigned char aspect;
-   unsigned char stretch;
-   unsigned char keep_http;
-   unsigned char borderless;
-   unsigned char randomize;
-   unsigned char no_jump_on_resort;
-   unsigned char full_screen;
-   unsigned char auto_zoom;
-   unsigned char draw_filename;
-   unsigned char list;
-   unsigned char quiet;
-   unsigned char preload;
-   unsigned char loadables;
-   unsigned char unloadables;
-   unsigned char reverse;
-   unsigned char no_menus;
-   unsigned char scale_down;
-   unsigned char builtin_http;
-   unsigned char wget_timestamp;
-   unsigned char bgmode;
-   unsigned char xinerama;
-   unsigned char screen_clip;
-   unsigned char hide_pointer;
-   unsigned char fmmode;
-   unsigned char draw_actions;
-   unsigned char cache_thumbnails;
-   unsigned char cycle_once;
-
-   char *output_file;
-   char *output_dir;
-   char *bg_file;
-   char *font;
-   char *title_font;
-   char *title;
-   char *thumb_title;
-   char *actions[10];
-   char *fontpath;
-   char *filelistfile;
-   char *menu_font;
-   char *customlist;
-   char *menu_bg;
-   char *image_bg;
-   char *rcfile;
-   char *menu_style;
-   char *caption_path;
-
-   gib_style *menu_style_l;
-
-   unsigned char next_button;
-   unsigned char zoom_button;
-   unsigned char menu_button;
-   unsigned char menu_ctrl_mask;
-
-   unsigned char rotate_button;
-   unsigned char blur_button;
-   unsigned char reload_button;
-   unsigned char no_rotate_ctrl_mask;
-   unsigned char no_blur_ctrl_mask;
-   unsigned char no_pan_ctrl_mask;
-
-   int thumb_w;
-   int thumb_h;
-   int limit_w;
-   int limit_h;
-   int reload;
-   int sort;
-   int debug_level;
-   int geom_flags;
-   int geom_x;
-   int geom_y;
-   int geom_w;
-   int geom_h;
-   int default_zoom;
-   int menu_border;
-   unsigned char adjust_reload;
-   unsigned int start_list_at;
-   
-   unsigned char mode;
-   unsigned char paused;
-   
-   double slideshow_delay;
-
-   Imlib_Font menu_fn;
+enum on_last_slide_action {
+	ON_LAST_SLIDE_RESUME = 0,
+	ON_LAST_SLIDE_QUIT,
+	ON_LAST_SLIDE_HOLD
+};
+
+struct __fehoptions {
+	unsigned char multiwindow;
+	unsigned char montage;
+	unsigned char index;
+	unsigned char thumbs;
+	unsigned char slideshow;
+	unsigned char recursive;
+	unsigned char output;
+	unsigned char verbose;
+	unsigned char display;
+	unsigned char bg;
+	unsigned char alpha;
+	unsigned char alpha_level;
+	unsigned char aspect;
+	unsigned char stretch;
+	unsigned char keep_http;
+	unsigned char use_conversion_cache;
+	unsigned char borderless;
+	unsigned char randomize;
+	unsigned char jump_on_resort;
+	unsigned char full_screen;
+	unsigned char draw_filename;
+#ifdef HAVE_LIBEXIF
+	unsigned char draw_exif;
+	unsigned char auto_rotate;
+#endif
+#ifdef HAVE_INOTIFY
+	unsigned char auto_reload;
+    int inotify_fd;
+#endif
+	unsigned char list;
+	unsigned char quiet;
+	unsigned char preload;
+	unsigned char loadables;
+	unsigned char unloadables;
+	unsigned char reverse;
+	unsigned char no_menus;
+	unsigned char scale_down;
+	unsigned char bgmode;
+	unsigned char xinerama;
+	unsigned char screen_clip;
+	unsigned char hide_pointer;
+	unsigned char draw_actions;
+	unsigned char draw_info;
+	unsigned char cache_thumbnails;
+	unsigned char on_last_slide;
+	unsigned char hold_actions[10];
+	unsigned char text_bg;
+	unsigned char no_fehbg;
+	unsigned char keep_zoom_vp;
+	unsigned char insecure_ssl;
+	unsigned char filter_by_dimensions;
+	unsigned char edit;
+
+	char *output_file;
+	char *output_dir;
+	char *bg_file;
+	char *image_bg;
+	char *font;
+	char *title_font;
+	char *title;
+	char *thumb_title;
+	char *actions[10];
+	char *action_titles[10];
+	char *fontpath;
+	char *filelistfile;
+	char *menu_font;
+	char *customlist;
+	char *caption_path;
+	char *start_list_at;
+	char *info_cmd;
+	char *index_info;
+
+	int force_aliasing;
+	int tap_zones;
+	int thumb_w;
+	int thumb_h;
+	int limit_w;
+	int limit_h;
+	unsigned int thumb_redraw;
+	double reload;
+	int sort;
+	int version_sort;
+	int debug;
+	int geom_enabled;
+	int geom_flags;
+	int geom_x;
+	int geom_y;
+	unsigned int geom_w;
+	unsigned int geom_h;
+	int offset_flags;
+	int offset_x;
+	int offset_y;
+	int default_zoom;
+	int zoom_mode;
+	double zoom_rate;
+	unsigned char adjust_reload;
+	int xinerama_index;
+	char *x11_class;
+	unsigned long int x11_windowid;
+
+	/* signed in case someone wants to invert scrolling real quick */
+	int scroll_step;
+
+	// imlib cache size in mebibytes
+	int cache_size;
+
+	unsigned int min_width, min_height, max_width, max_height;
+
+	unsigned char mode;
+	unsigned char paused;
+
+	double slideshow_delay;
+
+	signed int conversion_timeout;
+
+	Imlib_Font menu_fn;
+};
+
+enum __feh_option {
+OPTION_debug = '+',
+OPTION_scale_down = '.',
+OPTION_max_dimension = '<',
+OPTION_min_dimension = '>',
+OPTION_title_font = '@',
+OPTION_action = 'A',
+OPTION_image_bg = 'B',
+OPTION_fontpath = 'C',
+OPTION_slideshow_delay = 'D',
+OPTION_thumb_height = 'E',
+OPTION_fullscreen = 'F',
+OPTION_draw_actions = 'G',
+OPTION_limit_height = 'H',
+OPTION_fullindex = 'I',
+OPTION_thumb_redraw = 'J',
+OPTION_caption_path = 'K',
+OPTION_customlist = 'L',
+OPTION_menu_font = 'M',
+OPTION_no_menus = 'N',
+OPTION_output_only = 'O',
+OPTION_cache_thumbnails = 'P',
+OPTION_reload = 'R',
+OPTION_sort = 'S',
+OPTION_theme = 'T',
+OPTION_loadable = 'U',
+OPTION_verbose = 'V',
+OPTION_limit_width = 'W',
+OPTION_ignore_aspect = 'X',
+OPTION_hide_pointer = 'Y',
+OPTION_auto_zoom = 'Z',
+OPTION_title = '^',
+OPTION_alpha = 'a',
+OPTION_bg = 'b',
+OPTION_draw_filename = 'd',
+OPTION_font = 'e',
+OPTION_filelist = 'f',
+OPTION_geometry = 'g',
+OPTION_help = 'h',
+OPTION_index = 'i',
+OPTION_output_dir = 'j',
+OPTION_keep_http = 'k',
+OPTION_list = 'l',
+OPTION_montage = 'm',
+OPTION_reverse = 'n',
+OPTION_output = 'o',
+OPTION_preload = 'p',
+OPTION_quiet = 'q',
+OPTION_recursive = 'r',
+OPTION_stretch = 's',
+OPTION_thumbnails = 't',
+OPTION_unloadable = 'u',
+OPTION_version = 'v',
+OPTION_multiwindow = 'w',
+OPTION_borderless = 'x',
+OPTION_thumb_width = 'y',
+OPTION_randomize = 'z',
+OPTION_start_at = '|',
+OPTION_thumb_title = '~',
+OPTION_bg_title,
+OPTION_bg_center,
+OPTION_bg_scale,
+OPTION_bg_fill,
+OPTION_bg_max,
+OPTION_zoom,
+OPTION_zoom_step,
+OPTION_zoom_in_rate,
+OPTION_zoom_out_rate,
+OPTION_keep_zoom_vp,
+OPTION_no_screen_clip,
+OPTION_index_info,
+OPTION_magick_timeout,
+OPTION_action1,
+OPTION_action2,
+OPTION_action3,
+OPTION_action4,
+OPTION_action5,
+OPTION_action6,
+OPTION_action7,
+OPTION_action8,
+OPTION_action9,
+OPTION_no_jump_on_resort,
+OPTION_edit,
+OPTION_draw_exif,
+OPTION_auto_rotate,
+OPTION_no_xinerama,
+OPTION_draw_tinted,
+OPTION_info,
+OPTION_tap_zones,
+OPTION_force_aliasing,
+OPTION_no_fehbg,
+OPTION_scroll_step,
+OPTION_xinerama_index,
+OPTION_insecure,
+OPTION_no_recursive,
+OPTION_cache_size,
+OPTION_on_last_slide,
+OPTION_conversion_timeout,
+OPTION_version_sort,
+OPTION_offset,
+OPTION_auto_reload,
+OPTION_class,
+OPTION_no_conversion_cache,
+OPTION_window_id,
+};
+
+//typedef enum __fehoption fehoption;
+
+struct __fehkey {
+	unsigned int keysyms[3];
+	unsigned int keystates[3];
+	unsigned int state;
+	unsigned int button;
+	char *name;
+};
+
+enum key_action {
+	EVENT_menu_close = 0,
+	EVENT_menu_parent,
+	EVENT_menu_down,
+	EVENT_menu_up,
+	EVENT_menu_child,
+	EVENT_menu_select,
+	EVENT_scroll_left,
+	EVENT_scroll_right,
+	EVENT_scroll_down,
+	EVENT_scroll_up,
+	EVENT_scroll_left_page,
+	EVENT_scroll_right_page,
+	EVENT_scroll_down_page,
+	EVENT_scroll_up_page,
+	EVENT_prev_img,
+	EVENT_next_img,
+	EVENT_jump_back,
+	EVENT_jump_fwd,
+	EVENT_prev_dir,
+	EVENT_next_dir,
+	EVENT_jump_random,
+	EVENT_quit,
+	EVENT_close,
+	EVENT_remove,
+	EVENT_delete,
+	EVENT_jump_first,
+	EVENT_jump_last,
+	EVENT_action_0,
+	EVENT_action_1,
+	EVENT_action_2,
+	EVENT_action_3,
+	EVENT_action_4,
+	EVENT_action_5,
+	EVENT_action_6,
+	EVENT_action_7,
+	EVENT_action_8,
+	EVENT_action_9,
+	EVENT_zoom_in,
+	EVENT_zoom_out,
+	EVENT_zoom_default,
+	EVENT_zoom_fit,
+	EVENT_zoom_fill,
+	EVENT_size_to_image,
+	EVENT_render,
+	EVENT_toggle_actions,
+	EVENT_toggle_aliasing,
+	EVENT_toggle_auto_zoom,
+#ifdef HAVE_LIBEXIF
+	EVENT_toggle_exif,
+#endif
+	EVENT_toggle_filenames,
+	EVENT_toggle_info,
+	EVENT_toggle_pointer,
+	EVENT_toggle_caption,
+	EVENT_toggle_pause,
+	EVENT_toggle_menu,
+	EVENT_toggle_fullscreen,
+	EVENT_reload_image,
+	EVENT_save_image,
+	EVENT_save_filelist,
+	EVENT_orient_1,
+	EVENT_orient_3,
+	EVENT_flip,
+	EVENT_mirror,
+	EVENT_reload_minus,
+	EVENT_reload_plus,
+	EVENT_toggle_keep_vp,
+	EVENT_toggle_fixed_geometry,
+	EVENT_pan,
+	EVENT_zoom,
+	EVENT_blur,
+	EVENT_rotate,
+	EVENT_LIST_END
 };
 
 void init_parse_options(int argc, char **argv);
 char *feh_string_normalize(char *str);
-void feh_create_default_config(char *rcfile);
 
 extern fehoptions opt;
 
diff --git a/src/signals.c b/src/signals.c
new file mode 100644
index 0000000..058b8c9
--- /dev/null
+++ b/src/signals.c
@@ -0,0 +1,94 @@
+/* signals.c
+
+Copyright (C) 2010-2023 by Birte Kristina Friesel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#include "feh.h"
+#include "filelist.h"
+#include "winwidget.h"
+#include "options.h"
+
+void feh_handle_signal(int);
+volatile int sig_received = 0;
+volatile int sig_exit = 0;
+
+void setup_signal_handlers(void)
+{
+	struct sigaction feh_sh;
+	sigset_t feh_ss;
+	if (
+		(sigemptyset(&feh_ss) == -1) ||
+		(sigaddset(&feh_ss, SIGUSR1) == -1) ||
+		(sigaddset(&feh_ss, SIGUSR2) == -1) ||
+		(sigaddset(&feh_ss, SIGALRM) == -1) ||
+		(sigaddset(&feh_ss, SIGTERM) == -1) ||
+		(sigaddset(&feh_ss, SIGQUIT) == -1) ||
+		(sigaddset(&feh_ss, SIGINT) == -1) ||
+		(sigaddset(&feh_ss, SIGTTIN) == -1))
+	{
+		weprintf("Failed to set up signal masks");
+		return;
+	}
+
+	feh_sh.sa_handler = feh_handle_signal;
+	feh_sh.sa_mask    = feh_ss;
+	feh_sh.sa_flags   = 0;
+
+	if (
+		(sigaction(SIGUSR1, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGUSR2, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGALRM, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGTERM, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGQUIT, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGINT, &feh_sh, NULL) == -1) ||
+		(sigaction(SIGTTIN, &feh_sh, NULL) == -1))
+	{
+		weprintf("Failed to set up signal handler");
+		return;
+	}
+
+	return;
+}
+
+void feh_handle_signal(int signo)
+{
+	switch (signo) {
+		case SIGALRM:
+			if (childpid)
+				killpg(childpid, SIGINT);
+			return;
+		case SIGTTIN:
+			// we were probably backgrounded while we were running
+			control_via_stdin = 0;
+			return;
+		case SIGINT:
+		case SIGTERM:
+		case SIGQUIT:
+			if (childpid)
+				killpg(childpid, SIGINT);
+			sig_exit = 128 + signo;
+			return;
+	}
+
+	sig_received = signo;
+}
diff --git a/src/signals.h b/src/signals.h
new file mode 100644
index 0000000..3d78b67
--- /dev/null
+++ b/src/signals.h
@@ -0,0 +1,32 @@
+/* signals.h
+
+Copyright (C) 2010-2023 by Birte Kristina Friesel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef SIGNALS_H
+#define SIGNALS_H
+
+void setup_signal_handlers(void);
+extern volatile int sig_exit;
+extern volatile int sig_received;
+#endif
diff --git a/src/slideshow.c b/src/slideshow.c
index 3afbafe..266cb2e 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -1,6 +1,7 @@
 /* slideshow.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -28,562 +29,664 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "timers.h"
 #include "winwidget.h"
 #include "options.h"
+#include "signals.h"
 
-void
-init_slideshow_mode(void)
+void init_slideshow_mode(void)
 {
-   winwidget w = NULL;
-   int success = 0;
-   char *s = NULL;
-   gib_list *l = NULL, *last = NULL;
-   feh_file *file = NULL;
-
-   D_ENTER(3);
-
-   mode = "slideshow";
-   if (opt.start_list_at)
-   {
-      l = gib_list_nth(filelist, opt.start_list_at);
-      opt.start_list_at = 0;                /* for next time */
-   }
-   else
-   {
-      l = filelist;
-   }
-   for (; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      if (last)
-      {
-         filelist = feh_file_remove_from_list(filelist, last);
-         filelist_len--;
-         last = NULL;
-      }
-      current_file = l;
-      s = slideshow_create_name(file);
-      if ((w = winwidget_create_from_file(l, s, WIN_TYPE_SLIDESHOW)) != NULL)
-      {
-         free(s);
-         success = 1;
-         winwidget_show(w);
-         if (opt.slideshow_delay >= 0.0)
-            feh_add_timer(cb_slide_timer, w, opt.slideshow_delay,
-                          "SLIDE_CHANGE");
-         else if (opt.reload > 0)
-            feh_add_unique_timer(cb_reload_timer, w, opt.reload);
-         break;
-      }
-      else
-      {
-         free(s);
-         last = l;
-      }
-   }
-   if (!success)
-      show_mini_usage();
-   D_RETURN_(3);
+	winwidget w = NULL;
+	int success = 0;
+	gib_list *l = filelist, *last = NULL;
+
+	/*
+	 * In theory, --start-at FILENAME is simple: Look for a file called
+	 * FILENAME, start the filelist there, done.
+	 *
+	 * In practice, there are cases where this isn't sufficient. For instance,
+	 * a user running 'feh --start-at hello.jpg /tmp' will expect feh to start
+	 * at /tmp/hello.jpg, as if they had used
+	 * 'feh --start-at /tmp/hello.jpg /tmp'. Similarly, XDG Desktop files
+	 * may lead to the invocation 'feh --start-at /tmp/hello.jpg .' in /tmp,
+	 * expecting the behaviour of 'feh --start-at ./hello.jpg .'.
+	 *
+	 * Since a good user experience is not about being technically correct, but
+	 * about delivering the expected behaviour, we do some fuzzy matching
+	 * here. In the worst case, this will cause --start-at to start at the
+	 * wrong file.
+	 */
+
+	// Try finding an exact filename match first
+	for (; l && opt.start_list_at; l = l->next) {
+		if (!strcmp(opt.start_list_at, FEH_FILE(l->data)->filename)) {
+			free(opt.start_list_at);
+			opt.start_list_at = NULL;
+			break;
+		}
+	}
+
+	/*
+	 * If it didn't work (opt.start_list_at is still set): Fall back to
+	 * comparing just the filenames without directory prefixes. This may lead
+	 * to false positives, but for now that's just the way it is.
+	 */
+	if (opt.start_list_at) {
+		char *current_filename;
+		char *start_at_filename = strrchr(opt.start_list_at, '/');
+		if (start_at_filename) {
+			start_at_filename++; // We only care about the part after the '/'
+		} else {
+			start_at_filename = opt.start_list_at;
+		}
+		for (l = filelist; l && opt.start_list_at; l = l->next) {
+			current_filename = strrchr(FEH_FILE(l->data)->filename, '/');
+			if (current_filename) {
+				current_filename++; // We only care about the part after the '/'
+			} else {
+				current_filename = FEH_FILE(l->data)->filename;
+			}
+			if (!strcmp(start_at_filename, current_filename)) {
+				free(opt.start_list_at);
+				opt.start_list_at = NULL;
+				break;
+			}
+		}
+	}
+
+	// If that didn't work either, we're out of luck.
+	if (opt.start_list_at)
+		eprintf("--start-at %s: File not found in filelist",
+				opt.start_list_at);
+
+	if (!opt.title)
+		opt.title = PACKAGE " [%u of %l] - %f";
+
+	mode = "slideshow";
+	for (; l; l = l->next) {
+		if (last) {
+			filelist = feh_file_remove_from_list(filelist, last);
+			last = NULL;
+		}
+		current_file = l;
+		if ((w = winwidget_create_from_file(l, WIN_TYPE_SLIDESHOW)) != NULL) {
+			success = 1;
+			winwidget_show(w);
+			if (opt.slideshow_delay > 0.0)
+				feh_add_timer(cb_slide_timer, w, opt.slideshow_delay, "SLIDE_CHANGE");
+			if (opt.reload > 0)
+				feh_add_unique_timer(cb_reload_timer, w, opt.reload);
+			break;
+		} else {
+			last = l;
+		}
+	}
+	if (!success)
+		show_mini_usage();
+
+	return;
 }
 
-void
-cb_slide_timer(void *data)
+void cb_slide_timer(void *data)
 {
-   D_ENTER(4);
-   slideshow_change_image((winwidget) data, SLIDE_NEXT);
-   D_RETURN_(4);
+	slideshow_change_image((winwidget) data, SLIDE_NEXT, 1);
+	return;
 }
 
-void
-cb_reload_timer(void *data)
+void cb_reload_timer(void *data)
 {
-   winwidget w = (winwidget) data;
-
-   D_ENTER(4);
-   feh_reload_image(w, 0, 0);
-   feh_add_unique_timer(cb_reload_timer, w, opt.reload);
-   D_RETURN_(4);
+	gib_list *l;
+	char *current_filename;
+
+	winwidget w = (winwidget) data;
+
+	/*
+	 * multi-window mode has no concept of a "current file" and
+	 * dynamically adding/removing windows is not implemented at the moment.
+	 * So don't reload filelists in multi-window mode.
+	 */
+	if (current_file != NULL) {
+		/* save the current filename for refinding it in new list */
+		current_filename = estrdup(FEH_FILE(current_file->data)->filename);
+
+		for (l = filelist; l; l = l->next) {
+			feh_file_free(l->data);
+			l->data = NULL;
+		}
+		gib_list_free_and_data(filelist);
+		filelist = NULL;
+		filelist_len = 0;
+		current_file = NULL;
+
+		/* rebuild filelist from original_file_items */
+		if (gib_list_length(original_file_items) > 0)
+			for (l = gib_list_last(original_file_items); l; l = l->prev)
+				add_file_to_filelist_recursively(l->data, FILELIST_FIRST);
+		else if (!opt.filelistfile && !opt.bgmode)
+			add_file_to_filelist_recursively(".", FILELIST_FIRST);
+
+		if (opt.filelistfile) {
+			filelist = gib_list_cat(filelist, feh_read_filelist(opt.filelistfile));
+		}
+
+		if (!(filelist_len = gib_list_length(filelist))) {
+			eprintf("No files found to reload.");
+		}
+
+		feh_prepare_filelist();
+
+		/* find the previously current file */
+		for (l = filelist; l; l = l->next)
+			if (strcmp(FEH_FILE(l->data)->filename, current_filename) == 0) {
+				current_file = l;
+				break;
+			}
+
+		free(current_filename);
+
+		if (!current_file)
+			current_file = filelist;
+		w->file = current_file;
+	}
+
+	feh_reload_image(w, 1, 0);
+	feh_add_unique_timer(cb_reload_timer, w, opt.reload);
+	return;
 }
 
-void
-feh_reload_image(winwidget w, int resize, int force_new)
+void slideshow_change_image(winwidget winwid, int change, int render)
 {
-   char *title, *new_title;
-   int len;
-   Imlib_Image tmp;
-
-   D_ENTER(4);
-
-   if (!w->file) {
-      weprintf("couldn't reload, this image has no file associated with it.");
-      D_RETURN_(4);
-   }
-
-   free(FEH_FILE(w->file->data)->caption);
-   FEH_FILE(w->file->data)->caption = NULL;
-
-   len = strlen(w->name) + sizeof("Reloading: ") + 1;
-   new_title = emalloc(len);
-   snprintf(new_title, len, "Reloading: %s", w->name);
-   title = estrdup(w->name);
-   winwidget_rename(w, new_title);
-
-
-   /* force imlib2 not to cache */
-   if (force_new) {
-     winwidget_free_image(w);
-   }
-
-   /* if the image has changed in dimensions - we gotta resize */
-   if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) {
-     if (force_new) {
-       eprintf("failed to reload image\n");
-     } else {
-       weprintf("Couldn't reload image. Is it still there?");
-     }
-     winwidget_rename(w, title);
-     free(title);
-     free(new_title);
-     D_RETURN_(4);
-   }
-   if (force_new) {
-     w->im = tmp;
-     resize = 1;
-     winwidget_reset_image(w);
-   } else {
-     if ((gib_imlib_image_get_width(w->im) != gib_imlib_image_get_width(tmp)) || (gib_imlib_image_get_height(w->im) != gib_imlib_image_get_height(tmp))) {
-       resize = 1;
-       winwidget_reset_image(w);
-     }
-     winwidget_free_image(w);
-     w->im = tmp;
-   }
-
-   w->mode = MODE_NORMAL;
-   if ((w->im_w != gib_imlib_image_get_width(w->im))
-       || (w->im_h != gib_imlib_image_get_height(w->im)))
-       w->had_resize = 1;
-   if (w->has_rotated)
-   {
-       Imlib_Image temp;
-
-       temp = gib_imlib_create_rotated_image(w->im, 0.0);
-       w->im_w = gib_imlib_image_get_width(temp);
-       w->im_h = gib_imlib_image_get_height(temp);
-       gib_imlib_free_image_and_decache(temp);
-   }
-   else
-   {
-       w->im_w = gib_imlib_image_get_width(w->im);
-       w->im_h = gib_imlib_image_get_height(w->im);
-   }
-   winwidget_render_image(w, resize, 1);
-
-   winwidget_rename(w, title);
-   free(title);
-   free(new_title);
-
-   D_RETURN_(4);
+	gib_list *last = NULL;
+	gib_list *previous_file = current_file;
+	int i = 0;
+	int jmp = 1;
+	/* We can't use filelist_len in the for loop, since that changes when we
+	 * encounter invalid images.
+	 */
+	int our_filelist_len = filelist_len;
+
+	if (opt.slideshow_delay > 0.0)
+		feh_add_timer(cb_slide_timer, winwid, opt.slideshow_delay, "SLIDE_CHANGE");
+
+	/* Without this, clicking a one-image slideshow reloads it. Not very *
+	   intelligent behaviour :-) */
+	if (filelist_len < 2 && opt.on_last_slide != ON_LAST_SLIDE_QUIT)
+		return;
+
+	/* Ok. I do this in such an odd way to ensure that if the last or first *
+	   image is not loadable, it will go through in the right direction to *
+	   find the correct one. Otherwise SLIDE_LAST would try the last file, *
+	   then loop forward to find a loadable one. */
+	if (change == SLIDE_FIRST) {
+		current_file = gib_list_last(filelist);
+		change = SLIDE_NEXT;
+		previous_file = NULL;
+	} else if (change == SLIDE_LAST) {
+		current_file = filelist;
+		change = SLIDE_PREV;
+		previous_file = NULL;
+	}
+
+	/* The for loop prevents us looping infinitely */
+	for (i = 0; i < our_filelist_len; i++) {
+		winwidget_free_image(winwid);
+#ifdef HAVE_LIBEXIF
+		/*
+		 * An EXIF data chunk requires up to 50 kB of space. For large and
+		 * long-running slideshows, this would acculumate gigabytes of
+		 * EXIF data after a few days. We therefore do not cache EXIF data
+		 * in slideshows.
+		 */
+		if (FEH_FILE(winwid->file->data)->ed) {
+			exif_data_unref(FEH_FILE(winwid->file->data)->ed);
+			FEH_FILE(winwid->file->data)->ed = NULL;
+		}
+#endif
+		switch (change) {
+		case SLIDE_NEXT:
+			current_file = feh_list_jump(filelist, current_file, FORWARD, 1);
+			break;
+		case SLIDE_PREV:
+			current_file = feh_list_jump(filelist, current_file, BACK, 1);
+			break;
+		case SLIDE_RAND:
+			if (filelist_len > 1) {
+				current_file = feh_list_jump(filelist, current_file, FORWARD,
+					(random() % (filelist_len - 1)) + 1);
+				change = SLIDE_NEXT;
+			}
+			break;
+		case SLIDE_JUMP_FWD:
+			if (filelist_len < 5)
+				jmp = 1;
+			else if (filelist_len < 40)
+				jmp = 2;
+			else
+				jmp = filelist_len / 20;
+			if (!jmp)
+				jmp = 2;
+			current_file = feh_list_jump(filelist, current_file, FORWARD, jmp);
+			/* important. if the load fails, we only want to step on ONCE to
+			   try the next file, not another jmp */
+			change = SLIDE_NEXT;
+			break;
+		case SLIDE_JUMP_BACK:
+			if (filelist_len < 5)
+				jmp = 1;
+			else if (filelist_len < 40)
+				jmp = 2;
+			else
+				jmp = filelist_len / 20;
+			if (!jmp)
+				jmp = 2;
+			current_file = feh_list_jump(filelist, current_file, BACK, jmp);
+			/* important. if the load fails, we only want to step back ONCE to
+			   try the previous file, not another jmp */
+			change = SLIDE_NEXT;
+			break;
+		case SLIDE_JUMP_NEXT_DIR:
+			{
+				char old_dir[PATH_MAX], new_dir[PATH_MAX];
+				int j;
+
+				feh_file_dirname(old_dir, FEH_FILE(current_file->data), PATH_MAX);
+
+				for (j = 0; j < our_filelist_len; j++) {
+					current_file = feh_list_jump(filelist, current_file, FORWARD, 1);
+					feh_file_dirname(new_dir, FEH_FILE(current_file->data), PATH_MAX);
+					if (strcmp(old_dir, new_dir) != 0)
+						break;
+				}
+			}
+			change = SLIDE_NEXT;
+			break;
+		case SLIDE_JUMP_PREV_DIR:
+			{
+				char old_dir[PATH_MAX], new_dir[PATH_MAX];
+				int j;
+
+				/* Start the search from the previous file in case we are on
+				   the first file of a directory */
+				current_file = feh_list_jump(filelist, current_file, BACK, 1);
+				feh_file_dirname(old_dir, FEH_FILE(current_file->data), PATH_MAX);
+
+				for (j = 0; j < our_filelist_len; j++) {
+					current_file = feh_list_jump(filelist, current_file, BACK, 1);
+					feh_file_dirname(new_dir, FEH_FILE(current_file->data), PATH_MAX);
+					if (strcmp(old_dir, new_dir) != 0)
+						break;
+				}
+
+				/* Next file is the first entry of prev_dir */
+				current_file = feh_list_jump(filelist, current_file, FORWARD, 1);
+			}
+			change = SLIDE_NEXT;
+			break;
+		default:
+			eprintf("BUG!\n");
+			break;
+		}
+
+		if (last) {
+			filelist = feh_file_remove_from_list(filelist, last);
+			last = NULL;
+		}
+
+		if (opt.on_last_slide == ON_LAST_SLIDE_HOLD && previous_file &&
+			((current_file == filelist && change == SLIDE_NEXT) ||
+			(previous_file == filelist && change == SLIDE_PREV))) {
+				current_file = previous_file;
+		}
+
+		if (winwidget_loadimage(winwid, FEH_FILE(current_file->data))) {
+			int w = gib_imlib_image_get_width(winwid->im);
+			int h = gib_imlib_image_get_height(winwid->im);
+			if (feh_should_ignore_image(winwid->im)) {
+				last = current_file;
+				continue;
+			}
+			winwid->mode = MODE_NORMAL;
+			winwid->file = current_file;
+			if ((winwid->im_w != w) || (winwid->im_h != h))
+				winwid->had_resize = 1;
+			winwidget_reset_image(winwid);
+			winwid->im_w = w;
+			winwid->im_h = h;
+			if (render) {
+				winwidget_render_image(winwid, 1, 0);
+			}
+			break;
+		} else
+			last = current_file;
+	}
+	if (last)
+		filelist = feh_file_remove_from_list(filelist, last);
+
+	if (filelist_len == 0)
+		eprintf("No more slides in show");
+
+	return;
 }
 
-
-void
-slideshow_change_image(winwidget winwid, int change)
+void slideshow_pause_toggle(winwidget w)
 {
-   int success = 0;
-   gib_list *last = NULL;
-   int i = 0;
-   int jmp = 1;
-   char *s;
-
-   D_ENTER(4);
-
-   /* Without this, clicking a one-image slideshow reloads it. Not very *
-      intelligent behaviour :-) */
-   if (filelist_len < 2 && opt.cycle_once == 0)
-      D_RETURN_(4);
-
-   /* Ok. I do this in such an odd way to ensure that if the last or first *
-      image is not loadable, it will go through in the right direction to *
-      find the correct one. Otherwise SLIDE_LAST would try the last file, *
-      then loop forward to find a loadable one. */
-   if (change == SLIDE_FIRST)
-   {
-      current_file = gib_list_last(filelist);
-      change = SLIDE_NEXT;
-   }
-   else if (change == SLIDE_LAST)
-   {
-      current_file = filelist;
-      change = SLIDE_PREV;
-   }
-
-   /* The for loop prevents us looping infinitely */
-   for (i = 0; i < filelist_len; i++)
-   {
-      winwidget_free_image(winwid);
-      switch (change)
-      {
-        case SLIDE_NEXT:
-           current_file = feh_list_jump(filelist, current_file, FORWARD, 1);
-           break;
-        case SLIDE_PREV:
-           current_file = feh_list_jump(filelist, current_file, BACK, 1);
-           break;
-        case SLIDE_JUMP_FWD:
-           if (filelist_len < 5)
-              jmp = 1;
-           else if (filelist_len < 40)
-              jmp = 2;
-           else
-              jmp = filelist_len / 20;
-           if (!jmp)
-              jmp = 2;
-           current_file = feh_list_jump(filelist, current_file, FORWARD, jmp);
-           /* important. if the load fails, we only want to step on ONCE to
-              try the next file, not another jmp */
-           change = SLIDE_NEXT;
-           break;
-        case SLIDE_JUMP_BACK:
-           if (filelist_len < 5)
-              jmp = 1;
-           else if (filelist_len < 40)
-              jmp = 2;
-           else
-              jmp = filelist_len / 20;
-           if (!jmp)
-              jmp = 2;
-           current_file = feh_list_jump(filelist, current_file, BACK, jmp);
-           /* important. if the load fails, we only want to step back ONCE to
-              try the previous file, not another jmp */
-           change = SLIDE_NEXT;
-           break;
-        default:
-           eprintf("BUG!\n");
-           break;
-      }
-
-      if (last)
-      {
-         filelist = feh_file_remove_from_list(filelist, last);
-         filelist_len--;
-         last = NULL;
-      }
-      s = slideshow_create_name(FEH_FILE(current_file->data));
-
-      winwidget_rename(winwid, s);
-      free(s);
-
-      if ((winwidget_loadimage(winwid, FEH_FILE(current_file->data))) != 0)
-      {
-         success = 1;
-         winwid->mode = MODE_NORMAL;
-         winwid->file = current_file;
-         if ((winwid->im_w != gib_imlib_image_get_width(winwid->im))
-             || (winwid->im_h != gib_imlib_image_get_height(winwid->im)))
-            winwid->had_resize = 1;
-         winwidget_reset_image(winwid);
-         winwid->im_w = gib_imlib_image_get_width(winwid->im);
-         winwid->im_h = gib_imlib_image_get_height(winwid->im);
-         winwidget_render_image(winwid, 1, 1);
-         break;
-      }
-      else
-         last = current_file;
-   }
-   if (!success)
-   {
-      /* We get here if three files in a row could not be loaded.
-       * However, it seems that this piece of code is never reached when feh
-       * would otherwise fail; it's only executed in the aforementioned case,
-       * causing slideshows to exit although there still are lots of working slides.
-       *
-       * So far, there is one known case were we should exit here:
-       * When viewing a set of files, externally removing all of them and then resizing
-       * the window in feh, feh will print lots of imlib errors and eventually segfault.
-       */
-      weprintf("No more slides in show?");
-   }
-   if (opt.slideshow_delay >= 0.0)
-      feh_add_timer(cb_slide_timer, winwid, opt.slideshow_delay,
-                    "SLIDE_CHANGE");
-   D_RETURN_(4);
-}
+	if (!opt.paused) {
+		opt.paused = 1;
+	} else {
+		opt.paused = 0;
+	}
 
-void
-slideshow_pause_toggle(winwidget w)
-{
-   char *title, *new_title;
-   int len;
-
-   if (!opt.paused)
-   {
-      opt.paused = 1;
-
-      len = strlen(w->name) + sizeof(" [Paused]") + 1;
-      new_title = emalloc(len);
-      snprintf(new_title, len, "%s [Paused]", w->name);
-      title = estrdup(w->name);
-      winwidget_rename(w, new_title);
-   }
-   else
-   {
-      opt.paused = 0;
-   }
+	winwidget_rename(w, NULL);
 }
 
-char *
-slideshow_create_name(feh_file * file)
+void feh_action_run(feh_file * file, char *action, winwidget winwid)
 {
-   char *s = NULL;
-   int len = 0;
-
-   D_ENTER(4);
-   if (!opt.title)
-   {
-      len =
-         strlen(PACKAGE " [slideshow mode] - ") + strlen(file->filename) + 1;
-      s = emalloc(len);
-      snprintf(s, len, PACKAGE " [%d of %d] - %s",
-               gib_list_num(filelist, current_file) + 1,
-               gib_list_length(filelist), file->filename);
-   }
-   else
-   {
-      s = estrdup(feh_printf(opt.title, file));
-   }
-
-   D_RETURN(4, s);
+	if (action) {
+		char *sys;
+		D(("Running action %s\n", action));
+		sys = feh_printf(action, file, winwid);
+
+		if (opt.verbose && !opt.list && !opt.customlist)
+			fprintf(stderr, "Running action -->%s<--\n", sys);
+		if (system(sys) == -1)
+			perror("running action via system() failed");
+	}
+	return;
 }
 
-void
-feh_action_run(feh_file * file, char *action)
+char *format_size(double size)
 {
-  D_ENTER(4);
-  if (action)
-  {
-    char *sys;
-    D(3, ("Running action %s\n", action));
-    sys = feh_printf(action, file);
-
-    if (opt.verbose && !opt.list && !opt.customlist)
-       fprintf(stderr, "Running action -->%s<--\n", sys);
-    system(sys);
-  }
-  D_RETURN_(4);
+	static char ret[5];
+	char units[] = {' ', 'k', 'M', 'G', 'T'};
+	unsigned char postfix = 0;
+	while (size >= 1000) {
+		size /= 1000;
+		postfix++;
+	}
+	snprintf(ret, 5, "%3.0f%c", size, units[postfix]);
+	return ret;
 }
 
-char *
-feh_printf(char *str, feh_file * file)
+char *feh_printf(char *str, feh_file * file, winwidget winwid)
 {
-   char *c;
-   char buf[20];
-   static char ret[4096];
-
-   D_ENTER(4);
-
-   ret[0] = '\0';
-
-   for (c = str; *c != '\0'; c++)
-   {
-      if (*c == '%')
-      {
-         c++;
-         switch (*c)
-         {
-           case 'f':
-              if (file)
-                 strcat(ret, file->filename);
-              break;
-           case 'n':
-              if (file)
-                 strcat(ret, file->name);
-              break;
-           case 'w':
-              if (file)
-              {
-                 if (!file->info)
-                    feh_file_info_load(file, NULL);
-                 snprintf(buf, sizeof(buf), "%d", file->info->width);
-                 strcat(ret, buf);
-              }
-              break;
-           case 'h':
-              if (file)
-              {
-                 if (!file->info)
-                    feh_file_info_load(file, NULL);
-                 snprintf(buf, sizeof(buf), "%d", file->info->height);
-                 strcat(ret, buf);
-              }
-              break;
-           case 's':
-              if (file)
-              {
-                 if (!file->info)
-                    feh_file_info_load(file, NULL);
-                 snprintf(buf, sizeof(buf), "%d", file->info->size);
-                 strcat(ret, buf);
-              }
-              break;
-           case 'p':
-              if (file)
-              {
-                 if (!file->info)
-                    feh_file_info_load(file, NULL);
-                 snprintf(buf, sizeof(buf), "%d", file->info->pixels);
-                 strcat(ret, buf);
-              }
-              break;
-           case 't':
-              if (file)
-              {
-                 if (!file->info)
-                    feh_file_info_load(file, NULL);
-                 strcat(ret, file->info->format);
-              }
-              break;
-           case 'P':
-              strcat(ret, PACKAGE);
-              break;
-           case 'v':
-              strcat(ret, VERSION);
-              break;
-           case 'm':
-              strcat(ret, mode);
-              break;
-           case 'l':
-              snprintf(buf, sizeof(buf), "%d", gib_list_length(filelist));
-              strcat(ret, buf);
-              break;
-           case 'u':
-              snprintf(buf, sizeof(buf), "%d",
-                       current_file != NULL ? gib_list_num(filelist,
-                                                           current_file) +
-                       1 : 0);
-              strcat(ret, buf);
-              break;
-           default:
-              strncat(ret, c, 1);
-              break;
-         }
-      }
-      else if (*c == '\\')
-      {
-         c++;
-         switch (*c)
-         {
-           case 'n':
-              strcat(ret, "\n");
-              break;
-           default:
-              strncat(ret, c, 1);
-              break;
-         }
-      }
-      else
-         strncat(ret, c, 1);
-   }
-   D_RETURN(4, ret);
+	char *c;
+	char buf[20];
+	static char ret[4096];
+	char *filelist_tmppath;
+
+	ret[0] = '\0';
+	filelist_tmppath = NULL;
+	gib_list *f;
+
+	for (c = str; *c != '\0'; c++) {
+		if ((*c == '%') && (*(c+1) != '\0')) {
+			c++;
+			switch (*c) {
+			case 'a':
+				if (opt.paused == 1) {
+				   strncat(ret, "paused", sizeof(ret) - strlen(ret) - 1);
+				}
+				else {
+				   strncat(ret, "playing", sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'f':
+				if (file)
+					strncat(ret, file->filename, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'F':
+				if (file)
+					strncat(ret, shell_escape(file->filename), sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'g':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%d,%d", winwid->w, winwid->h);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'h':
+				if (file && (file->info || !feh_file_info_load(file, NULL))) {
+					snprintf(buf, sizeof(buf), "%d", file->info->height);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'l':
+				snprintf(buf, sizeof(buf), "%d", gib_list_length(filelist));
+				strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'L':
+				if (filelist_tmppath != NULL) {
+					strncat(ret, filelist_tmppath, sizeof(ret) - strlen(ret) - 1);
+				} else {
+					filelist_tmppath = feh_unique_filename("/tmp/","filelist");
+					feh_write_filelist(filelist, filelist_tmppath);
+					strncat(ret, filelist_tmppath, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'm':
+				strncat(ret, mode, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'n':
+				if (file)
+					strncat(ret, file->name, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'N':
+				if (file)
+					strncat(ret, shell_escape(file->name), sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'o':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%d,%d", winwid->im_x,
+						winwid->im_y);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'p':
+				if (file && (file->info || !feh_file_info_load(file, NULL))) {
+					snprintf(buf, sizeof(buf), "%d", file->info->pixels);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'P':
+				if (file && (file->info || !feh_file_info_load(file, NULL))) {
+					strncat(ret, format_size(file->info->pixels), sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'r':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%.1f", winwid->im_angle);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 's':
+				if (file && (file->size >= 0 || !feh_file_stat(file))) {
+					snprintf(buf, sizeof(buf), "%d", file->size);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'S':
+				if (file && (file->size >= 0 || !feh_file_stat(file))) {
+					strncat(ret, format_size(file->size), sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 't':
+				if (file && (file->info || !feh_file_info_load(file, NULL))) {
+					strncat(ret, file->info->format, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'u':
+				f = current_file ? current_file : gib_list_find_by_data(filelist, file);
+				snprintf(buf, sizeof(buf), "%d", f ? gib_list_num(filelist, f) + 1 : 0);
+				strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'v':
+				strncat(ret, VERSION, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'V':
+				snprintf(buf, sizeof(buf), "%d", getpid());
+				strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				break;
+			case 'w':
+				if (file && (file->info || !feh_file_info_load(file, NULL))) {
+					snprintf(buf, sizeof(buf), "%d", file->info->width);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'W':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%dx%d+%d+%d", winwid->w, winwid->h, winwid->x, winwid->y);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'z':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%.2f", winwid->zoom);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				} else {
+					strncat(ret, "1.00", sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case 'Z':
+				if (winwid) {
+					snprintf(buf, sizeof(buf), "%f", winwid->zoom);
+					strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
+			case '%':
+				strncat(ret, "%", sizeof(ret) - strlen(ret) - 1);
+				break;
+			default:
+				weprintf("Unrecognized format specifier %%%c", *c);
+				if ((strlen(ret) + 3) < sizeof(ret))
+					strncat(ret, c - 1, 2);
+				break;
+			}
+		} else if ((*c == '\\') && (*(c+1) != '\0') && ((strlen(ret) + 3) < sizeof(ret))) {
+			c++;
+			switch (*c) {
+			case 'n':
+				strcat(ret, "\n");
+				break;
+			default:
+				strncat(ret, c - 1, 2);
+				break;
+			}
+		} else if ((strlen(ret) + 2) < sizeof(ret))
+			strncat(ret, c, 1);
+	}
+	if (filelist_tmppath != NULL)
+		free(filelist_tmppath);
+	return(ret);
 }
 
-void
-feh_filelist_image_remove(winwidget winwid, char do_delete)
+void feh_filelist_image_remove(winwidget winwid, char do_delete)
 {
-   if (winwid->type == WIN_TYPE_SLIDESHOW)
-   {
-      char *s;
-      gib_list *doomed;
-
-      doomed = current_file;
-      slideshow_change_image(winwid, SLIDE_NEXT);
-      filelist_len--;
-      if (do_delete)
-         filelist = feh_file_rm_and_free(filelist, doomed);
-      else
-         filelist = feh_file_remove_from_list(filelist, doomed);
-      if (!filelist)
-      {
-         /* No more images. Game over ;-) */
-         winwidget_destroy(winwid);
-         return;
-      }
-      s = slideshow_create_name(FEH_FILE(winwid->file->data));
-      winwidget_rename(winwid, s);
-      free(s);
-   }
-   else if ((winwid->type == WIN_TYPE_SINGLE)
-            || (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER))
-   {
-      filelist_len--;
-      if (do_delete)
-         filelist = feh_file_rm_and_free(filelist, winwid->file);
-      else
-         filelist = feh_file_remove_from_list(filelist, winwid->file);
-      winwidget_destroy(winwid);
-   }
+	if (winwid->type == WIN_TYPE_SLIDESHOW) {
+		gib_list *doomed;
+
+		doomed = current_file;
+		/*
+		 * work around feh_list_jump exiting if ON_LAST_SLIDE_QUIT is set
+		 * and no further files are left (we need to delete first)
+		 */
+		if (opt.on_last_slide == ON_LAST_SLIDE_QUIT && ! doomed->next && do_delete) {
+			feh_file_rm_and_free(filelist, doomed);
+			exit(0);
+		}
+		if (doomed->next) {
+			slideshow_change_image(winwid, SLIDE_NEXT, 0);
+		}
+		else {
+			slideshow_change_image(winwid, SLIDE_PREV, 0);
+		}
+		if (do_delete)
+			filelist = feh_file_rm_and_free(filelist, doomed);
+		else
+			filelist = feh_file_remove_from_list(filelist, doomed);
+		if (!filelist) {
+			/* No more images. Game over ;-) */
+			winwidget_destroy(winwid);
+			return;
+		}
+		winwidget_render_image(winwid, 1, 0);
+	} else if ((winwid->type == WIN_TYPE_SINGLE)
+		   || (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)) {
+		if (do_delete)
+			filelist = feh_file_rm_and_free(filelist, winwid->file);
+		else
+			filelist = feh_file_remove_from_list(filelist, winwid->file);
+		winwid->file = NULL;
+		winwidget_destroy(winwid);
+	}
 }
 
 void slideshow_save_image(winwidget win)
 {
-   char *tmpname;
-
-   D_ENTER(4);
-   if(win->file) {
-     tmpname = feh_unique_filename("", FEH_FILE(win->file->data)->name);
-   } else if(mode) {
-     char *tmp;
-     tmp = estrjoin(".", mode, "png", NULL);
-     tmpname = feh_unique_filename("", tmp);
-     free(tmp);
-   } else {
-     tmpname = feh_unique_filename("", "noname.png");
-   }
-
-   if(!opt.quiet)
-      printf("saving image to filename '%s'\n", tmpname);
-
-   gib_imlib_save_image(win->im, tmpname);
-   free(tmpname);
-   D_RETURN_(4);
+	char *tmpname;
+	Imlib_Load_Error err;
+	char *base_dir = "";
+	if (opt.output_dir) {
+		base_dir = estrjoin("", opt.output_dir, "/", NULL);
+	}
+
+	if (win->file) {
+		tmpname = feh_unique_filename(base_dir, FEH_FILE(win->file->data)->name);
+	} else if (mode) {
+		char *tmp;
+		tmp = estrjoin(".", mode, "png", NULL);
+		tmpname = feh_unique_filename(base_dir, tmp);
+		free(tmp);
+	} else {
+		tmpname = feh_unique_filename(base_dir, "noname.png");
+	}
+
+	if (opt.output_dir) {
+		free(base_dir);
+	}
+
+	if (opt.verbose)
+		fprintf(stderr, "saving image to filename '%s'\n", tmpname);
+
+	gib_imlib_save_image_with_error_return(win->im, tmpname, &err);
+
+	if (err)
+		feh_print_load_error(tmpname, win, err, LOAD_ERROR_IMLIB);
+
+	free(tmpname);
+	return;
 }
 
-gib_list *
-feh_list_jump(gib_list * root, gib_list * l, int direction, int num)
+gib_list *feh_list_jump(gib_list * root, gib_list * l, int direction, int num)
 {
-   int i;
-   gib_list *ret = NULL;
-
-   if (!root)
-      return (NULL);
-   if (!l)
-      return (root);
-
-   ret = l;
-
-   for (i = 0; i < num; i++)
-   {
-      if (direction == FORWARD)
-      {
-         if (ret->next)
-         {
-            ret = ret->next;
-         }
-         else
-         {
-            if (opt.cycle_once)
-            {
-              exit(0);
-            }
-            ret = root;
-         }
-      }
-      else
-      {
-         if (ret->prev)
-            ret = ret->prev;
-         else
-            ret = gib_list_last(ret);
-      }
-   }
-   return (ret);
+	int i;
+	gib_list *ret = NULL;
+
+	if (!root)
+		return (NULL);
+	if (!l)
+		return (root);
+
+	ret = l;
+
+	for (i = 0; i < num; i++) {
+		if (direction == FORWARD) {
+			if (ret->next) {
+				ret = ret->next;
+			} else {
+				if (opt.on_last_slide == ON_LAST_SLIDE_QUIT) {
+					exit(0);
+				}
+				if (opt.randomize) {
+					/* Randomize the filename order */
+					filelist = gib_list_randomize(filelist);
+					ret = filelist;
+				} else {
+					ret = root;
+				}
+			}
+		} else {
+			if (ret->prev)
+				ret = ret->prev;
+			else
+				ret = gib_list_last(ret);
+		}
+	}
+	return (ret);
 }
-
diff --git a/src/stamp-h.in b/src/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/src/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/src/structs.h b/src/structs.h
index a2d3527..8438930 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,7 @@
 /* structs.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -33,5 +34,7 @@ typedef struct __feh_file_info feh_file_info;
 typedef struct __winwidget _winwidget;
 typedef _winwidget *winwidget;
 typedef struct __fehoptions fehoptions;
+typedef struct __fehkey fehkey;
+typedef struct __fehkb fehkb;
 
 #endif
diff --git a/src/strverscmp.c b/src/strverscmp.c
new file mode 100644
index 0000000..ddc6b6d
--- /dev/null
+++ b/src/strverscmp.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2005-2020 Rich Felker, et al.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <string.h>
+
+int strverscmp(const char *l0, const char *r0)
+{
+	const unsigned char *l = (const void *)l0;
+	const unsigned char *r = (const void *)r0;
+	size_t i, dp, j;
+	int z = 1;
+
+	/* Find maximal matching prefix and track its maximal digit
+	 * suffix and whether those digits are all zeros. */
+	for (dp=i=0; l[i]==r[i]; i++) {
+		int c = l[i];
+		if (!c) return 0;
+		if (!isdigit(c)) dp=i+1, z=1;
+		else if (c!='0') z=0;
+	}
+
+	if (l[dp]-'1'<9U && r[dp]-'1'<9U) {
+		/* If we're looking at non-degenerate digit sequences starting
+		 * with nonzero digits, longest digit string is greater. */
+		for (j=i; isdigit(l[j]); j++)
+			if (!isdigit(r[j])) return 1;
+		if (isdigit(r[j])) return -1;
+	} else if (z && dp<i && (isdigit(l[i]) || isdigit(r[i]))) {
+		/* Otherwise, if common prefix of digit sequence is
+		 * all zeros, digits order less than non-digits. */
+		return (unsigned char)(l[i]-'0') - (unsigned char)(r[i]-'0');
+	}
+
+	return l[i] - r[i];
+}
diff --git a/src/support.c b/src/support.c
deleted file mode 100644
index ee214cf..0000000
--- a/src/support.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/* support.c
-
-Copyright (C) 1999-2003 Tom Gilbert.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its documentation and acknowledgment shall be
-given in the documentation and software packages that this Software was
-used.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include "feh.h"
-#include "filelist.h"
-#include "options.h"
-#include "support.h"
-#include <limits.h>
-Window ipc_win = None;
-Window my_ipc_win = None;
-Atom ipc_atom = None;
-static unsigned char timeout = 0;
-
-/*
- * This is a boolean indicating
- * That while we seem to see E16 IPC
- * it's actually E17 faking it
- * -- richlowe 2005-06-22
- */
-static char e17_fake_ipc = 0;
-
-void
-feh_wm_set_bg_file(char *file, unsigned char bgmode)
-{
-   Imlib_Image im;
-   feh_file *fil;
-
-   fil = feh_file_new(file);
-   if (fil)
-   {
-      if (feh_load_image(&im, fil) == 0)
-         eprintf("Couldn't load image in order to set bg");
-      switch (bgmode)
-      {
-        case BG_MODE_SEAMLESS:
-           gib_imlib_image_tile(im);
-           feh_wm_set_bg(NULL, im, 0, 0, 0, 1);
-           break;
-        case BG_MODE_TILE:
-           feh_wm_set_bg(file, im, 0, 0, 0, 1);
-           break;
-        case BG_MODE_SCALE:
-           feh_wm_set_bg(file, im, 0, 1, 0, 1);
-           break;
-        default:
-           feh_wm_set_bg(file, im, 1, 0, 0, 1);
-           break;
-      }
-      gib_imlib_free_image_and_decache(im);
-      feh_file_free(fil);
-   }
-}
-
-void
-feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
-              int desktop, int set)
-{
-   char bgname[20];
-   int num = (int) rand();
-   char bgfil[4096];
-   char sendbuf[4096];
-
-   D_ENTER(4);
-
-   snprintf(bgname, sizeof(bgname), "FEHBG_%d", num);
-
-   if (!fil)
-   {
-      snprintf(bgfil, sizeof(bgfil), "%s/.%s.png", getenv("HOME"), bgname);
-      imlib_context_set_image(im);
-      imlib_image_set_format("png");
-      gib_imlib_save_image(im, bgfil);
-      D(3, ("bg saved as %s\n", bgfil));
-      fil = bgfil;
-   }
-   D(3, ("Setting bg %s\n", fil));
-
-   if (feh_wm_get_wm_is_e() && (enl_ipc_get_win() != None))
-   {
-      snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file %s", bgname,
-               fil);
-      enl_ipc_send(sendbuf);
-
-      if (scaled)
-      {
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.solid 0 0 0",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 0",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xjust 512",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yjust 512",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xperc 1024",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yperc 1024",
-                  bgname);
-         enl_ipc_send(sendbuf);
-      }
-      else if (centered)
-      {
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.solid 0 0 0",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 0",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xjust 512",
-                  bgname);
-         enl_ipc_send(sendbuf);
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yjust 512",
-                  bgname);
-         enl_ipc_send(sendbuf);
-      }
-      else
-      {
-         snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 1",
-                  bgname);
-         enl_ipc_send(sendbuf);
-      }
-
-      if (set)
-      {
-         snprintf(sendbuf, sizeof(sendbuf), "use_bg %s %d", bgname, desktop);
-         enl_ipc_send(sendbuf);
-      }
-      enl_ipc_sync();
-   }
-   else
-   {
-      Atom prop_root, prop_esetroot, type;
-      int format;
-      unsigned long length, after;
-      unsigned char *data_root, *data_esetroot;
-      Pixmap pmap_d1, pmap_d2;
-      /* string for sticking in ~/.fehbg */
-      char *fehbg = NULL;
-      char *home;
-      char filbuf[PATH_MAX];
-
-      /* local display to set closedownmode on */
-      Display *disp2;
-      Window root2;
-      int depth2;
-      XGCValues gcvalues;
-      GC gc;
-      int in, out, w, h;
-
-      D(3, ("Falling back to XSetRootWindowPixmap\n"));
-      
-      /* Put the filename in filbuf between ' and escape ' in the filename */
-      out = 0;
-      filbuf[out++] = '\'';
-      for (in = 0; fil[in] && out < (PATH_MAX-4); in++) {
-         if (fil[in] == '\'') {
-            filbuf[out++] = '\\';
-         }
-         filbuf[out++] = fil[in];
-      }
-      filbuf[out++] = '\'';
-      filbuf[out++] = 0;
-      
-      if (scaled) {
-         w = scr->width;
-         h = scr->height;
-
-/* disable xinerama check for setting background */
-#if 0
-/* #ifdef HAVE_LIBXINERAMA */
-         if (opt.xinerama && xinerama_screens) {
-           w = xinerama_screens[xinerama_screen].width;
-           h = xinerama_screens[xinerama_screen].height;
-         }
-#endif /* HAVE_LIBXINERAMA */
-
-         pmap_d1 = XCreatePixmap(disp, root, w, h, depth);
-         gib_imlib_render_image_on_drawable_at_size(pmap_d1, im, 0, 0, w, h,
-                                                    1, 0, 1);
-         fehbg = estrjoin(" ", "feh --bg-scale", filbuf, NULL);
-      } else if (centered) {
-         XGCValues gcval;
-         GC gc;
-         int x, y;
-
-         D(3, ("centering\n"));
-         w = scr->width;
-         h = scr->height;
-
-/* disable xinerama check for setting background */
-#if 0
-/* #ifdef HAVE_LIBXINERAMA */
-         if (opt.xinerama && xinerama_screens) {
-           w = xinerama_screens[xinerama_screen].width;
-           h = xinerama_screens[xinerama_screen].height;
-         }
-#endif /* HAVE_LIBXINERAMA */
-
-         pmap_d1 = XCreatePixmap(disp, root, w, h, depth);
-         gcval.foreground = BlackPixel(disp, DefaultScreen(disp));
-         gc = XCreateGC(disp, root, GCForeground, &gcval);
-         XFillRectangle(disp, pmap_d1, gc, 0, 0, w, h);
-         x = (w - gib_imlib_image_get_width(im)) >> 1;
-         y = (h - gib_imlib_image_get_height(im)) >> 1;
-         gib_imlib_render_image_on_drawable(pmap_d1, im, x, y, 1, 0, 0);
-         XFreeGC(disp, gc);
-         fehbg = estrjoin(" ", "feh --bg-center", filbuf, NULL);
-      } else {
-         w = gib_imlib_image_get_width(im);
-         h = gib_imlib_image_get_height(im);
-         pmap_d1 =
-            XCreatePixmap(disp, root, w, h, depth);
-         gib_imlib_render_image_on_drawable(pmap_d1, im, 0, 0, 1, 0, 0);
-         fehbg = estrjoin(" ", "feh --bg-tile", filbuf, NULL);
-      }
-
-      if (fehbg) {
-        home = getenv("HOME");
-        if(home) {
-          FILE *fp;
-          char *path;
-          path = estrjoin("/", home, ".fehbg", NULL);
-          if ((fp = fopen(path, "w")) == NULL) {
-	     weprintf("Can't open %s for write", path);
-          } else {
-             fprintf(fp, "%s\n", fehbg);
-             fclose(fp);
-          }
-          free(path);
-        }
-        free(fehbg);
-      }
-      
-      /* create new display, copy pixmap to new display */
-      disp2 = XOpenDisplay(NULL);
-      if (!disp2)
-         eprintf("Can't reopen X display.");
-      root2 = RootWindow(disp2, DefaultScreen(disp2));
-      depth2 = DefaultDepth(disp2, DefaultScreen(disp2));
-      XSync(disp, False);
-      pmap_d2 = XCreatePixmap(disp2, root2, scr->width, scr->height, depth2);
-      gcvalues.fill_style = FillTiled;
-      gcvalues.tile = pmap_d1;
-      gc = XCreateGC(disp2, pmap_d2, GCFillStyle|GCTile, &gcvalues);
-      XFillRectangle(disp2, pmap_d2, gc, 0, 0, scr->width, scr->height);
-      XFreeGC(disp2, gc);
-      XSync(disp2, False);
-      XSync(disp, False);
-      XFreePixmap(disp, pmap_d1);
-      
-      prop_root = XInternAtom(disp2, "_XROOTPMAP_ID", True);
-      prop_esetroot = XInternAtom(disp2, "ESETROOT_PMAP_ID", True);
-
-      if (prop_root != None && prop_esetroot != None)
-      {
-         XGetWindowProperty(disp2, root2, prop_root, 0L, 1L, False,
-                            AnyPropertyType, &type, &format, &length, &after,
-                            &data_root);
-         if (type == XA_PIXMAP)
-         {
-            XGetWindowProperty(disp2, root2, prop_esetroot, 0L, 1L, False,
-                               AnyPropertyType, &type, &format, &length,
-                               &after, &data_esetroot);
-            if (data_root && data_esetroot)
-            {
-               if (type == XA_PIXMAP
-                   && *((Pixmap *) data_root) == *((Pixmap *) data_esetroot))
-               {
-                  XKillClient(disp2, *((Pixmap *) data_root));
-               }
-            }
-         }
-      }
-      /* This will locate the property, creating it if it doesn't exist */
-      prop_root = XInternAtom(disp2, "_XROOTPMAP_ID", False);
-      prop_esetroot = XInternAtom(disp2, "ESETROOT_PMAP_ID", False);
-
-      if (prop_root == None || prop_esetroot == None)
-         weprintf("creation of pixmap property failed.");
-
-      XChangeProperty(disp2, root2, prop_root, XA_PIXMAP, 32, PropModeReplace,
-                      (unsigned char *) &pmap_d2, 1);
-      XChangeProperty(disp2, root2, prop_esetroot, XA_PIXMAP, 32,
-                      PropModeReplace, (unsigned char *) &pmap_d2, 1);
-
-      XSetWindowBackgroundPixmap(disp2, root2, pmap_d2);
-      XClearWindow(disp2, root2);
-      XFlush(disp2);
-      XSetCloseDownMode(disp2, RetainPermanent);
-      XCloseDisplay(disp2);
-   }
-   D_RETURN_(4);
-}
-
-signed char
-feh_wm_get_wm_is_e(void)
-{
-   static signed char e = -1;
-
-   D_ENTER(4);
-
-   /* check if E is actually running */
-   if (e == -1)
-   {
-      /* XXX: This only covers E17 prior to 6/22/05 */
-      if ((XInternAtom(disp, "ENLIGHTENMENT_COMMS", True) != None) &&
-          (XInternAtom(disp, "ENLIGHTENMENT_VERSION", True) != None))
-      {
-         D(3, ("Enlightenment detected.\n"));
-         e = 1;
-      }
-      else
-      {
-         D(3, ("Enlightenment not detected.\n"));
-         e = 0;
-      }
-   }
-   D_RETURN(4, e);
-}
-
-int
-feh_wm_get_num_desks(void)
-{
-   char *buf, *ptr;
-   int desks;
-
-   D_ENTER(4);
-
-   if (!feh_wm_get_wm_is_e())
-      D_RETURN(4, -1);
-
-   buf = enl_send_and_wait("num_desks ?");
-   if (buf == IPC_FAKE)         /* Fake E17 IPC */
-       D_RETURN(4, -1);
-   D(3, ("Got from E IPC: %s\n", buf));
-   ptr = buf;
-   while (ptr && !isdigit(*ptr))
-      ptr++;
-   desks = atoi(ptr);
-
-D_RETURN(4, desks)}
-
-Window
-enl_ipc_get_win(void)
-{
-
-   unsigned char *str = NULL;
-   Atom prop, prop2, ever;
-   unsigned long num, after;
-   int format;
-   Window dummy_win;
-   int dummy_int;
-   unsigned int dummy_uint;
-
-   D_ENTER(4);
-
-   D(3, ("Searching for IPC window.\n"));
-
-   /*
-    * Shortcircuit this entire func
-    * if we already know it's an e17 fake
-    */
-   if (e17_fake_ipc)
-     D_RETURN(4, ipc_win)
-   
-   prop = XInternAtom(disp, "ENLIGHTENMENT_COMMS", True);
-   if (prop == None)
-   {
-      D(3, ("Enlightenment is not running.\n"));
-      D_RETURN(4, None);
-   } else {
-     /* XXX: This will only work with E17 prior to 6/22/2005 */
-     ever = XInternAtom(disp, "ENLIGHTENMENT_VERSION", True);
-     if (ever == None) {
-       /* This is an E without ENLIGHTENMENT_VERSION */
-       D(3, ("E16 IPC Protocol not supported"));
-       D_RETURN(4, None);
-     }
-   }
-   XGetWindowProperty(disp, root, prop, 0, 14, False, AnyPropertyType, &prop2,
-                      &format, &num, &after, &str);
-   if (str)
-   {
-      sscanf((char *) str, "%*s %x", (unsigned int *) &ipc_win);
-      XFree(str);
-   }
-   if (ipc_win != None)
-   {
-      if (!XGetGeometry
-          (disp, ipc_win, &dummy_win, &dummy_int, &dummy_int, &dummy_uint,
-           &dummy_uint, &dummy_uint, &dummy_uint))
-      {
-         D(3,
-           (" -> IPC Window property is valid, but the window doesn't exist.\n"));
-         ipc_win = None;
-      }
-      str = NULL;
-      if (ipc_win != None)
-      {
-         XGetWindowProperty(disp, ipc_win, prop, 0, 14, False,
-                            AnyPropertyType, &prop2, &format, &num, &after,
-                            &str);
-         if (str)
-         {
-            XFree(str);
-         }
-         else
-         {
-            D(3,
-              (" -> IPC Window lacks the proper atom.  I can't talk to fake IPC windows....\n"));
-            ipc_win = None;
-         }
-      }
-   }
-   if (ipc_win != None)
-   {
-
-      XGetWindowProperty(disp, ipc_win, ever, 0, 14, False, AnyPropertyType,
-                        &prop2, &format, &num, &after, &str);
-      if (str) {
-        /*
-         * This is E17's way of telling us it's only pretending
-         * as a workaround for a bug related to the way java handles
-         * Window Managers.
-         * (Only valid after date of this comment)
-         * -- richlowe 2005-06-22
-         */
-        XFree(str);
-        D(3,(" -> Found a fake E17 IPC window, ignoring"));
-        ipc_win = None;
-        e17_fake_ipc = 1;
-        D_RETURN(4, ipc_win);
-      }
-       
-      D(3,
-        (" -> IPC Window found and verified as 0x%08x.  Registering feh as an IPC client.\n",
-         (int) ipc_win));
-      XSelectInput(disp, ipc_win,
-                   StructureNotifyMask | SubstructureNotifyMask);
-      enl_ipc_send("set clientname " PACKAGE);
-      enl_ipc_send("set version " VERSION);
-      enl_ipc_send("set email tom@linuxbrit.co.uk");
-      enl_ipc_send("set web http://www.linuxbrit.co.uk");
-      enl_ipc_send("set info Feh - be pr0n or be dead");
-   }
-   if (my_ipc_win == None)
-   {
-      my_ipc_win = XCreateSimpleWindow(disp, root, -2, -2, 1, 1, 0, 0, 0);
-   }
-   D_RETURN(4, ipc_win);
-}
-
-void
-enl_ipc_send(char *str)
-{
-
-   static char *last_msg = NULL;
-   char buff[21];
-   register unsigned short i;
-   register unsigned char j;
-   unsigned short len;
-   XEvent ev;
-
-   D_ENTER(4);
-   if (str == NULL)
-   {
-      if (last_msg == NULL)
-         eprintf("eeek");
-      str = last_msg;
-      D(4, ("Resending last message \"%s\" to Enlightenment.\n", str));
-   }
-   else
-   {
-      if (last_msg != NULL)
-      {
-         free(last_msg);
-      }
-      last_msg = estrdup(str);
-      D(4, ("Sending \"%s\" to Enlightenment.\n", str));
-   }
-   if (ipc_win == None)
-   {
-      if ((ipc_win = enl_ipc_get_win()) == None)
-      {
-         D(3,
-           ("Hrm. Enlightenment doesn't seem to be running. No IPC window, no IPC.\n"));
-         D_RETURN_(4);
-      }
-   }
-   len = strlen(str);
-   ipc_atom = XInternAtom(disp, "ENL_MSG", False);
-   if (ipc_atom == None)
-   {
-      D(3, ("IPC error:  Unable to find/create ENL_MSG atom.\n"));
-      D_RETURN_(4);
-   }
-   for (; XCheckTypedWindowEvent(disp, my_ipc_win, ClientMessage, &ev););	/* Discard any out-of-sync messages */
-   ev.xclient.type = ClientMessage;
-   ev.xclient.serial = 0;
-   ev.xclient.send_event = True;
-   ev.xclient.window = ipc_win;
-   ev.xclient.message_type = ipc_atom;
-   ev.xclient.format = 8;
-
-   for (i = 0; i < len + 1; i += 12)
-   {
-      sprintf(buff, "%8x", (int) my_ipc_win);
-      for (j = 0; j < 12; j++)
-      {
-         buff[8 + j] = str[i + j];
-         if (!str[i + j])
-         {
-            break;
-         }
-      }
-      buff[20] = 0;
-      for (j = 0; j < 20; j++)
-      {
-         ev.xclient.data.b[j] = buff[j];
-      }
-      XSendEvent(disp, ipc_win, False, 0, (XEvent *) & ev);
-   }
-   D_RETURN_(4);
-}
-
-static sighandler_t *
-enl_ipc_timeout(int sig)
-{
-   timeout = 1;
-   D_RETURN(4, (sighandler_t *) sig);
-   sig = 0;
-}
-
-char *
-enl_wait_for_reply(void)
-{
-
-   XEvent ev;
-   static char msg_buffer[20];
-   register unsigned char i;
-
-   D_ENTER(4);
-
-   alarm(2);
-   for (;
-        !XCheckTypedWindowEvent(disp, my_ipc_win, ClientMessage, &ev)
-        && !timeout;);
-   alarm(0);
-   if (ev.xany.type != ClientMessage)
-   {
-      D_RETURN(4, IPC_TIMEOUT);
-   }
-   for (i = 0; i < 20; i++)
-   {
-      msg_buffer[i] = ev.xclient.data.b[i];
-   }
-   D_RETURN(4, msg_buffer + 8);
-}
-
-char *
-enl_ipc_get(const char *msg_data)
-{
-
-   static char *message = NULL;
-   static unsigned short len = 0;
-   char buff[13], *ret_msg = NULL;
-   register unsigned char i;
-   unsigned char blen;
-
-   D_ENTER(4);
-
-   if (msg_data == IPC_TIMEOUT)
-   {
-      D_RETURN(4, IPC_TIMEOUT);
-   }
-   for (i = 0; i < 12; i++)
-   {
-      buff[i] = msg_data[i];
-   }
-   buff[12] = 0;
-   blen = strlen(buff);
-   if (message != NULL)
-   {
-      len += blen;
-      message = (char *) erealloc(message, len + 1);
-      strcat(message, buff);
-   }
-   else
-   {
-      len = blen;
-      message = (char *) emalloc(len + 1);
-      strcpy(message, buff);
-   }
-   if (blen < 12)
-   {
-      ret_msg = message;
-      message = NULL;
-      D(4, ("Received complete reply:  \"%s\"\n", ret_msg));
-   }
-   D_RETURN(4, ret_msg);
-}
-
-char *
-enl_send_and_wait(char *msg)
-{
-   char *reply = IPC_TIMEOUT;
-   sighandler_t old_alrm;
-
-   D_ENTER(4);
-
-   /*
-    * Shortcut this func and return IPC_FAKE
-    * If the IPC Window is the E17 fake
-    */
-   if (e17_fake_ipc)
-     return IPC_FAKE;
-   
-   if (ipc_win == None)
-   {
-      /* The IPC window is missing.  Wait for it to return or feh to be killed. */
-      /* Only called once in the E17 case */
-      for (; enl_ipc_get_win() == None;)
-      {
-         if (e17_fake_ipc)      
-           return IPC_FAKE;
-         else
-           sleep(1);
-      }
-   }
-   old_alrm = (sighandler_t) signal(SIGALRM, (sighandler_t) enl_ipc_timeout);
-   for (; reply == IPC_TIMEOUT;)
-   {
-      timeout = 0;
-      enl_ipc_send(msg);
-      for (; !(reply = enl_ipc_get(enl_wait_for_reply())););
-      if (reply == IPC_TIMEOUT)
-      {
-         /* We timed out.  The IPC window must be AWOL.  Reset and resend message. */
-         D(3, ("IPC timed out.  IPC window has gone. Clearing ipc_win.\n"));
-         XSelectInput(disp, ipc_win, None);
-         ipc_win = None;
-      }
-   }
-   signal(SIGALRM, old_alrm);
-   D_RETURN(4, reply);
-}
diff --git a/src/thumbnail.c b/src/thumbnail.c
index b4f410d..70af5e0 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -1,6 +1,7 @@
 /* thumbnail.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -30,836 +31,635 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "thumbnail.h"
 #include "md5.h"
 #include "feh_png.h"
+#include "index.h"
+#include "signals.h"
 
-static char *create_index_dimension_string(int w, int h);
-static char *create_index_size_string(char *file);
-static char *create_index_title_string(int num, int w, int h);
 static gib_list *thumbnails = NULL;
 
 static thumbmode_data td;
 
 /* TODO Break this up a bit ;) */
 /* TODO s/bit/lot */
-void
-init_thumbnail_mode(void)
+void init_thumbnail_mode(void)
 {
 	/* moved to thumbnail_data:
-		 Imlib_Image im_main;
-		 Imlib_Image bg_im = NULL;
-		 Imlib_Font fn = NULL;
-		 Imlib_Font title_fn = NULL;
-
-		 int w = 800, h = 600;
-		 int bg_w = 0, bg_h = 0;
-
-		 int text_area_w, text_area_h;
-		 int max_column_w = 0;
-	*/
-
-
-   Imlib_Image im_temp;
-   int ww = 0, hh = 0, www, hhh, xxx, yyy;
-   int x = 0, y = 0;
-   winwidget winwid = NULL;
-   Imlib_Image im_thumb = NULL;
-   unsigned char trans_bg = 0;
-   int title_area_h = 0;
-   int tw = 0, th = 0;
-   int fw_name, fw_size, fw_dim, fh;
-   int thumbnailcount = 0;
-   feh_file *file = NULL;
-   gib_list *l, *last = NULL;
-   int lines;
-   int index_image_width, index_image_height;
-   int x_offset_name = 0, x_offset_dim = 0, x_offset_size = 0;
-   char *s;
-
-	 /* initialize thumbnail mode data */
-	 td.im_main = NULL;
-	 td.im_bg = NULL;
-	 td.font_main = NULL;
-	 td.font_title = NULL;
-
-	 td.w = 640;
-	 td.h = 480;
-	 td.bg_w = 0;
-	 td.bg_h = 0;
-	 td.thumb_tot_h = 0;
-	 td.text_area_w = 0;
-	 td.text_area_h = 0;
-
-	 td.vertical = 0;
-	 td.max_column_w = 0;
-
-   D_ENTER(3);
-
-   mode = "thumbnail";
-
-   td.font_main = gib_imlib_load_font(opt.font);
-
-   if (opt.title_font)
-   {
-      int fh, fw;
-
-      td.font_title = gib_imlib_load_font(opt.title_font);
-      gib_imlib_get_text_size(td.font_title, "W", NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-      title_area_h = fh + 4;
-   }
-   else
-      td.font_title = imlib_load_font(DEFAULT_FONT_TITLE);
-
-   if ((!td.font_main) || (!td.font_title))
-      eprintf("Error loading fonts");
-
-   /* Work out how tall the font is */
-   gib_imlib_get_text_size(td.font_main, "W", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-   /* For now, allow room for the right number of lines with small gaps */
-   td.text_area_h =
-      ((th + 2) * (opt.index_show_name + opt.index_show_size +
-                   opt.index_show_dim)) + 5;
-
-   /* This includes the text area for index data */
-   td.thumb_tot_h = opt.thumb_h + td.text_area_h;
-
-   /* Use bg image dimensions for default size */
-   if (opt.bg && opt.bg_file)
-   {
-      if (!strcmp(opt.bg_file, "trans"))
-         trans_bg = 1;
-      else
-      {
-
-         D(3, ("Time to apply a background to blend onto\n"));
-         if (feh_load_image_char(&td.im_bg, opt.bg_file) != 0)
-         {
-            td.bg_w = gib_imlib_image_get_width(td.im_bg);
-            td.bg_h = gib_imlib_image_get_height(td.im_bg);
-         }
-      }
-   }
-
-	 /* figure out geometry for the main window and entries */
-	 feh_thumbnail_calculate_geometry();
-
-   index_image_width = td.w;
-   index_image_height = td.h + title_area_h;
-   td.im_main = imlib_create_image(index_image_width, index_image_height);
-   gib_imlib_image_set_has_alpha(td.im_main, 1);
-
-   if (!td.im_main)
-      eprintf("Imlib error creating index image, are you low on RAM?");
-
-   if (td.im_bg)
-      gib_imlib_blend_image_onto_image(td.im_main, td.im_bg,
-                                       gib_imlib_image_has_alpha(td.im_bg), 0, 0,
-                                       td.bg_w, td.bg_h, 0, 0, td.w, td.h, 1, 0, 0);
-   else if (trans_bg)
-   {
-      gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, td.h + title_area_h, 0, 0,
-                                     0, 0);
-      gib_imlib_image_set_has_alpha(td.im_main, 1);
-   }
-   else
-   {
-      /* Colour the background */
-      gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, td.h + title_area_h, 0, 0,
-                                     0, 255);
-   }
-
-   /* Create title now */
-
-   if (!opt.title)
-      s = estrdup(PACKAGE " [thumbnail mode]");
-   else
-      s = estrdup(feh_printf(opt.title, NULL));
-
-   if (opt.display)
-   {
-      winwid = winwidget_create_from_image(td.im_main, s, WIN_TYPE_THUMBNAIL);
-      winwidget_show(winwid);
-   }
-
-	 /* make sure we have an ~/.thumbnails/normal directory for storing
-			permanent thumbnails */
-	 td.cache_thumbnails = feh_thumbnail_setup_thumbnail_dir();
-   td.cache_thumbnails = opt.cache_thumbnails;
-
-   for (l = filelist; l; l = l->next)
-   {
-      file = FEH_FILE(l->data);
-      if (last)
-      {
-         filelist = feh_file_remove_from_list(filelist, last);
-         filelist_len--;
-         last = NULL;
-      }
-      D(4, ("About to load image %s\n", file->filename));
-			/*      if (feh_load_image(&im_temp, file) != 0) */
-			if (feh_thumbnail_get_thumbnail(&im_temp, file) != 0)
-			{
-         if (opt.verbose)
-            feh_display_status('.');
-         D(4, ("Successfully loaded %s\n", file->filename));
-         www = opt.thumb_w;
-         hhh = opt.thumb_h;
-         ww = gib_imlib_image_get_width(im_temp);
-         hh = gib_imlib_image_get_height(im_temp);
-         thumbnailcount++;
-         if (gib_imlib_image_has_alpha(im_temp))
-            imlib_context_set_blend(1);
-         else
-            imlib_context_set_blend(0);
-
-         if (opt.aspect)
-         {
-            double ratio = 0.0;
-
-            /* Keep the aspect ratio for the thumbnail */
-            ratio = ((double) ww / hh) / ((double) www / hhh);
-
-            if (ratio > 1.0)
-               hhh = opt.thumb_h / ratio;
-            else if (ratio != 1.0)
-               www = opt.thumb_w * ratio;
-         }
-
-         if ((!opt.stretch) && ((www > ww) || (hhh > hh)))
-         {
-            /* Don't make the image larger unless stretch is specified */
-            www = ww;
-            hhh = hh;
-         }
-
-         im_thumb =
-            gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, ww, hh, www,
-                                                  hhh, 1);
-         gib_imlib_free_image_and_decache(im_temp);
-
-         if (opt.alpha)
-         {
-            DATA8 atab[256];
-
-            D(3, ("Applying alpha options\n"));
-            gib_imlib_image_set_has_alpha(im_thumb, 1);
-            memset(atab, opt.alpha_level, sizeof(atab));
-            gib_imlib_apply_color_modifier_to_rectangle(im_thumb, 0, 0, www,
-                                                        hhh, NULL, NULL, NULL,
-                                                        atab);
-         }
-
-         td.text_area_w = opt.thumb_w;
-         /* Now draw on the info text */
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw_name, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw_name > td.text_area_w)
-               td.text_area_w = fw_name;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(td.font_main, create_index_dimension_string(ww, hh),
-                                    NULL, &fw_dim, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw_dim > td.text_area_w)
-               td.text_area_w = fw_dim;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw_size, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw_size > td.text_area_w)
-               td.text_area_w = fw_size;
-         }
-         if (td.text_area_w > opt.thumb_w)
-            td.text_area_w += 5;
-
-         /* offsets for centering text */
-         x_offset_name = (td.text_area_w - fw_name) / 2;
-         x_offset_dim = (td.text_area_w - fw_dim) / 2;
-         x_offset_size = (td.text_area_w - fw_size) / 2;
-
-         if (td.vertical)
-         {
-					 if (td.text_area_w > td.max_column_w)
-               td.max_column_w = td.text_area_w;
-            if (y > td.h - td.thumb_tot_h)
-            {
-               y = 0;
-               x += td.max_column_w;
-               td.max_column_w = 0;
-            }
-            if (x > td.w - td.text_area_w)
-               break;
-         }
-         else
-         {
-            if (x > td.w - td.text_area_w)
-            {
-               x = 0;
-               y += td.thumb_tot_h;
-            }
-            if (y > td.h - td.thumb_tot_h)
-               break;
-         }
-
-         if (opt.aspect)
-         {
-            xxx = x + ((opt.thumb_w - www) / 2);
-            yyy = y + ((opt.thumb_h - hhh) / 2);
-         }
-         else
-         {
-            /* Ignore the aspect ratio and squash the image in */
-            xxx = x;
-            yyy = y;
-         }
-
-         /* Draw now */
-         gib_imlib_blend_image_onto_image(td.im_main, im_thumb,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0, 0, www, hhh, xxx, yyy, www, hhh,
-                                          1,
-                                          gib_imlib_image_has_alpha(im_thumb),
-                                          0);
-
-         thumbnails =
-            gib_list_add_front(thumbnails,
-                               feh_thumbnail_new(file, xxx, yyy, www, hhh));
-
-         gib_imlib_free_image_and_decache(im_thumb);
-
-         lines = 0;
-         if (opt.index_show_name)
-            gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_name,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                file->name, IMLIB_TEXT_TO_RIGHT, 255, 255,
-                                255, 255);
-         if (opt.index_show_dim)
-            gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_dim,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                create_index_dimension_string(ww, hh),
-                                IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-         if (opt.index_show_size)
-            gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_size,
-                                y + opt.thumb_h + (lines++ * (th + 2)) + 2,
-                                create_index_size_string(file->filename),
-                                IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
-
-         if (td.vertical)
-            y += td.thumb_tot_h;
-         else
-            x += td.text_area_w;
-      }
-      else
-      {
-         if (opt.verbose)
-            feh_display_status('x');
-         last = l;
-      }
-      if (opt.display)
-      {
-         winwidget_render_image(winwid, 0, 0);
-         if (!feh_main_iteration(0))
-            exit(0);
-      }
-   }
-   if (opt.verbose)
-      fprintf(stdout, "\n");
-
-   if (opt.title_font)
-   {
-      int fw, fh, fx, fy;
-      char *s;
-
-      s = create_index_title_string(thumbnailcount, td.w, td.h);
-      gib_imlib_get_text_size(td.font_title, s, NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-      fx = (index_image_width - fw) >> 1;
-      fy = index_image_height - fh - 2;
-      gib_imlib_text_draw(td.im_main, td.font_title, NULL, fx, fy, s, IMLIB_TEXT_TO_RIGHT,
-                          255, 255, 255, 255);
-   }
-
-   if (opt.output && opt.output_file)
-   {
-      char output_buf[1024];
-
-      if (opt.output_dir)
-         snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
-      else
-         strncpy(output_buf, opt.output_file, 1024);
-      gib_imlib_save_image(td.im_main, output_buf);
-      if (opt.verbose)
-      {
-         int tw, th;
-
-         tw = gib_imlib_image_get_width(td.im_main);
-         th = gib_imlib_image_get_height(td.im_main);
-         fprintf(stdout, PACKAGE " - File saved as %s\n", output_buf);
-         fprintf(stdout,
-                 "    - Image is %dx%d pixels and contains %d thumbnails\n",
-                 tw, th, thumbnailcount);
-      }
-   }
-
-   if (!opt.display)
-      gib_imlib_free_image_and_decache(td.im_main);
-
-   free(s);
-   D_RETURN_(3);
-}
+	   Imlib_Image im_main;
+	   Imlib_Image bg_im = NULL;
+	   Imlib_Font fn = NULL;
+	   Imlib_Font title_fn = NULL;
 
+	   int w = 800, h = 600;
+	   int bg_w = 0, bg_h = 0;
 
-static char *
-create_index_size_string(char *file)
-{
-   static char str[50];
-   int size = 0;
-   double kbs = 0.0;
-   struct stat st;
-
-   D_ENTER(4);
-   if (stat(file, &st))
-      kbs = 0.0;
-   else
-   {
-      size = st.st_size;
-      kbs = (double) size / 1000;
-   }
-
-   snprintf(str, sizeof(str), "%.2fKb", kbs);
-   D_RETURN(4, str);
-}
+	   int text_area_w, text_area_h;
+	   int max_column_w = 0;
+	 */
 
-static char *
-create_index_dimension_string(int w, int h)
-{
-   static char str[50];
+	Imlib_Load_Error err;
+	Imlib_Image im_temp;
+	int ww = 0, hh = 0, www, hhh, xxx, yyy;
+	int orig_w, orig_h;
+	int x = 0, y = 0;
+	winwidget winwid = NULL;
+	Imlib_Image im_thumb = NULL;
+	unsigned char trans_bg = 0;
+	int title_area_h = 0;
+	int tw = 0, th = 0;
+	int fw, fh;
+	int thumbnailcount = 0;
+	feh_file *file = NULL;
+	gib_list *l, *last = NULL;
+	int lineno;
+	int index_image_width, index_image_height;
+	unsigned int thumb_counter = 0;
+	gib_list *line, *lines;
+
+	/* initialize thumbnail mode data */
+	td.im_main = NULL;
+	td.im_bg = NULL;
+	td.font_main = NULL;
+	td.font_title = NULL;
+
+	td.w = 640;
+	td.h = 480;
+	td.bg_w = 0;
+	td.bg_h = 0;
+	td.thumb_tot_h = 0;
+	td.text_area_w = 0;
+	td.text_area_h = 0;
+
+	td.vertical = 0;
+	td.max_column_w = 0;
+
+	if (!opt.thumb_title)
+		opt.thumb_title = "%n";
+	mode = "thumbnail";
+
+	if (opt.font)
+		td.font_main = gib_imlib_load_font(opt.font);
+
+	if (!td.font_main)
+		td.font_main = gib_imlib_load_font(DEFAULT_FONT);
+
+	if (opt.title_font) {
+		int fh, fw;
+
+		td.font_title = gib_imlib_load_font(opt.title_font);
+		if (!td.font_title)
+			td.font_title = gib_imlib_load_font(DEFAULT_FONT_TITLE);
+
+		gib_imlib_get_text_size(td.font_title, "W", NULL, &fw, &fh,
+				IMLIB_TEXT_TO_RIGHT);
+		title_area_h = fh + 4;
+	} else
+		td.font_title = imlib_load_font(DEFAULT_FONT_TITLE);
+
+	if ((!td.font_main) || (!td.font_title))
+		eprintf("Error loading fonts");
+
+	/* Work out how tall the font is */
+	gib_imlib_get_text_size(td.font_main, "W", NULL, &tw, &th,
+			IMLIB_TEXT_TO_RIGHT);
+	get_index_string_dim(NULL, td.font_main, &fw, &fh);
+	td.text_area_h = fh + 5;
+
+	/* This includes the text area for index data */
+	td.thumb_tot_h = opt.thumb_h + td.text_area_h;
+
+	/* Use bg image dimensions for default size */
+	if (opt.bg && opt.bg_file) {
+		if (!strcmp(opt.bg_file, "trans"))
+			trans_bg = 1;
+		else {
+
+			D(("Time to apply a background to blend onto\n"));
+			if (feh_load_image_char(&td.im_bg, opt.bg_file) != 0) {
+				td.bg_w = gib_imlib_image_get_width(td.im_bg);
+				td.bg_h = gib_imlib_image_get_height(td.im_bg);
+			}
+		}
+	}
 
-   D_ENTER(4);
-   snprintf(str, sizeof(str), "%dx%d", w, h);
-   D_RETURN(4, str);
-}
+	/* figure out geometry for the main window and entries */
+	feh_thumbnail_calculate_geometry();
 
-static char *
-create_index_title_string(int num, int w, int h)
-{
-   static char str[50];
+	index_image_width = td.w;
+	index_image_height = td.h + title_area_h;
+	D(("imlib_create_image(%d, %d)\n", index_image_width, index_image_height));
+	td.im_main = imlib_create_image(index_image_width, index_image_height);
 
-   D_ENTER(4);
-   snprintf(str, sizeof(str),
-            PACKAGE " index - %d thumbnails, %d by %d pixels", num, w, h);
-   D_RETURN(4, str);
-}
+	if (!td.im_main) {
+		if (index_image_height >= 32768 || index_image_width >= 32768) {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image.\n"
+					"This is probably due to Imlib2 issues when dealing with images larger than 32k x 32k pixels.",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		} else {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image. Do you have enough RAM?",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		}
+	}
 
-feh_thumbnail *
-feh_thumbnail_new(feh_file * file, int x, int y, int w, int h)
-{
-   feh_thumbnail *thumb;
+	gib_imlib_image_set_has_alpha(td.im_main, 1);
+
+	if (td.im_bg)
+		gib_imlib_blend_image_onto_image(td.im_main, td.im_bg,
+						 gib_imlib_image_has_alpha
+						 (td.im_bg), 0, 0, td.bg_w, td.bg_h, 0, 0,
+						 td.w, td.h, 1, 0, 0);
+	else if (trans_bg) {
+		gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w,
+				td.h + title_area_h, 0, 0, 0, 0);
+		gib_imlib_image_set_has_alpha(td.im_main, 1);
+	} else {
+		/* Colour the background */
+		gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w,
+				td.h + title_area_h, 0, 0, 0, 255);
+	}
+
+
+	if (opt.display) {
+		winwid = winwidget_create_from_image(td.im_main, WIN_TYPE_THUMBNAIL);
+		winwidget_rename(winwid, PACKAGE " [thumbnail mode]");
+		winwidget_show(winwid);
+	}
+
+	td.cache_thumbnails = opt.cache_thumbnails;
+
+	if (td.cache_thumbnails) {
+		if (opt.thumb_w > opt.thumb_h)
+			td.cache_dim = opt.thumb_w;
+		else
+			td.cache_dim = opt.thumb_h;
+
+		if (td.cache_dim > 1024) {
+			/* Not specified by XDG thumbnail standard */
+			td.cache_thumbnails = 0;
+		} else if (td.cache_dim > 512) {
+			td.cache_dim = 1024;
+			td.cache_dir = estrdup("xx-large");
+		} else if (td.cache_dim > 256) {
+			td.cache_dim = 512;
+			td.cache_dir = estrdup("x-large");
+		} else if (td.cache_dim > 128) {
+			td.cache_dim = 256;
+			td.cache_dir = estrdup("large");
+		} else {
+			td.cache_dim = 128;
+			td.cache_dir = estrdup("normal");
+		}
+		feh_thumbnail_setup_thumbnail_dir();
+	}
+
+	for (l = filelist; l; l = l->next) {
+		file = FEH_FILE(l->data);
+		if (last) {
+			filelist = feh_file_remove_from_list(filelist, last);
+			last = NULL;
+		}
+		D(("About to load image %s\n", file->filename));
+		/*      if (feh_load_image(&im_temp, file) != 0) */
+		if (feh_thumbnail_get_thumbnail(&im_temp, file, &orig_w, &orig_h)
+				!= 0) {
+			if (opt.verbose)
+				feh_display_status('.');
+			D(("Successfully loaded %s\n", file->filename));
+			www = opt.thumb_w;
+			hhh = opt.thumb_h;
+			ww = gib_imlib_image_get_width(im_temp);
+			hh = gib_imlib_image_get_height(im_temp);
+
+			if (!orig_w) {
+				orig_w = ww;
+				orig_h = hh;
+			}
+
+			thumbnailcount++;
+			if (gib_imlib_image_has_alpha(im_temp))
+				imlib_context_set_blend(1);
+			else
+				imlib_context_set_blend(0);
+
+			if (opt.aspect) {
+				double ratio = 0.0;
+
+				/* Keep the aspect ratio for the thumbnail */
+				ratio = ((double) ww / hh) / ((double) www / hhh);
+
+				if (ratio > 1.0)
+					hhh = opt.thumb_h / ratio;
+				else if (ratio != 1.0)
+					www = opt.thumb_w * ratio;
+			}
+
+			if ((!opt.stretch) && ((www > ww) || (hhh > hh))) {
+				/* Don't make the image larger unless stretch is specified */
+				www = ww;
+				hhh = hh;
+			}
+
+			im_thumb = gib_imlib_create_cropped_scaled_image(im_temp, 0, 0,
+					ww, hh, www, hhh, 1);
+			gib_imlib_free_image_and_decache(im_temp);
+
+			if (opt.alpha) {
+				DATA8 atab[256];
+
+				D(("Applying alpha options\n"));
+				gib_imlib_image_set_has_alpha(im_thumb, 1);
+				memset(atab, opt.alpha_level, sizeof(atab));
+				gib_imlib_apply_color_modifier_to_rectangle
+				    (im_thumb, 0, 0, www, hhh, NULL, NULL, NULL, atab);
+			}
 
-   D_ENTER(4);
+			td.text_area_w = opt.thumb_w;
+			/* Now draw on the info text */
+			if (opt.index_info) {
+				get_index_string_dim(file, td.font_main, &fw, &fh);
+				if (fw > td.text_area_w)
+					td.text_area_w = fw;
+				if (fh > td.text_area_h) {
+					td.text_area_h = fh + 5;
+					td.thumb_tot_h = opt.thumb_h + td.text_area_h;
+				}
+			}
+			if (td.text_area_w > opt.thumb_w)
+				td.text_area_w += 5;
+
+			if (td.vertical) {
+				if (td.text_area_w > td.max_column_w)
+					td.max_column_w = td.text_area_w;
+				if (y > td.h - td.thumb_tot_h) {
+					y = 0;
+					x += td.max_column_w;
+					td.max_column_w = 0;
+				}
+				if (x > td.w - td.text_area_w)
+					break;
+			} else {
+				if (x > td.w - td.text_area_w) {
+					x = 0;
+					y += td.thumb_tot_h;
+				}
+				if (y > td.h - td.thumb_tot_h)
+					break;
+			}
+
+			/* center image relative to the text below it (if any) */
+			xxx = x + ((td.text_area_w - www) / 2);
+			yyy = y;
+
+			if (opt.aspect)
+				yyy += (opt.thumb_h - hhh) / 2;
+
+			/* Draw now */
+			gib_imlib_blend_image_onto_image(td.im_main,
+							 im_thumb,
+							 gib_imlib_image_has_alpha
+							 (im_thumb), 0, 0,
+							 www, hhh, xxx,
+							 yyy, www, hhh, 1,
+							 gib_imlib_image_has_alpha(im_thumb), 0);
+
+			thumbnails = gib_list_add_front(thumbnails,
+					feh_thumbnail_new(file, xxx, yyy, www, hhh));
+
+			gib_imlib_free_image_and_decache(im_thumb);
+
+			lineno = 0;
+			if (opt.index_info) {
+				line = lines = feh_wrap_string(create_index_string(file),
+						opt.thumb_w * 3, td.font_main, NULL);
+
+				while (line) {
+					gib_imlib_get_text_size(td.font_main, (char *) line -> data,
+							NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
+					gib_imlib_text_draw(td.im_main, td.font_main, NULL,
+							x + ((td.text_area_w - fw) >> 1),
+							y + opt.thumb_h + (lineno++ * (th + 2)) + 2,
+							(char *) line->data,
+							IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+					line = line->next;
+				}
+				gib_list_free_and_data(lines);
+			}
+
+			if (td.vertical)
+				y += td.thumb_tot_h;
+			else
+				x += td.text_area_w;
+		} else {
+			if (opt.verbose)
+				feh_display_status('x');
+			last = l;
+		}
+		if (opt.display) {
+			/* thumb_counter is unsigned, so no need to catch overflows */
+			if (++thumb_counter == opt.thumb_redraw) {
+				winwidget_render_image(winwid, 0, 1);
+				thumb_counter = 0;
+			}
+			if (!feh_main_iteration(0))
+				exit(0);
+		}
+	}
+
+	if (thumb_counter != 0)
+		winwidget_render_image(winwid, 0, 1);
+
+	if (opt.verbose)
+		putc('\n', stderr);
+
+	if (opt.title_font) {
+		int fw, fh, fx, fy;
+		char *s;
+
+		s = create_index_title_string(thumbnailcount, td.w, td.h);
+		gib_imlib_get_text_size(td.font_title, s, NULL, &fw, &fh,
+				IMLIB_TEXT_TO_RIGHT);
+		fx = (index_image_width - fw) >> 1;
+		fy = index_image_height - fh - 2;
+		gib_imlib_text_draw(td.im_main, td.font_title, NULL, fx,
+				fy, s, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255);
+
+		if (opt.display)
+			winwidget_render_image(winwid, 0, 1);
+	}
+
+	if (opt.output && opt.output_file) {
+		char output_buf[1024];
+
+		if (opt.output_dir)
+			snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
+		else {
+			strncpy(output_buf, opt.output_file, 1023);
+			output_buf[1023] = '\0';
+		}
+		gib_imlib_save_image_with_error_return(td.im_main, output_buf, &err);
+		if (err) {
+			feh_print_load_error(output_buf, td.im_main, err, LOAD_ERROR_IMLIB);
+		}
+		else if (opt.verbose) {
+			int tw, th;
+
+			tw = gib_imlib_image_get_width(td.im_main);
+			th = gib_imlib_image_get_height(td.im_main);
+			fprintf(stderr, PACKAGE " - File saved as %s\n", output_buf);
+			fprintf(stderr,
+					"    - Image is %dx%d pixels and contains %d thumbnails\n",
+					tw, th, thumbnailcount);
+		}
+	}
+
+	if (!opt.display)
+		gib_imlib_free_image_and_decache(td.im_main);
+	else if (opt.start_list_at) {
+		for (l = thumbnails; l; l = l->next) {
+			if (!strcmp(opt.start_list_at, FEH_THUMB(l->data)->file->filename)) {
+				free(opt.start_list_at);
+				opt.start_list_at = NULL;
+				feh_thumbnail_select(winwid, FEH_THUMB(l->data));
+				break;
+			}
+		}
+	}
 
-   thumb = (feh_thumbnail *) emalloc(sizeof(feh_thumbnail));
-   thumb->x = x;
-   thumb->y = y;
-   thumb->w = w;
-   thumb->h = h;
-   thumb->file = file;
-   thumb->exists = 1;
 
-   D_RETURN(4, thumb);
+	return;
 }
 
-feh_file *
-feh_thumbnail_get_file_from_coords(int x, int y)
+feh_thumbnail *feh_thumbnail_new(feh_file * file, int x, int y, int w, int h)
 {
-   gib_list *l;
-   feh_thumbnail *thumb;
-
-   D_ENTER(4);
-
-   for (l = thumbnails; l; l = l->next)
-   {
-      thumb = FEH_THUMB(l->data);
-      if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h))
-      {
-         if (thumb->exists)
-         {
-            D_RETURN(4, thumb->file);
-         }
-      }
-   }
-   D(4, ("No matching %d %d\n", x, y));
-   D_RETURN(4, NULL);
+	feh_thumbnail *thumb;
+
+	thumb = (feh_thumbnail *) emalloc(sizeof(feh_thumbnail));
+	thumb->x = x;
+	thumb->y = y;
+	thumb->w = w;
+	thumb->h = h;
+	thumb->file = file;
+	thumb->exists = 1;
+
+	return(thumb);
 }
 
-feh_thumbnail *
-feh_thumbnail_get_thumbnail_from_coords(int x, int y)
+feh_file *feh_thumbnail_get_file_from_coords(int x, int y)
 {
-   gib_list *l;
-   feh_thumbnail *thumb;
-
-   D_ENTER(4);
-
-   for (l = thumbnails; l; l = l->next)
-   {
-      thumb = FEH_THUMB(l->data);
-      if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h))
-      {
-         if (thumb->exists)
-         {
-            D_RETURN(4, thumb);
-         }
-      }
-   }
-   D(4, ("No matching %d %d\n", x, y));
-   D_RETURN(4, NULL);
+	gib_list *l;
+	feh_thumbnail *thumb;
+
+	for (l = thumbnails; l; l = l->next) {
+		thumb = FEH_THUMB(l->data);
+		if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) {
+			if (thumb->exists) {
+				return(thumb->file);
+			}
+		}
+	}
+	D(("No matching %d %d\n", x, y));
+	return(NULL);
 }
 
-feh_thumbnail *
-feh_thumbnail_get_from_file(feh_file * file)
+feh_thumbnail *feh_thumbnail_get_thumbnail_from_coords(int x, int y)
 {
-   gib_list *l;
-   feh_thumbnail *thumb;
-
-   D_ENTER(4);
-
-   for (l = thumbnails; l; l = l->next)
-   {
-      thumb = FEH_THUMB(l->data);
-      if (thumb->file == file)
-      {
-         if (thumb->exists)
-         {
-            D_RETURN(4, thumb);
-         }
-      }
-   }
-   D(4, ("No match\n"));
-   D_RETURN(4, NULL);
+	gib_list *l;
+	feh_thumbnail *thumb;
+
+	for (l = thumbnails; l; l = l->next) {
+		thumb = FEH_THUMB(l->data);
+		if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) {
+			if (thumb->exists) {
+				return(thumb);
+			}
+		}
+	}
+	D(("No matching %d %d\n", x, y));
+	return(NULL);
 }
 
+feh_thumbnail *feh_thumbnail_get_from_file(feh_file * file)
+{
+	gib_list *l;
+	feh_thumbnail *thumb;
+
+	for (l = thumbnails; l; l = l->next) {
+		thumb = FEH_THUMB(l->data);
+		if (thumb->file == file) {
+			if (thumb->exists) {
+				return(thumb);
+			}
+		}
+	}
+	D(("No match\n"));
+	return(NULL);
+}
 
-void
-feh_thumbnail_mark_removed(feh_file * file, int deleted)
+void feh_thumbnail_mark_removed(feh_file * file, int deleted)
 {
-   feh_thumbnail *thumb;
-   winwidget w;
-
-   D_ENTER(4);
-
-   thumb = feh_thumbnail_get_from_file(file);
-   if (thumb)
-   {
-      w = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL);
-      if (w)
-      {
-         td.font_main = imlib_load_font(DEFAULT_FONT_TITLE);
-         if (deleted)
-            gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y,
-                                           thumb->w, thumb->h, 255, 0, 0,
-                                           150);
-         else
-            gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y,
-                                           thumb->w, thumb->h, 0, 0, 255,
-                                           150);
-         if (td.font_main)
-         {
-            int tw, th;
-
-            gib_imlib_get_text_size(td.font_main, "X", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-            gib_imlib_text_draw(w->im, td.font_main, NULL, thumb->x + ((thumb->w - tw) / 2),
-                                thumb->y + ((thumb->h - th) / 2), "X",
-                                IMLIB_TEXT_TO_RIGHT, 205, 205, 50, 255);
-         }
-         else
-            weprintf(DEFAULT_FONT_TITLE);
-         winwidget_render_image(w, 0, 1);
-      }
-      thumb->exists = 0;
-   }
-   D_RETURN_(4);
+	feh_thumbnail *thumb;
+	winwidget w;
+
+	thumb = feh_thumbnail_get_from_file(file);
+	if (thumb) {
+		w = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL);
+		if (w) {
+			int tw, th;
+			if (deleted)
+				gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y,
+						thumb->w, thumb->h, 255, 0, 0, 150);
+			else
+				gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y,
+						thumb->w, thumb->h, 0, 0, 255, 150);
+
+			gib_imlib_get_text_size(td.font_main, "X", NULL, &tw, &th,
+					IMLIB_TEXT_TO_RIGHT);
+			gib_imlib_text_draw(w->im, td.font_main, NULL,
+					thumb->x + ((thumb->w - tw) / 2),
+					thumb->y + ((thumb->h - th) / 2), "X",
+					IMLIB_TEXT_TO_RIGHT, 205, 205, 50, 255);
+			winwidget_render_image(w, 0, 1);
+		}
+		thumb->exists = 0;
+	}
+	return;
 }
 
-void
-feh_thumbnail_calculate_geometry(void)
+void feh_thumbnail_calculate_geometry(void)
 {
-	gib_list *l;
-	feh_file *file;
+	if (!opt.limit_w && !opt.limit_h) {
+		if (td.im_bg) {
+			opt.limit_w = td.bg_w;
+			opt.limit_h = td.bg_h;
+		} else
+			opt.limit_w = 800;
+	}
 
-	int x = 0, y = 0;
-	int fw, fh;
+	/* Here we need to whiz through the files, and look at the filenames and
+	   info in the selected font, work out how much space we need, and
+	   calculate the size of the image we will require */
+
+	if (opt.limit_w) {
+		td.w = opt.limit_w;
+
+		index_calculate_height(td.font_main, td.w, &td.h, &td.thumb_tot_h);
 
-   if (!opt.limit_w && !opt.limit_h)
-   {
-      if (td.im_bg)
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for index.\n"
-                    " You did specify a background however, so the\n"
-                    " index size has defaulted to the size of the image\n");
-         opt.limit_w = td.bg_w;
-         opt.limit_h = td.bg_h;
-      }
-      else
-      {
-         if (opt.verbose)
-            fprintf(stdout,
-                    PACKAGE " - No size restriction specified for index.\n"
-                    " Using defaults (width limited to 640)\n");
-         opt.limit_w = 640;
-      }
-   }
-
-
-   /* Here we need to whiz through the files, and look at the filenames and
-      info in the selected font, work out how much space we need, and
-      calculate the size of the image we will require */
-
-   if (opt.limit_w && opt.limit_h)
-   {
-      int rec_h = 0;
-
-      td.w = opt.limit_w;
-      td.h = opt.limit_h;
-
-      /* Work out if this is big enough, and give a warning if not */
-
-      /* Pretend we are limiting width by that specified, loop through, and
-         see it we fit in the height specified. If not, continue the loop,
-         and recommend the final value instead. Carry on and make the index
-         anyway. */
-
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         td.text_area_w = opt.thumb_w;
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (td.text_area_w > opt.thumb_w)
-            td.text_area_w += 5;
-
-         if ((x > td.w - td.text_area_w))
-         {
-            x = 0;
-            y += td.thumb_tot_h;
-         }
-
-         x += td.text_area_w;
-      }
-      rec_h = y + td.thumb_tot_h;
-
-      if (td.h < rec_h)
-      {
-         weprintf("The image size you specified (%d by %d) is not large\n"
-                  "enough to hold all the thumnails you specified (%d). To fit all\n"
-                  "the thumnails, either decrease their size, choose a smaller font,\n"
-                  "or use a larger image (may I recommend %d by %d?)",
-                  opt.limit_w, opt.limit_h, filelist_len, opt.limit_w, rec_h);
-      }
-   }
-   else if (opt.limit_h)
-   {
-      td.vertical = 1;
-      td.h = opt.limit_h;
-      /* calc w */
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         td.text_area_w = opt.thumb_w;
-         /* Calc width of text */
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (td.text_area_w > opt.thumb_w)
-            td.text_area_w += 5;
-
-         if (td.text_area_w > td.max_column_w)
-            td.max_column_w = td.text_area_w;
-
-         if ((y > td.h - td.thumb_tot_h))
-         {
-            y = 0;
-            x += td.max_column_w;
-            td.max_column_w = 0;
-         }
-
-         y += td.thumb_tot_h;
-      }
-      td.w = x + td.text_area_w;
-      td.max_column_w = 0;
-   }
-   else if (opt.limit_w)
-   {
-      td.w = opt.limit_w;
-      /* calc h */
-
-      for (l = filelist; l; l = l->next)
-      {
-         file = FEH_FILE(l->data);
-         td.text_area_w = opt.thumb_w;
-         if (opt.index_show_name)
-         {
-            gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh,
-                                    IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_dim)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_dimension_string(1000, 1000),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-         if (opt.index_show_size)
-         {
-            gib_imlib_get_text_size(td.font_main,
-                                    create_index_size_string(file->filename),
-                                    NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT);
-            if (fw > td.text_area_w)
-               td.text_area_w = fw;
-         }
-
-         if (td.text_area_w > opt.thumb_w)
-            td.text_area_w += 5;
-
-         if ((x > td.w - td.text_area_w))
-         {
-            x = 0;
-            y += td.thumb_tot_h;
-         }
-
-         x += td.text_area_w;
-      }
-      td.h = y + td.thumb_tot_h;
-   }
+		if (opt.limit_h) {
+			if (td.h> opt.limit_h)
+				weprintf(
+					"The image size you specified (%dx%d) is not large\n"
+					"enough to hold all %d thumbnails. To fit all\n"
+					"the thumnails, either decrease their size, choose a smaller font,\n"
+					"or use a larger image (like %dx%d)",
+					opt.limit_w, opt.limit_h, filelist_len, opt.limit_w, td.h);
+			td.h = opt.limit_h;
+		}
+	} else if (opt.limit_h) {
+		td.vertical = 1;
+		td.h = opt.limit_h;
+
+		index_calculate_width(td.font_main, &td.w, td.h, &td.thumb_tot_h);
+	}
 }
 
-int
-feh_thumbnail_get_thumbnail(Imlib_Image *image, feh_file *file)
+int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file,
+	int * orig_w, int * orig_h)
 {
 	int status = 0;
 	char *thumb_file = NULL, *uri = NULL;
 
+	*orig_w = 0;
+	*orig_h = 0;
+
 	if (!file || !file->filename)
-		return(0);
+		return (0);
 
-	if (td.cache_thumbnails)
-	{
+	if (td.cache_thumbnails) {
 		uri = feh_thumbnail_get_name_uri(file->filename);
 		thumb_file = feh_thumbnail_get_name(uri);
-		status = feh_thumbnail_get_generated(image, file, thumb_file, uri);
+
+		if (thumb_file == NULL) {
+			free(uri);
+			return feh_load_image(image, file);
+		}
+
+		status = feh_thumbnail_get_generated(image, file, thumb_file,
+			orig_w, orig_h);
 
 		if (!status)
-			status = feh_thumbnail_generate(image, file, thumb_file, uri);
-		
-    printf("uri is %s, thumb_file is %s\n", uri, thumb_file);
+			status = feh_thumbnail_generate(image, file, thumb_file, uri,
+				orig_w, orig_h);
+
+		D(("uri is %s, thumb_file is %s\n", uri, thumb_file));
 		free(uri);
 		free(thumb_file);
-	}
-	else
+	} else
 		status = feh_load_image(image, file);
 
 	return status;
 }
 
-char*
-feh_thumbnail_get_name(char *uri)
+static char *feh_thumbnail_get_prefix(void)
 {
-	char *home = NULL, *thumb_file = NULL, *md5_name = NULL;
+	char *dir = NULL, *home, *xdg_cache_home;
 
-	/* FIXME: make sure original file isn't under ~/.thumbnails */
+	// TODO: perhaps make sure that either of those paths aren't /-terminated
 
+	xdg_cache_home = getenv("XDG_CACHE_HOME");
+	if (xdg_cache_home && xdg_cache_home[0] == '/') {
+		dir = estrjoin("/", xdg_cache_home, "thumbnails", td.cache_dir, NULL);
+	} else {
+		home = getenv("HOME");
+		if (home && home[0] == '/') {
+			dir = estrjoin("/", home, ".cache/thumbnails", td.cache_dir, NULL);
+		}
+	}
 
+	return dir;
+}
 
-	md5_name = feh_thumbnail_get_name_md5(uri);
+char *feh_thumbnail_get_name(char *uri)
+{
+	char *prefix, *thumb_file = NULL, *md5_name;
 
-	home = getenv("HOME");
-	if (home)
-	{
-		thumb_file = estrjoin("/", home, ".thumbnails/normal", md5_name, NULL);
-	}
+	/* FIXME: make sure original file isn't under ~/.thumbnails */
 
-	free(md5_name);
+	prefix = feh_thumbnail_get_prefix();
+	if (prefix) {
+		md5_name = feh_thumbnail_get_name_md5(uri);
+		thumb_file = estrjoin("/", prefix, md5_name, NULL);
+		free(md5_name);
+		free(prefix);
+	}
 
 	return thumb_file;
 }
 
-char*
-feh_thumbnail_get_name_uri(char *name)
+char *feh_thumbnail_get_name_uri(char *name)
 {
 	char *cwd, *uri = NULL;
 
-	/* FIXME: what happends with http, https, and ftp? MTime etc */
-	if ((strncmp(name, "http://", 7) != 0) &&
-			(strncmp(name, "https://", 8) != 0) &&
-			(strncmp(name, "ftp://", 6) != 0) &&
-			(strncmp(name, "file://", 7) != 0))
-	{
+	/* FIXME: what happens with http, https, and ftp? MTime etc */
+	if (!path_is_url(name)) {
 
-		/* make sure it's an absoulte path */
+		/* make sure it's an absolute path */
 		/* FIXME: add support for ~, need to investigate if it's expanded
-			 somewhere else before adding (unecessary) code */
+		   somewhere else before adding (unnecessary) code */
 		if (name[0] != '/') {
+			/* work around /some/path/./image.ext */
+			if ((strncmp(name, "./", 2)) == 0)
+				name += 2;
 			cwd = getcwd(NULL, 0);
 			uri = estrjoin("/", "file:/", cwd, name, NULL);
 			free(cwd);
 		} else {
 			uri = estrjoin(NULL, "file://", name, NULL);
 		}
-	}
-	else
+	} else
 		uri = estrdup(name);
-	
+
 	return uri;
 }
 
-char*
-feh_thumbnail_get_name_md5(char *uri)
+char *feh_thumbnail_get_name_md5(char *uri)
 {
 	int i;
 	char *pos, *md5_name;
@@ -868,13 +668,12 @@ feh_thumbnail_get_name_md5(char *uri)
 
 	/* generate the md5 sum */
 	md5_init(&pms);
-	md5_append(&pms, uri, strlen(uri));
+	md5_append(&pms, (unsigned char *)uri, strlen(uri));
 	md5_finish(&pms, digest);
 
 	/* print the md5 as hex to a string */
-	md5_name = emalloc(32 + 4 + 1 * sizeof(char)); /* md5 + .png + '\0' */
-	for (i = 0, pos = md5_name; i < 16; i++, pos += 2)
-	{
+	md5_name = emalloc(32 + 4 + 1);	/* md5 + .png + '\0' */
+	for (i = 0, pos = md5_name; i < 16; i++, pos += 2) {
 		sprintf(pos, "%02x", digest[i]);
 	}
 	sprintf(pos, ".png");
@@ -882,111 +681,267 @@ feh_thumbnail_get_name_md5(char *uri)
 	return md5_name;
 }
 
-int
-feh_thumbnail_generate(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri)
+int feh_thumbnail_generate(Imlib_Image * image, feh_file * file,
+		char *thumb_file, char *uri, int * orig_w, int * orig_h)
 {
 	int w, h, thumb_w, thumb_h;
-	char *c_mtime;
 	Imlib_Image im_temp;
 	struct stat sb;
+	char c_width[8], c_height[8];
+	char *tmp_thumb_file, *prefix;
+	int tmp_fd;
 
-	if (feh_load_image(&im_temp, file) != 0)
-	{
-		w = gib_imlib_image_get_width(im_temp);
-		h = gib_imlib_image_get_height(im_temp);
-		thumb_w = 128;
-		thumb_h = 128;
+	if (feh_load_image(&im_temp, file) != 0) {
+		*orig_w = w = gib_imlib_image_get_width(im_temp);
+		*orig_h = h = gib_imlib_image_get_height(im_temp);
+		thumb_w = td.cache_dim;
+		thumb_h = td.cache_dim;
 
-		if ((w > 128) || (h > 128))
-		{
+		if ((w > td.cache_dim) || (h > td.cache_dim)) {
 			double ratio = (double) w / h;
 			if (ratio > 1.0)
-				thumb_h = 128 / ratio;
+				thumb_h = td.cache_dim / ratio;
 			else if (ratio != 1.0)
-				thumb_w = 128 * ratio;
+				thumb_w = td.cache_dim * ratio;
+		} else {
+			/*
+			 * The image is smaller than the specified thumbnail size.
+			 * Do not cache or transform it.
+			 */
+			*image = im_temp;
+			return 1;
 		}
 
 		*image = gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, w, h,
-																									 thumb_w, thumb_h, 1);
-
-		if (!stat(file->filename, &sb))
-		{
-      char c_mtime[256];
-			sprintf(c_mtime, "%d", sb.st_mtime);
-			feh_png_write_png(*image, thumb_file,
-												"Thumb::URI", uri, "Thumb::MTime", c_mtime);
+				thumb_w, thumb_h, 1);
+
+		if (!stat(file->filename, &sb)) {
+			char c_mtime[128];
+			sprintf(c_mtime, "%d", (int)sb.st_mtime);
+			snprintf(c_width, 8, "%d", w);
+			snprintf(c_height, 8, "%d", h);
+			prefix = feh_thumbnail_get_prefix();
+			if (prefix == NULL) {
+				gib_imlib_free_image_and_decache(im_temp);
+				return 0;
+			}
+			tmp_thumb_file = estrjoin("/", prefix, ".feh_thumbnail_XXXXXX", NULL);
+			free(prefix);
+			tmp_fd = mkstemp(tmp_thumb_file);
+			if (!feh_png_write_png_fd(*image, tmp_fd, "Thumb::URI", uri,
+					"Thumb::MTime", c_mtime,
+					"Thumb::Image::Width", c_width,
+					"Thumb::Image::Height", c_height)) {
+				rename(tmp_thumb_file, thumb_file);
+			} else {
+				unlink(tmp_thumb_file);
+			}
+			close(tmp_fd);
+			free(tmp_thumb_file);
 		}
 
 		gib_imlib_free_image_and_decache(im_temp);
 
-		return(1);
+		return 1;
 	}
 
-	return(0);
+	return 0;
 }
 
-int
-feh_thumbnail_get_generated(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri)
+int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file,
+	char *thumb_file, int * orig_w, int * orig_h)
 {
 	struct stat sb;
 	char *c_mtime;
+	char *c_width, *c_height;
 	time_t mtime = 0;
 	gib_hash *hash;
 
-	if (!stat(file->filename, &sb))
-	{
+	if (!stat(file->filename, &sb)) {
 		hash = feh_png_read_comments(thumb_file);
-		if (hash != NULL)
-		{
-			c_mtime = (char*) gib_hash_get(hash, "Thumb::MTime");
+		if (hash != NULL) {
+			c_mtime  = (char *) gib_hash_get(hash, "Thumb::MTime");
+			c_width  = (char *) gib_hash_get(hash, "Thumb::Image::Width");
+			c_height = (char *) gib_hash_get(hash, "Thumb::Image::Height");
 			if (c_mtime != NULL)
-				mtime = (time_t) strtol(c_mtime, NULL,10);
+				mtime = (time_t) strtol(c_mtime, NULL, 10);
+			if (c_width != NULL)
+				*orig_w = atoi(c_width);
+			if (c_height != NULL)
+				*orig_h = atoi(c_height);
 			gib_hash_free_and_data(hash);
 		}
 
 		/* FIXME: should we bother about Thumb::URI? */
-		if (mtime == sb.st_mtime)
-		{
-      feh_load_image_char(image, thumb_file);
+		if (mtime == sb.st_mtime) {
+			feh_load_image_char(image, thumb_file);
 
-			return(1);
+			return (1);
 		}
 	}
 
-	return(0);
+	return (0);
 }
 
-int
-feh_thumbnail_setup_thumbnail_dir(void)
+void feh_thumbnail_show_fullsize(feh_file *thumbfile)
+{
+	winwidget thumbwin = NULL;
+	gib_list *l;
+
+	for (l = filelist; l; l = l->next) {
+		if (FEH_FILE(l->data) == thumbfile) {
+			break;
+		}
+	}
+	if (!l) {
+		eprintf("Cannot find %s in filelist, wtf", thumbfile->filename);
+	}
+	thumbwin = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL_VIEWER);
+	if (!thumbwin) {
+		thumbwin = winwidget_create_from_file(
+				l,
+				WIN_TYPE_THUMBNAIL_VIEWER);
+		if (thumbwin)
+			winwidget_show(thumbwin);
+	} else if (FEH_FILE(thumbwin->file->data) != thumbfile) {
+		thumbwin->file = l;
+#ifdef HAVE_INOTIFY
+        winwidget_inotify_remove(thumbwin);
+#endif
+		feh_reload_image(thumbwin, 1, 0);
+#ifdef HAVE_INOTIFY
+        winwidget_inotify_add(thumbwin, thumbfile);
+#endif
+	}
+}
+
+void feh_thumbnail_select(winwidget winwid, feh_thumbnail *thumbnail)
+{
+	Imlib_Image origwin;
+
+	if (thumbnail == td.selected)
+		return;
+
+	if (thumbnail) {
+		origwin = winwid->im;
+		winwid->im = gib_imlib_clone_image(origwin);
+		gib_imlib_image_fill_rectangle(winwid->im,
+				thumbnail->x, thumbnail->y, thumbnail->w,
+				thumbnail->h, 50, 50, 255, 100);
+		gib_imlib_image_draw_rectangle(winwid->im,
+				thumbnail->x, thumbnail->y, thumbnail->w,
+				thumbnail->h, 255, 255, 255, 255);
+		gib_imlib_image_draw_rectangle(winwid->im,
+				thumbnail->x + 1, thumbnail->y + 1,
+				thumbnail->w - 2, thumbnail->h - 2,
+				0, 0, 0, 255);
+		gib_imlib_image_draw_rectangle(winwid->im,
+				thumbnail->x + 2, thumbnail->y + 2,
+				thumbnail->w - 4, thumbnail->h - 4,
+				255, 255, 255, 255);
+		winwidget_render_image(winwid, 0, 0);
+		gib_imlib_free_image_and_decache(winwid->im);
+		winwid->im = origwin;
+	} else
+		winwidget_render_image(winwid, 0, 0);
+
+	td.selected = thumbnail;
+}
+
+void feh_thumbnail_select_next(winwidget winwid, int jump)
+{
+	gib_list *l;
+	feh_thumbnail *thumb;
+	int len = 0, cur = 0, target = 0;
+
+	for (l = thumbnails; l; l = l->next) {
+		thumb = FEH_THUMB(l->data);
+		if (thumb == td.selected)
+			cur = len;
+		len++;
+	}
+
+	target = (cur + len - jump) % len;
+
+	for (l = thumbnails; l; l = l->next) {
+		if (target-- == 0) {
+			feh_thumbnail_select(winwid, FEH_THUMB(l->data));
+		}
+	}
+}
+
+void feh_thumbnail_select_prev(winwidget winwid, int jump)
+{
+	gib_list *l;
+	feh_thumbnail *thumb;
+	int len = 0, cur = 0, target = 0;
+
+	for (l = thumbnails; l; l = l->next) {
+		thumb = FEH_THUMB(l->data);
+		if (thumb == td.selected)
+			cur = len;
+		len++;
+	}
+
+	target = (cur + jump) % len;
+
+	for (l = thumbnails; l; l = l->next) {
+		if (target-- == 0) {
+			feh_thumbnail_select(winwid, FEH_THUMB(l->data));
+			break;
+		}
+	}
+}
+
+void feh_thumbnail_show_selected(void)
+{
+	if (td.selected && td.selected->file)
+		feh_thumbnail_show_fullsize(td.selected->file);
+}
+
+feh_file* feh_thumbnail_get_selected_file(void)
+{
+	if (td.selected)
+		return td.selected->file;
+	return NULL;
+}
+
+int feh_thumbnail_setup_thumbnail_dir(void)
 {
 	int status = 0;
 	struct stat sb;
-	char *dir, *dir_thumbnails, *home;
+	char *dir, *p;
 
-	home = getenv("HOME");
-	if (home != NULL)
-	{
-		dir = estrjoin("/", home, ".thumbnails/normal", NULL);
+	dir = feh_thumbnail_get_prefix();
 
+	if (dir) {
 		if (!stat(dir, &sb)) {
 			if (S_ISDIR(sb.st_mode))
-				status = 1;				
+				status = 1;
 			else
 				weprintf("%s should be a directory", dir);
 		} else {
-			dir_thumbnails = estrjoin("/", home, ".thumbnails", NULL);
-
-			if (stat(dir_thumbnails, &sb) != 0)
-			{
-				if (mkdir(dir_thumbnails, 0700) == -1)
-					weprintf("unable to create %s directory", dir_thumbnails);
+			for (p = dir + 1; *p; p++) {
+				if (*p != '/') {
+					continue;
+				}
+
+				*p = 0;
+				if (stat(dir, &sb) != 0) {
+					if (mkdir(dir, 0700) == -1) {
+						weprintf("unable to create directory %s", dir);
+					}
+				}
+				*p = '/';
 			}
 
-			if (mkdir(dir, 0700) == -1)
-				weprintf("unable to create %s directory", dir);
-			else
-				status = 1;
+			if (stat(dir, &sb) != 0) {
+				if (mkdir(dir, 0700) == -1) {
+					weprintf("unable to create directory %s", dir);
+				}
+			}
 		}
+		free(dir);
 	}
 
 	return status;
diff --git a/src/thumbnail.h b/src/thumbnail.h
index bc986de..e69759f 100644
--- a/src/thumbnail.h
+++ b/src/thumbnail.h
@@ -1,6 +1,7 @@
 /* thumbnail.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -26,45 +27,43 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef THIMBNAIL_H
 #define THIMBNAIL_H
 
-
 #include "feh.h"
 #include "filelist.h"
 #include "winwidget.h"
 
 #define FEH_THUMB(l) ((feh_thumbnail *) l)
 
-typedef struct thumbnail
-{
-   int x;
-   int y;
-   int w;
-   int h;
-   feh_file *file;
-   unsigned char exists;
-   struct feh_thumbnail *next;
-}
-feh_thumbnail;
-
-typedef struct thumbmode_data
-{
-	/* FIXME: text_area_h not really needed, remove? */
+typedef struct thumbnail {
+	int x;
+	int y;
+	int w;
+	int h;
+	feh_file *file;
+	unsigned char exists;
+	struct feh_thumbnail *next;
+} feh_thumbnail;
 
-	Imlib_Image im_main; /* base image which all thumbnails are rendered on */
-	Imlib_Image im_bg; /* background for the thumbnails */
+typedef struct thumbmode_data {
+	Imlib_Image im_main;     /* base image which all thumbnails are rendered on */
+	Imlib_Image im_bg;       /* background for the thumbnails */
 
-	Imlib_Font font_main; /* font used for file info */
-	Imlib_Font font_title; /* font used for title */
+	Imlib_Font font_main;    /* font used for file info */
+	Imlib_Font font_title;   /* font used for title */
 
-	int w, h, bg_w, bg_h; /* dimensions of the window and bg image */
+	int w, h, bg_w, bg_h;    /* dimensions of the window and bg image */
 
-	int thumb_tot_h; /* total space needed for a thumbnail including description */
+	int thumb_tot_h;         /* total space needed for a thumbnail including description */
 	int text_area_w, text_area_h; /* space needed for thumbnail description */
 
-	int max_column_w; /* FIXME: description */
-	int vertical; /* FIXME: vertical in what way? */
-	int cache_thumbnails; /* use cached thumbnails from ~/.thumbnails/normal */
-}
-thumbmode_data;
+	int max_column_w;        /* FIXME: description */
+	int vertical;            /* == !opt.limit_w && opt.limit_h */
+
+	int cache_thumbnails;    /* use cached thumbnails from ~/.thumbnails */
+	int cache_dim;           /* 128 = 128x128 ("normal"), 256 = 256x256 ("large") */
+	char *cache_dir;         /* "normal"/"large" (.thumbnails/...) */
+	feh_thumbnail *selected;     /* currently selected thumbnail */
+
+} thumbmode_data;
 
 feh_thumbnail *feh_thumbnail_new(feh_file * fil, int x, int y, int w, int h);
 feh_file *feh_thumbnail_get_file_from_coords(int x, int y);
@@ -74,12 +73,18 @@ void feh_thumbnail_mark_removed(feh_file * file, int deleted);
 
 void feh_thumbnail_calculate_geometry(void);
 
-int feh_thumbnail_get_thumbnail(Imlib_Image *image, feh_file *file);
-int feh_thumbnail_generate(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri);
-int feh_thumbnail_get_generated(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri);
+int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file, int * orig_w, int * orig_h);
+int feh_thumbnail_generate(Imlib_Image * image, feh_file * file, char *thumb_file, char *uri, int * orig_w, int * orig_h);
+int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, char * thumb_file, int * orig_w, int * orig_h);
 char *feh_thumbnail_get_name(char *uri);
 char *feh_thumbnail_get_name_uri(char *name);
 char *feh_thumbnail_get_name_md5(char *uri);
+void feh_thumbnail_show_fullsize(feh_file *thumbfile);
+void feh_thumbnail_select(winwidget winwid, feh_thumbnail *thumbnail);
+void feh_thumbnail_select_next(winwidget winwid, int jump);
+void feh_thumbnail_select_prev(winwidget winwid, int jump);
+void feh_thumbnail_show_selected(void);
+feh_file *feh_thumbnail_get_selected_file(void);
 
 int feh_thumbnail_setup_thumbnail_dir(void);
 
diff --git a/src/timers.c b/src/timers.c
index 5db92f0..8e42050 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,6 +1,7 @@
 /* timers.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -29,144 +30,156 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 fehtimer first_timer = NULL;
 
-void
-feh_handle_timer(void)
+void feh_handle_timer(void)
 {
-   fehtimer ft;
-
-   D_ENTER(4);
-   if (!first_timer)
-   {
-      D(3,("No timer to handle, returning\n"));
-      D_RETURN_(4);
-   }
-   ft = first_timer;
-   first_timer = first_timer->next;
-   D(3,("Executing timer function now\n"));
-   (*(ft->func)) (ft->data);
-   D(3,("Freeing the timer\n"));
-   if (ft && ft->name)
-      free(ft->name);
-   if (ft)
-      free(ft);
-   D_RETURN_(4);
+	fehtimer ft;
+
+	if (!first_timer) {
+		D(("No timer to handle, returning\n"));
+		return;
+	}
+	ft = first_timer;
+	first_timer = first_timer->next;
+	D(("Executing timer function now\n"));
+	(*(ft->func)) (ft->data);
+	D(("Freeing the timer\n"));
+	if (ft && ft->name)
+		free(ft->name);
+	if (ft)
+		free(ft);
+	return;
 }
 
-double
-feh_get_time(void)
+double feh_get_time(void)
 {
-   struct timeval timev;
+	struct timeval timev;
 
-   D_ENTER(4);
-   gettimeofday(&timev, NULL);
-   D_RETURN(4,(double) timev.tv_sec + (((double) timev.tv_usec) / 1000000));
+	gettimeofday(&timev, NULL);
+	return((double) timev.tv_sec + (((double) timev.tv_usec) / 1000000));
 }
 
-void
-feh_remove_timer(char *name)
+void feh_remove_timer_by_data(void *data)
 {
-   fehtimer ft, ptr, pptr;
-
-   D_ENTER(4);
-   D(3,("removing %s\n", name));
-   pptr = NULL;
-   ptr = first_timer;
-   while (ptr)
-   {
-      D(3,("Stepping through event list\n"));
-      ft = ptr;
-      if (!strcmp(ft->name, name))
-      {
-         D(3,("Found it. Removing\n"));
-         if (pptr)
-            pptr->next = ft->next;
-         else
-            first_timer = ft->next;
-         if (ft->next)
-            ft->next->in += ft->in;
-         if (ft->name)
-            free(ft->name);
-         if (ft)
-            free(ft);
-         D_RETURN_(4);
-      }
-      pptr = ptr;
-      ptr = ptr->next;
-   }
-   D_RETURN_(4);
+	fehtimer ft, ptr, pptr;
+
+	D(("removing timer for %p\n", data));
+	pptr = NULL;
+	ptr = first_timer;
+	while (ptr) {
+		D(("Stepping through event list\n"));
+		ft = ptr;
+		if (ft->data == data) {
+			D(("Found it. Removing\n"));
+			if (pptr)
+				pptr->next = ft->next;
+			else
+				first_timer = ft->next;
+			if (ft->next)
+				ft->next->in += ft->in;
+			if (ft->name)
+				free(ft->name);
+			if (ft)
+				free(ft);
+			return;
+		}
+		pptr = ptr;
+		ptr = ptr->next;
+	}
+	return;
 }
 
-void
-feh_add_timer(void (*func) (void *data), void *data, double in, char *name)
+static void feh_remove_timer(char *name)
 {
-   fehtimer ft, ptr, pptr;
-   double tally;
-
-   D_ENTER(4);
-   D(3,("adding timer %s for %f seconds time\n", name, in));
-   feh_remove_timer(name);
-   ft = malloc(sizeof(_fehtimer));
-   ft->next = NULL;
-   ft->func = func;
-   ft->data = data;
-   ft->name = estrdup(name);
-   ft->just_added = 1;
-   ft->in = in;
-   D(3,("ft->in = %f\n", ft->in));
-   tally = 0.0;
-   if (!first_timer)
-   {
-      D(3,("No first timer\n"));
-      first_timer = ft;
-   }
-   else
-   {
-      D(3,("There is a first timer\n"));
-      pptr = NULL;
-      ptr = first_timer;
-      tally = 0.0;
-      while (ptr)
-      {
-         tally += ptr->in;
-         if (tally > in)
-         {
-            tally -= ptr->in;
-            ft->next = ptr;
-            if (pptr)
-               pptr->next = ft;
-            else
-               first_timer = ft;
-            ft->in -= tally;
-            if (ft->next)
-               ft->next->in -= ft->in;
-            D_RETURN_(4);
-         }
-         pptr = ptr;
-         ptr = ptr->next;
-      }
-      if (pptr)
-         pptr->next = ft;
-      else
-         first_timer = ft;
-      ft->in -= tally;
-   }
-   D(3,("ft->in = %f\n", ft->in));
-   D_RETURN_(4);
+	fehtimer ft, ptr, pptr;
+
+	D(("removing %s\n", name));
+	pptr = NULL;
+	ptr = first_timer;
+	while (ptr) {
+		D(("Stepping through event list\n"));
+		ft = ptr;
+		if (!strcmp(ft->name, name)) {
+			D(("Found it. Removing\n"));
+			if (pptr)
+				pptr->next = ft->next;
+			else
+				first_timer = ft->next;
+			if (ft->next)
+				ft->next->in += ft->in;
+			if (ft->name)
+				free(ft->name);
+			if (ft)
+				free(ft);
+			return;
+		}
+		pptr = ptr;
+		ptr = ptr->next;
+	}
+	return;
 }
 
-void
-feh_add_unique_timer(void (*func) (void *data), void *data, double in)
+
+void feh_add_timer(void (*func) (void *data), void *data, double in, char *name)
+{
+	fehtimer ft, ptr, pptr;
+	double tally;
+
+	D(("adding timer %s for %f seconds time\n", name, in));
+	feh_remove_timer(name);
+	ft = emalloc(sizeof(_fehtimer));
+	ft->next = NULL;
+	ft->func = func;
+	ft->data = data;
+	ft->name = estrdup(name);
+	ft->just_added = 1;
+	ft->in = in;
+	D(("ft->in = %f\n", ft->in));
+	if (!first_timer) {
+		D(("No first timer\n"));
+		first_timer = ft;
+	} else {
+		D(("There is a first timer\n"));
+		pptr = NULL;
+		ptr = first_timer;
+		tally = 0.0;
+		while (ptr) {
+			tally += ptr->in;
+			if (tally > in) {
+				tally -= ptr->in;
+				ft->next = ptr;
+				if (pptr)
+					pptr->next = ft;
+				else
+					first_timer = ft;
+				ft->in -= tally;
+				if (ft->next)
+					ft->next->in -= ft->in;
+				return;
+			}
+			pptr = ptr;
+			ptr = ptr->next;
+		}
+		if (pptr)
+			pptr->next = ft;
+		else
+			first_timer = ft;
+		ft->in -= tally;
+	}
+	D(("ft->in = %f\n", ft->in));
+	return;
+}
+
+void feh_add_unique_timer(void (*func) (void *data), void *data, double in)
 {
-   static long i = 0;
-   char evname[20];
-
-   D_ENTER(4);
-   snprintf(evname, sizeof(evname), "T_%ld", i);
-   D(4,("adding timer with unique name %s\n", evname));
-   feh_add_timer(func, data, in, evname);
-   i++;
-   /* Mega paranoia ;) */
-   if (i > 1000000)
-      i = 0;
-   D_RETURN_(4);
+	static long i = 0;
+	char evname[20];
+
+	snprintf(evname, sizeof(evname), "T_%ld", i);
+	D(("adding timer with unique name %s\n", evname));
+	feh_add_timer(func, data, in, evname);
+	i++;
+	/* Mega paranoia ;) */
+	if (i > 1000000)
+		i = 0;
+	return;
 }
diff --git a/src/timers.h b/src/timers.h
index 5cce160..e95d9b5 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -26,22 +26,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef TIMERS_H
 #define TIMERS_H
 
-struct __fehtimer
-{
-   char *name;
-   void (*func) (void *data);
-   void *data;
-   double in;
-   char just_added;
-   fehtimer next;
+struct __fehtimer {
+	char *name;
+	void (*func) (void *data);
+	void *data;
+	double in;
+	char just_added;
+	fehtimer next;
 };
 
 void feh_handle_timer(void);
 double feh_get_time(void);
-void feh_remove_timer(char *name);
-void feh_add_timer(void (*func) (void *data), void *data, double in,
-
-                   char *name);
+void feh_remove_timer_by_data(void *data);
+void feh_add_timer(void (*func) (void *data), void *data, double in, char *name);
 void feh_add_unique_timer(void (*func) (void *data), void *data, double in);
 
 extern fehtimer first_timer;
diff --git a/src/transupp.c b/src/transupp.c
deleted file mode 100644
index 7b6d7ee..0000000
--- a/src/transupp.c
+++ /dev/null
@@ -1,1233 +0,0 @@
-/*
- * transupp.c
- *
- * Copyright (C) 1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains image transformation routines and other utility code
- * used by the jpegtran sample application.  These are NOT part of the core
- * JPEG library.  But we keep these routines separate from jpegtran.c to
- * ease the task of maintaining jpegtran-like programs that have other user
- * interfaces.
- */
-
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include <string.h>
-#define MEMZERO(target,size)  memset((void *)(target), 0, (size_t)(size))
-#define MEMCOPY(dest,src,size)  memcpy((void *)(dest), (const void *)(src), (size_t)(size))
-#define SIZEOF(object)  ((size_t) sizeof(object))
-#define JFREAD(file,buf,sizeofbuf)  \
-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf)  \
-    ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-
-
-#include "jpeglib.h"
-#include "transupp.h"		/* My own external interface */
-
-
-#if TRANSFORMS_SUPPORTED
-
-/*
- * Lossless image transformation routines.  These routines work on DCT
- * coefficient arrays and thus do not require any lossy decompression
- * or recompression of the image.
- * Thanks to Guido Vollbeding for the initial design and code of this feature.
- *
- * Horizontal flipping is done in-place, using a single top-to-bottom
- * pass through the virtual source array.  It will thus be much the
- * fastest option for images larger than main memory.
- *
- * The other routines require a set of destination virtual arrays, so they
- * need twice as much memory as jpegtran normally does.  The destination
- * arrays are always written in normal scan order (top to bottom) because
- * the virtual array manager expects this.  The source arrays will be scanned
- * in the corresponding order, which means multiple passes through the source
- * arrays for most of the transforms.  That could result in much thrashing
- * if the image is larger than main memory.
- *
- * Some notes about the operating environment of the individual transform
- * routines:
- * 1. Both the source and destination virtual arrays are allocated from the
- *    source JPEG object, and therefore should be manipulated by calling the
- *    source's memory manager.
- * 2. The destination's component count should be used.  It may be smaller
- *    than the source's when forcing to grayscale.
- * 3. Likewise the destination's sampling factors should be used.  When
- *    forcing to grayscale the destination's sampling factors will be all 1,
- *    and we may as well take that as the effective iMCU size.
- * 4. When "trim" is in effect, the destination's dimensions will be the
- *    trimmed values but the source's will be untrimmed.
- * 5. All the routines assume that the source and destination buffers are
- *    padded out to a full iMCU boundary.  This is true, although for the
- *    source buffer it is an undocumented property of jdcoefct.c.
- * Notes 2,3,4 boil down to this: generally we should use the destination's
- * dimensions and ignore the source's.
- */
-
-
-LOCAL(void)
-do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   jvirt_barray_ptr *src_coef_arrays)
-/* Horizontal flip; done in-place, so no separate dest array is required */
-{
-  JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
-  int ci, k, offset_y;
-  JBLOCKARRAY buffer;
-  JCOEFPTR ptr1, ptr2;
-  JCOEF temp1, temp2;
-  jpeg_component_info *compptr;
-
-  /* Horizontal mirroring of DCT blocks is accomplished by swapping
-   * pairs of blocks in-place.  Within a DCT block, we perform horizontal
-   * mirroring by changing the signs of odd-numbered columns.
-   * Partial iMCUs at the right edge are left untouched.
-   */
-  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    for (blk_y = 0; blk_y < compptr->height_in_blocks;
-	 blk_y += compptr->v_samp_factor) {
-      buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {
-	  ptr1 = buffer[offset_y][blk_x];
-	  ptr2 = buffer[offset_y][comp_width - blk_x - 1];
-	  /* this unrolled loop doesn't need to know which row it's on... */
-	  for (k = 0; k < DCTSIZE2; k += 2) {
-	    temp1 = *ptr1;	/* swap even column */
-	    temp2 = *ptr2;
-	    *ptr1++ = temp2;
-	    *ptr2++ = temp1;
-	    temp1 = *ptr1;	/* swap odd column with sign change */
-	    temp2 = *ptr2;
-	    *ptr1++ = -temp2;
-	    *ptr2++ = -temp1;
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   jvirt_barray_ptr *src_coef_arrays,
-	   jvirt_barray_ptr *dst_coef_arrays)
-/* Vertical flip */
-{
-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JBLOCKROW src_row_ptr, dst_row_ptr;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* We output into a separate array because we can't touch different
-   * rows of the source virtual array simultaneously.  Otherwise, this
-   * is a pretty straightforward analog of horizontal flip.
-   * Within a DCT block, vertical mirroring is done by changing the signs
-   * of odd-numbered rows.
-   * Partial iMCUs at the bottom edge are copied verbatim.
-   */
-  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      if (dst_blk_y < comp_height) {
-	/* Row is within the mirrorable area. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      } else {
-	/* Bottom-edge blocks will be copied verbatim. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      }
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	if (dst_blk_y < comp_height) {
-	  /* Row is within the mirrorable area. */
-	  dst_row_ptr = dst_buffer[offset_y];
-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	       dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[dst_blk_x];
-	    for (i = 0; i < DCTSIZE; i += 2) {
-	      /* copy even row */
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = *src_ptr++;
-	      /* copy odd row with sign change */
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = - *src_ptr++;
-	    }
-	  }
-	} else {
-	  /* Just copy row verbatim. */
-	  jcopy_block_row(src_buffer[offset_y], dst_buffer[offset_y],
-			  compptr->width_in_blocks);
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	      jvirt_barray_ptr *src_coef_arrays,
-	      jvirt_barray_ptr *dst_coef_arrays)
-/* Transpose source into destination */
-{
-  JDIMENSION dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Transposing pixels within a block just requires transposing the
-   * DCT coefficients.
-   * Partial iMCUs at the edges require no special treatment; we simply
-   * process all the available DCT blocks for every component.
-   */
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    for (i = 0; i < DCTSIZE; i++)
-	      for (j = 0; j < DCTSIZE; j++)
-		dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   jvirt_barray_ptr *src_coef_arrays,
-	   jvirt_barray_ptr *dst_coef_arrays)
-/* 90 degree rotation is equivalent to
- *   1. Transposing the image;
- *   2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Because of the horizontal mirror step, we can't process partial iMCUs
-   * at the (output) right edge properly.  They just get transposed and
-   * not mirrored.
-   */
-  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
-	    if (dst_blk_x < comp_width) {
-	      /* Block is within the mirrorable area. */
-	      dst_ptr = dst_buffer[offset_y]
-		[comp_width - dst_blk_x - offset_x - 1];
-	      for (i = 0; i < DCTSIZE; i++) {
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		i++;
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-	      }
-	    } else {
-	      /* Edge blocks are transposed but not mirrored. */
-	      dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	      for (i = 0; i < DCTSIZE; i++)
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	    jvirt_barray_ptr *src_coef_arrays,
-	    jvirt_barray_ptr *dst_coef_arrays)
-/* 270 degree rotation is equivalent to
- *   1. Horizontal mirroring;
- *   2. Transposing the image.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Because of the horizontal mirror step, we can't process partial iMCUs
-   * at the (output) bottom edge properly.  They just get transposed and
-   * not mirrored.
-   */
-  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    if (dst_blk_y < comp_height) {
-	      /* Block is within the mirrorable area. */
-	      src_ptr = src_buffer[offset_x]
-		[comp_height - dst_blk_y - offset_y - 1];
-	      for (i = 0; i < DCTSIZE; i++) {
-		for (j = 0; j < DCTSIZE; j++) {
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  j++;
-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		}
-	      }
-	    } else {
-	      /* Edge blocks are transposed but not mirrored. */
-	      src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
-	      for (i = 0; i < DCTSIZE; i++)
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	    jvirt_barray_ptr *src_coef_arrays,
-	    jvirt_barray_ptr *dst_coef_arrays)
-/* 180 degree rotation is equivalent to
- *   1. Vertical mirroring;
- *   2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JBLOCKROW src_row_ptr, dst_row_ptr;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
-  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      if (dst_blk_y < comp_height) {
-	/* Row is within the vertically mirrorable area. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      } else {
-	/* Bottom-edge rows are only mirrored horizontally. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      }
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	if (dst_blk_y < comp_height) {
-	  /* Row is within the mirrorable area. */
-	  dst_row_ptr = dst_buffer[offset_y];
-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
-	  /* Process the blocks that can be mirrored both ways. */
-	  for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
-	    for (i = 0; i < DCTSIZE; i += 2) {
-	      /* For even row, negate every odd column. */
-	      for (j = 0; j < DCTSIZE; j += 2) {
-		*dst_ptr++ = *src_ptr++;
-		*dst_ptr++ = - *src_ptr++;
-	      }
-	      /* For odd row, negate every even column. */
-	      for (j = 0; j < DCTSIZE; j += 2) {
-		*dst_ptr++ = - *src_ptr++;
-		*dst_ptr++ = *src_ptr++;
-	      }
-	    }
-	  }
-	  /* Any remaining right-edge blocks are only mirrored vertically. */
-	  for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[dst_blk_x];
-	    for (i = 0; i < DCTSIZE; i += 2) {
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = *src_ptr++;
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = - *src_ptr++;
-	    }
-	  }
-	} else {
-	  /* Remaining rows are just mirrored horizontally. */
-	  dst_row_ptr = dst_buffer[offset_y];
-	  src_row_ptr = src_buffer[offset_y];
-	  /* Process the blocks that can be mirrored. */
-	  for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
-	    for (i = 0; i < DCTSIZE2; i += 2) {
-	      *dst_ptr++ = *src_ptr++;
-	      *dst_ptr++ = - *src_ptr++;
-	    }
-	  }
-	  /* Any remaining right-edge blocks are only copied. */
-	  for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[dst_blk_x];
-	    for (i = 0; i < DCTSIZE2; i++)
-	      *dst_ptr++ = *src_ptr++;
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	       jvirt_barray_ptr *src_coef_arrays,
-	       jvirt_barray_ptr *dst_coef_arrays)
-/* Transverse transpose is equivalent to
- *   1. 180 degree rotation;
- *   2. Transposition;
- * or
- *   1. Horizontal mirroring;
- *   2. Transposition;
- *   3. Horizontal mirroring.
- * These steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
-  MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    if (dst_blk_y < comp_height) {
-	      src_ptr = src_buffer[offset_x]
-		[comp_height - dst_blk_y - offset_y - 1];
-	      if (dst_blk_x < comp_width) {
-		/* Block is within the mirrorable area. */
-		dst_ptr = dst_buffer[offset_y]
-		  [comp_width - dst_blk_x - offset_x - 1];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		  }
-		  i++;
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  }
-		}
-	      } else {
-		/* Right-edge blocks are mirrored in y only */
-		dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		  }
-		}
-	      }
-	    } else {
-	      src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
-	      if (dst_blk_x < comp_width) {
-		/* Bottom-edge blocks are mirrored in x only */
-		dst_ptr = dst_buffer[offset_y]
-		  [comp_width - dst_blk_x - offset_x - 1];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  i++;
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		}
-	      } else {
-		/* At lower right corner, just transpose, no mirroring */
-		dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-		for (i = 0; i < DCTSIZE; i++)
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	      }
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-/* Request any required workspace.
- *
- * We allocate the workspace virtual arrays from the source decompression
- * object, so that all the arrays (both the original data and the workspace)
- * will be taken into account while making memory management decisions.
- * Hence, this routine must be called after jpeg_read_header (which reads
- * the image dimensions) and before jpeg_read_coefficients (which realizes
- * the source's virtual arrays).
- */
-
-GLOBAL(void)
-jtransform_request_workspace (j_decompress_ptr srcinfo,
-			      jpeg_transform_info *info)
-{
-  jvirt_barray_ptr *coef_arrays = NULL;
-  jpeg_component_info *compptr;
-  int ci;
-
-  if (info->force_grayscale &&
-      srcinfo->jpeg_color_space == JCS_YCbCr &&
-      srcinfo->num_components == 3) {
-    /* We'll only process the first component */
-    info->num_components = 1;
-  } else {
-    /* Process all the components */
-    info->num_components = srcinfo->num_components;
-  }
-
-  switch (info->transform) {
-  case JXFORM_NONE:
-  case JXFORM_FLIP_H:
-    /* Don't need a workspace array */
-    break;
-  case JXFORM_FLIP_V:
-  case JXFORM_ROT_180:
-    /* Need workspace arrays having same dimensions as source image.
-     * Note that we allocate arrays padded out to the next iMCU boundary,
-     * so that transform routines need not worry about missing edge blocks.
-     */
-    coef_arrays = (jvirt_barray_ptr *)
-      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
-	SIZEOF(jvirt_barray_ptr) * info->num_components);
-    for (ci = 0; ci < info->num_components; ci++) {
-      compptr = srcinfo->comp_info + ci;
-      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
-	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) compptr->v_samp_factor);
-    }
-    break;
-  case JXFORM_TRANSPOSE:
-  case JXFORM_TRANSVERSE:
-  case JXFORM_ROT_90:
-  case JXFORM_ROT_270:
-    /* Need workspace arrays having transposed dimensions.
-     * Note that we allocate arrays padded out to the next iMCU boundary,
-     * so that transform routines need not worry about missing edge blocks.
-     */
-    coef_arrays = (jvirt_barray_ptr *)
-      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
-	SIZEOF(jvirt_barray_ptr) * info->num_components);
-    for (ci = 0; ci < info->num_components; ci++) {
-      compptr = srcinfo->comp_info + ci;
-      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
-	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) compptr->h_samp_factor);
-    }
-    break;
-  }
-  info->workspace_coef_arrays = coef_arrays;
-}
-
-
-/* Transpose destination image parameters */
-
-LOCAL(void)
-transpose_critical_parameters (j_compress_ptr dstinfo)
-{
-  int tblno, i, j, ci, itemp;
-  jpeg_component_info *compptr;
-  JQUANT_TBL *qtblptr;
-  JDIMENSION dtemp;
-  UINT16 qtemp;
-
-  /* Transpose basic image dimensions */
-  dtemp = dstinfo->image_width;
-  dstinfo->image_width = dstinfo->image_height;
-  dstinfo->image_height = dtemp;
-
-  /* Transpose sampling factors */
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    itemp = compptr->h_samp_factor;
-    compptr->h_samp_factor = compptr->v_samp_factor;
-    compptr->v_samp_factor = itemp;
-  }
-
-  /* Transpose quantization tables */
-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
-    qtblptr = dstinfo->quant_tbl_ptrs[tblno];
-    if (qtblptr != NULL) {
-      for (i = 0; i < DCTSIZE; i++) {
-	for (j = 0; j < i; j++) {
-	  qtemp = qtblptr->quantval[i*DCTSIZE+j];
-	  qtblptr->quantval[i*DCTSIZE+j] = qtblptr->quantval[j*DCTSIZE+i];
-	  qtblptr->quantval[j*DCTSIZE+i] = qtemp;
-	}
-      }
-    }
-  }
-}
-
-
-/* Trim off any partial iMCUs on the indicated destination edge */
-
-LOCAL(void)
-trim_right_edge (j_compress_ptr dstinfo)
-{
-  int ci, max_h_samp_factor;
-  JDIMENSION MCU_cols;
-
-  /* We have to compute max_h_samp_factor ourselves,
-   * because it hasn't been set yet in the destination
-   * (and we don't want to use the source's value).
-   */
-  max_h_samp_factor = 1;
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    int h_samp_factor = dstinfo->comp_info[ci].h_samp_factor;
-    max_h_samp_factor = MAX(max_h_samp_factor, h_samp_factor);
-  }
-  MCU_cols = dstinfo->image_width / (max_h_samp_factor * DCTSIZE);
-  if (MCU_cols > 0)		/* can't trim to 0 pixels */
-    dstinfo->image_width = MCU_cols * (max_h_samp_factor * DCTSIZE);
-}
-
-LOCAL(void)
-trim_bottom_edge (j_compress_ptr dstinfo)
-{
-  int ci, max_v_samp_factor;
-  JDIMENSION MCU_rows;
-
-  /* We have to compute max_v_samp_factor ourselves,
-   * because it hasn't been set yet in the destination
-   * (and we don't want to use the source's value).
-   */
-  max_v_samp_factor = 1;
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    int v_samp_factor = dstinfo->comp_info[ci].v_samp_factor;
-    max_v_samp_factor = MAX(max_v_samp_factor, v_samp_factor);
-  }
-  MCU_rows = dstinfo->image_height / (max_v_samp_factor * DCTSIZE);
-  if (MCU_rows > 0)		/* can't trim to 0 pixels */
-    dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE);
-}
-
-LOCAL(void)
-set_exif_orientation (JOCTET FAR * data, unsigned int length,
-			unsigned char new_orient)
-{
-  boolean is_motorola; /* Flag for byte order */
-  unsigned int number_of_tags, tagnum;
-  unsigned int firstoffset, offset;
-
-  if (length < 12) return; /* Length of an IFD entry */
-
-  /* Discover byte order */
-  if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)
-    is_motorola = FALSE;
-  else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)
-    is_motorola = TRUE;
-  else
-    return;
-
-  /* Check Tag Mark */
-  if (is_motorola) {
-    if (GETJOCTET(data[2]) != 0) return;
-    if (GETJOCTET(data[3]) != 0x2A) return;
-  } else {
-    if (GETJOCTET(data[3]) != 0) return;
-    if (GETJOCTET(data[2]) != 0x2A) return;
-  }
-
-  /* Get first IFD offset (offset to IFD0) */
-  if (is_motorola) {
-    if (GETJOCTET(data[4]) != 0) return;
-    if (GETJOCTET(data[5]) != 0) return;
-    firstoffset = GETJOCTET(data[6]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[7]);
-  } else {
-    if (GETJOCTET(data[7]) != 0) return;
-    if (GETJOCTET(data[6]) != 0) return;
-    firstoffset = GETJOCTET(data[5]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[4]);
-  }
-  if (firstoffset > length - 2) return; /* check end of data segment */
-
-  /* Get the number of directory entries contained in this IFD */
-  if (is_motorola) {
-    number_of_tags = GETJOCTET(data[firstoffset]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset+1]);
-  } else {
-    number_of_tags = GETJOCTET(data[firstoffset+1]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset]);
-  }
-  if (number_of_tags == 0) return;
-  firstoffset += 2;
-
-  /* Search for Orientation offset Tag in IFD0 */
-  for (;;) {
-    if (firstoffset > length - 12) return; /* check end of data segment */
-    /* Get Tag number */
-    if (is_motorola) {
-      tagnum = GETJOCTET(data[firstoffset]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset+1]);
-    } else {
-      tagnum = GETJOCTET(data[firstoffset+1]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset]);
-    }
-    if (tagnum == 0x0112) break; /* found Orientation Tag */
-    if (--number_of_tags == 0) return;
-    firstoffset += 12;
-  }
-
-  if (is_motorola) {
-    data[firstoffset+2] = 0; /* Format = unsigned short (2 octets) */
-    data[firstoffset+3] = 3;
-    data[firstoffset+4] = 0; /* Number Of Components = 1 */
-    data[firstoffset+5] = 0;
-    data[firstoffset+6] = 0;
-    data[firstoffset+7] = 1;
-    data[firstoffset+8] = 0;
-    data[firstoffset+9] = (unsigned char) new_orient;
-    data[firstoffset+10] = 0;
-    data[firstoffset+11] = 0;
-  } else {
-    data[firstoffset+2] = 3; /* Format = unsigned short (2 octets) */
-    data[firstoffset+3] = 0;
-    data[firstoffset+4] = 1; /* Number Of Components = 1 */
-    data[firstoffset+5] = 0;
-    data[firstoffset+6] = 0;
-    data[firstoffset+7] = 0;
-    data[firstoffset+8] = (unsigned char) new_orient;
-    data[firstoffset+9] = 0;
-    data[firstoffset+10] = 0;
-    data[firstoffset+11] = 0;
-  }
-}
-
-/* Adjust Exif image parameters.
- *
- * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible.
- */
-
-LOCAL(void)
-adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
-			JDIMENSION new_width, JDIMENSION new_height)
-{
-  boolean is_motorola; /* Flag for byte order */
-  unsigned int number_of_tags, tagnum;
-  unsigned int firstoffset, offset;
-  unsigned int new_orient;
-  JDIMENSION new_value;
-
-  if (length < 12) return; /* Length of an IFD entry */
-
-  /* Discover byte order */
-  if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)
-    is_motorola = FALSE;
-  else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)
-    is_motorola = TRUE;
-  else
-    return;
-
-  /* Check Tag Mark */
-  if (is_motorola) {
-    if (GETJOCTET(data[2]) != 0) return;
-    if (GETJOCTET(data[3]) != 0x2A) return;
-  } else {
-    if (GETJOCTET(data[3]) != 0) return;
-    if (GETJOCTET(data[2]) != 0x2A) return;
-  }
-
-  /* Get first IFD offset (offset to IFD0) */
-  if (is_motorola) {
-    if (GETJOCTET(data[4]) != 0) return;
-    if (GETJOCTET(data[5]) != 0) return;
-    firstoffset = GETJOCTET(data[6]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[7]);
-  } else {
-    if (GETJOCTET(data[7]) != 0) return;
-    if (GETJOCTET(data[6]) != 0) return;
-    firstoffset = GETJOCTET(data[5]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[4]);
-  }
-  if (firstoffset > length - 2) return; /* check end of data segment */
-
-  /* Get the number of directory entries contained in this IFD */
-  if (is_motorola) {
-    number_of_tags = GETJOCTET(data[firstoffset]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset+1]);
-  } else {
-    number_of_tags = GETJOCTET(data[firstoffset+1]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset]);
-  }
-  if (number_of_tags == 0) return;
-  firstoffset += 2;
-
-  /* Search for ExifSubIFD offset Tag in IFD0 */
-  for (;;) {
-    if (firstoffset > length - 12) return; /* check end of data segment */
-    /* Get Tag number */
-    if (is_motorola) {
-      tagnum = GETJOCTET(data[firstoffset]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset+1]);
-    } else {
-      tagnum = GETJOCTET(data[firstoffset+1]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset]);
-    }
-    if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */
-    if (--number_of_tags == 0) return;
-    firstoffset += 12;
-  }
-
-  /* Get the ExifSubIFD offset */
-  if (is_motorola) {
-    if (GETJOCTET(data[firstoffset+8]) != 0) return;
-    if (GETJOCTET(data[firstoffset+9]) != 0) return;
-    offset = GETJOCTET(data[firstoffset+10]);
-    offset <<= 8;
-    offset += GETJOCTET(data[firstoffset+11]);
-  } else {
-    if (GETJOCTET(data[firstoffset+11]) != 0) return;
-    if (GETJOCTET(data[firstoffset+10]) != 0) return;
-    offset = GETJOCTET(data[firstoffset+9]);
-    offset <<= 8;
-    offset += GETJOCTET(data[firstoffset+8]);
-  }
-  if (offset > length - 2) return; /* check end of data segment */
-
-  /* Get the number of directory entries contained in this SubIFD */
-  if (is_motorola) {
-    number_of_tags = GETJOCTET(data[offset]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[offset+1]);
-  } else {
-    number_of_tags = GETJOCTET(data[offset+1]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[offset]);
-  }
-  if (number_of_tags < 2) return;
-  offset += 2;
-
-  /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */
-  do {
-    if (offset > length - 12) return; /* check end of data segment */
-    /* Get Tag number */
-    if (is_motorola) {
-      tagnum = GETJOCTET(data[offset]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[offset+1]);
-    } else {
-      tagnum = GETJOCTET(data[offset+1]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[offset]);
-    }
-    if (tagnum == 0xA002 || tagnum == 0xA003) {
-      if (tagnum == 0xA002) {
-	new_value = new_width; /* ExifImageWidth Tag */
-      } else {
-	new_value = new_height; /* ExifImageHeight Tag */
-      }
-      if (is_motorola) {
-	data[offset+2] = 0; /* Format = unsigned long (4 octets) */
-	data[offset+3] = 4;
-	data[offset+4] = 0; /* Number Of Components = 1 */
-	data[offset+5] = 0;
-	data[offset+6] = 0;
-	data[offset+7] = 1;
-	data[offset+8] = 0;
-	data[offset+9] = 0;
-	data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF);
-	data[offset+11] = (JOCTET)(new_value & 0xFF);
-      } else {
-	data[offset+2] = 4; /* Format = unsigned long (4 octets) */
-	data[offset+3] = 0;
-	data[offset+4] = 1; /* Number Of Components = 1 */
-	data[offset+5] = 0;
-	data[offset+6] = 0;
-	data[offset+7] = 0;
-	data[offset+8] = (JOCTET)(new_value & 0xFF);
-	data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF);
-	data[offset+10] = 0;
-	data[offset+11] = 0;
-      }
-    }
-    offset += 12;
-  } while (--number_of_tags);
-}
-
-
-/* Adjust output image parameters as needed.
- *
- * This must be called after jpeg_copy_critical_parameters()
- * and before jpeg_write_coefficients().
- *
- * The return value is the set of virtual coefficient arrays to be written
- * (either the ones allocated by jtransform_request_workspace, or the
- * original source data arrays).  The caller will need to pass this value
- * to jpeg_write_coefficients().
- */
-
-GLOBAL(jvirt_barray_ptr *)
-jtransform_adjust_parameters (j_decompress_ptr srcinfo,
-			      j_compress_ptr dstinfo,
-			      jvirt_barray_ptr *src_coef_arrays,
-			      jpeg_transform_info *info)
-{
-  jpeg_saved_marker_ptr marker;
-  /* If force-to-grayscale is requested, adjust destination parameters */
-  if (info->force_grayscale) {
-    /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
-     * properly.  Among other things, the target h_samp_factor & v_samp_factor
-     * will get set to 1, which typically won't match the source.
-     * In fact we do this even if the source is already grayscale; that
-     * provides an easy way of coercing a grayscale JPEG with funny sampling
-     * factors to the customary 1,1.  (Some decoders fail on other factors.)
-     */
-    if ((dstinfo->jpeg_color_space == JCS_YCbCr &&
-	 dstinfo->num_components == 3) ||
-	(dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
-	 dstinfo->num_components == 1)) {
-      /* We have to preserve the source's quantization table number. */
-      int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;
-      jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);
-      dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;
-    } else {
-      /* Sorry, can't do it */
-      ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);
-    }
-  }
-
-  /* Correct the destination's image dimensions etc if necessary */
-  switch (info->transform) {
-  case JXFORM_NONE:
-    /* Nothing to do */
-    break;
-  case JXFORM_FLIP_H:
-    if (info->trim)
-      trim_right_edge(dstinfo);
-    break;
-  case JXFORM_FLIP_V:
-    if (info->trim)
-      trim_bottom_edge(dstinfo);
-    break;
-  case JXFORM_TRANSPOSE:
-    transpose_critical_parameters(dstinfo);
-    /* transpose does NOT have to trim anything */
-    break;
-  case JXFORM_TRANSVERSE:
-    transpose_critical_parameters(dstinfo);
-    if (info->trim) {
-      trim_right_edge(dstinfo);
-      trim_bottom_edge(dstinfo);
-    }
-    break;
-  case JXFORM_ROT_90:
-    transpose_critical_parameters(dstinfo);
-    if (info->trim)
-      trim_right_edge(dstinfo);
-    break;
-  case JXFORM_ROT_180:
-    if (info->trim) {
-      trim_right_edge(dstinfo);
-      trim_bottom_edge(dstinfo);
-    }
-    break;
-  case JXFORM_ROT_270:
-    transpose_critical_parameters(dstinfo);
-    if (info->trim)
-      trim_bottom_edge(dstinfo);
-    break;
-  }
-
-  for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
-    if (marker->marker != JPEG_APP0+1)
-      continue;
-    /* Adjust Exif properties */
-    if (marker->marker == JPEG_APP0+1 &&
-        marker->data_length >= 6 &&
-        GETJOCTET(marker->data[0]) == 0x45 &&
-        GETJOCTET(marker->data[1]) == 0x78 &&
-        GETJOCTET(marker->data[2]) == 0x69 &&
-        GETJOCTET(marker->data[3]) == 0x66 &&
-        GETJOCTET(marker->data[4]) == 0 &&
-        GETJOCTET(marker->data[5]) == 0) {
-      /* Suppress output of JFIF marker */
-      dstinfo->write_JFIF_header = FALSE;
-      /* Adjust Exif image parameters */
-      if (dstinfo->image_width  != srcinfo->image_width ||
-          dstinfo->image_height != srcinfo->image_height)
-        /* Align data segment to start of TIFF structure for parsing */
-        adjust_exif_parameters(marker->data + 6,
-                               marker->data_length - 6,
-                               dstinfo->image_width, dstinfo->image_height);
-      /* I'm honestly not sure what the right thing to do is here.. The
-       * existing orientation tag may be incorrect, so making a change based
-       * on the previous value seems like the wrong thing to do. For now, I'm
-       * going to assume that the user is always "fixing" the orientation,
-       * i.e. putting the image the "right way up". In this case, we want to
-       * set the orientation to "top left".
-       */
-        set_exif_orientation(marker->data + 6,
-                             marker->data_length - 6,
-                             1);
-    }
-  }
-
-  /* Return the appropriate output data set */
-  if (info->workspace_coef_arrays != NULL)
-    return info->workspace_coef_arrays;
-  return src_coef_arrays;
-}
-
-
-/* Execute the actual transformation, if any.
- *
- * This must be called *after* jpeg_write_coefficients, because it depends
- * on jpeg_write_coefficients to have computed subsidiary values such as
- * the per-component width and height fields in the destination object.
- *
- * Note that some transformations will modify the source data arrays!
- */
-
-GLOBAL(void)
-jtransform_execute_transformation (j_decompress_ptr srcinfo,
-				   j_compress_ptr dstinfo,
-				   jvirt_barray_ptr *src_coef_arrays,
-				   jpeg_transform_info *info)
-{
-  jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;
-
-  switch (info->transform) {
-  case JXFORM_NONE:
-    break;
-  case JXFORM_FLIP_H:
-    do_flip_h(srcinfo, dstinfo, src_coef_arrays);
-    break;
-  case JXFORM_FLIP_V:
-    do_flip_v(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_TRANSPOSE:
-    do_transpose(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_TRANSVERSE:
-    do_transverse(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_90:
-    do_rot_90(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_180:
-    do_rot_180(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_270:
-    do_rot_270(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
-    break;
-  }
-}
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/* Setup decompression object to save desired markers in memory.
- * This must be called before jpeg_read_header() to have the desired effect.
- */
-
-GLOBAL(void)
-jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
-{
-#ifdef SAVE_MARKERS_SUPPORTED
-  int m;
-
-  /* Save comments except under NONE option */
-  if (option != JCOPYOPT_NONE) {
-    jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);
-  }
-  /* Save all types of APPn markers iff ALL option */
-  if (option == JCOPYOPT_ALL) {
-    for (m = 0; m < 16; m++)
-      jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
-  }
-#endif /* SAVE_MARKERS_SUPPORTED */
-}
-
-/* Copy markers saved in the given source object to the destination object.
- * This should be called just after jpeg_start_compress() or
- * jpeg_write_coefficients().
- * Note that those routines will have written the SOI, and also the
- * JFIF APP0 or Adobe APP14 markers if selected.
- */
-
-GLOBAL(void)
-jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-		       JCOPY_OPTION option)
-{
-  jpeg_saved_marker_ptr marker;
-
-  /* In the current implementation, we don't actually need to examine the
-   * option flag here; we just copy everything that got saved.
-   * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
-   * if the encoder library already wrote one.
-   */
-  for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
-    if (dstinfo->write_JFIF_header &&
-	marker->marker == JPEG_APP0 &&
-	marker->data_length >= 5 &&
-	GETJOCTET(marker->data[0]) == 0x4A &&
-	GETJOCTET(marker->data[1]) == 0x46 &&
-	GETJOCTET(marker->data[2]) == 0x49 &&
-	GETJOCTET(marker->data[3]) == 0x46 &&
-	GETJOCTET(marker->data[4]) == 0)
-      continue;			/* reject duplicate JFIF */
-    if (dstinfo->write_Adobe_marker &&
-	marker->marker == JPEG_APP0+14 &&
-	marker->data_length >= 5 &&
-	GETJOCTET(marker->data[0]) == 0x41 &&
-	GETJOCTET(marker->data[1]) == 0x64 &&
-	GETJOCTET(marker->data[2]) == 0x6F &&
-	GETJOCTET(marker->data[3]) == 0x62 &&
-	GETJOCTET(marker->data[4]) == 0x65)
-      continue;			/* reject duplicate Adobe */
-#ifdef NEED_FAR_POINTERS
-    /* We could use jpeg_write_marker if the data weren't FAR... */
-    {
-      unsigned int i;
-      jpeg_write_m_header(dstinfo, marker->marker, marker->data_length);
-      for (i = 0; i < marker->data_length; i++)
-	jpeg_write_m_byte(dstinfo, marker->data[i]);
-    }
-#else
-    jpeg_write_marker(dstinfo, marker->marker,
-		      marker->data, marker->data_length);
-#endif
-  }
-}
diff --git a/src/transupp.h b/src/transupp.h
deleted file mode 100644
index 5c2d32a..0000000
--- a/src/transupp.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * transupp.h
- *
- * Copyright (C) 1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for image transformation routines and
- * other utility code used by the jpegtran sample application.  These are
- * NOT part of the core JPEG library.  But we keep these routines separate
- * from jpegtran.c to ease the task of maintaining jpegtran-like programs
- * that have other user interfaces.
- *
- * NOTE: all the routines declared here have very specific requirements
- * about when they are to be executed during the reading and writing of the
- * source and destination files.  See the comments in transupp.c, or see
- * jpegtran.c for an example of correct usage.
- */
-
-/* If you happen not to want the image transform support, disable it here */
-#ifndef TRANSFORMS_SUPPORTED
-#define TRANSFORMS_SUPPORTED 1		/* 0 disables transform code */
-#endif
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jtransform_request_workspace		jTrRequest
-#define jtransform_adjust_parameters		jTrAdjust
-#define jtransform_execute_transformation	jTrExec
-#define jcopy_markers_setup			jCMrkSetup
-#define jcopy_markers_execute			jCMrkExec
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/*
- * Codes for supported types of image transformations.
- */
-
-typedef enum {
-	JXFORM_NONE,		/* no transformation */
-	JXFORM_FLIP_H,		/* horizontal flip */
-	JXFORM_FLIP_V,		/* vertical flip */
-	JXFORM_TRANSPOSE,	/* transpose across UL-to-LR axis */
-	JXFORM_TRANSVERSE,	/* transpose across UR-to-LL axis */
-	JXFORM_ROT_90,		/* 90-degree clockwise rotation */
-	JXFORM_ROT_180,		/* 180-degree rotation */
-	JXFORM_ROT_270		/* 270-degree clockwise (or 90 ccw) */
-} JXFORM_CODE;
-
-/*
- * Although rotating and flipping data expressed as DCT coefficients is not
- * hard, there is an asymmetry in the JPEG format specification for images
- * whose dimensions aren't multiples of the iMCU size.  The right and bottom
- * image edges are padded out to the next iMCU boundary with junk data; but
- * no padding is possible at the top and left edges.  If we were to flip
- * the whole image including the pad data, then pad garbage would become
- * visible at the top and/or left, and real pixels would disappear into the
- * pad margins --- perhaps permanently, since encoders & decoders may not
- * bother to preserve DCT blocks that appear to be completely outside the
- * nominal image area.  So, we have to exclude any partial iMCUs from the
- * basic transformation.
- *
- * Transpose is the only transformation that can handle partial iMCUs at the
- * right and bottom edges completely cleanly.  flip_h can flip partial iMCUs
- * at the bottom, but leaves any partial iMCUs at the right edge untouched.
- * Similarly flip_v leaves any partial iMCUs at the bottom edge untouched.
- * The other transforms are defined as combinations of these basic transforms
- * and process edge blocks in a way that preserves the equivalence.
- *
- * The "trim" option causes untransformable partial iMCUs to be dropped;
- * this is not strictly lossless, but it usually gives the best-looking
- * result for odd-size images.  Note that when this option is active,
- * the expected mathematical equivalences between the transforms may not hold.
- * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim
- * followed by -rot 180 -trim trims both edges.)
- *
- * We also offer a "force to grayscale" option, which simply discards the
- * chrominance channels of a YCbCr image.  This is lossless in the sense that
- * the luminance channel is preserved exactly.  It's not the same kind of
- * thing as the rotate/flip transformations, but it's convenient to handle it
- * as part of this package, mainly because the transformation routines have to
- * be aware of the option to know how many components to work on.
- */
-
-typedef struct {
-  /* Options: set by caller */
-  JXFORM_CODE transform;	/* image transform operator */
-  boolean trim;			/* if TRUE, trim partial MCUs as needed */
-  boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
-
-  /* Internal workspace: caller should not touch these */
-  int num_components;		/* # of components in workspace */
-  jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
-} jpeg_transform_info;
-
-
-#if TRANSFORMS_SUPPORTED
-
-/* Request any required workspace */
-EXTERN(void) jtransform_request_workspace
-	JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
-/* Adjust output image parameters */
-EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     jvirt_barray_ptr *src_coef_arrays,
-	     jpeg_transform_info *info));
-/* Execute the actual transformation, if any */
-EXTERN(void) jtransform_execute_transformation
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     jvirt_barray_ptr *src_coef_arrays,
-	     jpeg_transform_info *info));
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/*
- * Support for copying optional markers from source to destination file.
- */
-
-typedef enum {
-	JCOPYOPT_NONE,		/* copy no optional markers */
-	JCOPYOPT_COMMENTS,	/* copy only comment (COM) markers */
-	JCOPYOPT_ALL		/* copy all optional markers */
-} JCOPY_OPTION;
-
-#define JCOPYOPT_DEFAULT  JCOPYOPT_COMMENTS	/* recommended default */
-
-/* Setup decompression object to save desired markers in memory */
-EXTERN(void) jcopy_markers_setup
-	JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
-/* Copy markers saved in the given source object to the destination object */
-EXTERN(void) jcopy_markers_execute
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     JCOPY_OPTION option));
diff --git a/src/ttfonts/Makefile.am b/src/ttfonts/Makefile.am
deleted file mode 100644
index 7df955a..0000000
--- a/src/ttfonts/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-testfonts_DATA = \
-menu.style black.style yudit.ttf
-
-testfontsdir=$(prefix)/share/feh/fonts
-
-EXTRA_DIST = $(testfonts_DATA)
diff --git a/src/ttfonts/Makefile.in b/src/ttfonts/Makefile.in
deleted file mode 100644
index ae93e14..0000000
--- a/src/ttfonts/Makefile.in
+++ /dev/null
@@ -1,216 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GIBLIB_CFLAGS = @GIBLIB_CFLAGS@
-GIBLIB_LIBS = @GIBLIB_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-HAVE_LIB = @HAVE_LIB@
-HAVE_XINERAMA = @HAVE_XINERAMA@
-IMLIB_CFLAGS = @IMLIB_CFLAGS@
-IMLIB_LIBS = @IMLIB_LIBS@
-LIB = @LIB@
-LTLIB = @LTLIB@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-UP = @UP@
-VERSION = @VERSION@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-testfonts_DATA =  menu.style black.style yudit.ttf
-
-
-testfontsdir = $(prefix)/share/feh/fonts
-
-EXTRA_DIST = $(testfonts_DATA)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../src/config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(testfonts_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/ttfonts/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-testfontsDATA: $(testfonts_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testfontsdir)
-	@list='$(testfonts_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(testfontsdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(testfontsdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(testfontsdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(testfontsdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-testfontsDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(testfonts_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(testfontsdir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/ttfonts
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-testfontsDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-testfontsDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(testfontsdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-testfontsDATA install-testfontsDATA tags distdir \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/ttfonts/black.style b/src/ttfonts/black.style
deleted file mode 100644
index d2a86a9..0000000
--- a/src/ttfonts/black.style
+++ /dev/null
@@ -1,4 +0,0 @@
-#Style
-#NAME Menu
-255 255 255 64 2 2
-255 255 255 255 0 0
diff --git a/src/ttfonts/menu.style b/src/ttfonts/menu.style
deleted file mode 100644
index 8557360..0000000
--- a/src/ttfonts/menu.style
+++ /dev/null
@@ -1,4 +0,0 @@
-#Style
-#NAME Menu
-0 0 0 64 2 2
-0 0 0 0 0 0
diff --git a/src/ttfonts/yudit.ttf b/src/ttfonts/yudit.ttf
deleted file mode 100644
index 8099e63..0000000
--- a/src/ttfonts/yudit.ttf
+++ /dev/null
diff --git a/src/utils.c b/src/utils.c
index 7183b66..eb128a2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -27,222 +27,203 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "debug.h"
 #include "options.h"
 
-static char *feh_user_name = NULL;
-static char *feh_tmp_dir = NULL;
-
 /* eprintf: print error message and exit */
-void
-eprintf(char *fmt, ...)
+void eprintf(char *fmt, ...)
 {
-   va_list args;
+	va_list args;
 
-   fflush(stdout);
-   fprintf(stderr, "%s ERROR: ", PACKAGE);
+	fflush(stdout);
+	fputs(PACKAGE " ERROR: ", stderr);
 
-   va_start(args, fmt);
-   vfprintf(stderr, fmt, args);
-   va_end(args);
+	va_start(args, fmt);
+	vfprintf(stderr, fmt, args);
+	va_end(args);
 
-   if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
-      fprintf(stderr, " %s", strerror(errno));
-   fprintf(stderr, "\n");
-   exit(2);
+	if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
+		fprintf(stderr, " %s", strerror(errno));
+	fputs("\n", stderr);
+	exit(2);
 }
 
 /* weprintf: print warning message and continue */
-void
-weprintf(char *fmt, ...)
+void weprintf(char *fmt, ...)
 {
-   va_list args;
+	va_list args;
 
-   fflush(stdout);
-   fprintf(stderr, "%s WARNING: ", PACKAGE);
+	fflush(stdout);
+	fputs(PACKAGE " WARNING: ", stderr);
 
-   va_start(args, fmt);
-   vfprintf(stderr, fmt, args);
-   va_end(args);
+	va_start(args, fmt);
+	vfprintf(stderr, fmt, args);
+	va_end(args);
 
-   if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
-      fprintf(stderr, " %s", strerror(errno));
-   fprintf(stderr, "\n");
+	if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
+		fprintf(stderr, " %s", strerror(errno));
+	fputs("\n", stderr);
 }
 
 /* estrdup: duplicate a string, report if error */
-char *
-_estrdup(char *s)
+char *_estrdup(char *s)
 {
-   char *t;
+	char *t;
 
-   if (!s)
-      return NULL;
+	if (!s)
+		return NULL;
 
-   t = (char *) malloc(strlen(s) + 1);
-   if (t == NULL)
-      eprintf("estrdup(\"%.20s\") failed:", s);
-   strcpy(t, s);
-   return t;
+	t = (char *) malloc(strlen(s) + 1);
+	if (t == NULL)
+		eprintf("estrdup(\"%.20s\") failed:", s);
+	strcpy(t, s);
+	return t;
 }
 
 /* emalloc: malloc and report if error */
-void *
-_emalloc(size_t n)
+void *_emalloc(size_t n)
 {
-   void *p;
+	void *p;
 
-   p = malloc(n);
-   if (p == NULL)
-      eprintf("malloc of %u bytes failed:", n);
-   return p;
+	p = malloc(n);
+	if (p == NULL)
+		eprintf("malloc of %u bytes failed:", n);
+	return p;
 }
 
 /* erealloc: realloc and report if error */
-void *
-_erealloc(void *ptr, size_t n)
+void *_erealloc(void *ptr, size_t n)
 {
-   void *p;
+	void *p;
 
-   p = realloc(ptr, n);
-   if (p == NULL)
-      eprintf("realloc of %p by %u bytes failed:", ptr, n);
-   return p;
+	p = realloc(ptr, n);
+	if (p == NULL)
+		eprintf("realloc of %p by %u bytes failed:", ptr, n);
+	return p;
 }
 
-char *
-estrjoin(const char *separator, ...)
+char *estrjoin(const char *separator, ...)
 {
-   char *string, *s;
-   va_list args;
-   int len;
-   int separator_len;
-
-   if (separator == NULL)
-      separator = "";
-
-   separator_len = strlen(separator);
-   va_start(args, separator);
-   s = va_arg(args, char *);
-
-   if (s)
-   {
-      len = strlen(s);
-      s = va_arg(args, char *);
-
-      while (s)
-      {
-         len += separator_len + strlen(s);
-         s = va_arg(args, char *);
-      }
-      va_end(args);
-      string = malloc(sizeof(char) * (len + 1));
-
-      *string = 0;
-      va_start(args, separator);
-      s = va_arg(args, char *);
-
-      strcat(string, s);
-      s = va_arg(args, char *);
-
-      while (s)
-      {
-         strcat(string, separator);
-         strcat(string, s);
-         s = va_arg(args, char *);
-      }
-   }
-   else
-      string = estrdup("");
-   va_end(args);
-
-   return string;
+	char *string, *s;
+	va_list args;
+	int len;
+	int separator_len;
+
+	if (separator == NULL)
+		separator = "";
+
+	separator_len = strlen(separator);
+	va_start(args, separator);
+	s = va_arg(args, char *);
+
+	if (s) {
+		len = strlen(s);
+		s = va_arg(args, char *);
+
+		while (s) {
+			len += separator_len + strlen(s);
+			s = va_arg(args, char *);
+		}
+		va_end(args);
+		string = emalloc(sizeof(char) * (len + 1));
+
+		*string = 0;
+		va_start(args, separator);
+		s = va_arg(args, char *);
+
+		strcat(string, s);
+		s = va_arg(args, char *);
+
+		while (s) {
+			strcat(string, separator);
+			strcat(string, s);
+			s = va_arg(args, char *);
+		}
+	} else
+		string = estrdup("");
+	va_end(args);
+
+	return string;
 }
 
-char *
-stroflen(char c, int l)
-{
-   static char buf[1024];
-   int i = 0;
-
-   buf[0] = '\0';
-   while (l--)
-      buf[i++] = c;
-   buf[i] = '\0';
-   return buf;
+char path_is_url(char *path) {
+	if ((!strncmp(path, "http://", 7))
+			|| (!strncmp(path, "https://", 8))
+			|| (!strncmp(path, "gopher://", 9))
+			|| (!strncmp(path, "gophers://", 10))
+			|| (!strncmp(path, "ftp://", 6))
+			|| (!strncmp(path, "file://", 7)))
+		return 1;
+	return 0;
 }
 
+/* Note: path must end with a trailing / or be an empty string */
 /* free the result please */
 char *feh_unique_filename(char *path, char *basename)
 {
-   char *tmpname;
-   char num[10];
-   char cppid[10];
-   static long int i = 1;
-   struct stat st;
-   pid_t ppid;
-
-   D_ENTER(4);
-   /* Massive paranoia ;) */
-   if (i > 999998)
-      i = 1;
-
-   ppid = getpid();
-   snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid);
-
-   /* make sure file doesn't exist */
-   do
-   {
-      snprintf(num, sizeof(num), "%06ld", i++);
-      tmpname =
-         estrjoin("", path, "feh_", cppid, "_", num, "_",
-                  basename, NULL);
-   }
-   while (stat(tmpname, &st) == 0);
-   D_RETURN(4, tmpname);
+	char *tmpname;
+	char num[10];
+	char cppid[12];
+	static long int i = 1;
+	struct stat st;
+	pid_t ppid;
+
+	/* Massive paranoia ;) */
+	if (i > 999998)
+		i = 1;
+
+	ppid = getpid();
+	snprintf(cppid, sizeof(cppid), "%06ld", (long) ppid);
+
+	tmpname = NULL;
+	/* make sure file doesn't exist */
+	do {
+		snprintf(num, sizeof(num), "%06ld", i++);
+		free(tmpname);
+		tmpname = estrjoin("", path, "feh_", cppid, "_", num, "_", basename, NULL);
+	}
+	while (stat(tmpname, &st) == 0);
+	return(tmpname);
 }
 
 /* reads file into a string, but limits o 4095 chars and ensures a \0 */
-char *ereadfile(char *path) {
-  char buffer[4096];
-  FILE *fp;
-  int count;
-
-  fp = fopen(path, "r");
-  if (!fp)
-    return NULL;
-
-  count = fread(buffer, sizeof(char), sizeof(buffer) - 1, fp);
-  if (buffer[count - 1] == '\n')
-    buffer[count - 1] = '\0';
-  else
-    buffer[count] = '\0';
-  
-  fclose(fp);
-
-  return estrdup(buffer);  
-}
+char *ereadfile(char *path)
+{
+	char buffer[4096];
+	FILE *fp;
+	size_t count;
 
-char *feh_get_tmp_dir(void) {
-  char *tmp;
-  if (feh_tmp_dir)
-    return feh_tmp_dir;
-  tmp = getenv("TMPDIR");
-  if (!tmp)
-    tmp = getenv("TMP");
-  if (!tmp)
-    tmp = getenv("TEMP");
-  if (!tmp)
-    tmp = "/tmp";
-  feh_tmp_dir = estrdup(tmp);
-  return feh_tmp_dir;
-}
+	fp = fopen(path, "r");
+	if (!fp)
+		return NULL;
 
-char *feh_get_user_name(void) {
-    struct passwd *pw = NULL;
+	count = fread(buffer, sizeof(char), sizeof(buffer) - 1, fp);
+	if (count > 0 && buffer[count - 1] == '\n')
+		buffer[count - 1] = '\0';
+	else
+		buffer[count] = '\0';
 
-    if (feh_user_name)
-      return feh_user_name;
-    setpwent ();
-    pw = getpwuid (getuid ());
-    endpwent ();
-    feh_user_name = estrdup(pw->pw_name);
-    return feh_user_name;
+	fclose(fp);
+
+	return estrdup(buffer);
+}
+
+char *shell_escape(char *input)
+{
+	static char ret[1024];
+	unsigned int out = 0, in = 0;
+
+	ret[out++] = '\'';
+	for (in = 0; input[in] && (out < (sizeof(ret) - 7)); in++) {
+		if (input[in] == '\'') {
+			ret[out++] = '\'';
+			ret[out++] = '"';
+			ret[out++] = '\'';
+			ret[out++] = '"';
+			ret[out++] = '\'';
+		}
+		else
+			ret[out++] = input[in];
+	}
+	ret[out++] = '\'';
+	ret[out++] = '\0';
+
+	return ret;
 }
diff --git a/src/utils.h b/src/utils.h
index 221319c..22cbbf8 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -26,6 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef UTILS_H
 #define UTILS_H
 
+#include <stdio.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 #ifndef __GNUC__
 # define __attribute__(x)
 #endif
@@ -36,11 +43,10 @@ char *_estrdup(char *s);
 void *_emalloc(size_t n);
 void *_erealloc(void *ptr, size_t n);
 char *estrjoin(const char *separator, ...);
-char *stroflen(char, int);
+char path_is_url(char *path);
 char *feh_unique_filename(char *path, char *basename);
 char *ereadfile(char *path);
-char *feh_get_tmp_dir(void);
-char *feh_get_user_name(void);
+char *shell_escape(char *input);
 
 #define ESTRAPPEND(a,b) \
   {\
@@ -74,7 +80,7 @@ char *feh_get_user_name(void);
       (a) = ____newstr;\
     }\
   }
-    
+
 #define ESTRTRUNC(string,chars) \
   {\
     int ____len;\
@@ -86,5 +92,4 @@ char *feh_get_user_name(void);
     }\
   }
 
-
 #endif
diff --git a/src/wallpaper.c b/src/wallpaper.c
new file mode 100644
index 0000000..e2fa67e
--- /dev/null
+++ b/src/wallpaper.c
@@ -0,0 +1,918 @@
+/* wallpaper.c
+
+Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software and its documentation and acknowledgment shall be
+given in the documentation and software packages that this Software was
+used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/
+
+#include <limits.h>
+#include <sys/stat.h>
+
+#include "feh.h"
+#include "filelist.h"
+#include "options.h"
+#include "wallpaper.h"
+
+Window ipc_win = None;
+Window my_ipc_win = None;
+Atom ipc_atom = None;
+static unsigned char timeout = 0;
+
+/*
+ * This is a boolean indicating
+ * That while we seem to see E16 IPC
+ * it's actually E17 faking it
+ * -- richlowe 2005-06-22
+ */
+static char e17_fake_ipc = 0;
+
+void feh_wm_set_bg_filelist(unsigned char bgmode)
+{
+	if (filelist_len == 0)
+		eprintf("No files specified for background setting");
+
+	switch (bgmode) {
+		case BG_MODE_TILE:
+			feh_wm_set_bg(NULL, NULL, 0, 0, 0, 0, 1);
+			break;
+		case BG_MODE_SCALE:
+			feh_wm_set_bg(NULL, NULL, 0, 1, 0, 0, 1);
+			break;
+		case BG_MODE_FILL:
+			feh_wm_set_bg(NULL, NULL, 0, 0, 1, 0, 1);
+			break;
+		case BG_MODE_MAX:
+			feh_wm_set_bg(NULL, NULL, 0, 0, 2, 0, 1);
+			break;
+		default:
+			feh_wm_set_bg(NULL, NULL, 1, 0, 0, 0, 1);
+			break;
+	}
+}
+
+static void feh_wm_load_next(Imlib_Image *im)
+{
+	static gib_list *wpfile = NULL;
+
+	if (wpfile == NULL)
+		wpfile = filelist;
+
+	if (feh_load_image(im, FEH_FILE(wpfile->data)) == 0)
+		eprintf("Unable to load image %s", FEH_FILE(wpfile->data)->filename);
+	if (wpfile->next)
+		wpfile = wpfile->next;
+
+	return;
+}
+
+static void feh_wm_set_bg_scaled(Pixmap pmap, Imlib_Image im, int use_filelist,
+		int x, int y, int w, int h)
+{
+	if (use_filelist)
+		feh_wm_load_next(&im);
+
+	gib_imlib_render_image_on_drawable_at_size(pmap, im, x, y, w, h,
+			1, 1, !opt.force_aliasing);
+
+	if (use_filelist)
+		gib_imlib_free_image_and_decache(im);
+
+	return;
+}
+
+static void feh_wm_set_bg_centered(Pixmap pmap, Imlib_Image im, int use_filelist,
+		int x, int y, int w, int h)
+{
+	int offset_x, offset_y;
+
+	if (use_filelist)
+		feh_wm_load_next(&im);
+
+	if(opt.geom_flags & XValue)
+		if(opt.geom_flags & XNegative)
+			offset_x = (w - gib_imlib_image_get_width(im)) + opt.geom_x;
+		else
+			offset_x = opt.geom_x;
+	else
+		offset_x = (w - gib_imlib_image_get_width(im)) >> 1;
+
+	if(opt.geom_flags & YValue)
+		if(opt.geom_flags & YNegative)
+			offset_y = (h - gib_imlib_image_get_height(im)) + opt.geom_y;
+		else
+			offset_y = opt.geom_y;
+	else
+		offset_y = (h - gib_imlib_image_get_height(im)) >> 1;
+
+	gib_imlib_render_image_part_on_drawable_at_size(pmap, im,
+		((offset_x < 0) ? -offset_x : 0),
+		((offset_y < 0) ? -offset_y : 0),
+		w,
+		h,
+		x + ((offset_x > 0) ? offset_x : 0),
+		y + ((offset_y > 0) ? offset_y : 0),
+		w,
+		h,
+		1, 1, 0);
+
+	if (use_filelist)
+		gib_imlib_free_image_and_decache(im);
+
+	return;
+}
+
+static void feh_wm_set_bg_filled(Pixmap pmap, Imlib_Image im, int use_filelist,
+		int x, int y, int w, int h)
+{
+	int img_w, img_h, cut_x;
+	int render_w, render_h, render_x, render_y;
+
+	if (use_filelist)
+		feh_wm_load_next(&im);
+
+	img_w = gib_imlib_image_get_width(im);
+	img_h = gib_imlib_image_get_height(im);
+
+	cut_x = (((img_w * h) > (img_h * w)) ? 1 : 0);
+
+	render_w = (  cut_x ? ((img_h * w) / h) : img_w);
+	render_h = ( !cut_x ? ((img_w * h) / w) : img_h);
+
+	render_x = (  cut_x ? ((img_w - render_w) >> 1) : 0);
+	render_y = ( !cut_x ? ((img_h - render_h) >> 1) : 0);
+
+	if ((opt.geom_flags & XValue) && cut_x) {
+		if (opt.geom_flags & XNegative) {
+			render_x = img_w - render_w + opt.geom_x;
+		} else {
+			render_x = opt.geom_x;
+		}
+		if (render_x < 0) {
+			render_x = 0;
+		} else if (render_x + render_w > img_w) {
+			render_x = img_w - render_w;
+		}
+	}
+	else if ((opt.geom_flags & YValue) && !cut_x) {
+		if (opt.geom_flags & YNegative) {
+			render_y = img_h - render_h + opt.geom_y;
+		} else {
+			render_y = opt.geom_y;
+		}
+		if (render_y < 0) {
+			render_y = 0;
+		} else if (render_y + render_h > img_h) {
+			render_y = img_h - render_h;
+		}
+	}
+
+	gib_imlib_render_image_part_on_drawable_at_size(pmap, im,
+		render_x, render_y,
+		render_w, render_h,
+		x, y, w, h,
+		1, 1, !opt.force_aliasing);
+
+	if (use_filelist)
+		gib_imlib_free_image_and_decache(im);
+
+	return;
+}
+
+static void feh_wm_set_bg_maxed(Pixmap pmap, Imlib_Image im, int use_filelist,
+		int x, int y, int w, int h)
+{
+	int img_w, img_h, border_x;
+	int render_w, render_h, render_x, render_y;
+	int margin_x, margin_y;
+
+	if (use_filelist)
+		feh_wm_load_next(&im);
+
+	img_w = gib_imlib_image_get_width(im);
+	img_h = gib_imlib_image_get_height(im);
+
+	border_x = (((img_w * h) > (img_h * w)) ? 0 : 1);
+
+	render_w = (  border_x ? ((img_w * h) / img_h) : w);
+	render_h = ( !border_x ? ((img_h * w) / img_w) : h);
+
+	if(opt.geom_flags & XValue)
+		if(opt.geom_flags & XNegative)
+			margin_x = (w - render_w) + opt.geom_x;
+		else
+			margin_x = opt.geom_x;
+	else
+		margin_x = (w - render_w) >> 1;
+
+	if(opt.geom_flags & YValue)
+		if(opt.geom_flags & YNegative)
+			margin_y = (h - render_h) + opt.geom_y;
+		else
+			margin_y = opt.geom_y;
+	else
+		margin_y = (h - render_h) >> 1;
+
+	render_x = x + (  border_x ? margin_x : 0);
+	render_y = y + ( !border_x ? margin_y : 0);
+
+	gib_imlib_render_image_on_drawable_at_size(pmap, im,
+		render_x, render_y,
+		render_w, render_h,
+		1, 1, !opt.force_aliasing);
+
+	if (use_filelist)
+		gib_imlib_free_image_and_decache(im);
+
+	return;
+}
+
+/*
+** Creates a script that can be used to create the same background
+** as the last time the program was called.
+*/
+void feh_wm_gen_bg_script(char* fil, int centered, int scaled, int filled, int use_filelist) {
+	char * home = getenv("HOME");
+
+	if (!home)
+		return;
+
+	FILE *fp;
+	int fd;
+	char *path;
+	char *exec_method;
+	char *absolute_path;
+	struct stat s;
+	gib_list *filelist_pos = filelist;
+
+	if (strchr(cmdargv[0], '/'))
+		exec_method = feh_absolute_path(cmdargv[0]);
+	else
+		exec_method = cmdargv[0];
+
+	path = estrjoin("/", home, ".fehbg", NULL);
+
+	if ((fp = fopen(path, "w")) == NULL) {
+		weprintf("Can't write to %s", path);
+	} else {
+		fputs("#!/bin/sh\n", fp);
+		fputs(exec_method, fp);
+		fputs(" --no-fehbg --bg-", fp);
+		if (centered)
+			fputs("center", fp);
+		else if (scaled)
+			fputs("scale", fp);
+		else if (filled == 1)
+			fputs("fill", fp);
+		else if (filled == 2)
+			fputs("max", fp);
+		else
+			fputs("tile", fp);
+		if (opt.image_bg) {
+			fputs(" --image-bg ", fp);
+			fputs(shell_escape(opt.image_bg), fp);
+		}
+#ifdef HAVE_LIBXINERAMA
+		if (opt.xinerama) {
+			if (opt.xinerama_index >= 0) {
+				fprintf(fp, " --xinerama-index %d", opt.xinerama_index);
+			}
+		}
+		else {
+			fputs(" --no-xinerama", fp);
+		}
+#endif			/* HAVE_LIBXINERAMA */
+		if (opt.geom_flags & XValue) {
+			fprintf(fp, " --geometry %c%d",
+					opt.geom_flags & XNegative ? '-' : '+',
+					opt.geom_flags & XNegative ? abs(opt.geom_x) : opt.geom_x);
+			if (opt.geom_flags & YValue) {
+				fprintf(fp, "%c%d",
+						opt.geom_flags & YNegative ? '-' : '+',
+						opt.geom_flags & YNegative ? abs(opt.geom_y) : opt.geom_y);
+			}
+		}
+		if (opt.force_aliasing) {
+			fputs(" --force-aliasing", fp);
+		}
+		fputc(' ', fp);
+		if (use_filelist) {
+#ifdef HAVE_LIBXINERAMA
+			for (int i = 0; (i < opt.xinerama ? num_xinerama_screens : 1) && filelist_pos; i++)
+#else
+				for (int i = 0; (i < 1                   ) && filelist_pos; i++)
+#endif
+				{
+					absolute_path = feh_absolute_path(FEH_FILE(filelist_pos->data)->filename);
+					fputs(shell_escape(absolute_path), fp);
+					filelist_pos = filelist_pos->next;
+					free(absolute_path);
+					fputc(' ', fp);
+				}
+		} else if (fil) {
+			absolute_path = feh_absolute_path(fil);
+			fputs(shell_escape(absolute_path), fp);
+			free(absolute_path);
+		}
+		fputc('\n', fp);
+		fd = fileno(fp);
+		if (fstat(fd, &s) != 0 || fchmod(fd, s.st_mode | S_IXUSR | S_IXGRP) != 0) {
+			weprintf("Can't set %s as executable", path);
+		}
+		fclose(fp);
+	}
+	free(path);
+
+	if(exec_method != cmdargv[0])
+		free(exec_method);
+}
+
+void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
+		int filled, int desktop, int use_filelist)
+{
+	XGCValues gcvalues;
+	XGCValues gcval;
+	GC gc;
+	char bgname[20];
+	int num = (int) random();
+	char bgfil[4096];
+	char sendbuf[4096];
+
+	/*
+	 * TODO this re-implements mkstemp (badly). However, it is only needed
+	 * for non-file images and enlightenment. Might be easier to just remove
+	 * it.
+	 */
+
+	snprintf(bgname, sizeof(bgname), "FEHBG_%d", num);
+
+	if (!fil && im) {
+		if (getenv("HOME") == NULL) {
+			weprintf("Cannot save wallpaper to temporary file: You have no HOME");
+			return;
+		}
+		snprintf(bgfil, sizeof(bgfil), "%s/.%s.png", getenv("HOME"), bgname);
+		imlib_context_set_image(im);
+		imlib_image_set_format("png");
+		gib_imlib_save_image(im, bgfil);
+		D(("bg saved as %s\n", bgfil));
+		fil = bgfil;
+	}
+
+	if (feh_wm_get_wm_is_e() && (enl_ipc_get_win() != None)) {
+		if (use_filelist) {
+			feh_wm_load_next(&im);
+			fil = FEH_FILE(filelist->data)->filename;
+		}
+		if ((size_t) snprintf(sendbuf, sizeof(sendbuf), "background %s bg.file %s", bgname, fil) >= sizeof(sendbuf)) {
+			weprintf("Writing to IPC send buffer was truncated");
+			return;
+		}
+		enl_ipc_send(sendbuf);
+
+		if (scaled) {
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.solid 0 0 0", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 0", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xjust 512", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yjust 512", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xperc 1024", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yperc 1024", bgname);
+			enl_ipc_send(sendbuf);
+		} else if (centered) {
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.solid 0 0 0", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 0", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.xjust 512", bgname);
+			enl_ipc_send(sendbuf);
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.yjust 512", bgname);
+			enl_ipc_send(sendbuf);
+		} else {
+			snprintf(sendbuf, sizeof(sendbuf), "background %s bg.tile 1", bgname);
+			enl_ipc_send(sendbuf);
+		}
+
+		snprintf(sendbuf, sizeof(sendbuf), "use_bg %s %d", bgname, desktop);
+		enl_ipc_send(sendbuf);
+		enl_ipc_sync();
+	} else {
+		Atom prop_root, prop_esetroot, type;
+		int format, i;
+		unsigned long length, after;
+		unsigned char *data_root = NULL, *data_esetroot = NULL;
+		Pixmap pmap_d1, pmap_d2;
+
+		/* local display to set closedownmode on */
+		Display *disp2;
+		Window root2;
+		int depth2;
+		int w, h;
+
+		D(("Falling back to XSetRootWindowPixmap\n"));
+
+		XColor color;
+		Colormap cmap = DefaultColormap(disp, DefaultScreen(disp));
+		if (opt.image_bg)
+			XAllocNamedColor(disp, cmap, (char*) opt.image_bg, &color, &color);
+		else
+			XAllocNamedColor(disp, cmap, "black", &color, &color);
+
+		if (scaled) {
+			pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth);
+
+#ifdef HAVE_LIBXINERAMA
+			if (opt.xinerama_index >= 0) {
+				gcval.foreground = color.pixel;
+				gc = XCreateGC(disp, root, GCForeground, &gcval);
+				XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height);
+				XFreeGC(disp, gc);
+			}
+
+			if (opt.xinerama && xinerama_screens) {
+				for (i = 0; i < num_xinerama_screens; i++) {
+					if (opt.xinerama_index < 0 || opt.xinerama_index == i) {
+						feh_wm_set_bg_scaled(pmap_d1, im, use_filelist,
+							xinerama_screens[i].x_org, xinerama_screens[i].y_org,
+							xinerama_screens[i].width, xinerama_screens[i].height);
+					}
+				}
+			}
+			else
+#endif			/* HAVE_LIBXINERAMA */
+				feh_wm_set_bg_scaled(pmap_d1, im, use_filelist,
+					0, 0, scr->width, scr->height);
+		} else if (centered) {
+
+			D(("centering\n"));
+
+			pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth);
+			gcval.foreground = color.pixel;
+			gc = XCreateGC(disp, root, GCForeground, &gcval);
+			XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height);
+
+#ifdef HAVE_LIBXINERAMA
+			if (opt.xinerama && xinerama_screens) {
+				for (i = 0; i < num_xinerama_screens; i++) {
+					if (opt.xinerama_index < 0 || opt.xinerama_index == i) {
+						feh_wm_set_bg_centered(pmap_d1, im, use_filelist,
+							xinerama_screens[i].x_org, xinerama_screens[i].y_org,
+							xinerama_screens[i].width, xinerama_screens[i].height);
+					}
+				}
+			}
+			else
+#endif				/* HAVE_LIBXINERAMA */
+				feh_wm_set_bg_centered(pmap_d1, im, use_filelist,
+					0, 0, scr->width, scr->height);
+
+			XFreeGC(disp, gc);
+
+		} else if (filled == 1) {
+
+			pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth);
+
+#ifdef HAVE_LIBXINERAMA
+			if (opt.xinerama_index >= 0) {
+				gcval.foreground = color.pixel;
+				gc = XCreateGC(disp, root, GCForeground, &gcval);
+				XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height);
+				XFreeGC(disp, gc);
+			}
+
+			if (opt.xinerama && xinerama_screens) {
+				for (i = 0; i < num_xinerama_screens; i++) {
+					if (opt.xinerama_index < 0 || opt.xinerama_index == i) {
+						feh_wm_set_bg_filled(pmap_d1, im, use_filelist,
+							xinerama_screens[i].x_org, xinerama_screens[i].y_org,
+							xinerama_screens[i].width, xinerama_screens[i].height);
+					}
+				}
+			}
+			else
+#endif				/* HAVE_LIBXINERAMA */
+				feh_wm_set_bg_filled(pmap_d1, im, use_filelist
+					, 0, 0, scr->width, scr->height);
+
+		} else if (filled == 2) {
+
+			pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth);
+			gcval.foreground = color.pixel;
+			gc = XCreateGC(disp, root, GCForeground, &gcval);
+			XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height);
+
+#ifdef HAVE_LIBXINERAMA
+			if (opt.xinerama && xinerama_screens) {
+				for (i = 0; i < num_xinerama_screens; i++) {
+					if (opt.xinerama_index < 0 || opt.xinerama_index == i) {
+						feh_wm_set_bg_maxed(pmap_d1, im, use_filelist,
+							xinerama_screens[i].x_org, xinerama_screens[i].y_org,
+							xinerama_screens[i].width, xinerama_screens[i].height);
+					}
+				}
+			}
+			else
+#endif				/* HAVE_LIBXINERAMA */
+				feh_wm_set_bg_maxed(pmap_d1, im, use_filelist,
+					0, 0, scr->width, scr->height);
+
+			XFreeGC(disp, gc);
+
+		} else {
+			if (use_filelist)
+				feh_wm_load_next(&im);
+			w = gib_imlib_image_get_width(im);
+			h = gib_imlib_image_get_height(im);
+			pmap_d1 = XCreatePixmap(disp, root, w, h, depth);
+			gib_imlib_render_image_on_drawable(pmap_d1, im, 0, 0, 1, 1, 0);
+		}
+
+		if (!opt.no_fehbg)
+			feh_wm_gen_bg_script(fil, centered, scaled, filled, use_filelist);
+
+		/* create new display, copy pixmap to new display */
+		disp2 = XOpenDisplay(NULL);
+		if (!disp2)
+			eprintf("Can't reopen X display.");
+		root2 = RootWindow(disp2, DefaultScreen(disp2));
+		depth2 = DefaultDepth(disp2, DefaultScreen(disp2));
+		XSync(disp, False);
+		pmap_d2 = XCreatePixmap(disp2, root2, scr->width, scr->height, depth2);
+		gcvalues.fill_style = FillTiled;
+		gcvalues.tile = pmap_d1;
+		gc = XCreateGC(disp2, pmap_d2, GCFillStyle | GCTile, &gcvalues);
+		XFillRectangle(disp2, pmap_d2, gc, 0, 0, scr->width, scr->height);
+		XFreeGC(disp2, gc);
+		XSync(disp2, False);
+		XSync(disp, False);
+		XFreePixmap(disp, pmap_d1);
+
+		prop_root = XInternAtom(disp2, "_XROOTPMAP_ID", True);
+		prop_esetroot = XInternAtom(disp2, "ESETROOT_PMAP_ID", True);
+
+		if (prop_root != None && prop_esetroot != None) {
+			XGetWindowProperty(disp2, root2, prop_root, 0L, 1L,
+					   False, AnyPropertyType, &type, &format, &length, &after, &data_root);
+			if (type == XA_PIXMAP) {
+				XGetWindowProperty(disp2, root2,
+						   prop_esetroot, 0L, 1L,
+						   False, AnyPropertyType,
+						   &type, &format, &length, &after, &data_esetroot);
+				if (data_root && data_esetroot) {
+					if (type == XA_PIXMAP && *((Pixmap *) data_root) == *((Pixmap *) data_esetroot)) {
+						XKillClient(disp2, *((Pixmap *)
+								     data_root));
+					}
+				}
+			}
+		}
+
+		if (data_root)
+			XFree(data_root);
+
+		if (data_esetroot)
+			XFree(data_esetroot);
+
+		/* This will locate the property, creating it if it doesn't exist */
+		prop_root = XInternAtom(disp2, "_XROOTPMAP_ID", False);
+		prop_esetroot = XInternAtom(disp2, "ESETROOT_PMAP_ID", False);
+
+		if (prop_root == None || prop_esetroot == None)
+			eprintf("creation of pixmap property failed.");
+
+		XChangeProperty(disp2, root2, prop_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pmap_d2, 1);
+		XChangeProperty(disp2, root2, prop_esetroot, XA_PIXMAP, 32,
+				PropModeReplace, (unsigned char *) &pmap_d2, 1);
+
+		XSetWindowBackgroundPixmap(disp2, root2, pmap_d2);
+		XClearWindow(disp2, root2);
+		XFlush(disp2);
+		XSetCloseDownMode(disp2, RetainPermanent);
+		XCloseDisplay(disp2);
+	}
+	return;
+}
+
+signed char feh_wm_get_wm_is_e(void)
+{
+	static signed char e = -1;
+
+	/* check if E is actually running */
+	if (e == -1) {
+		/* XXX: This only covers E17 prior to 6/22/05 */
+		if ((XInternAtom(disp, "ENLIGHTENMENT_COMMS", True) != None)
+		    && (XInternAtom(disp, "ENLIGHTENMENT_VERSION", True) != None)) {
+			D(("Enlightenment detected.\n"));
+			e = 1;
+		} else {
+			D(("Enlightenment not detected.\n"));
+			e = 0;
+		}
+	}
+	return(e);
+}
+
+int feh_wm_get_num_desks(void)
+{
+	char *buf, *ptr;
+	int desks;
+
+	if (!feh_wm_get_wm_is_e())
+		return(-1);
+
+	buf = enl_send_and_wait("num_desks ?");
+	if (buf == IPC_FAKE)	/* Fake E17 IPC */
+		return(-1);
+	D(("Got from E IPC: %s\n", buf));
+	ptr = buf;
+	while (ptr && !isdigit(*ptr))
+		ptr++;
+	desks = atoi(ptr);
+
+	return(desks);
+}
+
+Window enl_ipc_get_win(void)
+{
+
+	unsigned char *str = NULL;
+	Atom prop, prop2, ever;
+	unsigned long num, after;
+	int format;
+	Window dummy_win;
+	int dummy_int;
+	unsigned int dummy_uint;
+
+	D(("Searching for IPC window.\n"));
+
+	/*
+	 * Shortcircuit this entire func
+	 * if we already know it's an e17 fake
+	 */
+	if (e17_fake_ipc)
+		return(ipc_win);
+
+		    prop = XInternAtom(disp, "ENLIGHTENMENT_COMMS", True);
+	if (prop == None) {
+		D(("Enlightenment is not running.\n"));
+		return(None);
+	} else {
+		/* XXX: This will only work with E17 prior to 6/22/2005 */
+		ever = XInternAtom(disp, "ENLIGHTENMENT_VERSION", True);
+		if (ever == None) {
+			/* This is an E without ENLIGHTENMENT_VERSION */
+			D(("E16 IPC Protocol not supported"));
+			return(None);
+		}
+	}
+	XGetWindowProperty(disp, root, prop, 0, 14, False, AnyPropertyType, &prop2, &format, &num, &after, &str);
+	if (str) {
+		sscanf((char *) str, "%*s %x", (unsigned int *) &ipc_win);
+		XFree(str);
+	}
+	if (ipc_win != None) {
+		if (!XGetGeometry
+		    (disp, ipc_win, &dummy_win, &dummy_int, &dummy_int,
+		     &dummy_uint, &dummy_uint, &dummy_uint, &dummy_uint)) {
+			D((" -> IPC Window property is valid, but the window doesn't exist.\n"));
+			ipc_win = None;
+		}
+		str = NULL;
+		if (ipc_win != None) {
+			XGetWindowProperty(disp, ipc_win, prop, 0, 14,
+					   False, AnyPropertyType, &prop2, &format, &num, &after, &str);
+			if (str) {
+				XFree(str);
+			} else {
+				D((" -> IPC Window lacks the proper atom.  I can't talk to fake IPC windows....\n"));
+				ipc_win = None;
+			}
+		}
+	}
+	if (ipc_win != None) {
+
+		XGetWindowProperty(disp, ipc_win, ever, 0, 14, False,
+				   AnyPropertyType, &prop2, &format, &num, &after, &str);
+		if (str) {
+			/*
+			 * This is E17's way of telling us it's only pretending
+			 * as a workaround for a bug related to the way java handles
+			 * Window Managers.
+			 * (Only valid after date of this comment)
+			 * -- richlowe 2005-06-22
+			 */
+			XFree(str);
+			D((" -> Found a fake E17 IPC window, ignoring"));
+			ipc_win = None;
+			e17_fake_ipc = 1;
+			return(ipc_win);
+		}
+
+		D((" -> IPC Window found and verified as 0x%08x.  Registering feh as an IPC client.\n", (int) ipc_win));
+		XSelectInput(disp, ipc_win, StructureNotifyMask | SubstructureNotifyMask);
+		enl_ipc_send("set clientname " PACKAGE);
+		enl_ipc_send("set version " VERSION);
+		enl_ipc_send("set email tom@linuxbrit.co.uk");
+		enl_ipc_send("set web http://www.linuxbrit.co.uk");
+		enl_ipc_send("set info Feh - be pr0n or be dead");
+	}
+	if (my_ipc_win == None) {
+		my_ipc_win = XCreateSimpleWindow(disp, root, -2, -2, 1, 1, 0, 0, 0);
+	}
+	return(ipc_win);
+}
+
+void enl_ipc_send(char *str)
+{
+
+	static char *last_msg = NULL;
+	char buff[21];
+	register unsigned short i;
+	register unsigned char j;
+	unsigned short len;
+	XEvent ev;
+
+	if (str == NULL) {
+		if (last_msg == NULL)
+			eprintf("eeek");
+		str = last_msg;
+		D(("Resending last message \"%s\" to Enlightenment.\n", str));
+	} else {
+		if (last_msg != NULL) {
+			free(last_msg);
+		}
+		last_msg = estrdup(str);
+		D(("Sending \"%s\" to Enlightenment.\n", str));
+	}
+	if (ipc_win == None) {
+		if ((ipc_win = enl_ipc_get_win()) == None) {
+			D(("Hrm. Enlightenment doesn't seem to be running. No IPC window, no IPC.\n"));
+			return;
+		}
+	}
+	len = strlen(str);
+	ipc_atom = XInternAtom(disp, "ENL_MSG", False);
+	if (ipc_atom == None) {
+		D(("IPC error:  Unable to find/create ENL_MSG atom.\n"));
+		return;
+	}
+	for (; XCheckTypedWindowEvent(disp, my_ipc_win, ClientMessage, &ev););	/* Discard any out-of-sync messages */
+	ev.xclient.type = ClientMessage;
+	ev.xclient.serial = 0;
+	ev.xclient.send_event = True;
+	ev.xclient.window = ipc_win;
+	ev.xclient.message_type = ipc_atom;
+	ev.xclient.format = 8;
+
+	for (i = 0; i < len + 1; i += 12) {
+		sprintf(buff, "%8x", (int) my_ipc_win);
+		for (j = 0; j < 12; j++) {
+			buff[8 + j] = str[i + j];
+			if (!str[i + j]) {
+				break;
+			}
+		}
+		buff[20] = 0;
+		for (j = 0; j < 20; j++) {
+			ev.xclient.data.b[j] = buff[j];
+		}
+		XSendEvent(disp, ipc_win, False, 0, (XEvent *) & ev);
+	}
+	return;
+}
+
+void enl_ipc_timeout(int sig)
+{
+	if (sig == SIGALRM)
+		timeout = 1;
+	return;
+}
+
+char *enl_wait_for_reply(void)
+{
+
+	XEvent ev;
+	static char msg_buffer[20];
+	register unsigned char i;
+
+	alarm(2);
+	for (; !XCheckTypedWindowEvent(disp, my_ipc_win, ClientMessage, &ev)
+	     && !timeout;);
+	alarm(0);
+	if (ev.xany.type != ClientMessage) {
+		return(IPC_TIMEOUT);
+	}
+	for (i = 0; i < 20; i++) {
+		msg_buffer[i] = ev.xclient.data.b[i];
+	}
+	return(msg_buffer + 8);
+}
+
+char *enl_ipc_get(const char *msg_data)
+{
+
+	static char *message = NULL;
+	static size_t len = 0;
+	char buff[13], *ret_msg = NULL;
+	register unsigned char i;
+	unsigned char blen;
+
+	if (msg_data == IPC_TIMEOUT) {
+		return(IPC_TIMEOUT);
+	}
+	for (i = 0; i < 12; i++) {
+		buff[i] = msg_data[i];
+	}
+	buff[12] = 0;
+	blen = strlen(buff);
+	if (message != NULL) {
+		len += blen;
+		message = (char *) erealloc(message, len + 1);
+		strcat(message, buff);
+	} else {
+		len = blen;
+		message = (char *) emalloc(len + 1);
+		strcpy(message, buff);
+	}
+	if (blen < 12) {
+		ret_msg = message;
+		message = NULL;
+		D(("Received complete reply:  \"%s\"\n", ret_msg));
+	}
+	return(ret_msg);
+}
+
+char *enl_send_and_wait(char *msg)
+{
+	char *reply = IPC_TIMEOUT;
+	struct sigaction e17_sh, feh_sh;
+	sigset_t e17_ss;
+
+	/*
+	 * Shortcut this func and return IPC_FAKE
+	 * If the IPC Window is the E17 fake
+	 */
+	if (e17_fake_ipc)
+		return IPC_FAKE;
+
+	if (ipc_win == None) {
+		/* The IPC window is missing.  Wait for it to return or feh to be killed. */
+		/* Only called once in the E17 case */
+		for (; enl_ipc_get_win() == None;) {
+			if (e17_fake_ipc)
+				return IPC_FAKE;
+			else
+				sleep(1);
+		}
+	}
+
+	if ((sigemptyset(&e17_ss) == -1) || sigaddset(&e17_ss, SIGALRM) == -1) {
+		weprintf("Failed to set up temporary E17 signal masks");
+		return reply;
+	}
+	e17_sh.sa_handler = enl_ipc_timeout;
+	e17_sh.sa_mask = e17_ss;
+	e17_sh.sa_flags = 0;
+	if (sigaction(SIGALRM, &e17_sh, &feh_sh) == -1) {
+		weprintf("Failed to set up temporary E17 signal handler");
+		return reply;
+	}
+
+	for (; reply == IPC_TIMEOUT;) {
+		timeout = 0;
+		enl_ipc_send(msg);
+		for (; !(reply = enl_ipc_get(enl_wait_for_reply())););
+		if (reply == IPC_TIMEOUT) {
+			/* We timed out.  The IPC window must be AWOL.  Reset and resend message. */
+			D(("IPC timed out.  IPC window has gone. Clearing ipc_win.\n"));
+			XSelectInput(disp, ipc_win, None);
+			ipc_win = None;
+		}
+	}
+	if (sigaction(SIGALRM, &feh_sh, NULL) == -1) {
+		weprintf("Failed to restore signal handler");
+	}
+	return(reply);
+}
diff --git a/src/support.h b/src/wallpaper.h
index a8f81a1..c836c0f 100644
--- a/src/support.h
+++ b/src/wallpaper.h
@@ -1,6 +1,7 @@
-/* support.h
+/* wallpaper.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -23,34 +24,33 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#ifndef SUPPORT_H
-#define SUPPORT_H
+#ifndef WALLPAPER_H
+#define WALLPAPER_H
 
 #include <X11/Xfuncproto.h>
-#include <X11/Intrinsic.h>                  /* Xlib, Xutil, Xresource, Xfuncproto */
+#include <X11/Intrinsic.h>	/* Xlib, Xutil, Xresource, Xfuncproto */
 
 #define IPC_TIMEOUT    ((char *) 1)
-#define IPC_FAKE       ((char *) 2) /* Faked IPC */
+#define IPC_FAKE       ((char *) 2)	/* Faked IPC */
 
 #define enl_ipc_sync()  do {                                           \
        char *reply = enl_send_and_wait("nop");                         \
        if ((reply != IPC_FAKE) && (reply != IPC_TIMEOUT))              \
          free(reply);                                                  \
-   } while (0)                          
+   } while (0)
 
 extern Window ipc_win;
 extern Atom ipc_atom;
 
-_XFUNCPROTOBEGIN extern Window enl_ipc_get_win(void);
+extern Window enl_ipc_get_win(void);
 extern void enl_ipc_send(char *);
 extern char *enl_wait_for_reply(void);
 extern char *enl_ipc_get(const char *);
 extern char *enl_send_and_wait(char *);
 extern void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
-                          int desktop, int set);
+		int fill, int desktop, int for_screen);
 extern int feh_wm_get_num_desks(void);
 extern signed char feh_wm_get_wm_is_e(void);
-void feh_wm_set_bg_file(char *file, unsigned char bgmode);
+void feh_wm_set_bg_filelist(unsigned char bgmode);
 
-_XFUNCPROTOEND
 #endif
diff --git a/src/winwidget.c b/src/winwidget.c
index c494123..809a0a6 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -1,6 +1,7 @@
 /* winwidget.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2025 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -27,1073 +28,1230 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "filelist.h"
 #include "winwidget.h"
 #include "options.h"
+#include "events.h"
+#include "timers.h"
+
+#ifdef HAVE_INOTIFY
+#include <sys/inotify.h>
+#endif
 
 static void winwidget_unregister(winwidget win);
 static void winwidget_register(winwidget win);
 static winwidget winwidget_allocate(void);
 
-static char bm_no_data[] = { 0,0,0,0, 0,0,0,0 };
-int window_num = 0;             /* For window list */
-winwidget *windows = NULL;      /* List of windows to loop though */
 
-static winwidget
-winwidget_allocate(void)
+int window_num = 0;		/* For window list */
+winwidget *windows = NULL;	/* List of windows to loop though */
+
+static winwidget winwidget_allocate(void)
 {
-  winwidget ret = NULL;
-
-  D_ENTER(4);
-  ret = emalloc(sizeof(_winwidget));
-
-  ret->win = 0;
-  ret->w = 0;
-  ret->h = 0;
-  ret->full_screen = 0;
-  ret->im_w = 0;
-  ret->im_h = 0;
-  ret->im_angle = 0;
-  ret->bg_pmap = 0;
-  ret->bg_pmap_cache = 0;
-  ret->im = NULL;
-  ret->name = NULL;
-  ret->file = NULL;
-  ret->type = WIN_TYPE_UNSET;
-  ret->visible = 0;
-  ret->caption_entry = 0;
-
-  /* Zoom stuff */
-  ret->mode = MODE_NORMAL;
-
-  ret->gc = None;
-
-  /* New stuff */
-  ret->im_x = 0;
-  ret->im_y = 0;
-  ret->zoom = 1.0;
-
-  ret->click_offset_x = 0;
-  ret->click_offset_y = 0;
-  ret->im_click_offset_x = 0;
-  ret->im_click_offset_y = 0;
-  ret->has_rotated = 0;
-
-  D_RETURN(4, ret);
+	winwidget ret = NULL;
+
+	ret = emalloc(sizeof(_winwidget));
+	memset(ret, 0, sizeof(_winwidget));
+
+	ret->win = 0;
+	ret->w = 0;
+	ret->h = 0;
+	ret->full_screen = 0;
+	ret->im_w = 0;
+	ret->im_h = 0;
+	ret->im_angle = 0;
+	ret->bg_pmap = 0;
+	ret->bg_pmap_cache = 0;
+	ret->im = NULL;
+	ret->name = NULL;
+	ret->file = NULL;
+	ret->errstr = NULL;
+	ret->type = WIN_TYPE_UNSET;
+	ret->visible = 0;
+	ret->caption_entry = 0;
+	ret->force_aliasing = opt.force_aliasing;
+
+	/* Zoom stuff */
+	ret->mode = MODE_NORMAL;
+
+	ret->gc = None;
+
+	/* New stuff */
+	ret->im_x = 0;
+	ret->im_y = 0;
+	ret->zoom = 1.0;
+	ret->old_zoom = 1.0;
+
+	ret->click_offset_x = 0;
+	ret->click_offset_y = 0;
+	ret->has_rotated = 0;
+
+#ifdef HAVE_INOTIFY
+    ret->inotify_wd = -1;
+#endif
+
+	return(ret);
 }
 
-winwidget
-winwidget_create_from_image(Imlib_Image im,
-                            char *name,
-                            char type)
+winwidget winwidget_create_from_image(Imlib_Image im, char type)
 {
-  winwidget ret = NULL;
-
-  D_ENTER(4);
+	winwidget ret = NULL;
 
-  if (im == NULL)
-    D_RETURN(4, NULL);
+	if (im == NULL)
+		return(NULL);
 
-  ret = winwidget_allocate();
-  ret->type = type;
+	ret = winwidget_allocate();
+	ret->type = type;
 
-  ret->im = im;
-  ret->w = ret->im_w = gib_imlib_image_get_width(ret->im);
-  ret->h = ret->im_h = gib_imlib_image_get_height(ret->im);
+	ret->im = im;
+	ret->w = ret->im_w = gib_imlib_image_get_width(ret->im);
+	ret->h = ret->im_h = gib_imlib_image_get_height(ret->im);
 
-  if (name)
-    ret->name = estrdup(name);
-  else
-    ret->name = estrdup(PACKAGE);
+	if (opt.full_screen && (type != WIN_TYPE_THUMBNAIL)) {
+		ret->full_screen = True;
+	} else if (opt.default_zoom) {
+		ret->zoom = 0.01 * opt.default_zoom;
+		ret->w *= ret->zoom;
+		ret->h *= ret->zoom;
+	}
+	winwidget_create_window(ret, ret->w, ret->h);
+	winwidget_render_image(ret, 1, 0);
 
-  if (opt.full_screen)
-    ret->full_screen = True;
-  winwidget_create_window(ret, ret->w, ret->h);
-  winwidget_render_image(ret, 1, 1);
-
-  D_RETURN(4, ret);
+	return(ret);
 }
 
-winwidget
-winwidget_create_from_file(gib_list * list,
-                           char *name,
-                           char type)
+winwidget winwidget_create_from_file(gib_list * list, char type)
 {
-  winwidget ret = NULL;
-  feh_file *file = FEH_FILE(list->data);
-
-  D_ENTER(4);
-
-  if (!file || !file->filename)
-    D_RETURN(4, NULL);
-
-  ret = winwidget_allocate();
-  ret->file = list;
-  ret->type = type;
-  if (name)
-    ret->name = estrdup(name);
-  else
-    ret->name = estrdup(file->filename);
-
-  if (winwidget_loadimage(ret, file) == 0) {
-    winwidget_destroy(ret);
-    D_RETURN(4, NULL);
-  }
-
-  if (!ret->win) {
-    ret->w = ret->im_w = gib_imlib_image_get_width(ret->im);
-    ret->h = ret->im_h = gib_imlib_image_get_height(ret->im);
-    D(3,
-      ("image is %dx%d pixels, format %s\n", ret->w, ret->h,
-       gib_imlib_image_format(ret->im)));
-    if (opt.full_screen)
-      ret->full_screen = True;
-    winwidget_create_window(ret, ret->w, ret->h);
-    winwidget_render_image(ret, 1, 1);
-  }
-
-  D_RETURN(4, ret);
+	winwidget ret = NULL;
+	feh_file *file = FEH_FILE(list->data);
+
+	if (!file || !file->filename)
+		return(NULL);
+
+	ret = winwidget_allocate();
+	ret->file = list;
+	ret->type = type;
+
+	if ((winwidget_loadimage(ret, file) == 0) || feh_should_ignore_image(ret->im)) {
+		winwidget_destroy(ret);
+		return(NULL);
+	}
+
+	if (!ret->win) {
+		ret->w = ret->im_w = gib_imlib_image_get_width(ret->im);
+		ret->h = ret->im_h = gib_imlib_image_get_height(ret->im);
+		D(("image is %dx%d pixels, format %s\n", ret->w, ret->h, gib_imlib_image_format(ret->im)));
+		if (opt.full_screen) {
+			ret->full_screen = True;
+		} else if (opt.default_zoom) {
+			ret->zoom = 0.01 * opt.default_zoom;
+			ret->w *= ret->zoom;
+			ret->h *= ret->zoom;
+		}
+		winwidget_create_window(ret, ret->w, ret->h);
+		winwidget_render_image(ret, 1, 0);
+	}
+
+	return(ret);
 }
 
-void
-winwidget_create_window(winwidget ret,
-                        int w,
-                        int h)
+void winwidget_create_window(winwidget ret, int w, int h)
 {
-  XSetWindowAttributes attr;
-  XEvent ev;
-  XClassHint *xch;
-  MWMHints mwmhints;
-  Atom prop = None;
-  int x = 0;
-  int y = 0;
-
-  D_ENTER(4);
-
-  if (ret->full_screen) {
-    w = scr->width;
-    h = scr->height;
+	XWindowAttributes window_attr;
+	XSetWindowAttributes attr;
+	XEvent ev;
+	XClassHint *xch;
+	MWMHints mwmhints;
+	Atom prop = None;
+	pid_t pid;
+	int x = 0;
+	int y = 0;
+	char *tmpname;
+#ifdef HOST_NAME_MAX
+	char hostname[HOST_NAME_MAX];
+#else /* ! HOST_NAME_MAX */
+	long host_name_max;
+	char *hostname;
+#endif /* HOST_NAME_MAX */
+
+	D(("winwidget_create_window %dx%d\n", w, h));
+
+	if (ret->full_screen) {
+		w = scr->width;
+		h = scr->height;
 
 #ifdef HAVE_LIBXINERAMA
-    if (opt.xinerama && xinerama_screens) {
-      w = xinerama_screens[xinerama_screen].width;
-      h = xinerama_screens[xinerama_screen].height;
-    }
-#endif /* HAVE_LIBXINERAMA */
-  } else if (opt.geom_flags) {
-    if (opt.geom_flags & WidthValue) {
-      w = opt.geom_w;
-    }
-    if (opt.geom_flags & HeightValue) {
-      h = opt.geom_h;
-    }
-    if (opt.geom_flags & XValue) {
-      if (opt.geom_flags & XNegative) {
-        x = scr->width - opt.geom_x;
-      } else {
-        x = opt.geom_x;
-      }
-    }
-    if (opt.geom_flags & YValue) {
-      if (opt.geom_flags & YNegative) {
-        y = scr->height - opt.geom_y;
-      } else {
-        y = opt.geom_y;
-      }
-    }
-  } else if (opt.screen_clip) {
-    if (w > scr->width)
-      w = scr->width;
-    if (h > scr->height)
-      h = scr->height;
+		if (opt.xinerama && xinerama_screens) {
+			w = xinerama_screens[xinerama_screen].width;
+			h = xinerama_screens[xinerama_screen].height;
+			x = xinerama_screens[xinerama_screen].x_org;
+			y = xinerama_screens[xinerama_screen].y_org;
+		}
+#endif				/* HAVE_LIBXINERAMA */
+	} else if (opt.geom_flags) {
+		if (opt.geom_flags & WidthValue) {
+			w = opt.geom_w;
+		}
+		if (opt.geom_flags & HeightValue) {
+			h = opt.geom_h;
+		}
+		if (opt.geom_flags & XValue) {
+			if (opt.geom_flags & XNegative) {
+				x = scr->width - opt.geom_x;
+			} else {
+				x = opt.geom_x;
+			}
+		}
+		if (opt.geom_flags & YValue) {
+			if (opt.geom_flags & YNegative) {
+				y = scr->height - opt.geom_y;
+			} else {
+				y = opt.geom_y;
+			}
+		}
+	} else if (opt.screen_clip) {
+		if (w > scr->width)
+			w = scr->width;
+		if (h > scr->height)
+			h = scr->height;
 
 #ifdef HAVE_LIBXINERAMA
-    if (opt.xinerama && xinerama_screens) {
-      if (w > xinerama_screens[xinerama_screen].width)
-        w = xinerama_screens[xinerama_screen].width;
-      if (h > xinerama_screens[xinerama_screen].height)
-        h = xinerama_screens[xinerama_screen].height;
-    }
-#endif /* HAVE_LIBXINERAMA */
-  }
-
-  ret->x = x;
-  ret->y = y;
-  ret->w = w;
-  ret->h = h;
-  ret->visible = False;
-
-  attr.backing_store = NotUseful;
-  attr.override_redirect = False;
-  attr.colormap = cm;
-  attr.border_pixel = 0;
-  attr.background_pixel = 0;
-  attr.save_under = False;
-  attr.event_mask =
-    StructureNotifyMask | ButtonPressMask | ButtonReleaseMask |
-    PointerMotionMask | EnterWindowMask | LeaveWindowMask | KeyPressMask |
-    KeyReleaseMask | ButtonMotionMask | ExposureMask | FocusChangeMask |
-    PropertyChangeMask | VisibilityChangeMask;
-
-  if (opt.borderless || ret->full_screen) {
-    prop = XInternAtom(disp, "_MOTIF_WM_HINTS", True);
-    if (prop == None) {
-      weprintf("Window Manager does not support MWM hints. "
-               "To get a borderless window I have to bypass your wm.");
-      attr.override_redirect = True;
-      mwmhints.flags = 0;
-    } else {
-      mwmhints.flags = MWM_HINTS_DECORATIONS;
-      mwmhints.decorations = 0;
-    }
-  } else
-    mwmhints.flags = 0;
-
-  ret->win =
-    XCreateWindow(disp, DefaultRootWindow(disp), x, y, w, h, 0, depth,
-                  InputOutput, vis,
-                  CWOverrideRedirect | CWSaveUnder | CWBackingStore |
-                  CWColormap | CWBackPixel | CWBorderPixel | CWEventMask,
-                  &attr);
-
-  if (mwmhints.flags) {
-    XChangeProperty(disp, ret->win, prop, prop, 32, PropModeReplace,
-                    (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
-  }
-  if (ret->full_screen) {
-    Atom prop_fs = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN",  False);
-	Atom prop_state = XInternAtom(disp, "_NET_WM_STATE", False);
-
-	memset(&ev, 0, sizeof(ev));
-	ev.xclient.type = ClientMessage;
-	ev.xclient.message_type = prop_state;
-	ev.xclient.display = disp;
-	ev.xclient.window = ret->win;
-	ev.xclient.format = 32;
-	ev.xclient.data.l[0] = (ret->full_screen ? 1 : 0);
-	ev.xclient.data.l[1] = prop_fs;
-
-    XChangeProperty(disp, ret->win, prop_state, XA_ATOM, 32,
-					PropModeReplace, &prop_fs, 1);
-  }
-
-  XSetWMProtocols(disp, ret->win, &wmDeleteWindow, 1);
-  winwidget_update_title(ret);
-  xch = XAllocClassHint();
-  xch->res_name = "feh";
-  xch->res_class = "feh";
-  XSetClassHint(disp, ret->win, xch);
-  XFree(xch);
-
-  /* Size hints */
-  if (ret->full_screen || opt.geom_flags) {
-    XSizeHints xsz;
-
-    xsz.flags = USPosition;
-    xsz.x = x;
-    xsz.y = y;
-    XSetWMNormalHints(disp, ret->win, &xsz);
-    XMoveWindow(disp, ret->win, x, y);
-  }
-  if (ret->full_screen && opt.hide_pointer) {
-    Cursor no_ptr;
-    XColor black, dummy;
-    Pixmap bm_no;
-    bm_no = XCreateBitmapFromData(disp, ret->win, bm_no_data, 8, 8);
-    XAllocNamedColor(disp, DefaultColormapOfScreen(DefaultScreenOfDisplay(disp)), "black", &black, &dummy);
-    
-    no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
-    XDefineCursor(disp, ret->win, no_ptr);
-  }
-
-  /* set the icon name property */
-  XSetIconName(disp, ret->win, "feh");
-  /* set the command hint */
-  XSetCommand(disp, ret->win, cmdargv, cmdargc);
-
-  winwidget_register(ret);
-  D_RETURN_(4);
+		if (opt.xinerama && xinerama_screens) {
+			if (w > xinerama_screens[xinerama_screen].width)
+				w = xinerama_screens[xinerama_screen].width;
+			if (h > xinerama_screens[xinerama_screen].height)
+				h = xinerama_screens[xinerama_screen].height;
+		}
+#endif				/* HAVE_LIBXINERAMA */
+	}
+
+	if (opt.paused) {
+		tmpname = estrjoin(" ", ret->name, "[Paused]", NULL);
+		free(ret->name);
+		ret->name = tmpname;
+	}
+
+	ret->x = x;
+	ret->y = y;
+	ret->w = w;
+	ret->h = h;
+	ret->visible = False;
+
+	attr.backing_store = NotUseful;
+	attr.override_redirect = False;
+	attr.colormap = cm;
+	attr.border_pixel = 0;
+	attr.background_pixel = 0;
+	attr.save_under = False;
+	attr.event_mask =
+	    StructureNotifyMask | ButtonPressMask | ButtonReleaseMask |
+	    PointerMotionMask | EnterWindowMask | LeaveWindowMask |
+	    KeyPressMask | KeyReleaseMask | ButtonMotionMask | ExposureMask
+	    | FocusChangeMask | PropertyChangeMask | VisibilityChangeMask;
+
+	memset(&mwmhints, 0, sizeof(mwmhints));
+	if (opt.borderless || ret->full_screen) {
+		prop = XInternAtom(disp, "_MOTIF_WM_HINTS", True);
+		if (prop == None) {
+			weprintf
+			    ("Window Manager does not support MWM hints. "
+			     "To get a borderless window I have to bypass your wm.");
+			attr.override_redirect = True;
+			mwmhints.flags = 0;
+		} else {
+			mwmhints.flags = MWM_HINTS_DECORATIONS;
+			mwmhints.decorations = 0;
+		}
+	}
+
+	if (opt.x11_windowid == 0) {
+		ret->win =
+		  XCreateWindow(disp, DefaultRootWindow(disp), x, y, w, h, 0,
+		                depth, InputOutput, vis,
+		                CWOverrideRedirect | CWSaveUnder | CWBackingStore
+		                | CWColormap | CWBackPixel | CWBorderPixel | CWEventMask,
+		                &attr);
+	} else {
+		/* x11_windowid is a pointer to the window */
+		ret->win = (Window) opt.x11_windowid;
+
+		/* set our attributes on the window */
+		XChangeWindowAttributes(disp, ret->win,
+                            CWOverrideRedirect | CWSaveUnder | CWBackingStore
+                            | CWColormap | CWBackPixel | CWBorderPixel
+                            | CWEventMask, &attr);
+
+		/* determine the size and visibility of the window */
+		XGetWindowAttributes(disp, ret->win, &window_attr);
+		ret->visible = (window_attr.map_state == IsViewable);
+		ret->x = window_attr.x;
+		ret->y = window_attr.y;
+		ret->w = window_attr.width;
+		ret->h = window_attr.height;
+	}
+
+	if (mwmhints.flags) {
+		XChangeProperty(disp, ret->win, prop, prop, 32,
+				PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
+	}
+	if (ret->full_screen) {
+		Atom prop_fs = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False);
+		Atom prop_state = XInternAtom(disp, "_NET_WM_STATE", False);
+
+		memset(&ev, 0, sizeof(ev));
+		ev.xclient.type = ClientMessage;
+		ev.xclient.message_type = prop_state;
+		ev.xclient.display = disp;
+		ev.xclient.window = ret->win;
+		ev.xclient.format = 32;
+		ev.xclient.data.l[0] = 1;
+		ev.xclient.data.l[1] = prop_fs;
+
+		XChangeProperty(disp, ret->win, prop_state, XA_ATOM, 32,
+				PropModeReplace, (unsigned char *) &prop_fs, 1);
+	}
+
+	pid = getpid();
+	prop = XInternAtom(disp, "_NET_WM_PID", False);
+	XChangeProperty(disp, ret->win, prop, XA_CARDINAL, sizeof(pid_t) * 8,
+			PropModeReplace, (const unsigned char *)&pid, 1);
+
+#ifdef HOST_NAME_MAX
+	if (gethostname(hostname, HOST_NAME_MAX) == 0) {
+		hostname[HOST_NAME_MAX-1] = '\0';
+		prop = XInternAtom(disp, "WM_CLIENT_MACHINE", False);
+		XChangeProperty(disp, ret->win, prop, XA_STRING, sizeof(char) * 8,
+				PropModeReplace, (unsigned char *)hostname, strlen(hostname));
+	}
+#else /* ! HOST_NAME_MAX */
+	if ((host_name_max = sysconf(_SC_HOST_NAME_MAX)) != -1 ) {
+		if ((hostname = calloc(1, host_name_max + 1)) != NULL ) {
+			if (gethostname(hostname, host_name_max) == 0) {
+				prop = XInternAtom(disp, "WM_CLIENT_MACHINE", False);
+				XChangeProperty(disp, ret->win, prop, XA_STRING, sizeof(char) * 8,
+						PropModeReplace, (unsigned char *)hostname, strlen(hostname));
+			}
+			free(hostname);
+		}
+	}
+#endif /* HOST_NAME_MAX */
+
+	XSetWMProtocols(disp, ret->win, &wmDeleteWindow, 1);
+	winwidget_update_title(ret);
+	xch = XAllocClassHint();
+	xch->res_name = "feh";
+	xch->res_class = opt.x11_class ? opt.x11_class : "feh";
+	XSetClassHint(disp, ret->win, xch);
+	XFree(xch);
+
+	/* Size hints */
+	if (ret->full_screen || opt.geom_flags) {
+		XSizeHints xsz;
+
+		xsz.flags = USPosition;
+		xsz.x = x;
+		xsz.y = y;
+		XSetWMNormalHints(disp, ret->win, &xsz);
+		XMoveWindow(disp, ret->win, x, y);
+	}
+	if (opt.hide_pointer)
+		winwidget_set_pointer(ret, 0);
+
+	/* set the icon name property */
+	XSetIconName(disp, ret->win, "feh");
+	/* set the command hint */
+	XSetCommand(disp, ret->win, cmdargv, cmdargc);
+
+	winwidget_register(ret);
+
+	/* do not scale down a thumbnail list window, only those created from it */
+	if (opt.geom_enabled && (ret->type != WIN_TYPE_THUMBNAIL)) {
+		opt.geom_w = w;
+		opt.geom_h = h;
+		opt.geom_flags |= WidthValue | HeightValue;
+	}
+
+	return;
 }
 
-void
-winwidget_update_title(winwidget ret)
+void winwidget_update_title(winwidget ret)
 {
-  char *name;
-
-  D_ENTER(4);
-  D(4, ("winwid->name = %s\n", ret->name));
-  name = ret->name ? ret->name : "feh";
-  XStoreName(disp, ret->win, name);
-  XSetIconName(disp, ret->win, name);
-  /* XFlush(disp); */
-  D_RETURN_(4);
+	char *name;
+	Atom prop_name = XInternAtom(disp, "_NET_WM_NAME", False);
+	Atom prop_icon = XInternAtom(disp, "_NET_WM_ICON_NAME", False);
+	Atom prop_utf8 = XInternAtom(disp, "UTF8_STRING", False);
+
+	D(("winwid->name = %s\n", ret->name));
+	name = ret->name ? ret->name : "feh";
+	XStoreName(disp, ret->win, name);
+	XSetIconName(disp, ret->win, name);
+
+	XChangeProperty(disp, ret->win, prop_name, prop_utf8, 8,
+			PropModeReplace, (const unsigned char *)name, strlen(name));
+
+	XChangeProperty(disp, ret->win, prop_icon, prop_utf8, 8,
+			PropModeReplace, (const unsigned char *)name, strlen(name));
+
+	return;
 }
 
-void
-winwidget_setup_pixmaps(winwidget winwid)
+void winwidget_update_caption(winwidget winwid)
 {
-  D_ENTER(4);
-
-  if (winwid->full_screen) {
-    if (!(winwid->bg_pmap)) {
-      if (winwid->gc == None) {
-        XGCValues gcval;
-
-        gcval.foreground = BlackPixel(disp, DefaultScreen(disp));
-        winwid->gc = XCreateGC(disp, winwid->win, GCForeground, &gcval);
-      }
-      winwid->bg_pmap =
-        XCreatePixmap(disp, winwid->win, scr->width, scr->height, depth);
-    }
-    XFillRectangle(disp, winwid->bg_pmap, winwid->gc, 0, 0, scr->width,
-                   scr->height);
-  } else {
-    if (!winwid->bg_pmap || winwid->had_resize) {
-      D(4, ("recreating background pixmap (%dx%d)\n", winwid->w, winwid->h));
-      if (winwid->bg_pmap)
-        XFreePixmap(disp, winwid->bg_pmap);
-
-      if (winwid->w == 0)
-        winwid->w = 1;
-      if (winwid->h == 0)
-        winwid->h = 1;
-      winwid->bg_pmap =
-        XCreatePixmap(disp, winwid->win, winwid->w, winwid->h, depth);
-      winwid->had_resize = 0;
-    }
-  }
-  D_RETURN_(4);
+	if (opt.caption_path) {
+		/* TODO: Does someone understand the caching here. Is this the right
+		 * approach now that I have broken this out into a separate function. -lsmith */
+
+		/* cache bg pixmap. during caption entry, multiple redraws are done
+		 * because the caption overlay changes - the image doesn't though, so re-
+		 * rendering that is a waste of time */
+		if (winwid->caption_entry) {
+			GC gc;
+			if (winwid->bg_pmap_cache)
+				XFreePixmap(disp, winwid->bg_pmap_cache);
+			winwid->bg_pmap_cache = XCreatePixmap(disp, winwid->win, winwid->w, winwid->h, depth);
+			gc = XCreateGC(disp, winwid->win, 0, NULL);
+			XCopyArea(disp, winwid->bg_pmap, winwid->bg_pmap_cache, gc, 0, 0, winwid->w, winwid->h, 0, 0);
+			XFreeGC(disp, gc);
+		}
+		feh_draw_caption(winwid);
+	}
+	return;
 }
 
-void
-winwidget_render_image(winwidget winwid,
-                       int resize,
-                       int alias)
+void winwidget_setup_pixmaps(winwidget winwid)
 {
-  int sx, sy, sw, sh, dx, dy, dw, dh;
-  int calc_w, calc_h;
-
-  D_ENTER(4);
-
-  if (!winwid->full_screen && resize) {
-    winwidget_resize(winwid, winwid->im_w, winwid->im_h);
-    winwidget_reset_image(winwid);
-  }
-
-  /* bounds checks for panning */
-  if (winwid->im_x > winwid->w)
-    winwid->im_x = winwid->w;
-  if (winwid->im_y > winwid->h)
-    winwid->im_y = winwid->h;
-
-  winwidget_setup_pixmaps(winwid);
-
-  if (!winwid->full_screen
-      && ((gib_imlib_image_has_alpha(winwid->im)) || (opt.geom_flags)
-          || (winwid->im_x || winwid->im_y) || (winwid->zoom != 1.0)
-          || (winwid->w > winwid->im_w || winwid->h > winwid->im_h)
-          || (winwid->has_rotated)))
-    feh_draw_checks(winwid);
-
-  if (!winwid->full_screen && opt.scale_down
-      && ((winwid->w < winwid->im_w) || (winwid->h < winwid->im_h))) {
-    D(2, ("scaling down image\n"));
-
-    feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h,
-                         winwid->w, winwid->h);
-    winwidget_resize(winwid, winwid->im_w * winwid->zoom,
-                     winwid->im_h * winwid->zoom);
-  }
-
-  if (resize && (winwid->full_screen || opt.geom_flags)) {
-    int smaller;                /* Is the image smaller than screen? */
-    int max_w, max_h;
-
-    if (winwid->full_screen) {
-      max_w = scr->width;
-      max_h = scr->height;
-#ifdef HAVE_LIBXINERAMA
-      if (opt.xinerama && xinerama_screens) {
-        max_w = xinerama_screens[xinerama_screen].width;
-        max_h = xinerama_screens[xinerama_screen].height;
-      }
-#endif /* HAVE_LIBXINERAMA */
-    } else {
-      if (opt.geom_flags & WidthValue) {
-        max_w = opt.geom_w;
-      }
-      if (opt.geom_flags & HeightValue) {
-        max_h = opt.geom_h;
-      }
-    }
+	if (winwid->full_screen) {
+		if (!(winwid->bg_pmap)) {
+			if (winwid->gc == None) {
+				XGCValues gcval;
+
+				if (!opt.image_bg || !strcmp(opt.image_bg, "default")) {
+					gcval.foreground = BlackPixel(disp, DefaultScreen(disp));
+					winwid->gc = XCreateGC(disp, winwid->win, GCForeground, &gcval);
+				} else if (!strcmp(opt.image_bg, "checks")) {
+					gcval.tile = feh_create_checks();
+					gcval.fill_style = FillTiled;
+					winwid->gc = XCreateGC(disp, winwid->win, GCTile | GCFillStyle, &gcval);
+				} else {
+					XColor color;
+					Colormap cmap = DefaultColormap(disp, DefaultScreen(disp));
+					XAllocNamedColor(disp, cmap, (char*) opt.image_bg, &color, &color);
+					gcval.foreground = color.pixel;
+					winwid->gc = XCreateGC(disp, winwid->win, GCForeground, &gcval);
+				}
+			}
+			winwid->bg_pmap = XCreatePixmap(disp, winwid->win, scr->width, scr->height, depth);
+		}
+		XFillRectangle(disp, winwid->bg_pmap, winwid->gc, 0, 0, scr->width, scr->height);
+	} else {
+		if (!winwid->bg_pmap || winwid->had_resize) {
+			D(("recreating background pixmap (%dx%d)\n", winwid->w, winwid->h));
+			if (winwid->bg_pmap)
+				XFreePixmap(disp, winwid->bg_pmap);
+
+			if (winwid->w == 0)
+				winwid->w = 1;
+			if (winwid->h == 0)
+				winwid->h = 1;
+			winwid->bg_pmap = XCreatePixmap(disp, winwid->win, winwid->w, winwid->h, depth);
+			winwid->had_resize = 0;
+		}
+	}
+	return;
+}
 
-    D(4, ("Calculating for fullscreen/fixed geom render\n"));
-    smaller = ((winwid->im_w < max_w) && (winwid->im_h < max_h));
-
-    if (!smaller || opt.auto_zoom) {
-      double ratio = 0.0;
-
-      /* Image is larger than the screen (so wants shrinking), or it's
-         smaller but wants expanding to fill it */
-      ratio =
-        feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h,
-                             max_w, max_h);
-
-      /* contributed by Jens Laas <jens.laas@data.slu.se>
-       * What it does:
-       * zooms images by a fixed amount but never larger than the screen.
-       *
-       * Why:
-       * This is nice if you got a collection of images where some
-       * are small and can stand a small zoom. Large images are unaffected.
-       *
-       * When does it work, and how?
-       * You have to be in fullscreen mode _and_ have auto-zoom turned on.
-       *   "feh -FZ --zoom 130 imagefile" will do the trick.
-       *        -zoom percent - the new switch.
-       *                        100 = orignal size,
-       *                        130 is 30% larger.
-       */
-      if (opt.default_zoom) {
-        double old_zoom = winwid->zoom;
-
-        winwid->zoom = 0.01 * opt.default_zoom;
-        if ((winwid->im_h * winwid->zoom) > max_h)
-          winwid->zoom = old_zoom;
-        if ((winwid->im_w * winwid->zoom) > max_w)
-          winwid->zoom = old_zoom;
-
-        winwid->im_x = ((int) (max_w - (winwid->im_w * winwid->zoom))) >> 1;
-        winwid->im_y = ((int) (max_h - (winwid->im_h * winwid->zoom))) >> 1;
-      } else {
-        if (ratio > 1.0) {
-          /* height is the factor */
-          winwid->im_x = 0;
-          winwid->im_y = ((int) (max_h - (winwid->im_h * winwid->zoom))) >> 1;
-        } else {
-          /* width is the factor */
-          winwid->im_x = ((int) (max_w - (winwid->im_w * winwid->zoom))) >> 1;
-          winwid->im_y = 0;
-        }
-      }
-    } else {
-      /* my modification to jens hack, allow --zoom without auto-zoom mode */
-      if(opt.default_zoom) {
-        winwid->zoom = 0.01 * opt.default_zoom;
-      } else {
-        winwid->zoom = 1.0;
-      }
-      /* Just center the image in the window */
-      winwid->im_x = (int)(max_w - (winwid->im_w * winwid->zoom)) >> 1;
-      winwid->im_y = (int)(max_h - (winwid->im_h * winwid->zoom)) >> 1;
-    }
-  }
-
-  /* Now we ensure only to render the area we're looking at */
-  dx = winwid->im_x;
-  dy = winwid->im_y;
-  if (dx < 0)
-    dx = 0;
-  if (dy < 0)
-    dy = 0;
-
-  if (winwid->im_x < 0)
-    sx = 0 - (winwid->im_x / winwid->zoom);
-  else
-    sx = 0;
-
-  if (winwid->im_y < 0)
-    sy = 0 - (winwid->im_y / winwid->zoom);
-  else
-    sy = 0;
-  
-  calc_w = winwid->im_w * winwid->zoom;
-  calc_h = winwid->im_h * winwid->zoom;
-  dw = (winwid->w - winwid->im_x);
-  dh = (winwid->h - winwid->im_y);
-  if (calc_w < dw)
-    dw = calc_w;
-  if (calc_h < dh)
-    dh = calc_h;
-  if (dw > winwid->w)
-    dw = winwid->w;
-  if (dh > winwid->h)
-    dh = winwid->h;
-
-  sw = dw / winwid->zoom;
-  sh = dh / winwid->zoom;
-
-  D(5,
-    ("sx: %d sy: %d sw: %d sh: %d dx: %d dy: %d dw: %d dh: %d zoom: %f\n", sx,
-     sy, sw, sh, dx, dy, dw, dh, winwid->zoom));
-
-  D(5, ("winwidget_render(): winwid->im_angle = %f\n", winwid->im_angle));
-  if (winwid->has_rotated)
-    gib_imlib_render_image_part_on_drawable_at_size_with_rotation(winwid->
-                                                                  bg_pmap,
-                                                                  winwid->im,
-                                                                  sx, sy, sw,
-                                                                  sh, dx, dy,
-                                                                  dw, dh,
-                                                                  winwid->
-                                                                  im_angle, 1,
-                                                                  1, alias);
-  else
-    gib_imlib_render_image_part_on_drawable_at_size(winwid->bg_pmap,
-                                                    winwid->im, sx, sy, sw,
-                                                    sh, dx, dy, dw, dh, 1,
-                                                    gib_imlib_image_has_alpha
-                                                    (winwid->im), alias);
-  if (opt.caption_path) {
-    /* cache bg pixmap. during caption entry, multiple redraws are done
-     * because the caption overlay changes - the image doesn't though, so re-
-     * rendering that is a waste of time */
-    if (winwid->caption_entry) {
-      GC gc;
-      if (winwid->bg_pmap_cache)
-        XFreePixmap(disp, winwid->bg_pmap_cache);
-      winwid->bg_pmap_cache = XCreatePixmap(disp,
-                                            winwid->win,
-                                            winwid->w,
-                                            winwid->h,
-                                            depth);
-      gc = XCreateGC(disp, winwid->win, 0, NULL);
-      XCopyArea(disp, winwid->bg_pmap, winwid->bg_pmap_cache, gc, 0, 0, winwid->w, winwid->h, 0, 0);
-      XFreeGC(disp, gc);
-    }
-    feh_draw_caption(winwid);
-  }
-
-  if (opt.draw_filename)
-    feh_draw_filename(winwid);
-  if (opt.draw_actions)
-    feh_draw_actions(winwid);
-  if ((opt.mode == MODE_ZOOM) && !alias)
-    feh_draw_zoom(winwid);
-  XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
-  XClearWindow(disp, winwid->win);
-  D_RETURN_(4);
+void winwidget_render_image(winwidget winwid, int resize, int force_alias)
+{
+	int sx, sy, sw, sh, dx, dy, dw, dh;
+	int calc_w, calc_h;
+	int antialias = 0;
+
+	if (!winwid->full_screen && resize) {
+		if (opt.default_zoom) {
+			winwid->zoom = 0.01 * opt.default_zoom;
+			winwidget_resize(winwid, winwid->im_w * winwid->zoom, winwid->im_h * winwid->zoom, 0);
+		} else {
+			winwidget_resize(winwid, winwid->im_w, winwid->im_h, 0);
+		}
+		winwidget_reset_image(winwid);
+	}
+
+	D(("winwidget_render_image resize %d force_alias %d im %dx%d\n",
+	      resize, force_alias, winwid->im_w, winwid->im_h));
+
+	/* winwidget_setup_pixmaps(winwid) resets the winwid->had_resize flag */
+	int had_resize = winwid->had_resize || resize;
+
+	winwidget_setup_pixmaps(winwid);
+
+	if (had_resize && !opt.keep_zoom_vp && (winwid->type != WIN_TYPE_THUMBNAIL)) {
+		double required_zoom = 1.0;
+		feh_calc_needed_zoom(&required_zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);
+
+		winwid->zoom = opt.default_zoom ? (0.01 * opt.default_zoom) : 1.0;
+
+		if ((opt.scale_down || (winwid->full_screen && !opt.default_zoom))
+				&& winwid->zoom > required_zoom)
+			winwid->zoom = required_zoom;
+		else if ((opt.zoom_mode && required_zoom > 1)
+				&& (!opt.default_zoom || required_zoom < winwid->zoom))
+			winwid->zoom = required_zoom;
+
+		if (opt.offset_flags & XValue) {
+			if (opt.offset_flags & XNegative) {
+				winwid->im_x = winwid->w - (winwid->im_w * winwid->zoom) - opt.offset_x;
+			} else {
+				winwid->im_x = - opt.offset_x * winwid->zoom;
+			}
+		} else {
+			winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
+		}
+		if (opt.offset_flags & YValue) {
+			if (opt.offset_flags & YNegative) {
+				winwid->im_y = winwid->h - (winwid->im_h * winwid->zoom) - opt.offset_y;
+			} else {
+				winwid->im_y = - opt.offset_y * winwid->zoom;
+			}
+		} else {
+			winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
+		}
+	}
+
+	winwid->had_resize = 0;
+
+	if (opt.keep_zoom_vp)
+		winwidget_sanitise_offsets(winwid);
+
+	if (!winwid->full_screen && ((gib_imlib_image_has_alpha(winwid->im))
+				     || (opt.geom_flags & (WidthValue | HeightValue))
+				     || (winwid->im_x || winwid->im_y)
+				     || (winwid->w > winwid->im_w * winwid->zoom)
+				     || (winwid->h > winwid->im_h * winwid->zoom)
+				     || (winwid->has_rotated)))
+		feh_draw_checks(winwid);
+
+	/* Now we ensure only to render the area we're looking at */
+	dx = winwid->im_x;
+	dy = winwid->im_y;
+	if (dx < 0)
+		dx = 0;
+	if (dy < 0)
+		dy = 0;
+
+	if (winwid->im_x < 0)
+		sx = 0 - lround(winwid->im_x / winwid->zoom);
+	else
+		sx = 0;
+
+	if (winwid->im_y < 0)
+		sy = 0 - lround(winwid->im_y / winwid->zoom);
+	else
+		sy = 0;
+
+	calc_w = lround(winwid->im_w * winwid->zoom);
+	calc_h = lround(winwid->im_h * winwid->zoom);
+	dw = (winwid->w - winwid->im_x);
+	dh = (winwid->h - winwid->im_y);
+
+	D(("sx: %4d sy: %4d sw:      sh:      dx: %4d dy: %4d dw: %4d dh: %4d zoom: %f\n",
+	   sx, sy, sw, sh, dx, dy, dw, dh, winwid->zoom));
+
+	if (calc_w < dw) {
+		dw = calc_w;
+	}
+	if (calc_h < dh) {
+		dh = calc_h;
+	}
+	if (dw > winwid->w)
+		dw = winwid->w;
+	if (dh > winwid->h)
+		dh = winwid->h;
+
+	sw = lround(dw / winwid->zoom);
+	sh = lround(dh / winwid->zoom);
+
+	D(("sx: %4d sy: %4d sw: %4d sh: %4d dx: %4d dy: %4d dw: %4d dh: %4d zoom: %f\n",
+	   sx, sy, sw, sh, dx, dy, dw, dh, winwid->zoom));
+
+	if ((winwid->zoom != 1.0 || winwid->has_rotated) && !force_alias && !winwid->force_aliasing)
+		antialias = 1;
+
+	D(("winwidget_render(): winwid->im_angle = %f\n", winwid->im_angle));
+	if (winwid->has_rotated)
+		gib_imlib_render_image_part_on_drawable_at_size_with_rotation
+			(winwid->bg_pmap, winwid->im, sx, sy, sw, sh, dx, dy, dw, dh,
+			winwid->im_angle, 1, 1, antialias);
+	else
+		gib_imlib_render_image_part_on_drawable_at_size(winwid->bg_pmap,
+								winwid->im,
+								sx, sy, sw,
+								sh, dx, dy,
+								dw, dh, 1,
+								gib_imlib_image_has_alpha(winwid->im),
+								antialias);
+
+	if (opt.mode == MODE_NORMAL) {
+		if (opt.caption_path)
+			winwidget_update_caption(winwid);
+		if (opt.draw_filename)
+			feh_draw_filename(winwid);
+#ifdef HAVE_LIBEXIF
+		if (opt.draw_exif)
+			feh_draw_exif(winwid);
+#endif
+		if (opt.draw_actions)
+			feh_draw_actions(winwid);
+		if (opt.draw_info && opt.info_cmd)
+			feh_draw_info(winwid);
+		if (winwid->errstr)
+			feh_draw_errstr(winwid);
+		if (winwid->file != NULL) {
+			if (opt.title && winwid->type != WIN_TYPE_THUMBNAIL_VIEWER) {
+				winwidget_rename(winwid, feh_printf(opt.title, FEH_FILE(winwid->file->data), winwid));
+			} else if (opt.thumb_title && winwid->type == WIN_TYPE_THUMBNAIL_VIEWER) {
+				winwidget_rename(winwid, feh_printf(opt.thumb_title, FEH_FILE(winwid->file->data), winwid));
+			}
+		}
+	} else if ((opt.mode == MODE_ZOOM) && !antialias)
+		feh_draw_zoom(winwid);
+
+	XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
+	XClearWindow(disp, winwid->win);
+	return;
 }
 
-void winwidget_render_image_cached(winwidget winwid) {
-  static GC gc = None;
-
-  if (gc == None) {
-    gc = XCreateGC(disp, winwid->win, 0, NULL);
-  }
-  XCopyArea(disp, winwid->bg_pmap_cache, winwid->bg_pmap, gc, 0, 0, winwid->w, winwid->h, 0, 0);
-
-  if (opt.caption_path)
-    feh_draw_caption(winwid);
-  if (opt.draw_filename)
-    feh_draw_filename(winwid);
-  if (opt.draw_actions)
-    feh_draw_actions(winwid);
-  XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
-  XClearWindow(disp, winwid->win);
+void winwidget_render_image_cached(winwidget winwid)
+{
+	static GC gc = None;
+
+	if (gc == None) {
+		gc = XCreateGC(disp, winwid->win, 0, NULL);
+	}
+	XCopyArea(disp, winwid->bg_pmap_cache, winwid->bg_pmap, gc, 0, 0, winwid->w, winwid->h, 0, 0);
+
+	if (opt.caption_path)
+		feh_draw_caption(winwid);
+	if (opt.draw_filename)
+		feh_draw_filename(winwid);
+	if (opt.draw_actions)
+		feh_draw_actions(winwid);
+	if (opt.draw_info && opt.info_cmd)
+		feh_draw_info(winwid);
+	XSetWindowBackgroundPixmap(disp, winwid->win, winwid->bg_pmap);
+	XClearWindow(disp, winwid->win);
 }
 
-double
-feh_calc_needed_zoom(double *zoom,
-                     int orig_w,
-                     int orig_h,
-                     int dest_w,
-                     int dest_h)
+double feh_calc_needed_zoom(double *zoom, int orig_w, int orig_h, int dest_w, int dest_h)
 {
-  double ratio = 0.0;
+	double ratio = 0.0;
 
-  D_ENTER(4);
+	ratio = ((double) orig_w / orig_h) / ((double) dest_w / dest_h);
 
-  ratio = ((double) orig_w / orig_h) / ((double) dest_w / dest_h);
+	if (opt.zoom_mode == ZOOM_MODE_FILL)
+		ratio = 1.0 / ratio;
 
-  if (ratio > 1.0)
-    *zoom = ((double) dest_w / orig_w);
-  else
-    *zoom = ((double) dest_h / orig_h);
+	if (ratio > 1.0)
+		*zoom = ((double) dest_w / orig_w);
+	else
+		*zoom = ((double) dest_h / orig_h);
 
-  D_RETURN(4, ratio);
+	return(ratio);
 }
 
-Pixmap
-feh_create_checks(void)
+Pixmap feh_create_checks(void)
 {
-  static Pixmap checks_pmap = None;
-  Imlib_Image checks = NULL;
-
-  D_ENTER(4);
-  if (checks_pmap == None) {
-    int onoff, x, y;
-
-    checks = imlib_create_image(16, 16);
-
-    if (!checks)
-      eprintf
-        ("Unable to create a teeny weeny imlib image. I detect problems");
-
-    if (strncmp(opt.image_bg, "white", 5) == 0)
-      gib_imlib_image_fill_rectangle(checks, 0, 0, 16, 16, 255, 255, 255, 255);
-    else if (strncmp(opt.image_bg, "black", 5) == 0)
-      gib_imlib_image_fill_rectangle(checks, 0, 0, 16, 16, 0, 0, 0, 255);
-    else {
-      for (y = 0; y < 16; y += 8) {
-        onoff = (y / 8) & 0x1;
-        for (x = 0; x < 16; x += 8) {
-          if (onoff)
-            gib_imlib_image_fill_rectangle(checks, x, y, 8, 8, 144, 144, 144,
-                                           255);
-          else
-            gib_imlib_image_fill_rectangle(checks, x, y, 8, 8, 100, 100, 100,
-                                           255);
-          onoff++;
-          if (onoff == 2)
-            onoff = 0;
-        }
-      }
-    }
-
-    checks_pmap = XCreatePixmap(disp, root, 16, 16, depth);
-    gib_imlib_render_image_on_drawable(checks_pmap, checks, 0, 0, 1, 0, 0);
-    gib_imlib_free_image_and_decache(checks);
-  }
-  D_RETURN(4, checks_pmap);
+	static Pixmap checks_pmap = None;
+	Imlib_Image checks = NULL;
+
+	if (checks_pmap == None) {
+		checks = imlib_create_image(16, 16);
+
+		if (!checks)
+			eprintf("Unable to create a teeny weeny imlib image. I detect problems");
+
+		if (!opt.image_bg || !strcmp(opt.image_bg, "default") || !strcmp(opt.image_bg, "checks")) {
+			gib_imlib_image_fill_rectangle(checks, 0, 0, 16, 16, 144, 144, 144, 255);
+			gib_imlib_image_fill_rectangle(checks, 0, 0,  8,  8, 100, 100, 100, 255);
+			gib_imlib_image_fill_rectangle(checks, 8, 8,  8,  8, 100, 100, 100, 255);
+		} else {
+			XColor color;
+			Colormap cmap = DefaultColormap(disp, DefaultScreen(disp));
+			XAllocNamedColor(disp, cmap, (char*) opt.image_bg, &color, &color);
+			gib_imlib_image_fill_rectangle(checks, 0, 0, 16, 16, color.red, color.green, color.blue, 255);
+		}
+
+		checks_pmap = XCreatePixmap(disp, root, 16, 16, depth);
+		gib_imlib_render_image_on_drawable(checks_pmap, checks, 0, 0, 1, 0, 0);
+		gib_imlib_free_image_and_decache(checks);
+	}
+	return(checks_pmap);
 }
 
-void
-winwidget_clear_background(winwidget w)
+void feh_draw_checks(winwidget win)
 {
-  D_ENTER(4);
-  XSetWindowBackgroundPixmap(disp, w->win, feh_create_checks());
-  /* XClearWindow(disp, w->win); */
-  D_RETURN_(4);
+	static GC gc = None;
+	XGCValues gcval;
+
+	if (gc == None) {
+		gcval.tile = feh_create_checks();
+		gcval.fill_style = FillTiled;
+		gc = XCreateGC(disp, win->win, GCTile | GCFillStyle, &gcval);
+	}
+	XFillRectangle(disp, win->bg_pmap, gc, 0, 0, win->w, win->h);
+	return;
 }
 
-void
-feh_draw_checks(winwidget win)
+void winwidget_destroy_xwin(winwidget winwid)
 {
-  static GC gc = None;
-  XGCValues gcval;
-
-  D_ENTER(4);
-  if (gc == None) {
-    gcval.tile = feh_create_checks();
-    gcval.fill_style = FillTiled;
-    gc = XCreateGC(disp, win->win, GCTile | GCFillStyle, &gcval);
-  }
-  XFillRectangle(disp, win->bg_pmap, gc, 0, 0, win->w, win->h);
-  D_RETURN_(4);
+	if (winwid->win) {
+		winwidget_unregister(winwid);
+		XDestroyWindow(disp, winwid->win);
+	}
+	if (winwid->bg_pmap) {
+		XFreePixmap(disp, winwid->bg_pmap);
+		winwid->bg_pmap = None;
+	}
+	return;
 }
 
-void
-winwidget_destroy_xwin(winwidget winwid)
+void winwidget_destroy(winwidget winwid)
 {
-  D_ENTER(4);
-  if (winwid->win) {
-    winwidget_unregister(winwid);
-    XDestroyWindow(disp, winwid->win);
-  }
-  if (winwid->bg_pmap) {
-    XFreePixmap(disp, winwid->bg_pmap);
-    winwid->bg_pmap = None;
-  }
-  D_RETURN_(4);
+#ifdef HAVE_INOTIFY
+    winwidget_inotify_remove(winwid);
+#endif
+	if (opt.reload > 0 && opt.multiwindow) {
+		feh_remove_timer_by_data(winwid);
+	}
+	winwidget_destroy_xwin(winwid);
+	if (winwid->name)
+		free(winwid->name);
+	if (winwid->gc)
+		XFreeGC(disp, winwid->gc);
+	if (winwid->im)
+		gib_imlib_free_image_and_decache(winwid->im);
+	free(winwid);
+	return;
 }
 
-void
-winwidget_destroy(winwidget winwid)
+#ifdef HAVE_INOTIFY
+void winwidget_inotify_remove(winwidget winwid)
 {
-  D_ENTER(4);
-  winwidget_destroy_xwin(winwid);
-  if (winwid->name)
-    free(winwid->name);
-  if ((winwid->type == WIN_TYPE_ABOUT) && winwid->file) {
-    feh_file_free(FEH_FILE(winwid->file->data));
-    free(winwid->file);
-  }
-  if (winwid->gc)
-    XFreeGC(disp, winwid->gc);
-  if (winwid->im)
-    gib_imlib_free_image_and_decache(winwid->im);
-  free(winwid);
-  D_RETURN_(4);
+    if (winwid->inotify_wd >= 0) {
+        D(("Removing inotify watch\n"));
+        if (inotify_rm_watch(opt.inotify_fd, winwid->inotify_wd))
+            weprintf("inotify_rm_watch failed:");
+        winwid->inotify_wd = -1;
+    }
 }
+#endif
 
-void
-winwidget_destroy_all(void)
+#ifdef HAVE_INOTIFY
+void winwidget_inotify_add(winwidget winwid, feh_file * file)
 {
-  int i;
+    if (opt.auto_reload && !path_is_url(file->filename)) {
+        D(("Adding inotify watch for %s\n", file->filename));
+        char dir[PATH_MAX];
+        feh_file_dirname(dir, file, PATH_MAX);
+
+        /*
+         * Handle files without directory part, e.g. "feh somefile.jpg".
+         * These always reside in the current directory.
+         */
+        if (dir[0] == '\0') {
+            dir[0] = '.';
+            dir[1] = '\0';
+        }
+        winwid->inotify_wd = inotify_add_watch(opt.inotify_fd, dir, IN_CLOSE_WRITE | IN_MOVED_TO);
+        if (winwid->inotify_wd < 0)
+            weprintf("inotify_add_watch failed:");
+    }
+}
+#endif
 
-  D_ENTER(4);
-  /* Have to DESCEND the list here, 'cos of the way _unregister works */
-  for (i = window_num - 1; i >= 0; i--)
-    winwidget_destroy(windows[i]);
-  D_RETURN_(4);
+#ifdef HAVE_INOTIFY
+#define INOTIFY_BUFFER_LEN (1024 * (sizeof (struct inotify_event)) + 16)
+void feh_event_handle_inotify(void)
+{
+    D(("Received inotify events\n"));
+    char buf[INOTIFY_BUFFER_LEN];
+    int i = 0;
+    int len = read (opt.inotify_fd, buf, INOTIFY_BUFFER_LEN);
+    if (len < 0) {
+        if (errno != EINTR)
+            eprintf("inotify event read failed");
+    } else if (!len)
+        eprintf("inotify event read failed");
+    while (i < len) {
+        struct inotify_event *event;
+        event = (struct inotify_event *) &buf[i];
+        for (int j = 0; j < window_num; j++) {
+            if(windows[j]->inotify_wd == event->wd) {
+                if (event->mask & IN_IGNORED) {
+                    D(("inotify watch was implicitly removed\n"));
+                    windows[j]->inotify_wd = -1;
+                } else if (event->mask & (IN_CLOSE_WRITE | IN_MOVED_TO)) {
+                    if (strcmp(event->name, FEH_FILE(windows[j]->file->data)->name) == 0) {
+                        D(("inotify says file changed\n"));
+                        feh_reload_image(windows[j], 0, 0);
+                    }
+                }
+                break;
+            }
+        }
+        i += sizeof(struct inotify_event) + event->len;
+    }
 }
+#endif
 
-void
-winwidget_rerender_all(int resize,
-                       int alias)
+void winwidget_destroy_all(void)
 {
-  int i;
+	int i;
 
-  D_ENTER(4);
-  /* Have to DESCEND the list here, 'cos of the way _unregister works */
-  for (i = window_num - 1; i >= 0; i--)
-    winwidget_render_image(windows[i], resize, alias);
-  D_RETURN_(4);
+	/* Have to DESCEND the list here, 'cos of the way _unregister works */
+	for (i = window_num - 1; i >= 0; i--)
+		winwidget_destroy(windows[i]);
+	return;
 }
 
-winwidget
-winwidget_get_first_window_of_type(unsigned int type)
+void winwidget_rerender_all(int resize)
 {
-  int i;
+	int i;
 
-  D_ENTER(4);
-  for (i = 0; i < window_num; i++)
-    if (windows[i]->type == type)
-      D_RETURN(4, windows[i]);
-  D_RETURN(4, NULL);
+	/* Have to DESCEND the list here, 'cos of the way _unregister works */
+	for (i = window_num - 1; i >= 0; i--)
+		winwidget_render_image(windows[i], resize, 0);
+	return;
 }
 
-int
-winwidget_loadimage(winwidget winwid,
-                    feh_file * file)
+winwidget winwidget_get_first_window_of_type(unsigned int type)
 {
-  D_ENTER(4);
-  D(4, ("filename %s\n", file->filename));
-  D_RETURN(4, feh_load_image(&(winwid->im), file));
+	int i;
+
+	for (i = 0; i < window_num; i++)
+		if (windows[i]->type == type)
+			return(windows[i]);
+	return(NULL);
 }
 
-void
-winwidget_show(winwidget winwid)
+int winwidget_loadimage(winwidget winwid, feh_file * file)
 {
-  XEvent ev;
-
-  D_ENTER(4);
-
-  /* feh_debug_print_winwid(winwid); */
-  if (!winwid->visible) {
-    XMapWindow(disp, winwid->win);
-    if (opt.full_screen)
-      XMoveWindow(disp, winwid->win, 0, 0);
-    /* wait for the window to map */
-    D(4, ("Waiting for window to map\n"));
-    XMaskEvent(disp, StructureNotifyMask, &ev);
-    D(4, ("Window mapped\n"));
-    winwid->visible = 1;
-  }
-  D_RETURN_(4);
+	D(("filename %s\n", file->filename));
+#ifdef HAVE_INOTIFY
+    winwidget_inotify_remove(winwid);
+#endif
+    int res = feh_load_image(&(winwid->im), file);
+#ifdef HAVE_INOTIFY
+    if (res) {
+        winwidget_inotify_add(winwid, file);
+    }
+#endif
+	return(res);
 }
 
-int
-winwidget_count(void)
+void winwidget_show(winwidget winwid)
 {
-  D_ENTER(4);
-  D_RETURN(4, window_num);
+	XEvent ev;
+
+	/* feh_debug_print_winwid(winwid); */
+	if (!winwid->visible) {
+		XMapWindow(disp, winwid->win);
+		if (opt.full_screen)
+			XMoveWindow(disp, winwid->win, 0, 0);
+		/* wait for the window to map */
+		D(("Waiting for window to map\n"));
+		XMaskEvent(disp, StructureNotifyMask, &ev);
+		winwidget_get_geometry(winwid, NULL);
+
+		/* Unfortunately, StructureNotifyMask does not only mask
+		 * the events of type MapNotify (which we want to mask here)
+		 * but also such of type ConfigureNotify (and others, see
+		 * https://tronche.com/gui/x/xlib/events/processing-overview.html),
+		 * which should be handled, especially on tiling wm's. To
+		 * remedy this, the handler is executed explicitly:
+		 */
+		if (ev.type == ConfigureNotify)
+			feh_event_handle_ConfigureNotify(&ev);
+		D(("Window mapped\n"));
+		winwid->visible = 1;
+	}
+	return;
 }
 
-void 
-winwidget_move(winwidget winwid,
-               int x,
-               int y)
+void winwidget_move(winwidget winwid, int x, int y)
 {
-  D_ENTER(4);
-  if (winwid && ((winwid->x != x) || (winwid->y != y))) {
-    winwid->x = x;
-    winwid->y = y;
-    winwid->x = (x > scr->width) ? scr->width : x;
-    winwid->y = (y > scr->height) ? scr->height : y;
-    XMoveWindow(disp, winwid->win, winwid->x, winwid->y);
-    XFlush(disp);
-  } else {
-    D(4, ("No move actually needed\n"));
-  }
-  D_RETURN_(4);
+	if (winwid && ((winwid->x != x) || (winwid->y != y))) {
+		winwid->x = (x > scr->width) ? scr->width : x;
+		winwid->y = (y > scr->height) ? scr->height : y;
+		XMoveWindow(disp, winwid->win, winwid->x, winwid->y);
+		XFlush(disp);
+	} else {
+		D(("No move actually needed\n"));
+	}
+	return;
 }
 
-void
-winwidget_resize(winwidget winwid,
-                 int w,
-                 int h)
+void winwidget_resize(winwidget winwid, int w, int h, int force_resize)
 {
-  Window ignored_window;
-  XWindowAttributes attributes;
-  int tc_x, tc_y;
-
-  D_ENTER(4);
-  if (opt.geom_flags) {
-    winwid->had_resize = 1;
-    return;
-  }
-  if (winwid && ((winwid->w != w) || (winwid->h != h))) {
-    D(4, ("Really doing a resize\n"));
-    /* winwidget_clear_background(winwid); */
-    if (opt.screen_clip) {
-      winwid->w = (w > scr->width) ? scr->width : w;
-      winwid->h = (h > scr->height) ? scr->height : h;
-    }
-    /* XResizeWindow(disp, winwid->win, winwid->w, winwid->h); */
-    XGetWindowAttributes(disp, winwid->win, &attributes);
-    XTranslateCoordinates(disp, winwid->win, attributes.root,
-      -attributes.border_width - attributes.x,
-      -attributes.border_width - attributes.y,
-      &tc_x, &tc_y, &ignored_window);
-    winwid->x = tc_x;                     
-    winwid->y = tc_y;
-    XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h);
-
-    winwid->had_resize = 1;
-    XFlush(disp);
+	XWindowAttributes attributes;
+	int tc_x, tc_y, px, py;
+	int scr_width = scr->width;
+	int scr_height = scr->height;
 
-#ifdef HAVE_LIBXINERAMA
-    if (opt.xinerama && xinerama_screens) {
-      int i;
-
-      for (i = 0; i < num_xinerama_screens; i++) {
-        xinerama_screen = 0;
-        if (XY_IN_RECT(winwid->x, winwid->y,
-                       xinerama_screens[i].x_org, xinerama_screens[i].y_org,
-                       xinerama_screens[i].width, xinerama_screens[i].height)) {
-          xinerama_screen = i;
-          break;
-        }
-          
-      }
-    }
-#endif /* HAVE_LIBXINERAMA */
+	/* discarded */
+	Window dw;
+	int di, i;
+	unsigned int du;
 
-  } else {
-    D(4, ("No resize actually needed\n"));
-  }
+	XGetWindowAttributes(disp, winwid->win, &attributes);
 
-  D_RETURN_(4);
+#ifdef HAVE_LIBXINERAMA
+	if (opt.xinerama && xinerama_screens) {
+		xinerama_screen = 0;
+		XQueryPointer(disp, root, &dw, &dw, &px, &py, &di, &di, &du);
+		for (i = 0; i < num_xinerama_screens; i++) {
+			if (XY_IN_RECT(px, py,
+						xinerama_screens[i].x_org,
+						xinerama_screens[i].y_org,
+						xinerama_screens[i].width,
+						xinerama_screens[i].height)) {
+				xinerama_screen = i;
+				break;
+			}
+
+		}
+		if (opt.xinerama_index >= 0)
+			xinerama_screen = opt.xinerama_index;
+
+		scr_width = xinerama_screens[xinerama_screen].width;
+		scr_height = xinerama_screens[xinerama_screen].height;
+	}
+#endif
+
+
+	D(("   x %d y %d w %d h %d\n", attributes.x, attributes.y, winwid->w,
+		winwid->h));
+
+	if ((opt.geom_flags & (WidthValue | HeightValue)) && !force_resize) {
+		winwid->had_resize = 1;
+		return;
+	}
+	if (winwid && ((winwid->w != w) || (winwid->h != h))) {
+		if (opt.screen_clip) {
+			double required_zoom = winwid->zoom;
+			if (opt.scale_down && !opt.keep_zoom_vp) {
+				int max_w = (w > scr_width) ? scr_width : w;
+				int max_h = (h > scr_height) ? scr_height : h;
+				feh_calc_needed_zoom(&required_zoom, winwid->im_w, winwid->im_h, max_w, max_h);
+			}
+			int desired_w = winwid->im_w * required_zoom;
+			int desired_h = winwid->im_h * required_zoom;
+			winwid->w = (desired_w > scr_width) ? scr_width : desired_w;
+			winwid->h = (desired_h > scr_height) ? scr_height : desired_h;
+		}
+		if (winwid->full_screen) {
+			XTranslateCoordinates(disp, winwid->win, attributes.root,
+						-attributes.border_width - attributes.x,
+						-attributes.border_width - attributes.y, &tc_x, &tc_y, &dw);
+			winwid->x = tc_x;
+			winwid->y = tc_y;
+			XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h);
+		} else
+			XResizeWindow(disp, winwid->win, winwid->w, winwid->h);
+
+		winwid->had_resize = 1;
+		XFlush(disp);
+
+		/*
+		 * Note:
+		 * While calling winwidget_get_geometry(winwid, NULL); at this point
+		 * would help alleviate flashing issues that can occur when feh has
+		 * to render a window two times in a row, or renders the initial image
+		 * with a resolution that differs from the one that is needed to
+		 * accomodate the resize.
+		 *
+		 * However, it would also break --scale-down in floating setups. As
+		 * flashing is less annoying, we do not call winwidget_get_geometry.
+		 * here.
+		 */
+
+		if (force_resize && (opt.geom_flags & (WidthValue | HeightValue))
+				&& (winwid->type != WIN_TYPE_THUMBNAIL)) {
+			opt.geom_w = winwid->w;
+			opt.geom_h = winwid->h;
+		}
+
+		D(("-> x %d y %d w %d h %d\n", winwid->x, winwid->y, winwid->w,
+			winwid->h));
+
+	} else {
+		D(("No resize actually needed\n"));
+	}
+
+	return;
 }
 
-void
-winwidget_hide(winwidget winwid)
+void winwidget_hide(winwidget winwid)
 {
-  D_ENTER(4);
-  XUnmapWindow(disp, winwid->win);
-  winwid->visible = 0;
-  D_RETURN_(4);
+	XUnmapWindow(disp, winwid->win);
+	winwid->visible = 0;
+	return;
 }
 
-static void
-winwidget_register(winwidget win)
+static void winwidget_register(winwidget win)
 {
-  D_ENTER(4);
-  D(5, ("window %p\n", win));
-  window_num++;
-  if (windows)
-    windows = erealloc(windows, window_num * sizeof(winwidget));
-  else
-    windows = emalloc(window_num * sizeof(winwidget));
-  windows[window_num - 1] = win;
-
-  XSaveContext(disp, win->win, xid_context, (XPointer) win);
-  D_RETURN_(4);
+	D(("window %p\n", win));
+	window_num++;
+	if (windows)
+		windows = erealloc(windows, window_num * sizeof(winwidget));
+	else
+		windows = emalloc(window_num * sizeof(winwidget));
+	windows[window_num - 1] = win;
+
+	XSaveContext(disp, win->win, xid_context, (XPointer) win);
+	return;
 }
 
-static void
-winwidget_unregister(winwidget win)
+static void winwidget_unregister(winwidget win)
 {
-  int i, j;
-
-  D_ENTER(4);
-  for (i = 0; i < window_num; i++) {
-    if (windows[i] == win) {
-      for (j = i; j < window_num - 1; j++)
-        windows[j] = windows[j + 1];
-      window_num--;
-      if (window_num > 0)
-        windows = erealloc(windows, window_num * sizeof(winwidget));
-      else {
-        free(windows);
-        windows = NULL;
-      }
-    }
-  }
-  XDeleteContext(disp, win->win, xid_context);
-  D_RETURN_(4);
+	int i, j;
+
+	for (i = 0; i < window_num; i++) {
+		if (windows[i] == win) {
+			for (j = i; j < window_num - 1; j++)
+				windows[j] = windows[j + 1];
+			window_num--;
+			if (window_num > 0)
+				windows = erealloc(windows, window_num * sizeof(winwidget));
+			else {
+				free(windows);
+				windows = NULL;
+			}
+		}
+	}
+	XDeleteContext(disp, win->win, xid_context);
+	return;
 }
 
-winwidget
-winwidget_get_from_window(Window win)
+winwidget winwidget_get_from_window(Window win)
 {
-  winwidget ret = NULL;
+	winwidget ret = NULL;
 
-  D_ENTER(4);
-  if (XFindContext(disp, win, xid_context, (XPointer *) & ret) != XCNOENT)
-    D_RETURN(4, ret);
-  D_RETURN(4, NULL);
+	if (XFindContext(disp, win, xid_context, (XPointer *) & ret) != XCNOENT)
+		return(ret);
+	return(NULL);
 }
 
-void
-winwidget_rename(winwidget winwid,
-                 char *newname)
+void winwidget_rename(winwidget winwid, char *newname)
 {
-  D_ENTER(4);
-  if (winwid->name)
-    free(winwid->name);
-  winwid->name = estrdup(newname);
-  winwidget_update_title(winwid);
-  D_RETURN_(4);
+	/* newname == NULL -> update current title */
+	char *p_str;
+
+	if (newname == NULL)
+		newname = estrdup(winwid->name ? winwid->name : "");
+	if (winwid->name)
+		free(winwid->name);
+
+	winwid->name = emalloc(strlen(newname) + 10);
+	strcpy(winwid->name, newname);
+
+	if (strlen(winwid->name) > 9)
+		p_str = winwid->name + strlen(winwid->name) - 9;
+	else
+		p_str = winwid->name;
+
+	if (opt.paused && strcmp(p_str, " [Paused]") != 0)
+		strcat(winwid->name, " [Paused]");
+	else if (!opt.paused && strcmp(p_str, " [Paused]") == 0)
+		*p_str = '\0';
+
+	winwidget_update_title(winwid);
+	return;
 }
 
-void
-winwidget_free_image(winwidget w)
+void winwidget_free_image(winwidget w)
 {
-  D_ENTER(4);
-  if (w->im)
-    gib_imlib_free_image_and_decache(w->im);
-  w->im = NULL;
-  w->im_w = 0;
-  w->im_h = 0;
-  D_RETURN_(4);
+	if (w->im) {
+		gib_imlib_free_image(w->im);
+	}
+	w->im = NULL;
+	w->im_w = 0;
+	w->im_h = 0;
+	return;
 }
 
-void
-feh_debug_print_winwid(winwidget w)
+void feh_debug_print_winwid(winwidget w)
 {
-  printf("winwid_debug:\n" "winwid = %p\n" "win = %ld\n" "w = %d\n" "h = %d\n"
-         "im_w = %d\n" "im_h = %d\n" "im_angle = %f\n" "type = %d\n"
-         "had_resize = %d\n" "im = %p\n" "GC = %p\n" "pixmap = %ld\n"
-         "name = %s\n" "file = %p\n" "mode = %d\n" "im_x = %d\n" "im_y = %d\n"
-         "zoom = %f\n" "click_offset_x = %d\n" "click_offset_y = %d\n"
-         "im_click_offset_x = %d\n" "im_click_offset_y = %d\n"
-         "has_rotated = %d\n", w, w->win, w->w, w->h, w->im_w, w->im_h,
-         w->im_angle, w->type, w->had_resize, w->im, w->gc, w->bg_pmap,
-         w->name, w->file, w->mode, w->im_x, w->im_y, w->zoom,
-         w->click_offset_x, w->click_offset_y, w->im_click_offset_x,
-         w->im_click_offset_y, w->has_rotated);
+	printf("winwid_debug:\n" "winwid = %p\n" "win = %ld\n" "w = %d\n"
+	       "h = %d\n" "im_w = %d\n" "im_h = %d\n" "im_angle = %f\n"
+	       "type = %d\n" "had_resize = %d\n" "im = %p\n" "GC = %p\n"
+	       "pixmap = %ld\n" "name = %s\n" "file = %p\n" "mode = %d\n"
+	       "im_x = %d\n" "im_y = %d\n" "zoom = %f\n" "old_zoom = %f\n"
+	       "click_offset_x = %d\n" "click_offset_y = %d\n"
+	       "has_rotated = %d\n", (void *)w, w->win, w->w, w->h, w->im_w,
+	       w->im_h, w->im_angle, w->type, w->had_resize, w->im, (void *)w->gc,
+	       w->bg_pmap, w->name, (void *)w->file, w->mode, w->im_x, w->im_y,
+	       w->zoom, w->old_zoom, w->click_offset_x, w->click_offset_y,
+	       w->has_rotated);
 }
 
-void
-winwidget_reset_image(winwidget winwid)
+void winwidget_reset_image(winwidget winwid)
 {
-  D_ENTER(4);
-  winwid->zoom = 1.0;
-  winwid->im_x = 0;
-  winwid->im_y = 0;
-  winwid->im_angle = 0.0;
-  winwid->has_rotated = 0;
-  D_RETURN_(4);
+	if (!opt.keep_zoom_vp) {
+		winwid->zoom = 1.0;
+		winwid->old_zoom = 1.0;
+		winwid->im_x = 0;
+		winwid->im_y = 0;
+	}
+	winwid->im_angle = 0.0;
+	winwid->has_rotated = 0;
+	return;
 }
 
-void
-winwidget_sanitise_offsets(winwidget winwid)
+void winwidget_center_image(winwidget winwid)
 {
-  int far_left, far_top;
-  int min_x, max_x, max_y, min_y;
-
-  D_ENTER(4);
-
-  far_left = winwid->w - (winwid->im_w * winwid->zoom);
-  far_top = winwid->h - (winwid->im_h * winwid->zoom);
-
-  if ((winwid->im_w * winwid->zoom) > winwid->w) {
-    min_x = far_left;
-    max_x = 0;
-  } else {
-    min_x = 0;
-    max_x = far_left;
-  }
-  if ((winwid->im_h * winwid->zoom) > winwid->h) {
-    min_y = far_top;
-    max_y = 0;
-  } else {
-    min_y = 0;
-    max_y = far_top;
-  }
-  if (winwid->im_x > max_x)
-    winwid->im_x = max_x;
-  if (winwid->im_x < min_x)
-    winwid->im_x = min_x;
-  if (winwid->im_y > max_y)
-    winwid->im_y = max_y;
-  if (winwid->im_y < min_y)
-    winwid->im_y = min_y;
-
-  D_RETURN_(4);
+	int scr_width, scr_height;
+
+	scr_width = scr->width;
+	scr_height = scr->height;
+
+#ifdef HAVE_LIBXINERAMA
+	if (opt.xinerama && xinerama_screens) {
+		scr_width = xinerama_screens[xinerama_screen].width;
+		scr_height = xinerama_screens[xinerama_screen].height;
+	}
+#endif				/* HAVE_LIBXINERAMA */
+
+	if (winwid->full_screen) {
+		winwid->im_x = (scr_width - lround(winwid->im_w * winwid->zoom)) >> 1;
+		winwid->im_y = (scr_height - lround(winwid->im_h * winwid->zoom)) >> 1;
+	} else {
+		if (opt.geom_flags & WidthValue)
+			winwid->im_x = ((int)opt.geom_w - lround(winwid->im_w * winwid->zoom)) >> 1;
+		else
+			winwid->im_x = (int) (winwid->w - lround(winwid->im_w * winwid->zoom)) >> 1;
+		if (opt.geom_flags & HeightValue)
+			winwid->im_y = ((int)opt.geom_h - lround(winwid->im_h * winwid->zoom)) >> 1;
+		else
+			winwid->im_y = (int) (winwid->h - lround(winwid->im_h * winwid->zoom)) >> 1;
+	}
+}
+
+void winwidget_sanitise_offsets(winwidget winwid)
+{
+	int far_left, far_top;
+	int min_x, max_x, max_y, min_y;
+
+	far_left = winwid->w - (winwid->im_w * winwid->zoom);
+	far_top = winwid->h - (winwid->im_h * winwid->zoom);
+
+	if ((winwid->im_w * winwid->zoom) > winwid->w) {
+		min_x = far_left;
+		max_x = 0;
+	} else {
+		min_x = 0;
+		max_x = far_left;
+	}
+	if ((winwid->im_h * winwid->zoom) > winwid->h) {
+		min_y = far_top;
+		max_y = 0;
+	} else {
+		min_y = 0;
+		max_y = far_top;
+	}
+	if (winwid->im_x > max_x)
+		winwid->im_x = max_x;
+	if (winwid->im_x < min_x)
+		winwid->im_x = min_x;
+	if (winwid->im_y > max_y)
+		winwid->im_y = max_y;
+	if (winwid->im_y < min_y)
+		winwid->im_y = min_y;
+
+	return;
 }
 
+void winwidget_size_to_image(winwidget winwid)
+{
+	winwidget_resize(winwid, winwid->im_w * winwid->zoom, winwid->im_h * winwid->zoom, 1);
+	winwid->im_x = winwid->im_y = 0;
+	winwidget_render_image(winwid, 0, 0);
+	return;
+}
 
-void
-winwidget_size_to_image(winwidget winwid)
+void winwidget_set_pointer(winwidget winwid, int visible)
 {
-  D_ENTER(4);
-  winwidget_resize(winwid, winwid->im_w * winwid->zoom,
-                   winwid->im_h * winwid->zoom);
-  winwid->im_x = winwid->im_y = 0;
-  winwidget_render_image(winwid, 0, 1);
-  D_RETURN_(4);
+	Cursor no_ptr;
+	XColor black, dummy;
+	Pixmap bm_no;
+	static char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	if (visible)
+		XUndefineCursor(disp, winwid->win);
+	else {
+		bm_no = XCreateBitmapFromData(disp, winwid->win, bm_no_data, 8, 8);
+		XAllocNamedColor(disp, DefaultColormapOfScreen(DefaultScreenOfDisplay(disp)), "black", &black, &dummy);
+
+		no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
+		XDefineCursor(disp, winwid->win, no_ptr);
+	}
 }
 
-int winwidget_get_width(winwidget winwid) {
-  int rect[4];
-  D_ENTER(4);
-  winwidget_get_geometry(winwid, rect);
-  D_RETURN(4, rect[2]);
+int winwidget_get_width(winwidget winwid)
+{
+	int rect[4];
+	winwidget_get_geometry(winwid, rect);
+	return(rect[2]);
 }
 
-int winwidget_get_height(winwidget winwid) {
-  int rect[4];
-  D_ENTER(4);
-  winwidget_get_geometry(winwid, rect);
-  D_RETURN(4, rect[3]);
+int winwidget_get_height(winwidget winwid)
+{
+	int rect[4];
+	winwidget_get_geometry(winwid, rect);
+	return(rect[3]);
 }
 
-void winwidget_get_geometry(winwidget winwid, int *rect) {
-  int bw, bp;
-  Window child;
-  D_ENTER(4);
-  if (!rect)
-    return;
-
-  XGetGeometry(disp, winwid->win, &root, 
-               &(rect[0]), &(rect[1]), &(rect[2]), &(rect[3]), &bw, &bp);
-
-  XTranslateCoordinates(disp, winwid->win, root,
-                          0, 0, &(rect[0]), &(rect[1]), &child);
-
-  /* update the window geometry (in case it's inaccurate) */
-  winwid->x = rect[0];
-  winwid->y = rect[1];
-  winwid->w = rect[2];
-  winwid->h = rect[3];
-  D_RETURN_(4);
+void winwidget_get_geometry(winwidget winwid, int *rect)
+{
+	unsigned int bw, bp;
+	Window child;
+
+	int inner_rect[4];
+
+	if (!rect)
+		rect = inner_rect;
+
+	XGetGeometry(disp, winwid->win, &root, &(rect[0]), &(rect[1]), (unsigned
+				int *)&(rect[2]), (unsigned int *)&(rect[3]), &bw, &bp);
+
+	XTranslateCoordinates(disp, winwid->win, root, 0, 0, &(rect[0]), &(rect[1]), &child);
+
+	/* update the window geometry (in case it's inaccurate) */
+	winwid->x = rect[0];
+	winwid->y = rect[1];
+	winwid->w = rect[2];
+	winwid->h = rect[3];
+	return;
 }
 
-void winwidget_show_menu(winwidget winwid) {
-  int x, y, b;
-  unsigned int c;
-  Window r;
-
-  XQueryPointer(disp, winwid->win, &r, &r, &x, &y, &b, &b, &c);
-  if (winwid->type == WIN_TYPE_ABOUT)
-  {
-    if (!menu_about_win)
-        feh_menu_init_about_win();
-    feh_menu_show_at_xy(menu_about_win, winwid, x, y);
-  }
-  else if (winwid->type == WIN_TYPE_SINGLE)
-  {
-    if (!menu_single_win)
-        feh_menu_init_single_win();
-    feh_menu_show_at_xy(menu_single_win, winwid, x, y);
-  }
-  else if (winwid->type == WIN_TYPE_THUMBNAIL)
-  {
-    if (!menu_thumbnail_win)
-        feh_menu_init_thumbnail_win();
-    feh_menu_show_at_xy(menu_thumbnail_win, winwid, x, y);
-  }
-  else if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)
-  {
-    if (!menu_single_win)
-        feh_menu_init_thumbnail_viewer();
-    feh_menu_show_at_xy(menu_thumbnail_viewer, winwid, x, y);
-  }
-  else
-  {
-    if (!menu_main)
-        feh_menu_init_main();
-    feh_menu_show_at_xy(menu_main, winwid, x, y);
-  }
+void winwidget_show_menu(winwidget winwid)
+{
+	int x, y, b;
+	unsigned int c;
+	Window r;
+
+	XQueryPointer(disp, winwid->win, &r, &r, &x, &y, &b, &b, &c);
+	if (winwid->type == WIN_TYPE_SINGLE) {
+		if (!menu_single_win)
+			feh_menu_init_single_win();
+		feh_menu_show_at_xy(menu_single_win, winwid, x, y);
+	} else if (winwid->type == WIN_TYPE_THUMBNAIL) {
+		if (!menu_thumbnail_win)
+			feh_menu_init_thumbnail_win();
+		feh_menu_show_at_xy(menu_thumbnail_win, winwid, x, y);
+	} else if (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER) {
+		if (!menu_single_win)
+			feh_menu_init_thumbnail_viewer();
+		feh_menu_show_at_xy(menu_thumbnail_viewer, winwid, x, y);
+	} else {
+		if (!menu_main)
+			feh_menu_init_main();
+		feh_menu_show_at_xy(menu_main, winwid, x, y);
+	}
 }
diff --git a/src/winwidget.h b/src/winwidget.h
index de08ec9..0894b5a 100644
--- a/src/winwidget.h
+++ b/src/winwidget.h
@@ -1,6 +1,7 @@
 /* winwidget.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2020 Birte Kristina Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -59,92 +60,103 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PROP_MWM_HINTS_ELEMENTS             5
 
 /* Motif window hints */
-typedef struct _mwmhints
-{
-   CARD32 flags;
-   CARD32 functions;
-   CARD32 decorations;
-   INT32 input_mode;
-   CARD32 status;
-}
-MWMHints;
-
-enum win_type
-{
-   WIN_TYPE_UNSET, WIN_TYPE_SLIDESHOW, WIN_TYPE_SINGLE, WIN_TYPE_ABOUT,
-   WIN_TYPE_THUMBNAIL, WIN_TYPE_THUMBNAIL_VIEWER
+typedef struct _mwmhints {
+	unsigned long flags;
+	unsigned long functions;
+	unsigned long decorations;
+	long input_mode;
+	unsigned long status;
+} MWMHints;
+
+enum win_type {
+	WIN_TYPE_UNSET, WIN_TYPE_SLIDESHOW, WIN_TYPE_SINGLE,
+	WIN_TYPE_THUMBNAIL, WIN_TYPE_THUMBNAIL_VIEWER
 };
 
-struct __winwidget
-{
-   Window win;
-   int x;
-   int y;
-   int w;
-   int h;
-   int im_w;
-   int im_h;
-   double im_angle;
-   enum win_type type;
-   unsigned char had_resize, full_screen;
-   Imlib_Image im;
-   GC gc;
-   Pixmap bg_pmap;
-   Pixmap bg_pmap_cache;
-   char *name;
-   gib_list *file;
-   unsigned char visible;
-
-   /* Stuff for zooming */
-   unsigned char mode;
-
-   unsigned char caption_entry; /* are we in caption entry mode? */
-
-   /* New stuff */
-   int im_x;                    /* image offset from window top left */
-   int im_y;                    /* image offset from window top left */
-   double zoom;                 /* From 0 (not visible) to 100 (actual size)
-                                   all the way up to INT_MAX (ouch) */
-   int click_offset_x;
-   int click_offset_y;
-   int im_click_offset_x;
-   int im_click_offset_y;
-
-   unsigned char has_rotated;
+struct __winwidget {
+	Window win;
+	int x;
+	int y;
+	int w;
+	int h;
+	int im_w;
+	int im_h;
+	int force_aliasing;
+	double im_angle;
+	enum win_type type;
+	unsigned char had_resize, full_screen;
+	Imlib_Image im;
+	GC gc;
+	Pixmap bg_pmap;
+	Pixmap bg_pmap_cache;
+	char *name;
+	gib_list *file;
+	unsigned char visible;
+	char *errstr;
+
+	/* panning, zooming, etc. */
+	unsigned char mode;
+
+	unsigned char caption_entry;
+
+	/* image offset from window top left */
+	int im_x;
+	int im_y;
+
+	/* From 0 (not visible) to 1.00 (actual size)
+	 * all the way up to INT_MAX (eww)
+	 */
+	double zoom;
+	double old_zoom;
+
+	int click_offset_x;
+	int click_offset_y;
+	int im_click_offset_x;
+	int im_click_offset_y;
+	time_t click_start_time;
+
+	unsigned char has_rotated;
+
+#ifdef HAVE_INOTIFY
+	int inotify_wd;
+#endif
 };
 
+#ifdef HAVE_INOTIFY
+void winwidget_inotify_remove(winwidget winwid);
+void winwidget_inotify_add(winwidget winwid, feh_file * file);
+#endif
+
 int winwidget_loadimage(winwidget winwid, feh_file * filename);
 void winwidget_show(winwidget winwid);
 void winwidget_show_menu(winwidget winwid);
 void winwidget_hide(winwidget winwid);
 void winwidget_destroy_all(void);
 void winwidget_free_image(winwidget w);
-void winwidget_render_image(winwidget winwid, int resize, int alias);
+void winwidget_center_image(winwidget w);
+void winwidget_render_image(winwidget winwid, int resize, int force_alias);
 void winwidget_rotate_image(winwidget winid, double angle);
 void winwidget_move(winwidget winwid, int x, int y);
-void winwidget_resize(winwidget winwid, int w, int h);
+void winwidget_resize(winwidget winwid, int w, int h, int force_resize);
 void winwidget_setup_pixmaps(winwidget winwid);
 void winwidget_update_title(winwidget ret);
-void winwidget_rerender_all(int resize, int alias);
+void winwidget_update_caption(winwidget winwid);
+void winwidget_rerender_all(int resize);
 void winwidget_destroy_xwin(winwidget winwid);
-int winwidget_count(void);
+
+void winwidget_set_pointer(winwidget winwid, int visible);
 
 void winwidget_get_geometry(winwidget winwid, int *rect);
 int winwidget_get_width(winwidget winwid);
 int winwidget_get_height(winwidget winwid);
 winwidget winwidget_get_from_window(Window win);
-winwidget winwidget_create_from_file(gib_list * filename, char *name,
-
-                                     char type);
-winwidget winwidget_create_from_image(Imlib_Image im, char *name, char type);
+winwidget winwidget_create_from_file(gib_list * filename, char type);
+winwidget winwidget_create_from_image(Imlib_Image im, char type);
 void winwidget_rename(winwidget winwid, char *newname);
 void winwidget_destroy(winwidget winwid);
 void winwidget_create_window(winwidget ret, int w, int h);
-void winwidget_clear_background(winwidget w);
 Pixmap feh_create_checks(void);
-double feh_calc_needed_zoom(double *zoom, int orig_w, int orig_h, int dest_w,
-
-                            int dest_h);
+double feh_calc_needed_zoom(double *zoom, int orig_w, int orig_h, int dest_w, int dest_h);
 void feh_debug_print_winwid(winwidget winwid);
 winwidget winwidget_get_first_window_of_type(unsigned int type);
 void winwidget_reset_image(winwidget winwid);
@@ -152,7 +164,7 @@ void winwidget_sanitise_offsets(winwidget winwid);
 void winwidget_size_to_image(winwidget winwid);
 void winwidget_render_image_cached(winwidget winwid);
 
-extern int window_num;          /* For window list */
-extern winwidget *windows;      /* List of windows to loop though */
+extern int window_num;		/* For window list */
+extern winwidget *windows;	/* List of windows to loop though */
 
 #endif