aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-04-18 00:47:36 -04:00
Code

Bug 1061: Correctly truncate UTF-8 titles in the tab bar.

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2009-01-01 20:01:50 +00:00 committed by Kalle Olavi Niemitalo
parent 8d19b87cb1
commit e5722ad0d9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -21,6 +21,7 @@ includes the changes listed under ``ELinks 0.11.5.GIT'' below.
option to disable this. When removing control characters from a option to disable this. When removing control characters from a
title, note the charset. Don't truncate titles to the width of the title, note the charset. Don't truncate titles to the width of the
terminal. terminal.
* bug 1061: Correctly truncate UTF-8 titles in the tab bar.
* enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman. * enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman.
ELinks 0.12pre2: ELinks 0.12pre2:

11
src/dialogs/status.c
View File

@ -359,7 +359,16 @@ display_tab_bar(struct session *ses, struct terminal *term, int tabs_count)
box.x, box.y, actual_tab_width, box.x, box.y, actual_tab_width,
msg, NULL); msg, NULL);
} else { } else {
int msglen = int_min(strlen(msg), actual_tab_width); int msglen;
#ifdef CONFIG_UTF8
if (term->utf8_cp) {
msglen = utf8_step_forward(msg, NULL,
actual_tab_width,
UTF8_STEP_CELLS_FEWER,
NULL) - msg;
} else
#endif /* CONFIG_UTF8 */
msglen = int_min(strlen(msg), actual_tab_width);
draw_text(term, box.x, box.y, msg, msglen, 0, color); draw_text(term, box.x, box.y, msg, msglen, 0, color);
} }