summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--acconfig.h1
-rw-r--r--configure.in17
-rw-r--r--src/options.c3
4 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 167efb9..41dc149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2921,3 +2921,9 @@ Mon Dec 13 09:42:44 PST 1999 Michael Jennings <mej@eterm.org>
thanks to all for pointing out my error. :-)
-------------------------------------------------------------------------------
+Mon Dec 13 10:00:40 PST 1999 Michael Jennings <mej@eterm.org>
+
+ A patch from Sung-Hyun Nam <namsh@lgic.co.kr> for some default Korean
+ fonts.
+
+-------------------------------------------------------------------------------
diff --git a/acconfig.h b/acconfig.h
index 1943763..15a8048 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -321,6 +321,7 @@
#undef FONT3
#undef FONT4
#undef DEF_FONT_IDX
+#undef MULTICHAR_ENCODING
#undef IOTRACE
#undef HAVE_UTEMPTER
diff --git a/configure.in b/configure.in
index 9025e66..d737d4a 100644
--- a/configure.in
+++ b/configure.in
@@ -336,6 +336,22 @@ AC_ARG_ENABLE(multi-charset,
AC_DEFINE_UNQUOTED(FONT2, "9x18")
AC_DEFINE_UNQUOTED(FONT3, "12x24")
AC_DEFINE_UNQUOTED(FONT4, "13x26")
+ AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "eucj")
+ 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")
elif test "$enableval" = "utf-8" -o "$enableval" = "utf8"; then
AC_MSG_RESULT(utf-8)
AC_DEFINE(MULTI_CHARSET)
@@ -350,6 +366,7 @@ AC_ARG_ENABLE(multi-charset,
AC_DEFINE_UNQUOTED(FONT2, "fixed")
AC_DEFINE_UNQUOTED(FONT3, "8x13")
AC_DEFINE_UNQUOTED(FONT4, "9x15")
+ AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, "utf8")
elif test "$enableval" = "no"; then
AC_MSG_RESULT(no)
AC_DEFINE_UNQUOTED(DEF_FONT_IDX, 2)
diff --git a/src/options.c b/src/options.c
index 2c41899..e6000a5 100644
--- a/src/options.c
+++ b/src/options.c
@@ -3161,6 +3161,9 @@ init_defaults(void)
eterm_font_add(&etmfonts, def_mfontName[i], i);
#endif
}
+#ifdef MULTI_CHARSET
+ rs_multichar_encoding = StrDup(MULTICHAR_ENCODING);
+#endif
TermWin.internalBorder = DEFAULT_BORDER_WIDTH;
}