aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/term.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-01-04 03:21:02 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-01-04 03:21:02 +0000
commitf6aa1baa5ceeef9b9eb07bfb1be21257d01a42dc (patch)
tree3900dfe65a69a28b81b6d8ac910a49a2b1e030f2 /term.c
parente513db850fd979df72529ff1e74db44e82704e92 (diff)
downloadmandoc-f6aa1baa5ceeef9b9eb07bfb1be21257d01a42dc.tar.gz
mandoc-f6aa1baa5ceeef9b9eb07bfb1be21257d01a42dc.tar.zst
mandoc-f6aa1baa5ceeef9b9eb07bfb1be21257d01a42dc.zip
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.
Diffstat (limited to 'term.c')
-rw-r--r--term.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/term.c b/term.c
index a807150e..76fdeab0 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.278 2019/01/03 19:59:55 schwarze Exp $ */
+/* $Id: term.c,v 1.279 2019/01/04 03:21:02 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -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);
/*