commit - d38e7214fdfed470deebf1643905955dd5e180b6
commit + 5492b68f8366ec397a44c05e441ac97c4f56b21a
blob - 318601d3a75fd80f2da145c278e17f960b687912
blob + f8e117b799a6177c228a73dce744667192529ab4
--- wrap.c
+++ wrap.c
}
static int
-push_line(struct buffer *buffer, const struct line *l, const char *buf, size_t len, int cont)
+push_line(struct buffer *buffer, const struct line *l, const char *buf, size_t len, int flags)
{
struct vline *vl;
vl->parent = l;
if (len != 0)
memcpy(vl->line, buf, len);
- vl->flags = cont;
+ vl->flags = flags;
if (TAILQ_EMPTY(&buffer->head))
TAILQ_INSERT_HEAD(&buffer->head, vl, vlines);
const char *start, *end, *line, *lastsep, *lastchar;
uint32_t cp = 0, state = 0;
size_t cur, prfxwidth, w;
- int cont;
+ int flags;
if ((line = l->line) == NULL)
return push_line(buffer, l, NULL, 0, 0);
start = line;
lastsep = NULL;
lastchar = line;
- cont = 0;
+ flags = 0;
for (; *line; line++) {
if (utf8_decode(&state, &cp, *line))
continue;
end = lastsep == NULL
? utf8_next_cp((char*)lastchar)
: utf8_next_cp((char*)lastsep);
- if (!push_line(buffer, l, start, end - start, cont))
+ if (!push_line(buffer, l, start, end - start, flags))
return 0;
- cont = 1;
+ flags = 1;
start = end;
cur = prfxwidth + utf8_swidth_between(start, lastchar);
} else {
cur += w;
}
- return push_line(buffer, l, start, line - start, cont);
+ return push_line(buffer, l, start, line - start, flags);
}
int