From 601d9c0cb5dbd044a9db014777f11b6e45db8780 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 15 Jan 2011 15:06:34 +0100 Subject: Add .../share/doc/feh/examples, move fehrc (feh themes) there --- Makefile | 9 ++++++- config.mk | 1 + data/examples/themes | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ src/fehrc.raw | 74 ---------------------------------------------------- 4 files changed, 78 insertions(+), 75 deletions(-) create mode 100644 data/examples/themes delete mode 100644 src/fehrc.raw diff --git a/Makefile b/Makefile index 06a9151..5c9b3c1 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ test-x11: all prove test/feh-bg.i install: install-man install-doc install-bin install-font install-img +install: install-examples install-man: @echo installing manuals to ${man_dir} @@ -49,6 +50,12 @@ install-img: @cp data/images/* ${image_dir} @chmod 644 ${image_dir}/* +install-examples: + @echo installing examples to ${example_dir} + @mkdir -p ${example_dir} + @cp data/examples/* ${example_dir} + @chmod 644 ${example_dir}/* + uninstall: rm -f ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1 @@ -79,4 +86,4 @@ clean: @${MAKE} -C man clean .PHONY: all test test-x11 install uninstall clean install-man install-doc \ - install-bin install-font install-img dist + install-bin install-font install-img install-examples dist diff --git a/config.mk b/config.mk index d2c96c4..fafaeb6 100644 --- a/config.mk +++ b/config.mk @@ -11,6 +11,7 @@ bin_dir = ${main_dir}/bin doc_dir = ${main_dir}/share/doc/feh image_dir = ${main_dir}/share/feh/images font_dir = ${main_dir}/share/feh/fonts +example_dir = ${main_dir}/share/doc/feh/examples # default CFLAGS CFLAGS ?= -g -O2 diff --git a/data/examples/themes b/data/examples/themes new file mode 100644 index 0000000..a507951 --- /dev/null +++ b/data/examples/themes @@ -0,0 +1,69 @@ +# Feh themes configuration file. +# Lines starting with # are comments. Midline comments are not supported. +# Place this as either ~/.config/feh/themes or /etc/feh/themes + +# 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. + +# Multiple options can of course be used. If they are too long for one line, +# you can use a \ to make them continue on the next one, but not mid-option. +# 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 --index --output-only .fehindex.jpg --limit-width 1024 \ + --thumb-width 128 --thumb-height 128 --verbose --quiet + +# Show a presentation +present --full-screen --sort name --hide-pointer + +# Booth mode ;-) +booth --full-screen --hide-pointer --slideshow-delay 20 + +# Screw xscreensaver, use feh =) +screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer + +# Different menus +brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png +aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png +aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png +sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png +black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \ + --menu-style " PREFIX "/share/feh/fonts/black.style + +# Some more examples, used by the feh developer + +rfs --full-screen --hide-pointer --auto-zoom --randomize +fs --full-screen --hide-pointer --auto-zoom --sort filename + +thumb_s --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ + --limit-width 1024 --sort filename \ + --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 + +thumb_b --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ + --limit-width 1024 --sort filename \ + --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 + +thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ + --limit-width 1024 --sort filename --index-name 0 + +thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ + --limit-width 1024 --sort filename --index-name 0 diff --git a/src/fehrc.raw b/src/fehrc.raw deleted file mode 100644 index 154a6e1..0000000 --- a/src/fehrc.raw +++ /dev/null @@ -1,74 +0,0 @@ -# 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. - -# Multiple options can of course be used. If they are too long for one line, -# you can (usually) use a \\ to make them continue on the next one: -# 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 --index --output-only .fehindex.jpg --limit-width 1024 \\ - --thumb-width 128 --thumb-height 128 --verbose --quiet - -# Show a presentation -present --full-screen --sort name --hide-pointer - -# Booth mode ;-) -booth --full-screen --hide-pointer --slideshow-delay 20 - -# Screw xscreensaver, use feh =) -screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer - -# Add tags to your html with ease :-) -newimg -q -L \"\\\"%n\\\"\" - -# Different menus -brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png -aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png -aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png -sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png -black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \\ - --menu-style " PREFIX "/share/feh/fonts/black.style - -# Some more examples, used by the feh developer - -rfs --full-screen --hide-pointer --auto-zoom --randomize -fs --full-screen --hide-pointer --auto-zoom --sort filename - -thumb_s --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \\ - --limit-width 1024 --sort filename \\ - --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 - -thumb_b --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \\ - --limit-width 1024 --sort filename \\ - --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 - -thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \\ - --limit-width 1024 --sort filename --index-name 0 - -thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \\ - --limit-width 1024 --sort filename --index-name 0 -- cgit v1.2.3