From 587571c6dd712d9ee39e2984b08958c5243eca99 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 7 Jun 2017 20:01:19 +0000 Subject: Prepare the terminal driver for filling multiple columns in parallel, second step: make the per-column byte pointer persistent across term_flushln() calls, such that a subsequent call can continue at the point where the previous call left. If more than one column is in use, return from term_flushln() when the column is full, rather than breaking the output line. No functional change, because nothing sets up multiple columns yet. --- term.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'term.h') diff --git a/term.h b/term.h index 1d2a9537..296d2ad1 100644 --- a/term.h +++ b/term.h @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.125 2017/06/07 17:38:26 schwarze Exp $ */ +/* $Id: term.h,v 1.126 2017/06/07 20:01:19 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011-2015, 2017 Ingo Schwarze @@ -52,6 +52,7 @@ struct termp_tbl { struct termp_col { int *buf; /* Output buffer. */ size_t maxcols; /* Allocated bytes in buf. */ + size_t col; /* Byte in buf to be written. */ size_t rmargin; /* Current right margin. */ size_t offset; /* Current left margin. */ }; @@ -61,6 +62,7 @@ struct termp { struct termp_col *tcols; /* Array of table columns. */ struct termp_col *tcol; /* Current table column. */ size_t maxtcol; /* Allocated table columns. */ + size_t lasttcol; /* Last column currently used. */ size_t line; /* Current output line number. */ size_t defindent; /* Default indent for text. */ size_t defrmargin; /* Right margin of the device. */ @@ -69,7 +71,7 @@ struct termp { size_t col; /* Byte position in buf. */ size_t lastcol; /* Bytes in buf. */ size_t viscol; /* Chars on current line. */ - size_t trailspace; /* See termp_flushln(). */ + size_t trailspace; /* See term_flushln(). */ size_t minbl; /* Minimum blanks before next field. */ int synopsisonly; /* Print the synopsis only. */ int mdocstyle; /* Imitate mdoc(7) output. */ -- cgit v1.2.3-56-ge451