From 653e8799096f93302f9a8d60ea6a643aedce3fc5 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 7 Jan 2000 15:51:22 +0000 Subject: [PATCH] Fri Jan 7 20:11:48 PST 2000 Michael Jennings A patch from Sung-Hyun Nam to improve multi-byte font configuration in the default theme files. SVN revision: 1870 --- ChangeLog | 6 ++ configure.in | 141 ++++++++++++++++++++++++------------ src/command.c | 10 +-- src/grkelot.c | 14 ++-- src/options.c | 14 ++-- src/term.c | 4 +- themes/Eterm/theme.cfg.in | 27 ++++--- themes/Makefile.am | 7 -- themes/auto/theme.cfg.in | 27 ++++--- themes/cEterm/theme.cfg.in | 27 ++++--- themes/chooser/theme.cfg.in | 27 ++++--- themes/emacs/theme.cfg.in | 27 ++++--- themes/irc/theme.cfg.in | 27 ++++--- themes/mutt/theme.cfg.in | 27 ++++--- themes/trans/theme.cfg.in | 27 ++++--- 15 files changed, 224 insertions(+), 188 deletions(-) diff --git a/ChangeLog b/ChangeLog index 504eb92..263ed77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3007,3 +3007,9 @@ Wed Jan 5 21:23:56 PST 2000 Michael Jennings Copyright date updates. ------------------------------------------------------------------------------- +Fri Jan 7 20:11:48 PST 2000 Michael Jennings + + A patch from Sung-Hyun Nam to improve multi-byte + font configuration in the default theme files. + +------------------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 3c8ad8c..b0941f2 100644 --- a/configure.in +++ b/configure.in @@ -345,72 +345,109 @@ AC_ARG_WITH(delete, fi, AC_MSG_RESULT(default) AC_DEFINE_UNQUOTED(KS_DELETE, "\177") ) +MULTICHAR_ENCODING="" AC_MSG_CHECKING(for multi-charset support) AC_ARG_ENABLE(multi-charset, [ --enable-multi-charset compile with multi-charset support], if test "$enableval" = "yes" -o "$enableval" = "kanji"; then AC_MSG_RESULT(kanji) AC_DEFINE(MULTI_CHARSET) - AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 0) - AC_DEFINE_UNQUOTED(MFONT0, "k14") - AC_DEFINE_UNQUOTED(MFONT1, "jiskan16") - AC_DEFINE_UNQUOTED(MFONT2, "jiskan18") - AC_DEFINE_UNQUOTED(MFONT3, "jiskan24") - AC_DEFINE_UNQUOTED(MFONT4, "jiskan26") - AC_DEFINE_UNQUOTED(FONT0, "fixed") - AC_DEFINE_UNQUOTED(FONT1, "8x16") - AC_DEFINE_UNQUOTED(FONT2, "9x18") - AC_DEFINE_UNQUOTED(FONT3, "12x24") - AC_DEFINE_UNQUOTED(FONT4, "13x26") - AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "eucj") + DEF_FONT_IDX=0 + MULTICHAR_ENCODING="eucj" + FONT0="fixed" + FONT1="8x16" + FONT2="9x18" + FONT3="12x24" + FONT4="13x26" + MFONT0="k14" + MFONT1="jiskan16" + MFONT2="jiskan18" + MFONT3="jiskan24" + MFONT4="jiskan26" elif test "$enableval" = "euc-kr" -o "$enableval" = "euckr"; then AC_MSG_RESULT(euckr) AC_DEFINE(MULTI_CHARSET) - AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 1) - AC_DEFINE_UNQUOTED(MFONT0, "-*-gulim-*-r-normal--14-*-*-*-*-140-ksc5601.1987-0") - AC_DEFINE_UNQUOTED(MFONT1, "-*-gulim-*-r-normal--16-*-*-*-*-160-ksc5601.1987-0") - AC_DEFINE_UNQUOTED(MFONT2, "-*-gulim-*-r-normal--18-*-*-*-*-180-ksc5601.1987-0") - AC_DEFINE_UNQUOTED(MFONT3, "-*-gulim-*-r-normal--20-*-*-*-*-200-ksc5601.1987-0") - AC_DEFINE_UNQUOTED(MFONT4, "-*-gulim-*-r-normal--24-*-*-*-*-240-ksc5601.1987-0") - AC_DEFINE_UNQUOTED(FONT0, "7x14") - AC_DEFINE_UNQUOTED(FONT1, "8x16") - AC_DEFINE_UNQUOTED(FONT2, "9x18") - AC_DEFINE_UNQUOTED(FONT3, "10x20") - AC_DEFINE_UNQUOTED(FONT4, "12x24") - AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "euckr") + DEF_FONT_IDX=1 + MULTICHAR_ENCODING="euckr" + FONT0="7x14" + FONT1="8x16" + FONT2="9x18" + FONT3="10x20" + FONT4="12x24" + MFONT0="-*-gulim-medium-r-normal--14-*-*-*-*-140-ksc5601.1987-0" + MFONT1="-*-gulim-medium-r-normal--16-*-*-*-*-160-ksc5601.1987-0" + MFONT2="-*-gulim-medium-r-normal--18-*-*-*-*-180-ksc5601.1987-0" + MFONT3="-*-gulim-medium-r-normal--20-*-*-*-*-200-ksc5601.1987-0" + MFONT4="-*-gulim-medium-r-normal--24-*-*-*-*-240-ksc5601.1987-0" elif test "$enableval" = "utf-8" -o "$enableval" = "utf8"; then AC_MSG_RESULT(utf-8) AC_DEFINE(MULTI_CHARSET) - AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 2) - AC_DEFINE_UNQUOTED(MFONT0, "-misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1") - AC_DEFINE_UNQUOTED(MFONT1, "-misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1") - AC_DEFINE_UNQUOTED(MFONT2, "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1") - AC_DEFINE_UNQUOTED(MFONT3, "-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1") - AC_DEFINE_UNQUOTED(MFONT4, "-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1") - AC_DEFINE_UNQUOTED(FONT0, "5x7") - AC_DEFINE_UNQUOTED(FONT1, "6x10") - AC_DEFINE_UNQUOTED(FONT2, "fixed") - AC_DEFINE_UNQUOTED(FONT3, "8x13") - AC_DEFINE_UNQUOTED(FONT4, "9x15") - AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "utf8") + DEF_FONT_IDX=2 + MULTICHAR_ENCODING="utf8" + MFONT0="-misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1" + MFONT1="-misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1" + MFONT2="-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1" + MFONT3="-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1" + MFONT4="-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1" + FONT0="5x7" + FONT1="6x10" + FONT2="fixed" + FONT3="8x13" + FONT4="9x15" elif test "$enableval" = "no"; then AC_MSG_RESULT(no) - AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 2) - AC_DEFINE_UNQUOTED(FONT0, "5x7") - AC_DEFINE_UNQUOTED(FONT1, "6x10") - AC_DEFINE_UNQUOTED(FONT2, "fixed") - AC_DEFINE_UNQUOTED(FONT3, "8x13") - AC_DEFINE_UNQUOTED(FONT4, "9x15") + DEF_FONT_IDX=2 + FONT0="5x7" + FONT1="6x10" + FONT2="fixed" + FONT3="8x13" + FONT4="9x15" else AC_ERROR(invalid value for --enable-multi-charset) fi, AC_MSG_RESULT(no) - AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 2) - AC_DEFINE_UNQUOTED(FONT0, "5x7") - AC_DEFINE_UNQUOTED(FONT1, "6x10") - AC_DEFINE_UNQUOTED(FONT2, "fixed") - AC_DEFINE_UNQUOTED(FONT3, "8x13") - AC_DEFINE_UNQUOTED(FONT4, "9x15") + DEF_FONT_IDX=2 + MULTICHAR_ENCODING=none + MFONT0=none + MFONT1=none + MFONT2=none + MFONT3=none + MFONT4=none + FONT0="5x7" + FONT1="6x10" + FONT2="fixed" + FONT3="8x13" + FONT4="9x15" ) + +AC_DEFINE_UNQUOTED(DEF_FONT_IDX, $DEF_FONT_IDX) +AC_DEFINE_UNQUOTED(FONT0, "$FONT0") +AC_DEFINE_UNQUOTED(FONT1, "$FONT1") +AC_DEFINE_UNQUOTED(FONT2, "$FONT2") +AC_DEFINE_UNQUOTED(FONT3, "$FONT3") +AC_DEFINE_UNQUOTED(FONT4, "$FONT4") +AC_SUBST(DEF_FONT_IDX) +AC_SUBST(FONT0) +AC_SUBST(FONT1) +AC_SUBST(FONT2) +AC_SUBST(FONT3) +AC_SUBST(FONT4) + +AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "$MULTICHAR_ENCODING") +AC_DEFINE_UNQUOTED(MFONT0, "$MFONT0") +AC_DEFINE_UNQUOTED(MFONT1, "$MFONT1") +AC_DEFINE_UNQUOTED(MFONT2, "$MFONT2") +AC_DEFINE_UNQUOTED(MFONT3, "$MFONT3") +AC_DEFINE_UNQUOTED(MFONT4, "$MFONT4") +AC_SUBST(MULTICHAR_ENCODING) +AC_SUBST(MFONT0) +AC_SUBST(MFONT1) +AC_SUBST(MFONT2) +AC_SUBST(MFONT3) +AC_SUBST(MFONT4) + +PKGDATADIR=`eval echo "${datadir}/$PACKAGE"` +AC_SUBST(PKGDATADIR) + AC_MSG_CHECKING(for XIM support) AC_ARG_ENABLE(xim, [ --enable-xim compile with XIM support], @@ -627,6 +664,14 @@ pix/Makefile \ src/Makefile \ themes/Makefile \ Eterm.spec \ +themes/Eterm/theme.cfg +themes/auto/theme.cfg +themes/cEterm/theme.cfg +themes/chooser/theme.cfg +themes/emacs/theme.cfg +themes/irc/theme.cfg +themes/mutt/theme.cfg +themes/trans/theme.cfg ) dnl If we're not building with Imlib support, don't build Esetroot diff --git a/src/command.c b/src/command.c index 875f41f..6fcd22b 100644 --- a/src/command.c +++ b/src/command.c @@ -2533,13 +2533,13 @@ tt_write(const unsigned char *buf, unsigned int count) * Only use for small ammounts of data. */ void -tt_printf(const unsigned char *fmt,...) +tt_printf(const unsigned char *fmt, ...) { static unsigned char buf[256]; va_list arg_ptr; va_start(arg_ptr, fmt); - vsprintf((char *) buf, (char *) fmt, arg_ptr); + vsnprintf((char *) buf, sizeof(buf), (char *) fmt, arg_ptr); va_end(arg_ptr); tt_write(buf, strlen((char *) buf)); } @@ -2649,7 +2649,7 @@ v_writeBig(int f, char *d, int len) if (v_bufstr == NULL && len > 0) { - v_buffer = malloc(len); + v_buffer = MALLOC(len); v_bufstr = v_buffer; v_bufptr = v_buffer; v_bufend = v_buffer + len; @@ -2679,7 +2679,7 @@ v_writeBig(int f, char *d, int len) /* Don't use XtRealloc because an error is not fatal. */ int size = v_bufptr - v_buffer; /* save across realloc */ - v_buffer = realloc(v_buffer, size + len); + v_buffer = REALLOC(v_buffer, size + len); if (v_buffer) { v_bufstr = v_buffer; v_bufptr = v_buffer + size; @@ -2732,7 +2732,7 @@ v_writeBig(int f, char *d, int len) int size = v_bufptr - v_buffer; int allocsize = size ? size : 1; - v_buffer = realloc(v_buffer, allocsize); + v_buffer = REALLOC(v_buffer, allocsize); if (v_buffer) { v_bufstr = v_buffer + start; v_bufptr = v_buffer + size; diff --git a/src/grkelot.c b/src/grkelot.c index 98d863b..494ea38 100644 --- a/src/grkelot.c +++ b/src/grkelot.c @@ -169,9 +169,9 @@ kstate_end(void) int i; for (i = 0; i < pStateNow->num_xlat; i++) - free(pStateNow->xlat[i].pval); + FREE(pStateNow->xlat[i].pval); if (pStateNow->num_xlat > 0) - free(pStateNow->xlat); + FREE(pStateNow->xlat); } /* @@ -246,22 +246,22 @@ kstate_add_xlat(char *str) return; /* add a new xlat table in state */ if (pStateNow->num_xlat == 0) { - pStateNow->xlat = malloc(sizeof(K_XLAT)); + pStateNow->xlat = MALLOC(sizeof(K_XLAT)); } else /* prefer contiguous data, realloc */ - pStateNow->xlat = realloc(pStateNow->xlat, (pStateNow->num_xlat + 1) * sizeof(K_XLAT)); + pStateNow->xlat = REALLOC(pStateNow->xlat, (pStateNow->num_xlat + 1) * sizeof(K_XLAT)); xlat = &pStateNow->xlat[pStateNow->num_xlat]; /* parse str and derive first, last, values */ xlat->first = (u_int) atoi(strtok(str, "-")); xlat->last = (u_int) atoi(strtok(NULL, ":")); i = 0; - pval_tmp = calloc(MAX_VAL, sizeof(K_XLAT)); + pval_tmp = CALLOC(MAX_VAL, sizeof(K_XLAT)); while ((sval = strtok(NULL, ",")) != NULL) { pval_tmp[i++] = (u_int) (atoi(sval)); } - xlat->pval = calloc(i, sizeof(K_XLAT)); + xlat->pval = CALLOC(i, sizeof(K_XLAT)); if (xlat->pval != NULL) memcpy(xlat->pval, pval_tmp, i * sizeof(u_int)); - free(pval_tmp); + FREE(pval_tmp); pStateNow->num_xlat++; } diff --git a/src/options.c b/src/options.c index 8e976e1..162c2e7 100644 --- a/src/options.c +++ b/src/options.c @@ -955,7 +955,7 @@ get_options(int argc, char *argv[]) register unsigned short k, len = argc - i; - rs_execArgs = (char **) malloc(sizeof(char *) * (argc - i + 1)); + rs_execArgs = (char **) MALLOC(sizeof(char *) * (argc - i + 1)); for (k = 0; k < len; k++) { rs_execArgs[k] = StrDup(argv[k + i]); @@ -967,7 +967,7 @@ get_options(int argc, char *argv[]) register unsigned short k; - rs_execArgs = (char **) malloc(sizeof(char *) * (NumWords(val_ptr) + 1)); + rs_execArgs = (char **) MALLOC(sizeof(char *) * (NumWords(val_ptr) + 1)); for (k = 0; val_ptr; k++) { rs_execArgs[k] = Word(1, val_ptr); @@ -1075,7 +1075,7 @@ get_options(int argc, char *argv[]) k = i + 1; } D_OPTIONS(("len == %d k == %d\n", len, k)); - rs_execArgs = (char **) malloc(sizeof(char *) * len); + rs_execArgs = (char **) MALLOC(sizeof(char *) * len); if (k == i) { rs_execArgs[0] = StrDup((char *) (val_ptr)); @@ -2051,7 +2051,7 @@ parse_keyboard(char *buff) len = 255; /* We can only handle lengths that will fit in a char */ if (len && KeySym_map[sym] == NULL) { - char *p = malloc(len + 1); + char *p = MALLOC(len + 1); *p = len; strncpy(p + 1, str, len); @@ -2209,7 +2209,7 @@ parse_misc(char *buff) Options |= Opt_exec; - RESET_AND_ASSIGN(rs_execArgs, (char **) malloc(sizeof(char *) * ((n = NumWords(PWord(2, buff))) + 1))); + RESET_AND_ASSIGN(rs_execArgs, (char **) MALLOC(sizeof(char *) * ((n = NumWords(PWord(2, buff))) + 1))); for (k = 0; k < n; k++) { rs_execArgs[k] = Word(k + 2, buff); @@ -3417,11 +3417,11 @@ post_parse(void) h = strtol(h1, (char **) NULL, 0); if (w || h) { rs_anim_pixmaps[i] = Word(3, temp); - rs_anim_pixmaps[i] = (char *) realloc(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 9); + rs_anim_pixmaps[i] = (char *) REALLOC(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 9); strcat(rs_anim_pixmaps[i], "@100x100"); } else { rs_anim_pixmaps[i] = Word(3, temp); - rs_anim_pixmaps[i] = (char *) realloc(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 5); + rs_anim_pixmaps[i] = (char *) REALLOC(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 5); strcat(rs_anim_pixmaps[i], "@0x0"); } FREE(temp); diff --git a/src/term.c b/src/term.c index 43cacb2..3bf58f6 100644 --- a/src/term.c +++ b/src/term.c @@ -1000,7 +1000,7 @@ process_csi_seq(void) break; #if defined (ENABLE_DISPLAY_ANSWER) case 7: - tt_printf((unsigned char *) "%s\n", display_name); + tt_write((unsigned char *) display_name, strlen(display_name)); break; #endif case 8: @@ -1532,7 +1532,7 @@ set_colorfgbg(void) int fg = -1, bg = -1; if (!colorfgbg_env) { - colorfgbg_env = (char *) malloc(30); + colorfgbg_env = (char *) MALLOC(30); strcpy(colorfgbg_env, "COLORFGBG=default;default;bg"); } for (i = BlackColor; i <= WhiteColor; i++) { diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in index 324a03f..05aa36f 100644 --- a/themes/Eterm/theme.cfg.in +++ b/themes/Eterm/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/Makefile.am b/themes/Makefile.am index 251ffdd..00804b8 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -6,13 +6,6 @@ EXTRA_DIST = Eterm/theme.cfg.in irc/theme.cfg.in chooser/theme.cfg.in emacs/them Eterm/menus.cfg irc/menus.cfg chooser/menus.cfg emacs/menus.cfg mutt/menus.cfg trans/menus.cfg \ cEterm/menus.cfg cEterm/theme.cfg.in auto/menus.cfg auto/theme.cfg.in -all: Makefile - -@for i in $(THEMES) ; do \ - echo "Generating theme config file for the $$i theme." ; \ - $(SED) -e 's%@''PREFIX''@%${prefix}%g' -e 's%@''PKGDATADIR''@%${DESTDIR}${pkgdatadir}%g' -e 's%@''THEME''@%'$$i'%g' \ - $(srcdir)/$$i/theme.cfg.in > $(srcdir)/$$i/theme.cfg ; \ - done - install-data-hook: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes -@for i in $(THEMES) ; do \ diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in index 286389d..c453794 100644 --- a/themes/auto/theme.cfg.in +++ b/themes/auto/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in index 84b13cf..9fd4bad 100644 --- a/themes/cEterm/theme.cfg.in +++ b/themes/cEterm/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -81,12 +80,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -96,12 +95,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in index 0fdd98e..e9510a9 100644 --- a/themes/chooser/theme.cfg.in +++ b/themes/chooser/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in index a524cc9..a2d6407 100644 --- a/themes/emacs/theme.cfg.in +++ b/themes/emacs/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in index 129cb1f..a8566d2 100644 --- a/themes/irc/theme.cfg.in +++ b/themes/irc/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 shine - font 3 nexus - font 4 fixed + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 8x13 font 6 9x15 font 7 10x20 @@ -99,12 +98,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in index 86e3daa..16a4210 100644 --- a/themes/mutt/theme.cfg.in +++ b/themes/mutt/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses. diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in index 764506e..62bc939 100644 --- a/themes/trans/theme.cfg.in +++ b/themes/trans/theme.cfg.in @@ -4,8 +4,7 @@ # the version it was written for, # minus the "DR-" if any. # -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs +# This is a sample Eterm config file. # # As always, the authors guarantee absolutely nothing and take # no responsibility for anything that might happen to you, your @@ -82,12 +81,12 @@ begin main # the Eterm defaults. The "bold" font is the font used if color BD has # not been set and Eterm cannot map the foreground color to one of the # high-intensity colors (8-15). - font default 2 - font 0 5x7 - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 + font default @DEF_FONT_IDX@ + font 0 @FONT0@ + font 1 @FONT1@ + font 2 @FONT2@ + font 3 @FONT3@ + font 4 @FONT4@ font 5 10x20 font 6 12x24 # font bold 7x14 @@ -97,12 +96,12 @@ begin main # 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 +# font 0 @MFONT0@ +# font 1 @MFONT1@ +# font 2 @MFONT2@ +# font 3 @MFONT3@ +# font 4 @MFONT4@ +# encoding @MULTICHAR_ENCODING@ # end multichar # Define the imageclasses.