Wed Jun 13 21:13:51 PDT 2001 Michael Jennings <mej@eterm.org>

There is now a new mechanism for dealing with the background image
	collection, including a new update script.  Please read the newly-
	rewritten bg/README.backgrounds for details.

	Also, I'm trying to flesh out the Contributors list in that file, but
	my memory isn't cooperating.  So if you contributed one of the
	backgrounds, or know someone who did, please let me know.


SVN revision: 4810
This commit is contained in:
Michael Jennings 2001-06-14 05:31:09 +00:00
parent 379d83a852
commit 3a471bb33e
50 changed files with 195 additions and 118 deletions

View File

@ -4200,3 +4200,14 @@ Mon Jun 11 22:04:08 PDT 2001 Michael Jennings <mej@eterm.org>
Laurence J. Lane <ljlane@debian.org>.
-------------------------------------------------------------------------------
Wed Jun 13 21:13:51 PDT 2001 Michael Jennings <mej@eterm.org>
There is now a new mechanism for dealing with the background image
collection, including a new update script. Please read the newly-
rewritten bg/README.backgrounds for details.
Also, I'm trying to flesh out the Contributors list in that file, but
my memory isn't cooperating. So if you contributed one of the
backgrounds, or know someone who did, please let me know.
-------------------------------------------------------------------------------

View File

@ -34,14 +34,14 @@ if test "$DIE" -eq 1; then
exit 1
fi
echo " libtoolize --copy --force"
libtoolize --copy --force
echo " libtoolize -c -f"
libtoolize -c -f
echo " aclocal -I . $ACLOCAL_FLAGS"
aclocal -I . $ACLOCAL_FLAGS
echo " autoheader"
autoheader
echo " automake --add-missing"
automake --add-missing
echo " automake -a -c"
automake -a -c
echo " autoconf"
autoconf

View File

@ -1,49 +1,19 @@
# $Id$
DIRS = tile scale
EXTRA_DIST = tile/014.jpg tile/circuit.jpg tile/giger1.jpg tile/40.jpg tile/blackstone.jpg \
tile/nebula.jpg scale/Dragon.jpg \
UPDATE_SCRIPT = @top_srcdir@/utils/Etbg_update_list
EXTRA_DIST = tile/014.jpg tile/circuit.jpg tile/giger1.jpg tile/40.jpg tile/blackstone.jpg tile/nebula.jpg \
README.backgrounds
pixmapdir = $(pkgdatadir)/pix
themedir = $(pkgdatadir)/themes
all: Makefile
@echo "*** Generating pixmap list files from images in tile/ and scale/..."
@true > $(srcdir)/pixmaps.list
@true > $(srcdir)/tile/tiled-pixmaps.list
@true > $(srcdir)/scale/scaled-pixmaps.list
@for i in `(cd $(srcdir)/tile && ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list)` ; do \
echo $$i >> $(srcdir)/tile/tiled-pixmaps.list ; \
echo '"'$$i'@0x0+0+0:tile"' >> $(srcdir)/pixmaps.list ; \
done
@for i in `(cd $(srcdir)/scale && ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list)` ; do \
echo $$i >> $(srcdir)/scale/scaled-pixmaps.list ; \
echo '"'$$i'@100x100"' >> $(srcdir)/pixmaps.list ; \
done
install-data-hook:
@if test ! -f $(srcdir)/pixmaps.list ; then $(MAKE) all ; fi
$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
@(for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; cd $(srcdir)/$$j ; \
for i in `ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list` ; do \
echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \
$(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \
@(for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; \
$(mkinstalldirs) $(DESTDIR)$(pixmapdir)/$$j ; cd $(srcdir)/$$j ; \
for i in `ls -1 | grep -v CVS | grep -v \.cvsignore` ; do \
echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \
$(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \
done ; cd .. ; \
done)
@for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \
if test -f $(DESTDIR)${pixmapdir}/$$i ; then \
$(CP) -p $(DESTDIR)${pixmapdir}/$$i $(DESTDIR)${pixmapdir}/$$i.old ; \
echo "WARNING: Backup of existing $$i created." ; \
fi ; \
done
$(INSTALL_DATA) $(srcdir)/tile/tiled-pixmaps.list $(DESTDIR)${pixmapdir}
$(INSTALL_DATA) $(srcdir)/scale/scaled-pixmaps.list $(DESTDIR)${pixmapdir}
$(INSTALL_DATA) $(srcdir)/pixmaps.list $(DESTDIR)${pixmapdir}
@for i in `ls -1d $(DESTDIR)${themedir}/*` ; do \
for j in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \
if test $$i != "." -a $$i != ".." -a ! -f $$i/$$j ; then \
echo "$(LN_S) ../../pix/$$j $$i/$$j" ; \
$(LN_S) ../../pix/$$j $$i/$$j ; \
fi ; \
done ; \
done
$(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir}

View File

@ -1,34 +1,64 @@
Eterm Background Archive
========================
Eterm Background Images
=======================
This is the official (<G>) collection of Eterm background images. The only
things that make it official are (1) I put it together, and (2) the default
themes that come with Eterm are designed to work with these images. NONE of
these images are original work by either of the Eterm authors; they have all
been collected from various sites on the web. As far as I know, they are all
freely available for use.
The default themes for Eterm are designed to select a background image
at random. In order for this to work, some sort of mechanism had to
be created for the creation and maintenance of a set of backgrounds,
both tileable and scaled. This mechanism had to allow for easy
selection of the random image as well as easy alterations to the
collection.
However, should any person who can provide proof of ownership of any of these
pictures object to their inclusion, they will be IMMEDIATELY withdrawn. No
copyright infringement is intended. Inclusion here should be taken as a
compliment. :-)
So here's how it works. Underneath this directory (bg/) you'll find
two subdirectories: tile and scale. These directories contain tiled
and scaled background images, respectively. When "make install" is
run, these images are automatically installed in directories with the
same names underneath <prefix>/share/Eterm/pix/. Once these images
have been copied into place, the Etbg_update_list utility is run to
create or update the pixmaps.list file, a text file containing the
master list of images and their geometries, from which Eterm will
choose an image at random.
Installation
If you wish to add or remove images from the collection, first cd into
<prefix>/share/Eterm/pix/. Once there, remove any unwanted images
from the tile/ and/or scale/ directories. Then copy any images you
want into either the tile/ or scale/ directory, depending on whether
you want Eterm to tile the image or scale it. When you have finished
adding and/or removing images, run the Etbg_update_list script again
(it is found in <prefix>/bin/) to update the list.
You may have as many or as few images in your collection as you like;
just remember to re-run the Etbg_update_list script after completing
each set of changes. Note that if you have fewer than 2 images in the
collection, you should edit the theme.cfg file for your theme to
deactivate the random image selection. (If you neglect to do this,
you may receive error messages from Eterm, but it will continue to
function.)
Disclaimer
----------
All images distributed with Eterm itself, and all those in the
supplementary backgrounds collection, were downloaded freely from the
Internet or submitted directly via e-mail by their authors. None of
these images are original work by me. Furthermore, I have made every
effort to ensure that the ones I downloaded are freely distributable.
However, should any person who can provide proof of ownership of any
of these pictures object to their inclusion, they will be IMMEDIATELY
withdrawn. No copyright infringement is intended. Inclusion here
should be taken as a compliment. :-)
Contributors
------------
Now that this is included with the Eterm distribution, these images will be
cataloged and installed as part of the normal Eterm build process.
The following contributions have been made by their authors. Thanks
to all who have contributed. If one of your images is in this
collection, but it isn't reflected here, please e-mail me
(mej@eterm.org) so I can correct the omission. Note that some of
these images are included with the supplemental backgrounds collection
rather than with the Eterm distribution.
Changes
-------
Adding pictures to the archive is equally simple. If the picture is intended
to be tiled, copy it into the "tile" directory. If it is intended to be scaled
(i.e., non-tileable pictures), copy it into the "scale" directory. Then re-run
"make" and "make install". That's it! The images will automatically be
included in Eterm's random rotation.
Removing pictures is done the same way. Simply remove them from whichever
directory they reside in, then re-run "make" and "make install". You will need
to manually remove the file from the pixmap directory if you so desire; these
instructions only pertain to changing the standard rotation.
Neopolis-horizon.jpg Joe Colburn <joe@nodomain.com>
cyber_bg.jpg Joe Colburn <joe@nodomain.com>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2000, Michael Jennings
* Copyright (C) 1997-2001, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to

68
utils/Etbg_update_list Executable file
View File

@ -0,0 +1,68 @@
#!/bin/sh -x
#
# Eterm backgrounds list file update utility
#
# $Id$
LISTFILE=pixmaps.list
if [ $# -gt 1 -o "X$1" = "X-h" -o "X$1" = "X--help" ]; then
echo "Syntax: Etbg_update_list [path]"
echo " (The default path is the current directory.)"
echo
exit 0
fi
# Find the pixmap directory
for i in "$1" "$PWD" "$PWD/pix" "$PWD/../pix" ; do
if [ -d "$i/tile" -o -d "$i/scale" ]; then
PIXDIR="$i"
break
fi
done
cd $PIXDIR
# Generate new pixmap list from tile/ and scale/ directories
echo "Etbg_update_list: Generating pixmap list file from images in tile/ and scale/..."
true > $LISTFILE.new
if [ -d tile ]; then
for i in `(cd tile && ls -1)` ; do
echo '"tile/'$i'@0x0+0+0:tile"' >> $LISTFILE.new
done
fi
if [ -d scale ]; then
for i in `(cd scale && ls -1)` ; do \
echo '"scale/'$i'@100x100"' >> $LISTFILE.new ; \
done
fi
# Check to see if the list has changed. If so, back up the old one.
if [ -s $LISTFILE ]; then
if (diff $LISTFILE $LISTFILE.new >/dev/null 2>&1); then
echo "Pixmap list is unchanged."
rm -f $LISTFILE.new
else
echo "Old pixmap list will be saved in $LISTFILE.old"
mv -f $LISTFILE $LISTFILE.old
fi
fi
if [ -s $LISTFILE.new ]; then
mv -f $LISTFILE.new $LISTFILE
fi
# If there's no theme directory nearby, just quit.
if [ ! -d "../themes" ]; then
exit 0
fi
# If there is, cd into it and make sure all the themes have list files.
cd ../themes
for i in `ls -1` ; do
if [ -f $i/theme.cfg -a ! -e $i/$LISTFILE ]; then
echo "Creating symlink to $LISTFILE for theme $i"
(cd $i && ln -sf ../../pix/$LISTFILE $LISTFILE)
fi
done

View File

@ -1,7 +1,7 @@
# $Id$
bin_PROGRAMS = Esetroot Etbg Ettable
bin_SCRIPTS = Etcolors Etsearch kEsetroot
bin_SCRIPTS = Etcolors Etsearch kEsetroot Etbg_update_list
Esetroot_SOURCES = Esetroot.c
Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
@ -9,6 +9,4 @@ Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
Etbg_SOURCES = Etbg.c
Ettable_SOURCES = Ettable.c
EXTRA_DIST = Etbg.c Esetroot.c Ettable.c Makefile.am \
Makefile.in Etcolors Etsearch kEsetroot.in
EXTRA_DIST = Etcolors Etsearch kEsetroot.in Etbg_update_list