Wed Apr 12 21:18:19 PDT 2000 Michael Jennings <mej@eterm.org>

	This is the initial commit with Imlib2 support.  READ THIS CAREFULLY.
	There is important information in this commit message that will keep
	you from getting screwed.

	First off, support for Imlib 1.x is GONE.  It is no longer supported
	as of now.  If you want to continue using it, do NOT install this
	version.  I tried to support both for awhile, but the code ended up
	being way too ugly and hackish.  Imlib2 is the future.  And trust me,
	when you see what we do with this future, you'll be happy for the
	switch.

	The good news is that most of the basics work.  Transparency still
	works, and the basic image stuff works.  Most users won't notice any
	major problems, so long as your Imlib2 is 100% up-to-date.

	However, a few things still don't work:

	1.  Auto mode is a bit broken.  You'll get X errors in XFree86 4.0.
	Don't use it if you're running XFree 4.

	2.  Color modifiers for images don't work.  At all.

	3.  Transparency shading/tinting will not work in 8bpp or lower.  Life
	blows sometimes.  Sorry.  Time for a real video card. :-)

	4.  The built-in icon is broken.

	5.  You WILL need to update your theme.cfg files.  The borders on the
	horizontal and vertical bar images were incorrect when combined with
	the new anti-aliased scaling.  The horizontal bars should have a right
	border of 3.  Vertical bars should have a bottom border of 3.  The
	menu images should have both right *and* bottom borders of 3.  You can
	either make those changes by hand, or use the --with-theme-update
	option to autogen.sh.  Your call.

	I think that covers everything I've run into.  I will point out that
	I don't really take advantage of a lot of the Imlib2 features just
	yet.  My first priority is to make all the stuff that worked before
	work again (or at least the important stuff).  Then I'll work on
	new features.

	So there it is.  If you're not ready for it, don't use it.  But if you
	are, I hope you like it.


SVN revision: 2478

9 files changed, 80 insertions, 267 deletions

diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index 9366d5b..c88c594 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -148,7 +148,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -157,11 +157,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -217,11 +217,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -250,11 +250,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -263,15 +263,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/active.tags b/themes/active.tags
deleted file mode 100644
index 7c784f0..0000000
--- a/themes/active.tags
+++ /dev/null
@@ -1,187 +0,0 @@
-# active.tags.X -- X Window System tag configuration 
-# Nat Friedman <ndf@mit.edu>
-
-# It's actually faster to split up the regexps in many cases.
-
-# URLs
-{
-Env=X
-Regexp=http+s?://[^\ "<>'()]+
-Binding=Button3
-Highlight=Blue
-SearchLines=4
-
-Action=export NS="`ps auxw |grep netscape |grep -v grep`"; if [ "$NS" = "" ]; then netscape "${}"& else netscape -remote "openURL(\"${}\")"; fi
-}
-
-# URLs that don't begin with "http://"
-{
-Env=X
-Regexp=www\.+[^\ ,"]+/?[^\ ,"<>()]+
-Binding=Button3
-Highlight=Blue
-SearchLines=2
-
-Action=export NS="`ps auxw |grep netscape |grep -v grep`"; if [ "$NS" = "" ]; then netscape "${}"& else netscape -remote "openURL(\"${}\")"; fi
-}
-
-# FTP URLs
-{
-Env=X
-Regexp=ftp://[^\ ,<>]+
-Binding=Button3
-Highlight=Blue
-SearchLines=2
-
-Action=Action=export NS="`ps -auxw |grep netscape |grep -v grep`"; if [ "$NS" = "" ]; then netscape "${}" & else netscape -remote 'openURL("${}")'; fi
-}
-
-# Resolve an IP address and type the hostname into the shell
-{
-Env=X
-Regexp=[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?
-Output=loop
-Binding=Button3
-Highlight=Green
-Clue=Resolve this IP address and type the hostname into the shell
-
-Action=echo -n "`host ${} |grep Name |cut -d ' ' -f 2`"
-}
-
-# Resolve an IP address and pop the hostname up
-{
-Env=X
-Regexp=[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?
-Binding=Button3&Shift
-Highlight=Green
-Clue=Resolve this IP address and pop up a window with the hostname
-
-Action=xmessage "`host ${} |grep Name |cut -d ' ' -f 2`" -nearmouse
-}
-
-# Directory browser
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=([^\ ]+/)
-Output=loop
-Highlight=*Green
-Binding=Button3
-
-Action=echo -e 'clear;cd ${};ls -F;echo ".."'
-}
-
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=\.\.+
-Output=loop
-Highlight=*Yellow
-Binding=Button3
-
-Action=echo -e 'clear;cd ${};ls -F;if [ "$PWD" = "/" ]; then echo -n ; else echo ".." ; fi;'
-}
-
-# View images
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ ]+\.jpg+|[^\ ]+\.jpeg+|[^\ ]+\.gif+|[^\ ]+\.ppm+
-Highlight=Red
-Binding=Button3
-Clue=View this image
-
-Action=xv -quit ${}
-}
-
-# View HTML files
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ "<>]+\.html+
-
-Highlight=Yellow
-Clue=Send this HTML file to Netscape
-
-Action=netscape -remote "openURL(${})"
-}
-
-# Uncompress and untar .tar.gz and .tgz files.
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ "'`=]+(tar\.gz|\.tgz|tar\.Z)
-Output=Loop
-Highlight=Magenta
-Clue=Uncompress and untar this file
-
-Action=echo -n "tar -xvzf ${}"
-}
-
-# Unzip .zip files.
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ "'`=]+\.zip
-Output=Loop
-Highlight=Magenta
-Clue=Unzip this file
-
-Action=echo -n "unzip -v ${}"
-}
-
-# Untar .tar files.
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ "'`=]+\.tar
-Output=Loop
-Highlight=Magenta
-Clue=Untar this file
-
-Action=echo -n "tar -xvf ${}"
-}
-
-# The following two tags will ghostview a .ps file if you right-click it,
-# and print it if you shift-right-click it.
-{
-Env=X
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ ]+\.ps
-Binding=Button3
-Highlight=Underline
-Clue=Send this file to ghostview
-
-Action=ghostview ${}
-}
-
-{
-Modes=bash,-bash,sh,-sh,csh,-csh,tcsh,-tcsh,ksh,-ksh,zsh,-zsh
-Regexp=[^\ ]+\.ps
-Binding=Button3&Shift
-Highlight=Underline
-Clue=Print this file
-
-Action=lpr ${}
-}
-
-#spell check a word
-{
-Env=X
-Regexp=[^\ ]+
-Latent=true
-Binding=Button1&Meta
-Highlight=Normal
-Output=loop
-Clue=Spell check this word
-
-Action=xmessage "`echo ${} |ispell -a |grep -v Ispell`"
-}
-
-# End of file
-
-
-
-
-
-
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index 9636ff8..193f244 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -148,7 +148,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -157,11 +157,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -217,11 +217,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -250,11 +250,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -263,15 +263,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index 4b6991d..e92b54a 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -147,7 +147,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -156,11 +156,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -216,11 +216,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -249,11 +249,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -262,15 +262,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 4176144..9ed3758 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -148,7 +148,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -157,11 +157,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -217,11 +217,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -250,11 +250,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -263,15 +263,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index 514bdb2..5fc3bec 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -148,7 +148,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -157,11 +157,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -217,11 +217,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -250,11 +250,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -263,15 +263,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index 12138c0..edda17d 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -150,7 +150,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -159,11 +159,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -219,11 +219,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -252,11 +252,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -265,15 +265,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 02ad001..3a6c1df 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -147,7 +147,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -156,11 +156,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -216,11 +216,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -249,11 +249,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -262,15 +262,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end
 
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index 7a0631e..4d169fd 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -148,7 +148,7 @@ begin main
       file bar_vertical_3.png
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type anchor
@@ -157,11 +157,11 @@ begin main
       color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 2 2 2 2
+      border 2 2 2 3
     end image
     begin image
       type thumb
@@ -217,11 +217,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 3
     end image
     begin image
       type submenu
@@ -250,11 +250,11 @@ begin main
       color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state disabled
       color white #333333
       cmod image 0xc0
-      border 2 2 2 2
+      border 2 3 2 2
     end image
     begin image
       type button
@@ -263,15 +263,15 @@ begin main
       color black #cccccc
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
       state clicked
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
-      border 2 2 2 2
+      border 2 3 2 2
     end image
   end