Commit add9cfa1 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Move fehrc / help from options.c into separate files

parent b58c4256
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
/src/*.o
/src/*.inc
/src/feh
+17 −5
Original line number Diff line number Diff line
@@ -3,15 +3,27 @@ include ../config.mk
TARGETS = ${shell echo *.c}
OBJECTS = ${TARGETS:.c=.o}

feh: deps.mk ${OBJECTS}
	${CC} ${LDFLAGS} ${CFLAGS} -o $@ ${OBJECTS} ${LDLIBS}
I_SRCS = ${shell echo *.raw}
I_DSTS = ${I_SRCS:.raw=.inc}

deps.mk: ${TARGETS}
	${CC} -MM ${TARGETS} > $@
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


deps.mk: ${TARGETS} ${I_DSTS}
	${CC} -MM ${TARGETS} > $@

clean:
	rm -f feh *.o
	rm -f feh *.o *.inc

.PHONY: clean

.SUFFIXES: .inc .raw
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ menu.o: menu.c feh.h structs.h menu.h utils.h getopt.h debug.h support.h \
multiwindow.o: multiwindow.c feh.h structs.h menu.h utils.h getopt.h \
  debug.h winwidget.h timers.h filelist.h options.h
options.o: options.c feh.h structs.h menu.h utils.h getopt.h debug.h \
  filelist.h options.h
  filelist.h options.h help.inc fehrc.inc
signals.o: signals.c feh.h structs.h menu.h utils.h getopt.h debug.h \
  winwidget.h
slideshow.o: slideshow.c feh.h structs.h menu.h utils.h getopt.h debug.h \

src/fehrc.raw

0 → 100644
+66 −0
Original line number Diff line number Diff line
# Feh configuration file.
# Lines starting with # are comments. Don't use comments mid-line.

# Feh expects to find this as ~/.fehrc or /etc/fehrc
# If both are available, ~/.fehrc will be used

# Options are defined in theme_name/options pairs.
# Separate themename and options by whitespace.

# There are two ways of specifying the theme. Either use feh -Tthemename,
# or use a symbolic link to feh with the name of the theme. eg
# ln -s `which feh` ~/bin/mkindex
# Now when you run 'mkindex', feh will load the config specified for the
# mkindex theme.

# ======================
# Some examples of usage
# ======================

# Set the default feh options to be recursive and verbose
# feh -rV

# Multiple options can of course be used. If they are not in one line,
# the lines after the theme name must start with a tab character. Like:
# imagemap -rV --quiet -W 400 -H 300 \\
#          --thumb-width 40 --thumb-height 30

# ====================
# A few default themes
# ====================

# Webcam mode, simply specify the url(s).
# e.g. feh -Twebcam http://cam1 http://cam2
webcam --multiwindow --reload 20

# Create an index of the current directory. This version uses . as the
# current dir, so you don't even need any commandline arguments.
mkindex -iVO index.jpg .

# More ambitious version...
imgidx -iVO .fehindex.jpg --limit-width 1200 --thumb-width 90 --thumb-height 90 .

# Show a presentation
present --full-screen --sort name

# Booth mode ;-)
booth --full-screen --hide-pointer --slideshow-delay 20

# Screw xscreensaver, use feh =)
screensave --full-screen --randomize --slideshow-delay 5

# Add <img> tags to your html with ease :-)
newimg -q -L \"<img src=\\\"%f\\\" alt=\\\"%n\\\" border=\\\"0\\\" width=\\\"%w\\\" height=\\\"%h\\\">\"

# Different menus
chrome --menu-bg " PREFIX "/share/feh/images/menubg_chrome.png
brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png
pastel --menu-bg " PREFIX "/share/feh/images/menubg_pastel.png
aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png
wood --menu-bg " PREFIX "/share/feh/images/menubg_wood.png
aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png
sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png
orange --menu-bg " PREFIX "/share/feh/images/menubg_orange.png
light --menu-bg " PREFIX "/share/feh/images/menubg_light.png
black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \\
      --menu-style " PREFIX "/share/feh/fonts/black.style

src/help.raw

0 → 100644
+331 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading