mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

fix for cursor positioning with that -y option of compctl (display strings) (14507)

Browse source
This commit is contained in:
Sven Wischnowsky 2001-05-28 11:42:00 +00:00
parent 5fe1924155
commit 1d5fbf228d
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2001-05-28 Sven Wischnowsky <wischnow@zsh.org>
* 14507: Src/Zle/compresult.c: fix for cursor positioning with
that -y option of compctl (display strings)
* 14504: Src/Modules/zprof.c: make the zprof wrapper function
be more careful, avoiding almost all of the code when the
module is being unloaded

35
Src/Zle/compresult.c
View file

@ -1398,9 +1398,12 @@ calclist(int showall)
if (!onlyexpl && pp) {
/* We have an ylist, lets see, if it contains newlines. */
hidden = 1;
while (!nl && *pp)
nl = !!strchr(*pp++, '\n');
while (!nl && *pp) {
if (ztrlen(*pp) >= columns)
nl = 1;
else
nl = !!strchr(*pp++, '\n');
}
pp = g->ylist;
if (nl || !pp[1]) {
/* Yup, there are newlines, count lines. */
@ -1411,17 +1414,17 @@ calclist(int showall)
while ((sptr = *pp)) {
while (sptr && *sptr) {
nlines += (nlptr = strchr(sptr, '\n'))
? 1 + (nlptr-sptr) / columns
: strlen(sptr) / columns;
? 1 + (nlptr - sptr - 1) / columns
: (ztrlen(sptr) - 1) / columns;
sptr = nlptr ? nlptr+1 : NULL;
}
nlines++;
pp++;
}
nlines--;
/*** nlines--; */
} else {
while (*pp) {
l = strlen(*pp);
l = ztrlen(*pp);
ndisp++;
if (l > glong)
glong = l;
@ -1524,7 +1527,7 @@ calclist(int showall)
g->width = 1;
while (*pp)
glines += 1 + (strlen(*pp++) / columns);
glines += 1 + (ztrlen(*pp++) / columns);
}
}
} else {
@ -1566,7 +1569,7 @@ calclist(int showall)
VARARR(int, ylens, yl);
for (i = 0; *pp; i++, pp++)
ylens[i] = strlen(*pp) + add;
ylens[i] = ztrlen(*pp) + add;
if (g->flags & CGF_ROWS) {
int count, tcol, first, maxlines = 0, llines;
@ -1913,10 +1916,16 @@ printlist(int over, CLPrintFunc printm, int showall)
}
}
if (g->flags & CGF_LINES) {
while (*pp) {
zputs(*pp, shout);
if (*++pp)
putc('\n', shout);
char *p;
while ((p = *pp++)) {
zputs(p, shout);
if (*pp) {
if (ztrlen(p) % columns)
putc('\n', shout);
else
fputs(" \010", shout);
}
}
} else {
int n = g->lcount, nl, nc, i, a;