fix: draw in core editor 8-bit locale and UTF-8 source

This commit is contained in:
Ilia Maslakov 2009-04-21 21:27:42 +00:00
parent 1d3c9e1742
commit 990838a226
2 changed files with 11 additions and 11 deletions

View File

@ -300,18 +300,18 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
lowlevel_set_color (color); lowlevel_set_color (color);
} }
} }
#ifndef HAVE_SLANG if ( textchar > 255 ) {
int res = g_unichar_to_utf8 (textchar, str); int res = g_unichar_to_utf8 (textchar, str);
if ( res == 0 ) { if ( res == 0 ) {
str[0] = '.'; str[0] = '.';
str[1] = '\0'; str[1] = '\0';
} else {
str[res] = '\0';
}
addstr (str);
} else { } else {
str[res] = '\0'; addch(textchar);
} }
addstr (str);
#else
addch (textchar);
#endif
p++; p++;
} }
} }

View File

@ -351,7 +351,7 @@ convert_from_utf_to_current_c (const int input_char)
if ( res == 0 ) { if ( res == 0 ) {
return ch; return ch;
} }
str[6] = '\0'; str[res] = '\0';
const char *cp_from = get_codepage_id ( source_codepage ); const char *cp_from = get_codepage_id ( source_codepage );
conv = str_crt_conv_from ( cp_from ); conv = str_crt_conv_from ( cp_from );