Fri Dec 10 23:33:16 PST 1999 Michael Jennings <mej@eterm.org>

	I finally got around to implementing double-buffering, although it
	seems to still have some issues with font changes.  But if you don't
	change fonts, it works great. :-)

	I also fixed the multibyte font stuff with help from Sung-Hyun Nam
	<namsh@lgic.co.kr>.  There seem to be some new issues here, though,
	with the background pixmap.  But I'm to tired to look deeper tonight.


SVN revision: 1588

17 files changed, 127 insertions, 105 deletions

diff --git a/themes/Eterm/Eterm-menu.cfg b/themes/Eterm/menus.cfg
index ac84547..ac84547 100644
--- a/themes/Eterm/Eterm-menu.cfg
+++ b/themes/Eterm/menus.cfg
diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index d129d38..324a03f 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -220,7 +232,7 @@ begin main
     end image
   end
 
-%include "Eterm-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -234,18 +246,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -303,6 +303,11 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
+# If true, Eterm will use a double-buffered background pixmap for drawing text.  This
+# makes redraws faster by reducing exposes, but it uses more memory.  If you have the
+# memory to spare, it's a good idea.
+#    double_buffer true
+
   end toggles
 
   begin keyboard
diff --git a/themes/Makefile.am b/themes/Makefile.am
index c3d697c..06da447 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -16,6 +16,13 @@ all: Makefile
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes
 	-@for i in $(THEMES) ; do \
+	  if test -d $(DESTDIR)$(pkgdatadir)/themes/$$i -a "@REMOVE_THEMES@" = "yes"; then \
+	    echo "Removing $$i theme in $(DESTDIR)$(pkgdatadir)/themes as requested." ; \
+	    $(RM) -rf $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
+	    if test -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \
+	      echo "ERROR:  Unable to remove theme." ; \
+	    fi ; \
+	  fi ; \
 	  if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \
 	    echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \
 	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
@@ -24,6 +31,6 @@ install-data-hook:
 	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
 	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \
 	  else \
-	    echo "ALERT!  Not overwriting theme $$i in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
+	    echo "ALERT!  Not overwriting $$i theme in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
 	  fi ; \
 	done
diff --git a/themes/auto/auto-menu.cfg b/themes/auto/menus.cfg
index ac84547..ac84547 100644
--- a/themes/auto/auto-menu.cfg
+++ b/themes/auto/menus.cfg
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index 0ea69e9..286389d 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -220,7 +232,7 @@ begin main
     end image
   end
 
-%include "auto-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -234,18 +246,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
diff --git a/themes/cEterm/cEterm-menu.cfg b/themes/cEterm/menus.cfg
index ac84547..ac84547 100644
--- a/themes/cEterm/cEterm-menu.cfg
+++ b/themes/cEterm/menus.cfg
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index 2e2806c..84b13cf 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -92,6 +92,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -219,7 +231,7 @@ begin main
     end image
   end
 
-%include "cEterm-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -233,18 +245,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
diff --git a/themes/chooser/chooser-menu.cfg b/themes/chooser/menus.cfg
index 0468cdc..0468cdc 100644
--- a/themes/chooser/chooser-menu.cfg
+++ b/themes/chooser/menus.cfg
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 3a83911..0fdd98e 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -220,7 +232,7 @@ begin main
     end image
   end
 
-%include "chooser-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -234,18 +246,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
diff --git a/themes/emacs/emacs-menu.cfg b/themes/emacs/menus.cfg
index 15851d2..15851d2 100644
--- a/themes/emacs/emacs-menu.cfg
+++ b/themes/emacs/menus.cfg
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index a773271..a524cc9 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -220,7 +232,7 @@ begin main
     end image
   end
 
-%include "emacs-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -234,18 +246,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
diff --git a/themes/irc/irc-menu.cfg b/themes/irc/menus.cfg
index ac84547..ac84547 100644
--- a/themes/irc/irc-menu.cfg
+++ b/themes/irc/menus.cfg
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index 614133e..129cb1f 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -95,6 +95,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -222,7 +234,7 @@ begin main
     end image
   end
 
-%include "irc-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -236,18 +248,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -300,6 +300,11 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
+# If true, Eterm will use a double-buffered background pixmap for drawing text.  This
+# makes redraws faster by reducing exposes, but it uses more memory.  If you have the
+# memory to spare, it's a good idea.
+#    double_buffer true
+
   end toggles
 
   begin keyboard
diff --git a/themes/mutt/mutt-menu.cfg b/themes/mutt/menus.cfg
index b2d5cab..b2d5cab 100644
--- a/themes/mutt/mutt-menu.cfg
+++ b/themes/mutt/menus.cfg
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 6566bcd..86e3daa 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -166,7 +178,7 @@ begin main
     end image
   end
 
-%include "mutt-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -180,18 +192,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root
@@ -244,6 +244,11 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
+# If true, Eterm will use a double-buffered background pixmap for drawing text.  This
+# makes redraws faster by reducing exposes, but it uses more memory.  If you have the
+# memory to spare, it's a good idea.
+#    double_buffer true
+
   end toggles
 
   begin keyboard
diff --git a/themes/trans/trans-menu.cfg b/themes/trans/menus.cfg
index ac84547..ac84547 100644
--- a/themes/trans/trans-menu.cfg
+++ b/themes/trans/menus.cfg
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index d068180..764506e 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -93,6 +93,18 @@ begin main
 #    font bold 7x14
   end attributes
 
+# The Multichar support options.  Same goes for these fonts as for the normal
+# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
+# or big5 or gb
+#  begin multichar
+#    font 0 k14
+#    font 1 jiskan16
+#    font 2 jiskan18
+#    font 3 jiskan24
+#    font 4 jiskan26
+#    encoding eucj
+#  end multichar
+
 # Define the imageclasses.
   begin imageclasses
 
@@ -220,7 +232,7 @@ begin main
     end image
   end
 
-%include "trans-menu.cfg"
+%include "menus.cfg"
 
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
@@ -234,18 +246,6 @@ begin main
     bind anymod 0xffbe to menu Eterm
   end actions
 
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-#  begin multichar
-#    font 0 k14
-#    font 1 jiskan16
-#    font 2 jiskan18
-#    font 3 jiskan24
-#    font 4 jiskan26
-#    encoding eucj
-#  end multichar
-
 # The XIM support options.
 # input_method: set the name of your favorate input method program
 # preedit_type: OverTheSpot or OffTheSpot or Root