mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-19 11:31:26 +01:00
Code Releases Activity

31784: better line width calculation for completion listings

Browse source 
When deciding whether there is enough horizontal space to show completion
descriptions for each match in a listing, treat the separator as part of
the description rather than as part of the match, and account for lines
that have already wrapped due to very long matches.
This commit is contained in:
Barton E. Schaefer 2013-10-03 15:59:52 -07:00
parent ea30fdaf25
commit 75fdec17b1
2 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,5 +1,11 @@
2013-10-03 Barton E. Schaefer <schaefer@zsh.org>
* 31784: Src/Zle/computil.c: when deciding whether there is enough
horizontal space to show completion descriptions for each match in
a listing, treat the separator as part of the description rather
than as part of the match, and account for lines that have already
wrapped due to very long matches.
* 31781: Src/Zle/computil.c: "compdescribe -i" must clear the
completion list column padding width along with the rest of the
description state. Cf. 31782.

58
Src/Zle/computil.c
View file

@ -644,35 +644,43 @@ cd_get(char **params)
p += str->len;
memset(p, ' ', (l = (cd_state.premaxw - str->width + CM_SPACE)));
p += l;
strcpy(p, cd_state.sep);
p += cd_state.slen;
/*
* copy a character at once until no more screen width
* is available. Leave 1 character at the end of screen
* as safety margin
*/
remw = zterm_columns - cd_state.premaxw -
cd_state.swidth - 3;
d = str->desc;
w = MB_METASTRWIDTH(d);
if (w <= remw)
strcpy(p, d);
else {
pp = p;
while (remw > 0 && *d) {
l = MB_METACHARLEN(d);
memcpy(pp, d, l);
pp[l] = '\0';
w = MB_METASTRWIDTH(pp);
if (w > remw) {
*pp = '\0';
break;
}
while (remw < 0 && zterm_columns) {
/* line wrapped, use remainder of the extra line */
remw += zterm_columns;
}
if (cd_state.slen < remw) {
strcpy(p, cd_state.sep);
p += cd_state.slen;
remw -= cd_state.slen;
pp += l;
d += l;
remw -= w;
/*
* copy a character at once until no more screen
* width is available. Leave 1 character at the
* end of screen as safety margin
*/
d = str->desc;
w = MB_METASTRWIDTH(d);
if (w <= remw)
strcpy(p, d);
else {
pp = p;
while (remw > 0 && *d) {
l = MB_METACHARLEN(d);
memcpy(pp, d, l);
pp[l] = '\0';
w = MB_METASTRWIDTH(pp);
if (w > remw) {
*pp = '\0';
break;
}
pp += l;
d += l;
remw -= w;
}
}
}