mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect edit_draw_this_line, edit_get_utf.

Browse Source 
utf-8 text now showed correct
This commit is contained in:
Ilia Maslakov 2009-04-13 09:28:07 +00:00
parent f45e7d1dc6
commit 13f13c1fb0
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit/edit.c
View File

@ -130,8 +130,8 @@ int edit_get_utf (WEdit * edit, long byte_index, int *char_width)
int width = 0;
if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0) {
*char_width = 0;
return 0;
*char_width = 1;
return '\n';
}
if (byte_index >= edit->curs1) {

13
edit/editdraw.c
View File

@ -296,6 +296,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
unsigned int c;
int color;
int i;
int utf8lag = 0;
edit_get_syntax_color (edit, b - 1, &color);
q = edit_move_forward3 (edit, b, start_col - edit->start_col, 0);
@ -318,7 +319,6 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
}
while (col <= end_col - edit->start_col) {
mc_log("col=%i, end_col = %i, edit->start_col = %i, end_col - edit->start_col = %i\n",col, end_col, edit->start_col,end_col - edit->start_col );
p->ch = 0;
p->style = 0;
if (q == edit->curs1)
@ -342,14 +342,13 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
c = edit_get_byte (edit, q);
} else {
c = edit_get_utf (edit, q, &cw);
mc_log("c:%04x, w:%i\n", c, cw);
}
/* we don't use bg for mc - fg contains both */
edit_get_syntax_color (edit, q, &color);
p->style |= color << 16;
switch (c) {
case '\n':
col = end_col - edit->start_col + 1; /* quit */
col = (end_col + utf8lag) - edit->start_col + 1; /* quit */
p->ch = ' ';
p++;
break;
@ -449,11 +448,13 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
p++;
}
} else {
if ( g_unichar_isprint (c) ) {
p->ch = c;
p++;
if ( cw > 1) {
col += cw - 1;
mc_log("col+ : %i\n", cw-1);
} else {
p->ch = '.';
p->style = MOD_ABNORMAL;
p++;
}
}
col++;