diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-07 17:38:26 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-07 17:38:26 +0000 |
commit | 675d4eca89a5a01b962c8f830b654f446061284d (patch) | |
tree | dac4fea2063e12734d758c2156a9bdcf83a35c4d /term_ps.c | |
parent | 13dededd58fd94c0507d28f08661caa187f9d989 (diff) | |
download | mandoc-675d4eca89a5a01b962c8f830b654f446061284d.tar.gz mandoc-675d4eca89a5a01b962c8f830b654f446061284d.tar.zst mandoc-675d4eca89a5a01b962c8f830b654f446061284d.zip |
Prepare the terminal driver for filling multiple columns in parallel,
first step: split column data out of the terminal state struct into
a new column state struct and use an array of such column state
structs. No functional change.
Diffstat (limited to 'term_ps.c')
-rw-r--r-- | term_ps.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.84 2017/05/08 15:34:54 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.85 2017/06/07 17:38:26 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -538,12 +538,15 @@ pspdf_alloc(const struct manoutput *outopts) size_t marginx, marginy, lineheight; const char *pp; - p = mandoc_calloc(1, sizeof(struct termp)); + p = mandoc_calloc(1, sizeof(*p)); + p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol)); + p->maxtcol = 1; + p->enc = TERMENC_ASCII; p->fontq = mandoc_reallocarray(NULL, - (p->fontsz = 8), sizeof(enum termfont)); + (p->fontsz = 8), sizeof(*p->fontq)); p->fontq[0] = p->fontl = TERMFONT_NONE; - p->ps = mandoc_calloc(1, sizeof(struct termp_ps)); + p->ps = mandoc_calloc(1, sizeof(*p->ps)); p->advance = ps_advance; p->begin = ps_begin; @@ -1220,7 +1223,7 @@ ps_endline(struct termp *p) ps_closepage(p); - p->offset -= p->ti; + p->tcol->offset -= p->ti; p->ti = 0; } |