From 7f9e8c632ffa743b8770302690cf8c9e17017d83 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 12 Jun 2017 20:45:18 +0000 Subject: implement the tbl(7) "allbox" option; used for example by curs_getch(3) and GLwDrawingArea(3) --- tbl_term.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tbl_term.c b/tbl_term.c index 5af39df3..797cfbe7 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.48 2017/06/12 20:14:18 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.49 2017/06/12 20:45:18 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze @@ -242,6 +242,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) cp = cp->next; } else vert = 0; + if (sp->opts->opts & TBL_OPT_ALLBOX) + vert = 1; if (vert == 0) continue; @@ -300,7 +302,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) free(tp->tbl.cols); tp->tbl.cols = NULL; tp->tcol->offset = offset; - } + } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX) + tbl_hrule(tp, sp, 1); + tp->flags &= ~TERMP_NONOSPACE; } @@ -336,6 +340,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind) vert = c2->vert; c2 = c2->next; } + if (sp->opts->opts & TBL_OPT_ALLBOX && !vert) + vert = 1; if (vert) tbl_char(tp, cross, vert); if (vert < 2) -- cgit v1.2.3-56-ge451