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, update_screen_driver: First read the "charset" option.

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2007-05-17 11:39:57 +03:00 committed by Witold Filipczyk
parent 0d9be10fe4
commit b6855c8616
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/terminal/screen.c
View File

@ -241,13 +241,14 @@ static INIT_LIST_HEAD(active_screen_drivers);
static void static void
update_screen_driver(struct screen_driver *driver, struct option *term_spec) update_screen_driver(struct screen_driver *driver, struct option *term_spec)
{ {
const int cp = get_opt_codepage_tree(term_spec, "charset");
int utf8_io = get_opt_bool_tree(term_spec, "utf_8_io"); int utf8_io = get_opt_bool_tree(term_spec, "utf_8_io");
#ifdef CONFIG_UTF8 #ifdef CONFIG_UTF8
/* Force UTF-8 I/O if the UTF-8 charset is selected. Various /* Force UTF-8 I/O if the UTF-8 charset is selected. Various
* places assume that the terminal's charset is unibyte if * places assume that the terminal's charset is unibyte if
* UTF-8 I/O is disabled. (bug 827) */ * UTF-8 I/O is disabled. (bug 827) */
if (is_cp_utf8(get_opt_codepage_tree(term_spec, "charset"))) if (is_cp_utf8(cp))
utf8_io = 1; utf8_io = 1;
driver->utf8 = utf8_io; driver->utf8 = utf8_io;
#endif /* CONFIG_UTF8 */ #endif /* CONFIG_UTF8 */
@ -281,7 +282,7 @@ update_screen_driver(struct screen_driver *driver, struct option *term_spec)
} }
#else #else
if (utf8_io) { if (utf8_io) {
driver->charsets[0] = get_opt_codepage_tree(term_spec, "charset"); driver->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"))
driver->frame = frame_restrict; driver->frame = frame_restrict;