From 246a96d69c628a5c6aa18bf731dddc2c8723a518 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 4 Jan 2019 03:21:02 +0000 Subject: Implement centering and adjustment to the right margin directly in the terminal filling routine, controlled by new flags TERMP_CENTER and TERMP_RIGHT. This became possible by the recent term_flushln() rewrite. No functional change yet, but to be used by upcoming commits. --- term.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'term.c') diff --git a/term.c b/term.c index 8644a776..af97796a 100644 --- a/term.c +++ b/term.c @@ -135,13 +135,27 @@ term_flushln(struct termp *p) /* * Figure out how much text will fit in the field. * If there is whitespace only, print nothing. - * Otherwise, print the field content. */ term_fill(p, &nbr, &vbr, vtarget); if (nbr == 0) break; + /* + * With the CENTER or RIGHT flag, increase the indentation + * to center the text between the left and right margins + * or to adjust it to the right margin, respectively. + */ + + if (vbr < vtarget) { + if (p->flags & TERMP_CENTER) + vbl += (vtarget - vbr) / 2; + else if (p->flags & TERMP_RIGHT) + vbl += vtarget - vbr; + } + + /* Finally, print the field content. */ + term_field(p, vbl, nbr, vbr, vtarget); /* -- cgit