aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

UTF-8, set_screen_driver_opt: Duplicate CONFIG_UTF8 code.

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2007-05-19 13:48:49 +03:00 committed by Witold Filipczyk
parent 5261cd17d1
commit b2d35c73ec
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/terminal/screen.c
View File

@ -260,6 +260,7 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec)
driver->opt.underline = NULL; driver->opt.underline = NULL;
} }
if (utf8_io) {
#ifdef CONFIG_UTF8 #ifdef CONFIG_UTF8
if (driver->type == TERM_LINUX) { if (driver->type == TERM_LINUX) {
if (get_opt_bool_tree(term_spec, "restrict_852")) if (get_opt_bool_tree(term_spec, "restrict_852"))
@ -278,8 +279,7 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec)
} else if (driver->type == TERM_VT100) { } else if (driver->type == TERM_VT100) {
driver->opt.frame = frame_vt100; driver->opt.frame = frame_vt100;
} }
#else #else /* !CONFIG_UTF8 */
if (utf8_io) {
driver->opt.charsets[0] = cp; driver->opt.charsets[0] = cp;
if (driver->type == TERM_LINUX) { if (driver->type == TERM_LINUX) {
if (get_opt_bool_tree(term_spec, "restrict_852")) if (get_opt_bool_tree(term_spec, "restrict_852"))
@ -300,8 +300,27 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec)
} else { } else {
driver->opt.charsets[1] = driver->opt.charsets[0]; driver->opt.charsets[1] = driver->opt.charsets[0];
} }
#endif /* !CONFIG_UTF8 */
} else { /* !utf8_io */
#ifdef CONFIG_UTF8
if (driver->type == TERM_LINUX) {
if (get_opt_bool_tree(term_spec, "restrict_852"))
driver->opt.frame = frame_restrict;
} else { if (get_opt_bool_tree(term_spec, "m11_hack"))
driver->opt.frame_seqs = m11_hack_frame_seqs;
if (driver->opt.utf8)
driver->opt.frame_seqs = utf8_linux_frame_seqs;
} else if (driver->type == TERM_FREEBSD) {
if (get_opt_bool_tree(term_spec, "m11_hack"))
driver->opt.frame_seqs = m11_hack_frame_seqs;
} else if (driver->type == TERM_VT100) {
driver->opt.frame = frame_vt100;
}
#else /* !CONFIG_UTF8 */
driver->opt.charsets[0] = -1; driver->opt.charsets[0] = -1;
if (driver->type == TERM_LINUX) { if (driver->type == TERM_LINUX) {
if (get_opt_bool_tree(term_spec, "restrict_852")) if (get_opt_bool_tree(term_spec, "restrict_852"))
@ -316,8 +335,8 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec)
} else if (driver->type == TERM_VT100) { } else if (driver->type == TERM_VT100) {
driver->opt.frame = frame_vt100; driver->opt.frame = frame_vt100;
} }
}
#endif /* CONFIG_UTF8 */ #endif /* CONFIG_UTF8 */
} /* !utf8_io */
} }
static int static int