diff --git a/.gitignore b/.gitignore
index ee80e5f5a073..557ad3300d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,26 @@
 bsddialog
 *.o
 *~
+*.a
 examples_library/buildlist
 examples_library/checklist
 examples_library/datebox
 examples_library/form
 examples_library/menu
 examples_library/mixedlist
 examples_library/radiolist
 examples_library/theme
 examples_library/treeview
 examples_library/infobox
 examples_library/msgbox
 examples_library/pause
 examples_library/rangebox
 examples_library/sade
 examples_library/timebox
 examples_library/yesno
 *.gz
 lib/libbsddialog.so*
 BSDDIALOG.geany
 BSDDIALOG.tags
 *.core
-bsdinstall/*
+freebsd-lab/
diff --git a/bsddialog.1 b/bsddialog.1
index 2846b77547a9..bfee3229bd1f 100644
--- a/bsddialog.1
+++ b/bsddialog.1
@@ -1,52 +1,66 @@
 .\"
 .\" Copyright (c) 2021 Alfonso Sabato Siciliano
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd December 11, 2021
 .Dt BSDDIALOG 1
 .Os
 .Sh NAME
 .Nm bsddialog
-.Nd build dialogs and widgets with a TUI
+.Nd terminal dialogs and widgets
 .Sh SYNOPSIS
 .Nm bsddialog
-.Op Fl options
-.Ar
+.Fl -help
+.Nm bsddialog
+.Fl -version
+.Nm bsddialog
+.Op Fl Ar -common-opts
+.Fl Ar -widget
+.Fl Artext
+.Fl Arheight
+.Fl Arwidth
+.Op Fl Ar -widget-opts
 .Sh DESCRIPTION
 The
-.Nm
-utility processes files ...
+.Nm BSDDialog
+is an utility to write a script with a Text User Interface. It can build
+dialogs and widgets: to show messages, to get input and to inform about a
+computation status.
 .\" .Sh ENVIRONMENT
 .\" For sections 1, 6, 7, and 8 only.
 .\" .Sh FILES
 .\" .Sh EXIT STATUS
 .\" For sections 1, 6, and 8 only.
 .\" .Sh EXAMPLES
 .\" .Sh DIAGNOSTICS
 .\" For sections 1, 4, 6, 7, 8, and 9 printf/stderr messages only.
-.\" .Sh SEE ALSO
-.\" .Xr foobar 1
+.Sh SEE ALSO
+.Xr bsddialog 3
 .\" .Sh HISTORY
 .\" .Sh AUTHORS
-.\" .Sh CAVEATS
-.\" .Sh BUGS
+.Sh CAVEATS
+autosize
+compatibility text
+.Sh BUGS
+buildlist
+forms
diff --git a/bsddialog.c b/bsddialog.c
index 6fc0d834a1ad..aa87dec2962b 100644
--- a/bsddialog.c
+++ b/bsddialog.c
@@ -1,1349 +1,1363 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/ioctl.h>
 
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <bsddialog.h>
 #include <bsddialog_theme.h>
 
 #define BSDDIALOG_VERSION "0.0.1"
 
 enum OPTS {
 	/* Common options */
 	ASCII_LINES = '?' + 1,
 	ASPECT_RATIO,
 	BACKTITLE,
 	BEGIN_X,
 	BEGIN_Y,
 	CANCEL_LABEL,
 	CLEAR,
 	COLORS,
 	CR_WRAP,
 	DATE_FORMAT,
 	DEFAULTNO,
 	DEFAULT_BUTTON,
 	DEFAULT_ITEM,
 	EXIT_LABEL,
 	EXTRA_BUTTON,
 	EXTRA_LABEL,
 	HELP,
 	HELP_BUTTON,
 	HELP_LABEL,
 	HELP_STATUS,
 	HELP_TAGS,
 	HFILE,	
 	HLINE,
 	IGNORE,
 	INSECURE,
+	ITEM_DEPTH,
 	ITEM_HELP,
 	ITEM_PREFIX,
 	MAX_INPUT,
 	NO_CANCEL,
 	NOCANCEL,
 	NO_COLLAPSE,
 	NO_ITEMS,
 	NO_LABEL,
 	NO_LINES,
 	NO_NL_EXPAND,
 	NO_OK,
 	NOOK,
 	NO_TAGS,
 	NO_SHADOW,
 	OK_LABEL,
 	OUTPUT_FD,
 	OUTPUT_SEPARATOR,
 	PRINT_MAXSIZE,
 	PRINT_SIZE,
 	PRINT_VERSION,
 	QUOTED,
 	SEPARATE_OUTPUT,
 	SEPARATOR,
 	SHADOW,
 	SINGLE_QUOTED,
 	SLEEP,
 	STDERR,
 	STDOUT,
 	THEME,
 	TIME_FORMAT,
 	TITLE,
 	TRIM,
 	VERSION,
 	YES_LABEL,
 	/* Widgets */
 	BUILDLIST,
 	CHECKLIST,
 	DATEBOX,
 	FORM,
 	GAUGE,
 	INFOBOX,
 	INPUTBOX,
 	MENU,
 	MIXEDFORM,
 	MIXEDGAUGE,
 	MSGBOX,
 	PASSWORDBOX,
 	PASSWORDFORM,
 	PAUSE,
 	RADIOLIST,
 	RANGEBOX,
 	TEXTBOX,
 	TIMEBOX,
 	TREEVIEW,
 	YESNO,
 };
 
 /* libbsddialog does not support NULL string for now */
 static char *nostring = "";
 /* Menus flags and options */
 static bool item_prefix_flag, item_bottomdesc_flag, item_output_sepnl_flag;
 static bool item_singlequote_flag, list_items_on_flag, item_tag_help_flag;
-static bool item_always_quote_flag;
+static bool item_always_quote_flag, item_depth_flag;
 static char *item_output_sep_flag;
 /* Time and calendar options */
 static char *date_fmt_flag, *time_fmt_flag;
 /* Forms */
 static int max_input_form_flag;
 /* General flags and options */
 static int output_fd_flag;
 
 void usage(void);
 /* widgets */
 #define BUILDER_ARGS struct bsddialog_conf conf, char* text, int rows,         \
 	int cols, int argc, char **argv, char *errbuf
 int buildlist_builder(BUILDER_ARGS);
 int checklist_builder(BUILDER_ARGS);
 int datebox_builder(BUILDER_ARGS);
 int form_builder(BUILDER_ARGS);
 int gauge_builder(BUILDER_ARGS);
 int infobox_builder(BUILDER_ARGS);
 int inputbox_builder(BUILDER_ARGS);
 int menu_builder(BUILDER_ARGS);
 int mixedform_builder(BUILDER_ARGS);
 int mixedgauge_builder(BUILDER_ARGS);
 int msgbox_builder(BUILDER_ARGS);
 int passwordbox_builder(BUILDER_ARGS);
 int passwordform_builder(BUILDER_ARGS);
 int pause_builder(BUILDER_ARGS);
 int radiolist_builder(BUILDER_ARGS);
 int rangebox_builder(BUILDER_ARGS);
 int textbox_builder(BUILDER_ARGS);
 int timebox_builder(BUILDER_ARGS);
 int treeview_builder(BUILDER_ARGS);
 int yesno_builder(BUILDER_ARGS);
 
 static void
 custom_text(bool cr_wrap, bool no_collapse, bool no_nl_expand, bool trim,
     char *text, char *buf)
 {
 	int i, j;
 
 	i = j = 0;
 	while (text[i] != '\0') {
 		switch (text[i]) {
 		case '\\':
 			buf[j] = '\\';
 			switch (text[i+1]) {
 			case '\\':
 				i++;
 				break;
 			case 'n':
 				if (no_nl_expand) {
 					j++;
 					buf[j] = 'n';
 				} else
 					buf[j] = '\n';
 				i++;
 				break;
 			case 't':
 				if (no_collapse) {
 					j++;
 					buf[j] = 't';
 				} else
 					buf[j] = '\t';
 				i++;
 				break;
 			}
 			break;
 		case '\n':
 			buf[j] = cr_wrap ? ' ' : '\n';
 			break;
 		case '\t':
 			buf[j] = no_collapse ? '\t' : ' ';
 			break;
 		default:
 			buf[j] = text[i];
 		}
 		i++;
 		j += (buf[j] == ' ' && trim && j > 0 && buf[j-1] == ' ') ?
 		    0 : 1;
 	}
 	buf[j] = '\0';
 }
 
 void usage(void)
 {
 
 	printf("usage: bsddialog --help\n"
 	       "       bsddialog --version\n"
 	       "       bsddialog [--<common-opts>] --<widget> <text> "
 	       "<height> <width> [--<widget-opts>]\n");
 	printf("\n");
 	printf("Common Options:\n");
 	printf("--ascii-lines, --aspect <ratio>, --backtitle <backtitle>, "
 		"--begin-x <x>, --begin-y <y>, --cancel-label <string>, "
 		"--clear, --colors, --date-format <format>, "
 		"--default-button <label>, --defaultno, --default-item <name>,"
 		"--exit-label <label>, --extra-button, --extra-label <label>,"
 		"--hfile <filename>, --help-button, --help-label <label>, "
 		"--help-status, --help-tags, --hline string, --ignore, "
-		"--insecure, --item-help, --items-prefix, --max-input <size>, "
-		"--no-cancel, --nocancel, --no-label <label>, --no-items, "
+		"--insecure, --item-depth, --item-help, --items-prefix, "
+		"--max-input <size>, --no-cancel, --nocancel, "
+		"--no-label <label>, --no-items, "
 		"--no-lines, --no-ok, --nook, --no-shadow, --no-tags, "
 		"--ok-label <label>, --output-fd <fd>, "
 		"--output-separator <sep>, --print-version, --print-size, "
 		"--quoted, --print-maxsize, --shadow, --single-quoted, "
 		"--separator <sep>, --separate-output, --sleep <secs>, "
 		"--stderr, --stdout, --theme <blackwhite|bsddialog|dialog>, "
 		"--time-format <format>, --title <title>, "
 		"--yes-label <string>.\n");
 	printf("\n");
 	printf("Widgets:\n");
 	printf("--buildlist <text> <rows> <cols> <menurows> [<name> <desc> "
 		    "<on|off> ...]\n"
 		"--checklist <text> <rows> <cols> <menurows> [<name> <desc> "
 		    "<on|off> ...]\n"
 		"--datebox <text> <rows> <cols> [<yy> <mm> <dd>]\n"
 		"--form <text> <rows> <cols> <formrows> [<label> <ylabel> "
 		    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxvalue> "
 		    "...]\n"
 		"--gauge <text> <rows> <cols> [<perc\\n> [<text> ...] XXX "
 		    "...] EOF\n"
 		"--infobox <text> <rows> <cols>\n"
 		"--inputbox <text> <rows> <cols> [init]\n"
 		"--menu <text> <rows> <cols> <menurows> [<name> <desc> ...]\n"
 		"--mixedform <text> <rows> <cols> <formrows> [<label> <ylabel> "
 		    "<xlabe> <init> <yfield> <xfield> <fieldlen> <maxvalue> "
 		    "<0|1|2> ...]\n"
 		"--mixedgauge <text> <rows> <cols> <mainperc> [<label> "
 		    "<01234567|-perc> ...]\n"
 		"--msgbox <text> <rows> <cols>\n"
 		"--passwordbox <text> <rows> <cols> [init]\n"
 		"--passwordform <text> <rows> <cols> <formrows> [<label> "
 		    "<ylabel> <xlabe> <init> <yfield> <xfield> <fieldlen> "
 		    "<maxvalue> ...]\n"
 		"--pause <text> <rows> <cols> <secs>\n"
 		"--radiolist <text> <rows> <cols> <menurows> [<name> <desc> "
 		    "<on|off> ...]\n"
 		"--rangebox <text> <rows> <cols> <min> <max> <default>\n"
 		"--textbox <file> <rows> <cols>\n"
 		"--timebox <text> <rows> <cols> [<hh> <mm> <ss>]\n"
 		"--treeview <text> <rows> <cols> <menurows> [<depth> <name> "
 		    "<desc> <on|off> ...]\n"
 		"--yesno <text> <rows> <cols>\n");
-		
-	
 }
 
 int main(int argc, char *argv[argc])
 {
 	char *text, *backtitle_flag, errorbuilder[1024];
 	int input, rows, cols, output, getH, getW;
 	int (*widgetbuilder)(BUILDER_ARGS) = NULL;
 	bool ignore_flag, print_maxsize_flag;
 	struct winsize ws;
 	struct bsddialog_conf conf;
 	enum bsddialog_default_theme theme_flag;
 	bool cr_wrap_flag, no_collapse_flag, no_nl_expand_flag, trim_flag;
 
 	bsddialog_initconf(&conf);
 
 	backtitle_flag = NULL;
 	theme_flag = -1;
 	output_fd_flag = STDERR_FILENO;
 	print_maxsize_flag = false;
 	ignore_flag = false;
 	errorbuilder[0] = '\0';
 	cr_wrap_flag = no_collapse_flag = no_nl_expand_flag = trim_flag = false;
 
 	item_output_sepnl_flag = item_singlequote_flag = false;
-	item_prefix_flag = item_bottomdesc_flag = false;
+	item_prefix_flag = item_bottomdesc_flag = item_depth_flag = false;
 	list_items_on_flag = item_tag_help_flag = false;
 	item_always_quote_flag = false;
 	item_output_sep_flag = NULL;
 
 	date_fmt_flag = time_fmt_flag = NULL;
 	
 	max_input_form_flag = 0;
 
 	/* options descriptor */
 	struct option longopts[] = {
 	    /* common options */
 	    {"ascii-lines",     no_argument,       NULL, ASCII_LINES },
 	    {"aspect",          required_argument, NULL, ASPECT_RATIO },
 	    {"backtitle",       required_argument, NULL, BACKTITLE },
 	    {"begin-x",         required_argument, NULL, BEGIN_X },
 	    {"begin-y",         required_argument, NULL, BEGIN_Y },
 	    {"cancel-label",    required_argument, NULL, CANCEL_LABEL },
 	    {"clear",           no_argument,       NULL, CLEAR },
 	    {"colors",          no_argument,       NULL, COLORS },
 	    {"cr-wrap",         no_argument,       NULL, CR_WRAP },
 	    {"date-format",     required_argument, NULL, DATE_FORMAT },
 	    {"defaultno",       no_argument,       NULL, DEFAULTNO },
 	    {"default-button",  required_argument, NULL, DEFAULT_BUTTON },
 	    {"default-item",    required_argument, NULL, DEFAULT_ITEM },
 	    {"exit-label",      required_argument, NULL, EXIT_LABEL },
 	    {"extra-button",    no_argument,       NULL, EXTRA_BUTTON },
 	    {"extra-label",     required_argument, NULL, EXTRA_LABEL },
 	    {"help",            no_argument,       NULL, HELP },
 	    {"help-button",     no_argument,       NULL, HELP_BUTTON },
 	    {"help-label",      required_argument, NULL, HELP_LABEL },
 	    {"help-status",     no_argument,       NULL, HELP_STATUS },
 	    {"help-tags",       no_argument,       NULL, HELP_TAGS },
 	    {"hfile",           required_argument, NULL, HFILE },
 	    {"hline",           required_argument, NULL, HLINE },
 	    {"ignore",          no_argument,       NULL, IGNORE },
 	    {"insecure",        no_argument,       NULL, INSECURE },
+	    {"item-depth",      no_argument,       NULL, ITEM_DEPTH },
 	    {"item-help",       no_argument,       NULL, ITEM_HELP },
 	    {"item-prefix",     no_argument,       NULL, ITEM_PREFIX },
 	    {"max-input",       required_argument, NULL, MAX_INPUT },
 	    {"no-cancel",       no_argument,       NULL, NO_CANCEL },
 	    {"nocancel",        no_argument,       NULL, NOCANCEL },
 	    {"no-collapse",     no_argument,       NULL, NO_COLLAPSE },
 	    {"no-items",        no_argument,       NULL, NO_ITEMS },
 	    {"no-label",        required_argument, NULL, NO_LABEL },
 	    {"no-lines",        no_argument,       NULL, NO_LINES },
 	    {"no-nl-expand",    no_argument,       NULL, NO_NL_EXPAND },
 	    {"no-ok",           no_argument,       NULL, NO_OK },
 	    {"nook ",           no_argument,       NULL, NOOK },
 	    {"no-tags",         no_argument,       NULL, NO_TAGS },
 	    {"no-shadow",       no_argument,       NULL, NO_SHADOW },
 	    {"ok-label",        required_argument, NULL, OK_LABEL },
 	    {"output-fd",       required_argument, NULL, OUTPUT_FD },
 	    {"separator",       required_argument, NULL, SEPARATOR },
 	    {"output-separator",required_argument, NULL, OUTPUT_SEPARATOR },
 	    {"print-maxsize",   no_argument,       NULL, PRINT_MAXSIZE },
 	    {"print-size",      no_argument,       NULL, PRINT_SIZE },
 	    {"print-version",   no_argument,       NULL, PRINT_VERSION },
 	    {"quoted",          no_argument,       NULL, QUOTED },
 	    {"separate-output", no_argument,       NULL, SEPARATE_OUTPUT },
 	    {"shadow",          no_argument,       NULL, SHADOW },
 	    {"single-quoted",   no_argument,       NULL, SINGLE_QUOTED },
 	    {"sleep",           required_argument, NULL, SLEEP },
 	    {"stderr",          no_argument,       NULL, STDERR },
 	    {"stdout",          no_argument,       NULL, STDOUT },
 	    {"theme_flag",      required_argument, NULL, THEME },
 	    {"time-format",     required_argument, NULL, TIME_FORMAT },
 	    {"title",           required_argument, NULL, TITLE },
 	    {"trim",            no_argument,       NULL, TRIM },
 	    {"version",         no_argument,       NULL, VERSION },
 	    {"yes-label",       required_argument, NULL, YES_LABEL },
 	    /* Widgets */
 	    {"buildlist",    no_argument, NULL, BUILDLIST },
 	    {"checklist",    no_argument, NULL, CHECKLIST },
 	    {"datebox",      no_argument, NULL, DATEBOX },
 	    {"form",         no_argument, NULL, FORM },
 	    {"gauge",        no_argument, NULL, GAUGE },
 	    {"infobox",      no_argument, NULL, INFOBOX },
 	    {"inputbox",     no_argument, NULL, INPUTBOX },
 	    {"menu",         no_argument, NULL, MENU },
 	    {"mixedform",    no_argument, NULL, MIXEDFORM },
 	    {"mixedgauge",   no_argument, NULL, MIXEDGAUGE },
 	    {"msgbox",       no_argument, NULL, MSGBOX },
 	    {"passwordbox",  no_argument, NULL, PASSWORDBOX },
 	    {"passwordform", no_argument, NULL, PASSWORDFORM },
 	    {"pause",        no_argument, NULL, PAUSE },
 	    {"radiolist",    no_argument, NULL, RADIOLIST },
 	    {"rangebox",     no_argument, NULL, RANGEBOX },
 	    {"textbox",      no_argument, NULL, TEXTBOX },
 	    {"timebox",      no_argument, NULL, TIMEBOX },
 	    {"treeview",     no_argument, NULL, TREEVIEW },
 	    {"yesno",        no_argument, NULL, YESNO },
 	    /* END */
 	    { NULL, 0, NULL, 0 }
 	};
 
 	while ((input = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
 		switch (input) {
 		/* Common options */
 		case ASCII_LINES:
 			conf.ascii_lines = true;
 			break;
 		case ASPECT_RATIO:
 			conf.aspect_ratio = atoi(optarg);
 			if (conf.aspect_ratio < 1) {
 				printf("Error: aspect cannot be < 1");
 				return (BSDDIALOG_ERROR);
 			}
 			break;
 		case BACKTITLE:
 			backtitle_flag = optarg;
 			break;
 		case BEGIN_X:
 			conf.x = atoi(optarg);
 			if (conf.x < BSDDIALOG_CENTER) {
 				printf("Error: --begin-x %d, cannot be < %d",
 				    conf.x, BSDDIALOG_CENTER);
 				return (BSDDIALOG_ERROR);
 			}
 			break;
 		case BEGIN_Y:
 			conf.y = atoi(optarg);
 			if (conf.y < BSDDIALOG_CENTER) {
 				printf("Error: --begin-y %d, cannot be < %d",
 				    conf.y, BSDDIALOG_CENTER);
 				return (BSDDIALOG_ERROR);
 			}
 			break;
 		case CANCEL_LABEL:
 			conf.button.cancel_label = optarg;
 			break;
 		case CLEAR:
 			conf.clear = true;
 			break;
 		case COLORS:
 			conf.text.colors = true;
 			break;
 		case CR_WRAP:
 			cr_wrap_flag = true;
 			break;
 		case DATE_FORMAT:
 			date_fmt_flag = optarg;
 			break;
 		case DEFAULT_BUTTON:
 			conf.button.default_label = optarg;
 			break;
 		case DEFAULT_ITEM:
 			conf.menu.default_item = optarg;
 			break;
 		case DEFAULTNO:
 			conf.button.default_cancel = true;
 			break;
 		case EXIT_LABEL:
 			conf.button.exit_label = optarg;
 			break;
 		case EXTRA_BUTTON:
 			conf.button.with_extra = true;
 			break;
 		case EXTRA_LABEL:
 			conf.button.extra_label = optarg;
 			break;
 		case HELP:
 			usage();
 			return (BSDDIALOG_OK);
 		case HELP_BUTTON:
 			conf.button.with_help = true;
 			break;
 		case HELP_LABEL:
 			conf.button.help_label = optarg;
 			break;
 		case HELP_STATUS:
 			list_items_on_flag = true;
 			break;
 		case HELP_TAGS:
 			item_tag_help_flag = true;
 			break;
 		case HFILE:
 			conf.f1_file = optarg;
 			break;
 		case HLINE:
 			conf.bottomtitle = optarg;
 			break;
 		case IGNORE:
 			ignore_flag = true;
 			break;
 		case INSECURE:
 			conf.form.securech = '*';
 			break;
+		case ITEM_DEPTH:
+			item_depth_flag = true;
+			break;
 		case ITEM_HELP:
 			item_bottomdesc_flag = true;
 			break;
 		case ITEM_PREFIX:
 			item_prefix_flag = true;
 			break;
 		case MAX_INPUT:
 			max_input_form_flag = atoi(optarg);
 			break;
 		case NO_ITEMS:
 			conf.menu.no_desc = true;
 			break;
 		case NOCANCEL:
 		case NO_CANCEL:
 			conf.button.without_cancel = true;
 			break;
 		case NO_COLLAPSE:
 			no_collapse_flag = true;
 			break;
 		case NO_LABEL:
 			conf.button.cancel_label = optarg;
 			break;
 		case NO_LINES:
 			conf.no_lines = true;
 			break;
 		case NO_NL_EXPAND:
 			no_nl_expand_flag = true;
 			break;
 		case NOOK:
 		case NO_OK:
 			conf.button.without_ok = true;
 			break;
 		case NO_TAGS:
 			conf.menu.no_name = true;
 			break;
 		case NO_SHADOW:
 			conf.shadow = false;
 			break;
 		case OK_LABEL:
 			conf.button.ok_label = optarg;
 			break;
 		case OUTPUT_FD:
 			output_fd_flag = atoi(optarg);
 			break;
 		case SEPARATOR:
 		case OUTPUT_SEPARATOR:
 			item_output_sep_flag = optarg;
 			break;
 		case QUOTED:
 			item_always_quote_flag = true;
 			break;
 		case PRINT_MAXSIZE:
 			print_maxsize_flag = true;
 			break;
 		case PRINT_SIZE:
 			conf.get_height = &getH;;
 			conf.get_width = &getW;
 			break;
 		case PRINT_VERSION:
 			printf("bsddialog version %s\n", BSDDIALOG_VERSION);
 			break;
 		case SEPARATE_OUTPUT:
 			item_output_sepnl_flag = true;
 			break;
 		case SHADOW:
 			conf.shadow = true;
 			break;
 		case SINGLE_QUOTED:
 			item_singlequote_flag = true;
 			break;
 		case SLEEP:
 			conf.sleep = atoi(optarg);
 			break;
 		case STDERR:
 			output_fd_flag = STDERR_FILENO;
 			break;
 		case STDOUT:
 			output_fd_flag = STDOUT_FILENO;
 			break;
 		case THEME:
 			if (strcmp(optarg, "bsddialog") == 0)
 				theme_flag = BSDDIALOG_THEME_BSDDIALOG;
 			else if (strcmp(optarg, "blackwhite") == 0)
 				theme_flag = BSDDIALOG_THEME_BLACKWHITE;
 			else if (strcmp(optarg, "dialog") == 0)
 				theme_flag = BSDDIALOG_THEME_DIALOG;
 			else {
 				printf("Unknown theme, possible values: ");
 				printf("blackwhite, bsddialog, dialog");
 				return (BSDDIALOG_ERROR);
 			}
 			break;
 		case TIME_FORMAT:
 			time_fmt_flag = optarg;
 			break;
 		case TITLE:
 			conf.title = optarg;
 			break;
 		case TRIM:
 			trim_flag = true;
 			break;
 		case VERSION:
 			printf("bsddialog %s (libbsddialog %s).\n",
 			    BSDDIALOG_VERSION, LIBBSDDIALOG_VERSION);
 			return (BSDDIALOG_OK);
 		case YES_LABEL:
 			conf.button.ok_label = optarg;
 			break;
 		/* Widgets */
 		case BUILDLIST:
 			widgetbuilder = buildlist_builder;
 			break;
 		case CHECKLIST:
 			widgetbuilder = checklist_builder;
 			break;
 		case DATEBOX:
 			widgetbuilder = datebox_builder;
 			break;
 		case FORM:
 			widgetbuilder = form_builder;
 			break;
 		case GAUGE:
 			widgetbuilder = gauge_builder;
 			break;
 		case INFOBOX:
 			widgetbuilder = infobox_builder;
 			break;
 		case INPUTBOX:
 			widgetbuilder = inputbox_builder;
 			break;
 		case MENU:
 			widgetbuilder = menu_builder;
 			break;
 		case MIXEDFORM:
 			widgetbuilder = mixedform_builder;
 			break;
 		case MIXEDGAUGE:
 			widgetbuilder = mixedgauge_builder;
 			break;
 		case MSGBOX:
 			widgetbuilder = msgbox_builder;
 			break;
 		case PAUSE:
 			widgetbuilder = pause_builder;
 			break;
 		case PASSWORDBOX:
 			widgetbuilder = passwordbox_builder;
 			break;
 		case PASSWORDFORM:
 			widgetbuilder = passwordform_builder;
 			break;
 		case RADIOLIST:
 			widgetbuilder = radiolist_builder;
 			break;
 		case RANGEBOX:
 			widgetbuilder = rangebox_builder;
 			break;
 		case TEXTBOX:
 			widgetbuilder = textbox_builder;
 			break;
 		case TIMEBOX:
 			widgetbuilder = timebox_builder;
 			break;
 		case TREEVIEW:
 			widgetbuilder = treeview_builder;
 			break;
 		case YESNO:
 			widgetbuilder = yesno_builder;
 			break;
 		/* Error */
 		default:
 			if (ignore_flag == true) 
 				break;
 			usage();
 			return (BSDDIALOG_ERROR);
 		}
 	}
 	argc -= optind;
 	argv += optind;
 
 	if (print_maxsize_flag) {
 		ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
 		dprintf(output_fd_flag, "MaxSize: %d, %d\n",
 		    ws.ws_row, ws.ws_col);
 		if (argc == 0)
 			return (BSDDIALOG_OK);
 	}
 
 	if (argc < 3) {
 		usage();
 		return (BSDDIALOG_ERROR);
 	}
 	if (widgetbuilder == textbox_builder)
 		text = argv[0];
 	else {
 		text = malloc(strlen(argv[0] + 1));
 		custom_text(cr_wrap_flag, no_collapse_flag, no_nl_expand_flag,
 		    trim_flag, argv[0], text);
 	}
 	rows = atoi(argv[1]);
 	cols = atoi(argv[2]);
 	argc -= 3;
 	argv += 3;
 
 	/* bsddialog terminal mode */
 	if(bsddialog_init() != 0) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (BSDDIALOG_ERROR);
 	}
 
 	if (theme_flag >= 0)
 		bsddialog_set_default_theme(theme_flag);
 
 	if (backtitle_flag != NULL)
 		bsddialog_backtitle(&conf, backtitle_flag);
 
 	output = BSDDIALOG_OK;
 	if (widgetbuilder != NULL)
 		output = widgetbuilder(conf, text, rows, cols, argc, argv,
 		    errorbuilder);
 
 	if (widgetbuilder != textbox_builder)
 		free(text);
 
 	bsddialog_end();
 	/* end bsddialog terminal mode */
 
 	if (output == BSDDIALOG_ERROR) {
 		if (errorbuilder[0] != '\0')
 			printf("Error: %s\n", errorbuilder);
 		else
 			printf("Error: %s\n", bsddialog_geterror());
 	}
 
 	if (conf.get_height != NULL && conf.get_width != NULL)
 		dprintf(output_fd_flag, "Widget size: (%d - %d)\n",
 		    *conf.get_height, *conf.get_width);
 
 	return (output);
 }
 
 /* Widgets */
 
 int gauge_builder(BUILDER_ARGS)
 {
 	int output, perc;
 
 	if (argc > 0) {
 		perc = argc > 0 ? atoi (argv[0]) : 0;
 		perc = perc < 0 ? 0 : perc;
 		perc = perc > 100 ? 100 : perc;
 	}
 	else
 		perc = 0;
 
 	output = bsddialog_gauge(&conf, text, rows, cols, perc);
 
 	return (output);
 }
 
 int infobox_builder(BUILDER_ARGS)
 {
 	int output;
 
 	output = bsddialog_infobox(&conf, text, rows, cols);
 
 	return (output);
 }
 
 int mixedgauge_builder(BUILDER_ARGS)
 {
 	int i, output, mainperc, nminibars, *minipercs;
 	char **minilabels;
 
 	if (argc < 1 || (((argc-1) % 2) != 0) ) {
 		strcpy(errbuf, "bad --mixedgauge arguments\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	mainperc = atoi(argv[0]);
 	mainperc = mainperc < 0 ? 0 : mainperc;
 	mainperc = mainperc > 100 ? 100 : mainperc;
 	argc--;
 	argv++;
 
 	nminibars  = argc / 2;
 	if ((minilabels = calloc(nminibars, sizeof(char*))) == NULL) {
 		strcpy(errbuf, "Cannot allocate memory for minilabels\n");
 		return BSDDIALOG_ERROR;
 	}
 	if ((minipercs = calloc(nminibars, sizeof(int))) == NULL) {
 		strcpy(errbuf, "Cannot allocate memory for minipercs\n");
 		return BSDDIALOG_ERROR;
 	}
 
 	for (i = 0; i < nminibars; i++) {
 		minilabels[i] = argv[i * 2];
 		minipercs[i] = atoi(argv[i * 2 + 1]);
 	}
 
 	output = bsddialog_mixedgauge(&conf, text, rows, cols, mainperc,
 	    nminibars, minilabels, minipercs);
 
 	return (output);
 }
 
 int msgbox_builder(BUILDER_ARGS)
 {
 	int output;
 
 	output = bsddialog_msgbox(&conf, text, rows, cols);
 
 	return (output);
 }
 
 int pause_builder(BUILDER_ARGS)
 {
 	int output, sec;
 
 	if (argc < 1) {
 		strcpy(errbuf, "not <seconds> argument for --pause\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	sec = atoi(argv[0]);
 	output = bsddialog_pause(&conf, text, rows, cols, sec);
 
 	return (output);
 }
 
 int rangebox_builder(BUILDER_ARGS)
 {
 	int output, min, max, value;
 
 	if (argc < 2) {
 		strcpy(errbuf, "usage --rangebox <text> <rows> <cols> <min> "
 		    "<max> [<init>]\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	min = atoi(argv[0]);
 	max = atoi(argv[1]);
 	
 	if (argc > 2) {
 		value = atoi(argv[2]);
 		value = value < min ? min : value;
 		value = value > max ? max : value;
 	}
 	else
 		value = min;
 
 	output = bsddialog_rangebox(&conf, text, rows, cols, min, max, &value);
 
 	dprintf(output_fd_flag, "%d", value);
 
 	return (output);
 }
 
 int textbox_builder(BUILDER_ARGS)
 {
 	int output;
 
 	output = bsddialog_textbox(&conf, text, rows, cols);
 
 	return (output);
 }
 
 int yesno_builder(BUILDER_ARGS)
 {
 	int output;
 
 	output = bsddialog_yesno(&conf, text, rows, cols);
 
 	return (output);
 }
 
 /* DATE and TIME */
 int datebox_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int yy, mm, dd;
 	time_t cal;
 	struct tm *localtm;
 	char stringdate[1024];
 
 	time(&cal);
 	localtm = localtime(&cal);
 	yy = localtm->tm_year + 1900;
 	mm = localtm->tm_mon + 1;
 	dd = localtm->tm_mday;
 
 	/* --calendar text h w [year month day] */
 	if (argc == 3) {
 		yy = atoi(argv[0]);
 		mm = atoi(argv[1]);
 		dd = atoi(argv[2]);
 	}
 
 	output = bsddialog_datebox(&conf, text, rows, cols, &yy, &mm, &dd);
 	if (output != BSDDIALOG_OK)
 		return (output);
 
 	if (date_fmt_flag == NULL) {
 		dprintf(output_fd_flag, "%u/%u/%u", yy, mm, dd);
 	}
 	else {
 		time(&cal);
 		localtm = localtime(&cal);
 		localtm->tm_year = yy - 1900;
 		localtm->tm_mon  = mm;
 		localtm->tm_mday = dd;
 		strftime(stringdate, 1024, date_fmt_flag, localtm);
 		dprintf(output_fd_flag, "%s", stringdate);
 	}
 
 	return (output);
 }
 
 int timebox_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int hh, mm, ss;
 	time_t clock;
 	struct tm *localtm;
 	char stringtime[1024];
 
 	time(&clock);
 	localtm = localtime(&clock);
 	hh = localtm->tm_hour;
 	mm = localtm->tm_min;
 	ss = localtm->tm_sec;
 
 	/* --timebox text h w [hour minute second] */
 	if (argc == 3) {
 		hh = atoi(argv[0]);
 		mm = atoi(argv[1]);
 		ss = atoi(argv[2]);
 	}
 
 	output = bsddialog_timebox(&conf, text, rows, cols, &hh, &mm, &ss);
 	if (output != BSDDIALOG_OK)
 		return (output);
 
 	if (time_fmt_flag == NULL) {
 		dprintf(output_fd_flag, "%u:%u:%u", hh, mm, ss);
 	}
 	else {
 		time(&clock);
 		localtm = localtime(&clock);
 		localtm->tm_hour = hh;
 		localtm->tm_min  = mm;
 		localtm->tm_sec = ss;
 		strftime(stringtime, 1024, time_fmt_flag, localtm);
 		dprintf(output_fd_flag, "%s", stringtime);
 	}
 
 	return (output);
 }
 
 /* MENU */
 static int
 get_menu_items(char *errbuf, int argc, char **argv, bool setprefix,
     bool setdepth, bool setname, bool setdesc, bool setstatus, bool sethelp,
     int *nitems, struct bsddialog_menuitem *items)
 {
 	int i, j, sizeitem;
 
 	sizeitem = 0;
 	if (setprefix) sizeitem++;
 	if (setdepth)  sizeitem++;
 	if (setname)   sizeitem++;
 	if (setdesc)   sizeitem++;
 	if (setstatus) sizeitem++;
 	if (sethelp)   sizeitem++;
 	if ((argc % sizeitem) != 0) {
 		strcpy(errbuf, "bad number of arguments for this menu\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	*nitems = argc / sizeitem;
 	j = 0;
 	for (i=0; i<*nitems; i++) {
 		items[i].prefix = setprefix ? argv[j++] : nostring;
 		items[i].depth = setdepth ? atoi(argv[j++]) : 0;
 		items[i].name = setname ? argv[j++] : nostring;
 		items[i].desc = setdesc ? argv[j++] : nostring;
 		if (setstatus)
 			items[i].on = strcmp(argv[j++], "on") == 0 ?
 			    true : false;
 		else
 			items[i].on = false;
 		items[i].bottomdesc = sethelp ? argv[j++] : nostring;
 	}
 
 	return (BSDDIALOG_OK);
 }
 
 static void
 print_menu_items(struct bsddialog_conf *conf, int output, int nitems,
     struct bsddialog_menuitem *items, int focusitem)
 {
 	int i;
 	bool sep, toquote;
 	char *sepstr, quotech, *helpvalue;
 
 	sep = false;
 	quotech = item_singlequote_flag ? '\'' : '"';
 	sepstr = item_output_sep_flag != NULL ? item_output_sep_flag : " ";
 
 	if (output == BSDDIALOG_HELP && focusitem >= 0) {
 		dprintf(output_fd_flag, "HELP ");
 		
 		helpvalue = items[focusitem].name;
 		if (item_bottomdesc_flag && item_tag_help_flag == false)
 			helpvalue = items[focusitem].bottomdesc;
 
 		toquote = item_always_quote_flag ||
 		    strchr(helpvalue, ' ') != NULL;
 
 		if (toquote)
 			dprintf(output_fd_flag, "%c", quotech);
 		dprintf(output_fd_flag, "%s", helpvalue);
 		if (toquote)
 			dprintf(output_fd_flag, "%c", quotech);
 		
 		if (list_items_on_flag == false)
 			return;
 			
 		sep = true;
 	}
 
 	if (output != BSDDIALOG_OK && list_items_on_flag == false)
 		return;
 
 	for (i = 0; i < nitems; i++) {
 		if (items[i].on == false)
 			continue;
 
 		if (sep == true) {
 			dprintf(output_fd_flag, "%s", sepstr);
 			if (item_output_sepnl_flag)
 				dprintf(output_fd_flag, "\n");
 		}
 		sep = true;
 
 		toquote = item_always_quote_flag ||
 		    strchr(items[i].name, ' ') != NULL;
 
 		if (toquote)
 			dprintf(output_fd_flag, "%c", quotech);
 		dprintf(output_fd_flag, "%s", items[i].name);
 		if (toquote)
 			dprintf(output_fd_flag, "%c", quotech);
 	}
 }
 
 int buildlist_builder(BUILDER_ARGS)
 {
 	int output, menurows, nitems, focusitem;
 	struct bsddialog_menuitem items[1024];
 
 	if (argc < 1) {
 		strcpy(errbuf, "<menurows> not provided");
 		return (BSDDIALOG_ERROR);
 	}
 
 	menurows = atoi(argv[0]);
    
 	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag, false,
 	    true, true, true, item_bottomdesc_flag, &nitems, items);
 	if (output != 0)
 		return (output);
 
 	output = bsddialog_buildlist(&conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 	if (output == BSDDIALOG_ERROR)
 		return (BSDDIALOG_ERROR);
 
 	print_menu_items(&conf, output, nitems, items, focusitem);
 
 	return (output);
 }
 
 int checklist_builder(BUILDER_ARGS)
 {
 	int output, menurows, nitems, focusitem;
 	struct bsddialog_menuitem items[1024];
 
 	if (argc < 1) {
 		strcpy(errbuf, "<menurows> not provided");
 		return (BSDDIALOG_ERROR);
 	}
 
 	menurows = atoi(argv[0]);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag, false,
-	    true, true, true, item_bottomdesc_flag, &nitems, items);
+	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag,
+	    item_depth_flag, true, true, true, item_bottomdesc_flag, &nitems,
+	    items);
 	if (output != 0)
 		return (output);
 
 	output = bsddialog_checklist(&conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
 	print_menu_items(&conf, output, nitems, items, focusitem);
 
 	return (output);
 }
 
 int menu_builder(BUILDER_ARGS)
 {
 	int output, menurows, nitems, focusitem;
 	struct bsddialog_menuitem items[1024];
 
 	if (argc < 1) {
 		strcpy(errbuf, "<menurows> not provided");
 		return (BSDDIALOG_ERROR);
 	}
 
 	menurows = atoi(argv[0]);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag, false,
-	    true, true, false, item_bottomdesc_flag, &nitems, items);
+	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag,
+	    item_depth_flag, true, true, false, item_bottomdesc_flag, &nitems,
+	    items);
 	if (output != 0)
 		return (output);
 
 	output = bsddialog_menu(&conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
 	print_menu_items(&conf, output, nitems, items, focusitem);
 
 	return (output);
 }
 
 int radiolist_builder(BUILDER_ARGS)
 {
 	int output, menurows, nitems, focusitem;
 	struct bsddialog_menuitem items[1024];
 
 	if (argc < 1) {
 		strcpy(errbuf, "<menurows> not provided");
 		return (BSDDIALOG_ERROR);
 	}
 
 	menurows = atoi(argv[0]);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag, false,
-	    true, true, true, item_bottomdesc_flag, &nitems, items);
+	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag,
+	    item_depth_flag, true, true, true, item_bottomdesc_flag, &nitems,
+	    items);
 	if (output != 0)
 		return (output);
 
 	output = bsddialog_radiolist(&conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
 	print_menu_items(&conf, output, nitems, items, focusitem);
 
 	return (output);
 }
 
 int treeview_builder(BUILDER_ARGS)
 {
 	int output, menurows, nitems, focusitem;
 	struct bsddialog_menuitem items[1024];
 
 	if (argc < 1) {
 		strcpy(errbuf, "<menurows> not provided");
 		return (BSDDIALOG_ERROR);
 	}
 
 	menurows = atoi(argv[0]);
 
 	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_flag, true,
 	    true, true, true, item_bottomdesc_flag, &nitems, items);
 	if (output != 0)
 		return (output);
 
 	conf.menu.no_name = true;
 	conf.menu.align_left = true;
 
 	output = bsddialog_radiolist(&conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 	
 	print_menu_items(&conf, output, nitems, items, focusitem);
 
 	return (output);
 }
 
 /* FORM */
 static void
 print_form_items(struct bsddialog_conf *conf, int output, int nitems,
     struct bsddialog_formitem *items)
 {
 	int i;
 
 	if (output == BSDDIALOG_ERROR)
 		return;
 
 	for (i=0; i < nitems; i++) {
 		dprintf(output_fd_flag, "%s\n", items[i].value);
 		free(items[i].value);
 	}
 }
 
 int form_builder(BUILDER_ARGS)
 {
 	int i, output, formheight, nitems, fieldlen, valuelen;
 	struct bsddialog_formitem items[1024];
 	unsigned int flags = 0;
 
 	if (argc < 1 || (((argc-1) % 8) != 0) ) {
 		strcpy(errbuf, "bad number of arguments for this form\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	formheight = atoi(argv[0]);
 
 	argc--;
 	argv++;
 
 	nitems = argc / 8;
 	for (i=0; i<nitems; i++) {
 		items[i].label	= argv[8*i];
 		items[i].ylabel = atoi(argv[8*i+1]);
 		items[i].xlabel = atoi(argv[8*i+2]);
 		items[i].init	= argv[8*i+3];
 		items[i].yfield	= atoi(argv[8*i+4]);
 		items[i].xfield	= atoi(argv[8*i+5]);
 
 		fieldlen = atoi(argv[8*i+6]);
 		items[i].fieldlen = abs(fieldlen);
 
 		valuelen = atoi(argv[8*i+7]);
 		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
 
 		flags |= (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
 		items[i].flags = flags;
+
+		items[i].bottomdesc = nostring;
 	}
 
 	output = bsddialog_form(&conf, text, rows, cols, formheight, nitems,
 	    items);
 	print_form_items(&conf, output, nitems, items);
 
 	return (output);
 }
 
 int inputbox_builder(BUILDER_ARGS)
 {
 	int output;
 	struct bsddialog_formitem item;
 
 	item.label	 = "";
 	item.ylabel	 = 0;
 	item.xlabel	 = 0;
 	item.init	 = argc > 0 ? argv[0] : "";
 	item.yfield	 = 1;
 	item.xfield	 = 1;
 	item.fieldlen    = cols > 4 ? cols-4 : 25;
 	item.maxvaluelen = max_input_form_flag > 0 ? max_input_form_flag : 2048;
 	item.flags	 = 0;
+	item.bottomdesc = nostring;
 
 	output = bsddialog_form(&conf, text, rows, cols, 1, 1, &item);
 	print_form_items(&conf, output, 1, &item);
 
 	return (output);
 }
 
 int mixedform_builder(BUILDER_ARGS)
 {
 	int i, output, formheight, nitems;
 	struct bsddialog_formitem items[1024];
 
 	if (argc < 1 || (((argc-1) % 9) != 0) ) {
 		strcpy(errbuf, "bad number of arguments for this form\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	formheight = atoi(argv[0]);
 	
 	argc--;
 	argv++;
 
 	nitems = argc / 9;
 	for (i=0; i<nitems; i++) {
 		items[i].label	     = argv[9*i];
 		items[i].ylabel      = atoi(argv[9*i+1]);
 		items[i].xlabel      = atoi(argv[9*i+2]);
 		items[i].init	     = argv[9*i+3];
 		items[i].yfield	     = atoi(argv[9*i+4]);
 		items[i].xfield	     = atoi(argv[9*i+5]);
 		items[i].fieldlen    = atoi(argv[9*i+6]);
 		items[i].maxvaluelen = atoi(argv[9*i+7]);
 		items[i].flags       = atoi(argv[9*i+8]);
+		items[i].bottomdesc = nostring;
 	}
 
 	output = bsddialog_form(&conf, text, rows, cols, formheight, nitems,
 	    items);
 	print_form_items(&conf, output, nitems, items);
 
 	return (output);
 }
 
 int passwordbox_builder(BUILDER_ARGS)
 {
 	int output;
 	struct bsddialog_formitem item;
 
 	item.label	 = "";
 	item.ylabel	 = 0;
 	item.xlabel	 = 0;
 	item.init	 = argc > 0 ? argv[0] : "";
 	item.yfield	 = 1;
 	item.xfield	 = 1;
 	item.fieldlen	 = cols > 4 ? cols-4 : 25;
 	item.maxvaluelen = max_input_form_flag > 0 ? max_input_form_flag : 2048;
 	item.flags       = BSDDIALOG_FIELDHIDDEN;
+	item.bottomdesc = nostring;
 
 	output = bsddialog_form(&conf, text, rows, cols, 1, 1, &item);
 	print_form_items(&conf, output, 1, &item);
 
 	return (output);
 }
 
 int passwordform_builder(BUILDER_ARGS)
 {
 	int i, output, formheight, nitems, fieldlen, valuelen;
 	struct bsddialog_formitem items[1024];
 	unsigned int flags = BSDDIALOG_FIELDHIDDEN;
 
 	if (argc < 1 || (((argc-1) % 8) != 0) ) {
 		strcpy(errbuf, "bad number of arguments for this form\n");
 		return (BSDDIALOG_ERROR);
 	}
 
 	formheight = atoi(argv[0]);
 	
 	argc--;
 	argv++;
 
 	nitems = argc / 8;
 	for (i=0; i<nitems; i++) {
 		items[i].label	= argv[8*i];
 		items[i].ylabel = atoi(argv[8*i+1]);
 		items[i].xlabel = atoi(argv[8*i+2]);
 		items[i].init	= argv[8*i+3];
 		items[i].yfield	= atoi(argv[8*i+4]);
 		items[i].xfield	= atoi(argv[8*i+5]);
 
 		fieldlen = atoi(argv[8*i+6]);
 		items[i].fieldlen = abs(fieldlen);
 
 		valuelen = atoi(argv[8*i+7]);
 		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
 
 		flags |= (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
 		items[i].flags = flags;
+
+		items[i].bottomdesc = nostring;
 	}
 
 	output = bsddialog_form(&conf, text, rows, cols, formheight,
 	    nitems, items);
 	print_form_items(&conf, output, nitems, items);
 
 	return (output);
 }
diff --git a/examples_library/sade.c b/examples_library/sade.c
index a159ab2afc0b..1c1d74e5a501 100644
--- a/examples_library/sade.c
+++ b/examples_library/sade.c
@@ -1,64 +1,56 @@
 /*-
  * SPDX-License-Identifier: CC0-1.0
  *
  * Written in 2021 by Alfonso Sabato Siciliano.
  * To the extent possible under law, the author has dedicated all copyright
  * and related and neighboring rights to this software to the public domain
  * worldwide. This software is distributed without any warranty, see:
  *   <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#include <bsddialog.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <bsddialog.h>
-
 /* Figure 15 - https://docs.freebsd.org/en/books/handbook/bsdinstall/ */
 int main()
 {
 	int i, output;
 	struct bsddialog_conf conf;
+	char *text = "Please review the disk setup. When complete, press the "
+	    "Finish button";
 	struct bsddialog_menuitem items[5] = {
 	    {"", false, 0, "ada0",   "16 GB GPT", ""},
 	    {"", false, 1, "ada0p1", "512 KB freebsd-boot", ""},
 	    {"", false, 1, "ada0p2", "15 GB freebsd-ufs", ""},
 	    {"", false, 1, "ada0p3", "819 MB freebsd-swap none", ""},
 	    {"", false, 0, "ada1",   "16 GB", ""}
 	};
-
+	
 	bsddialog_initconf(&conf);
-	conf.title = "Partition Editor";
-	char *text = "Please review the disk setup. When complete, press the "\
-	    "Finish button";
-
-	conf.menu.align_left = true;
 
-	conf.button.ok_label = "Create";
-	
-	conf.button.with_extra = true;
-	conf.button.extra_label = "Delete";
-	
-	conf.button.cancel_label = "Cancel";
-	
-	conf.button.with_help = true;
-	conf.button.help_label = "Revert";
-	
+	conf.title                 = "Partition Editor";
+	conf.menu.shortcut_buttons = true;
+	conf.menu.align_left       = true;
+	conf.button.ok_label       = "Create";
+	conf.button.with_extra     = true;
+	conf.button.extra_label    = "Delete";
+	conf.button.cancel_label   = "Cancel";
+	conf.button.with_help      = true;
+	conf.button.help_label     = "Revert";
 	conf.button.generic1_label = "Auto";
 	conf.button.generic2_label = "Finish";
+	conf.button.default_label  = "Finish";
 	
-	conf.button.default_label= "Finish";
-	
-	if (bsddialog_init() < 0)
-		return -1;
-
+	if (bsddialog_init() == BSDDIALOG_ERROR)
+		return (1);
 	output = bsddialog_menu(&conf, text, 20, 0, 10, 5, items, NULL);
-
 	bsddialog_end();
 
 	printf("Menu:\n");
 	for (i=0; i<5; i++)
 		printf(" [%c] %s\n", items[i].on ? 'X' : ' ', items[i].name);
 		
 	
-	return output;
+	return (output);
 }
diff --git a/examples_utility/mixedgauge.sh b/examples_utility/mixedgauge.sh
index ce867973859a..bc0f91a1e506 100755
--- a/examples_utility/mixedgauge.sh
+++ b/examples_utility/mixedgauge.sh
@@ -1,34 +1,34 @@
 #!/bin/sh
 #-
 # SPDX-License-Identifier: CC0-1.0
 #
 # Written in 2021 by Alfonso Sabato Siciliano.
 # To the extent possible under law, the author has dedicated all copyright
 # and related and neighboring rights to this software to the public domain
 # worldwide. This software is distributed without any warranty, see:
 # <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 
 input="A B C D E F G H"
 total=`echo $input | awk '{print split($0, a)}'`
 curr=1
 for i in $input
 do
         perc="$(expr $(expr $curr "*" 100 ) "/" $total )"
         curr=`expr $curr + 1`
 	./bsddialog --sleep 1 --title " mixedgauge " --mixedgauge "Example" 25 50  $perc \
 		"Hidden!"     8	\
 		"Label   1"   0	\
 		"Label   2"   1	\
 		"Label   3"   2	\
 		"Label   4"   3 \
 		"Label   5"   4	\
 		"Label   6"   5	\
 		"Label   7"   6	\
 		"Label   8"   7	\
 		"Label   9"   9	\
 		"Label  10"  10	\
-		"Label X" " -$perc"
+		"Label   X"  " -$perc"
 	#sleep 1
 done
 
diff --git a/lib/GNUMakefile b/lib/GNUMakefile
index 045b58828a07..318b1218f9c0 100644
--- a/lib/GNUMakefile
+++ b/lib/GNUMakefile
@@ -1,30 +1,30 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 # 	<http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.1
+VERSION = 0.0.2
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
-HEADERS = bsddialog.h bsddialog_theme.h
+HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
 SOURCES = barbox.c formbox.c infobox.c libbsddialog.c lib_util.c menubox.c \
 	messagebox.c textbox.c theme.c timebox.c
 OBJECTS = $(SOURCES:.c=.o)
 CFLAGS = -g -Wall -Werror -fpic
 LDFLAGS = -lform -lncurses -ltinfo
 LIBFLAG = -shared
 
 RM = rm -f
 LN = ln -s -f
 
 all : $(LIBRARY)
 
 $(LIBRARY): $(OBJECTS)
 	$(CC) $(LIBFLAG) $^ -o $(LIBRARY_SO).$(VERSION) $(LDFLAGS)
 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
 
 %.o: %.c $(HEADERS)
 	$(CC) $(CFLAGS) -c $<
 
 clean:
 	$(RM) $(LIBRARY_SO)* *.o *~
diff --git a/lib/Makefile b/lib/Makefile
index 08d8db5191dc..e8f3ab6aae02 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,77 +1,76 @@
 # Any copyright is dedicated to the Public Domain, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.0.1
+VERSION = 0.0.2
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
-HEADERS = bsddialog.h bsddialog_theme.h
+HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
 SOURCES = barbox.c formbox.c infobox.c libbsddialog.c lib_util.c menubox.c \
 	messagebox.c textbox.c theme.c timebox.c
 OBJECTS= ${SOURCES:.c=.o}
-FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
-	-fstack-protector-strong -Qunused-arguments
-CFLAGS = -fPIC -Wall -Wextra
+CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra
+LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
+	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} 
+
 .if defined(DEBUG)
+# `make -DDEBUG`
 CFLAGS += -g
 .else
-CFLAGS += ${FBSDFLAGS}
+CFLAGS += -O2 -pipe -std=gnu99 -Wno-format-zero-length \
+	-fstack-protector-strong -Qunused-arguments
 .endif
-LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} 
-
-INSTALL_PREFIX=/usr/local
-LN = ln -s -f
-RM = rm -f
-CP = cp
-GZIP = gzip -cn
-LDCONFIG = /sbin/ldconfig -m
 
 .if defined(PORTNCURSES)
-# PORT ncurses `make -DPORTNCURSES` 
+# PORT ncurses `make -DPORTNCURSES`
 CFLAGS += -DPORTNCURSES -I/usr/local/include
-LDFLAGS += -L/usr/local/lib -lform -lncurses -ltinfo
+LDFLAGS += -L/usr/local/lib -lformw -lncursesw -ltinfow
 .else
 # BASE ncurses
-LDFLAGS += -L/usr/lib -lform -lncurses -ltinfo
+LDFLAGS += -L/usr/lib -lformw -lncursesw -ltinfow
 .endif
 
+INSTALL_PREFIX=/usr/local
+LN = ln -s -f
+RM = rm -f
+CP = cp
+GZIP = gzip -cn
+LDCONFIG = /sbin/ldconfig -m
 MAN= ${OUTPUT}.3
 GZIP= gzip -cn
 MANDIR= /usr/local/share/man/man3
-
 INSTALL= install
 RM= rm -f
 
 #all : man ${LIBRARY}
 all : ${LIBRARY}
 
 ${LIBRARY}: ${OBJECTS}
 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
 	# LN for devel
 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 man:
 	${GZIP} ${LIBRARY}.3 > ${LIBRARY}.3.gz
 
 clean:
 	${RM} ${LIBRARY_SO}* *.o *~ *.gz
 
 
 install:
 	${CP} ${LIBRARY}.h ${INSTALL_PREFIX}/include
 	${CP} ${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/
 	${LN} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
 	${LDCONFIG} ${INSTALL_PREFIX}/lib
 	${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
 
 unistall:
 	${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h
 	${RM} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
 	${RM} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION}
 	${LDCONFIG} ${INSTALL_PREFIX}/lib
 	${RM} ${INSTALL_PREFIX}/man/man3/${LIBRARY}.3.gz
diff --git a/lib/barbox.c b/lib/barbox.c
index da4f0b72c1d6..d67dfb953992 100644
--- a/lib/barbox.c
+++ b/lib/barbox.c
@@ -1,672 +1,793 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
 #include "bsddialog.h"
+#include "bsddialog_progressview.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 #define BARMARGIN	3
 #define MINBARWIDTH	10
 #define MINWIDTH	(VBORDERS + MINBARWIDTH + BARMARGIN * 2)
 #define MINHEIGHT	7 /* without text */
 
-/* "Bar": gauge - mixedgauge - rangebox - pause */
+/* "Bar": gauge - mixedgauge - rangebox - pause - progressview */
+
+bool bsddialog_interruptprogview;
+bool bsddialog_abortprogview;
+int  bsddialog_total_progview;
 
 extern struct bsddialog_theme t;
 
 static void
 draw_perc_bar(WINDOW *win, int y, int x, int size, int perc, bool withlabel,
     int label)
 {
 	char labelstr[128];
 	int i, blue_x, color;
 
 	blue_x = (int)((perc*(size))/100);
 
 	wmove(win, y, x);
 	for (i = 0; i < size; i++) {
 		color = (i <= blue_x) ? t.bar.f_color : t.bar.color;
 		wattron(win, color);
 		waddch(win, ' ');
 		wattroff(win, color);
 	}
 
 	if (withlabel)
 		sprintf(labelstr, "%d", label);
 	else
 		sprintf(labelstr, "%3d%%", perc);
 	wmove(win, y, x + size/2 - 2);
 	for (i=0; i < (int) strlen(labelstr); i++) {
 		color = (blue_x + 1 <= size/2 - (int)strlen(labelstr)/2 + i ) ?
 		    t.bar.color : t.bar.f_color;
 		wattron(win, color);
 		waddch(win, labelstr[i]);
 		wattroff(win, color);
 	}
 }
 
 static int
 bar_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     char *text, struct buttons *bs)
 {
 	int maxword, maxline, nlines, buttonswidth;
 
 	if (get_text_properties(conf, text, &maxword, &maxline, &nlines) != 0)
 		return BSDDIALOG_ERROR;
 
 	buttonswidth = 0;
 	if (bs != NULL) { /* gauge has not buttons */
 		buttonswidth= bs->nbuttons * bs->sizebutton;
 		if (bs->nbuttons > 0)
 			buttonswidth += (bs->nbuttons-1) * t.button.space;
 	}
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += buttonswidth;
 		/* bar size */
 		*w = MAX(*w, MINWIDTH);
 		/* text size*/
 		*w = MAX((int)(maxline + VBORDERS + t.text.hmargin * 2), *w);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/* avoid terminal overflow */
 		*w = MIN(*w, widget_max_width(conf));
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = MINHEIGHT;
 		if (maxword > 0)
 			*h += 1;
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf));
 	}
 
 	return (0);
 }
 
 static int
 bar_checksize(char *text, int rows, int cols, struct buttons *bs)
 {
 	int minheight, minwidth;
 
 	minwidth = 0;
 	if (bs != NULL) { /* gauge has not buttons */
 		minwidth = bs->nbuttons * bs->sizebutton;
 		if (bs->nbuttons > 0)
 			minwidth += (bs->nbuttons-1) * t.button.space;
 	}
 	minwidth = MAX(minwidth + VBORDERS, MINBARWIDTH);
 
 	if (cols< minwidth)
 		RETURN_ERROR("Few cols for this widget");
 
 	minheight = MINHEIGHT + ((text != NULL && strlen(text) > 0) ? 1 : 0);
 	if (rows < minheight)
 		RETURN_ERROR("Few rows for this mixedgauge");
 
 	return 0;
 }
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int perc)
 {
 	WINDOW *widget, *textpad, *bar, *shadow;
 	char input[2048], ntext[2048], *pntext;
 	int y, x, h, w, htextpad;
 	bool mainloop;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_autosize(conf, rows, cols, &h, &w, text, NULL) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_checksize(text, h, w, NULL) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, false) != 0)
 		return BSDDIALOG_ERROR;
 
 	bar = new_boxed_window(conf, y+h-4, x+3, 3, w-6, RAISED);
 
 	mainloop = true;
 	while (mainloop) {
 		wrefresh(widget);
 		prefresh(textpad, 0, 0, y+1, x+1+t.text.hmargin, y+h-4,
 		    x+w-1-t.text.hmargin);
 		draw_perc_bar(bar, 1, 1, w-8, perc, false, -1 /*unused*/);
 		wrefresh(bar);
 
 		while (true) {
 			scanf("%s", input);
 			if (strcmp(input,"EOF") == 0) {
 				mainloop = false;
 				break;
 			}
 			if (strcmp(input,"XXX") == 0)
 				break;
 		}
 		scanf("%d", &perc);
 		perc = perc < 0 ? 0 : perc;
 		perc = perc > 100 ? 100 : perc;
 		htextpad = 1;
 		wclear(textpad);
 		pntext = &ntext[0];
 		ntext[0] = '\0';
 		while (true) {
 			scanf("%s", input);
 			if (strcmp(input,"EOF") == 0) {
 				mainloop = false;
 				break;
 			}
 			if (strcmp(input,"XXX") == 0)
 				break;
 			pntext[0] = ' ';
 			pntext++;
 			strcpy(pntext, input);
 			pntext += strlen(input);
 		}
 		print_textpad(conf, textpad, &htextpad, w-2-t.text.hmargin*2,
 		    ntext);
 	}
 
 	delwin(bar);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return BSDDIALOG_OK;
 }
 
-int
-bsddialog_mixedgauge(struct bsddialog_conf *conf, char* text, int rows,
-    int cols, unsigned int mainperc, unsigned int nminibars, char **minilabels,
-    int *minipercs)
+
+/* Mixedgauge */
+static int
+mixedgauge(struct bsddialog_conf *conf, char* text, int rows, int cols,
+    unsigned int mainperc, unsigned int nminibars, char **minilabels,
+    int *minipercs, bool color)
 {
 	WINDOW *widget, *textpad, *bar, *shadow;
 	int i, output, miniperc, y, x, h, w, max_minbarlen;
 	int maxword, maxline, nlines, htextpad, ypad;
-	char states[12][16] = {
-	    "[  Succeeded  ]", /*  0  */
-	    "[   Failed    ]", /*  1  */
-	    "[   Passed    ]", /*  2  */
-	    "[  Completed  ]", /*  3  */
-	    "[   Checked   ]", /*  4  */
-	    "[    Done     ]", /*  5  */
-	    "[   Skipped   ]", /*  6  */
-	    "[ In Progress ]", /*  7  */
-	    "(blank)        ", /*  8  */
-	    "[     N/A     ]", /*  9  */
-	    "[   Pending   ]", /* 10  */
-	    "[   UNKNOWN   ]", /* 10+ */
+	int colorperc, red, green;
+	char states[12][14] = {
+	    "  Succeeded  ", /*  0  */
+	    "   Failed    ", /*  1  */
+	    "   Passed    ", /*  2  */
+	    "  Completed  ", /*  3  */
+	    "   Checked   ", /*  4  */
+	    "    Done     ", /*  5  */
+	    "   Skipped   ", /*  6  */
+	    " In Progress ", /*  7  */
+	    "(blank)      ", /*  8  */
+	    "     N/A     ", /*  9  */
+	    "   Pending   ", /* 10  */
+	    "   UNKNOWN   ", /* 10+ */
 	};
 
+	red   = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_RED,  BSDDIALOG_BOLD);
+	green = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_GREEN,BSDDIALOG_BOLD);
+
 	max_minbarlen = 0;
 	for (i=0; i < (int)nminibars; i++)
 		max_minbarlen = MAX(max_minbarlen, (int)strlen(minilabels[i]));
 	max_minbarlen += 3 + 16 /* seps + [...] or mainbar */;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 
 	/* mixedgauge autosize */
 	if (get_text_properties(conf, text, &maxword, &maxline, &nlines) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		w = max_minbarlen + HBORDERS;
-		w = MAX(max_minbarlen, maxline + 4);
+		w = MAX(w, maxline + 4);
 		w = MAX(w, (int)conf->auto_minwidth);
 		w = MIN(w, widget_max_width(conf) - 1);
 	}
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		h = 5; /* borders + mainbar */
 		h += nminibars;
 		h += (strlen(text) > 0 ? 3 : 0);
 		h = MAX(h, (int)conf->auto_minheight);
 		h = MIN(h, widget_max_height(conf) -1);
 	}
 
 	/* mixedgauge checksize */
 	if (w < max_minbarlen + 2)
 		RETURN_ERROR("Few cols for this mixedgauge");
 	if (h < 5 + (int)nminibars + (strlen(text) > 0 ? 1 : 0))
 		RETURN_ERROR("Few rows for this mixedgauge");
 
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	output = new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w,
 	    RAISED, &textpad, &htextpad, text, false);
 	if (output == BSDDIALOG_ERROR)
 		return output;
 
 	/* mini bars */
 	for (i=0; i < (int)nminibars; i++) {
 		miniperc = minipercs[i];
 		if (miniperc == 8)
 			continue;
+		/* label */
+		if (color && (miniperc == 7 || miniperc < 0))
+			wattron(widget, A_BOLD);
 		mvwaddstr(widget, i+1, 2, minilabels[i]);
+			wattroff(widget, A_BOLD);
+		/* perc */
 		if (miniperc > 10)
 			mvwaddstr(widget, i+1, w-2-15, states[11]);
-		else if (miniperc >= 0 && miniperc <= 10)
-			mvwaddstr(widget, i+1, w-2-15, states[miniperc]);
+		else if (miniperc >= 0 && miniperc <= 10) {
+			mvwaddstr(widget, i+1, w-2-15, "[             ]");
+			if (color && miniperc == 1) /* Failed */
+				colorperc = red;
+			if (color && miniperc == 5) /* Done */
+				colorperc = green;
+			if (color && (miniperc == 1 || miniperc == 5))
+				wattron(widget, colorperc);
+			mvwaddstr(widget, i+1, 1+w-2-15, states[miniperc]);
+			if (color && (miniperc == 1 || miniperc == 5))
+				wattroff(widget, colorperc);
+		}
 		else { /* miniperc < 0 */
 			miniperc = abs(miniperc);
 			mvwaddstr(widget, i+1, w-2-15, "[             ]");
 			draw_perc_bar(widget, i+1, 1+w-2-15, 13, miniperc,
 			    false, -1 /*unused*/);
 		}
 	}
 
 	wrefresh(widget);
 	ypad =  y + h - 5 - htextpad;
 	ypad = ypad < y+(int)nminibars ? y+nminibars : ypad;
 	prefresh(textpad, 0, 0, ypad, x+2, y+h-4, x+w-2);
 	
 	/* main bar */
 	bar = new_boxed_window(conf, y+h -4, x+3, 3, w-6, RAISED);
 	
 	draw_perc_bar(bar, 1, 1, w-8, mainperc, false, -1 /*unused*/);
 
 	wattron(bar, t.bar.color);
 	mvwaddstr(bar, 0, 2, "Overall Progress");
 	wattroff(bar, t.bar.color);
 
 	wrefresh(bar);
 
 	/* getch(); port ncurses shows nothing */
 
 	delwin(bar);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return BSDDIALOG_OK;
 }
 
+int
+bsddialog_mixedgauge(struct bsddialog_conf *conf, char* text, int rows,
+    int cols, unsigned int mainperc, unsigned int nminibars, char **minilabels,
+    int *minipercs)
+{
+	int output;
+
+	output = mixedgauge(conf, text, rows, cols, mainperc, nminibars,
+	    minilabels, minipercs, false);
+
+	return (output);
+}
+
+int
+bsddialog_progressview (struct bsddialog_conf *conf, char * text, int rows,
+    int cols, struct bsddialog_progviewconf *pvconf, unsigned int nminibar,
+    struct bsddialog_fileminibar *minibar)
+{
+	int perc, output;
+	int *minipercs;
+	unsigned int i;
+	char **minilabels;
+	unsigned int mainperc, totaltodo;
+	time_t tstart, told, tnew, refresh;
+	bool update;
+	float readforsec;
+
+	if ((minilabels = calloc(nminibar, sizeof(char*))) == NULL)
+		RETURN_ERROR("Cannot allocate memory for minilabels\n");
+	if ((minipercs = calloc(nminibar, sizeof(int))) == NULL)
+		RETURN_ERROR("Cannot allocate memory for minipercs\n");
+
+	totaltodo = 0;
+	for(i=0; i<nminibar; i++) {
+		totaltodo     += minibar[i].size;
+		minilabels[i] = minibar[i].label;
+		minipercs[i]  = 10; /*Pending*/
+	}
+
+	refresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1;
+	output = BSDDIALOG_OK;
+	i = 0;
+	update = true;
+	time(&told);
+	tstart = told;
+	while (!(bsddialog_interruptprogview || bsddialog_abortprogview)) {
+		if (bsddialog_total_progview == 0 || totaltodo == 0)
+			mainperc = 0;
+		else
+			mainperc = (bsddialog_total_progview * 100) / totaltodo;
+
+		time(&tnew);
+		if (update || tnew > told + refresh) {
+			output = mixedgauge(conf, text, rows, cols, mainperc,
+			    nminibar, minilabels, minipercs, true);
+			if (output == BSDDIALOG_ERROR)
+				return BSDDIALOG_ERROR;
+
+			move(LINES-1, 2);
+			clrtoeol();
+			readforsec = ((tnew - tstart) == 0) ?
+			    0 : bsddialog_total_progview / (float)(tnew - tstart);
+			printw(pvconf->fmtbottomstr, bsddialog_total_progview,
+			    readforsec);
+			refresh();
+
+			time(&told);
+			update = false;
+		}
+
+		if (i >= nminibar)
+			break;
+		if (minibar[i].status == 1) /* Failed*/
+			break;
+
+		perc = pvconf->callback(&minibar[i]);
+
+		if (minibar[i].status == 5) {/* ||prec >= 100) Done */
+			minipercs[i] = 5;
+			update = true;
+			i++;
+		} else if (minibar[i].status == 1 || perc < 0) { /* Failed */
+			minipercs[i] = 1;
+			update = true;
+		} else if (perc == 0)
+			minipercs[i] = 7; /* In progress */
+		else /* perc > 0 */
+			minipercs[i] = -(perc);
+	}
+
+	free(minilabels);
+	free(minipercs);
+	return (output);
+}
+
 int
 bsddialog_rangebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     int min, int max, int *value)
 {
 	WINDOW *widget, *textpad, *bar, *shadow;
 	int i, y, x, h, w, htextpad;
 	bool loop, buttupdate, barupdate;
 	int input, currvalue, output, sizebar, bigchange, positions;
 	float perc;
 	struct buttons bs;
 
 	if (value == NULL)
 		RETURN_ERROR("*value cannot be NULL");
 
 	if (min >= max)
 		RETURN_ERROR("min >= max");
 
 	currvalue = *value;
 	positions = max - min + 1;
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_checksize(text, h, w, &bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	prefresh(textpad, 0, 0, y+1, x+1+t.text.hmargin, y+h-7, 
 			    x+w-1-t.text.hmargin);
 
 	sizebar = w - HBORDERS - 2 - BARMARGIN * 2;
 	bigchange = MAX(1, sizebar/10);
 
 	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARMARGIN, 3,
 	    sizebar + 2, RAISED);
 
 	loop = buttupdate = barupdate = true;
 	while(loop) {
 		if (buttupdate) {
 			draw_buttons(widget, h-2, w, bs, true);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 		if (barupdate) {
 			perc = ((float)(currvalue - min)*100) / (positions-1);
 			draw_perc_bar(bar, 1, 1, sizebar, perc, true, currvalue);
 			barupdate = false;
 			wrefresh(bar);
 		}
 
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			*value = currvalue;
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			buttupdate = true;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				buttupdate = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				buttupdate = true;
 			}
 			break;
 		case KEY_HOME:
 			currvalue = max;
 			barupdate = true;
 			break;
 		case KEY_END:
 			currvalue = min;
 			barupdate = true;
 			break;
 		case KEY_NPAGE:
 			currvalue -= bigchange;
 			if (currvalue < min)
 				currvalue = min;
 			barupdate = true;
 			break;
 		case KEY_PPAGE:
 			currvalue += bigchange;
 			if (currvalue > max)
 				currvalue = max;
 			barupdate = true;
 			break;
 		case KEY_UP:
 			if (currvalue < max) {
 				currvalue++;
 				barupdate = true;
 			}
 			break;
 		case KEY_DOWN:
 			if (currvalue > min) {
 				currvalue--;
 				barupdate = true;
 			}
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 			
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (bar_checksize(text, h, w, &bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 		
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			sizebar = w - HBORDERS - 2 - BARMARGIN * 2;
 			bigchange = MAX(1, sizebar/10);
 			wclear(bar);
 			mvwin(bar, y + h - 6, x + 1 + BARMARGIN);
 			wresize(bar, 3, sizebar + 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 				return BSDDIALOG_ERROR;
 
 			prefresh(textpad, 0, 0, y+1, x+1+t.text.hmargin, y+h-7, 
 			    x+w-1-t.text.hmargin);
 			
 			draw_borders(conf, bar, 3, sizebar + 2, RAISED);
 
 			barupdate = true;
 			buttupdate = true;
 			break;
 		default:
 			for (i = 0; i < (int) bs.nbuttons; i++)
 				if (tolower(input) == tolower((bs.label[i])[0])) {
 					output = bs.value[i];
 					loop = false;
 			}
 		}
 	}
 
 	delwin(bar);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
 
 int
 bsddialog_pause(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int sec)
 {
 	WINDOW *widget, *textpad, *bar, *shadow;
 	int i, output, y, x, h, w, htextpad;
 	bool loop, buttupdate, barupdate;
 	int input, tout, sizebar;
 	float perc;
 	struct buttons bs;
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (bar_checksize(text, h, w, &bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 	
 	prefresh(textpad, 0, 0, y+1, x+1+t.text.hmargin, y+h-7, 
 	    x+w-1-t.text.hmargin);
 
 	sizebar = w - HBORDERS - 2 - BARMARGIN * 2;
 	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARMARGIN, 3,
 	    sizebar + 2, RAISED);
 
 	tout = sec;
 	nodelay(stdscr, TRUE);
 	timeout(1000);
 	loop = buttupdate = barupdate = true;
 	while(loop) {
 		if (barupdate) {
 			perc = (float)tout * 100 / sec;
 			draw_perc_bar(bar, 1, 1, sizebar, perc, true, tout);
 			barupdate = false;
 			wrefresh(bar);
 		}
 
 		if (buttupdate) {
 			draw_buttons(widget, h-2, w, bs, true);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 
 		input = getch();
 		if(input < 0) { /* timeout */
 			tout--;
 			if (tout < 0) {
 				output = BSDDIALOG_TIMEOUT;
 				break;
 			}
 			else {
 				barupdate = true;
 				continue;
 			}
 		}
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			buttupdate = true;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				buttupdate = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				buttupdate = true;
 			}
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 			
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (bar_checksize(text, h, w, &bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 		
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			sizebar = w - HBORDERS - 2 - BARMARGIN * 2;
 			wclear(bar);
 			mvwin(bar, y + h - 6, x + 1 + BARMARGIN);
 			wresize(bar, 3, sizebar + 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 				return BSDDIALOG_ERROR;
 
 			prefresh(textpad, 0, 0, y+1, x+1+t.text.hmargin, y+h-7, 
 			    x+w-1-t.text.hmargin);
 			
 			draw_borders(conf, bar, 3, sizebar + 2, RAISED);
 
 			barupdate = true;
 			buttupdate = true;
 			break;
 		default:
 			for (i = 0; i < (int) bs.nbuttons; i++)
 				if (tolower(input) == tolower((bs.label[i])[0])) {
 					output = bs.value[i];
 					loop = false;
 			}
 		}
 	}
 
 	nodelay(stdscr, FALSE);
 
 	delwin(bar);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
diff --git a/lib/bsddialog.3 b/lib/bsddialog.3
index 7e1238f38e52..0264c29e4470 100644
--- a/lib/bsddialog.3
+++ b/lib/bsddialog.3
@@ -1,42 +1,530 @@
-.Dd $Mdocdate$
-.Dt PROGNAME section
+.\"
+.\" Copyright (c) 2021 Alfonso Sabato Siciliano
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd December 16, 2021
+.Dt BSDDIALOG 3
 .Os
 .Sh NAME
-.Nm progname
-.Nd one line about what it does
-.\" .Sh LIBRARY
-.\" For sections 2, 3, and 9 only.
-.\" Not used in OpenBSD.
+.Nm bsddialog_backtitle ,
+.Nm bsddialog_clearterminal ,
+.Nm bsddialog_color ,
+.Nm bsddialog_buildlist ,
+.Nm bsddialog_checklist ,
+.Nm bsddialog_datebox ,
+.Nm bsddialog_end ,
+.Nm bsddialog_form ,
+.Nm bsddialog_gauge ,
+.Nm bsddialog_geterror ,
+.Nm bsddialog_get_theme
+.Nm bsddialog_infobox ,
+.Nm bsddialog_init ,
+.Nm bsddialog_initconf ,
+.Nm bsddialog_menu ,
+.Nm bsddialog_mixedgauge ,
+.Nm bsddialog_mixedlist ,
+.Nm bsddialog_msgbox ,
+.Nm bsddialog_pause ,
+.Nm bsddialog_radiolist ,
+.Nm bsddialog_rangebox ,
+.Nm bsddialog_set_theme ,
+.Nm bsddialog_set_default_theme ,
+.Nm bsddialog_textbox ,
+.Nm bsddialog_timebox ,
+.Nm bsddialog_yesno
+.Nd terminal dialogs and widgets
+.Sh LIBRARY
+.Lb libbsddialog
 .Sh SYNOPSIS
-.Nm progname
-.Op Fl options
-.Ar
+.In bsddialog.h
+
+.Fd #define LIBBSDDIALOG_VERSION
+
+.Fd #define BSDDIALOG_ERROR
+.Fd #define BSDDIALOG_OK
+.Fd #define BSDDIALOG_YES
+.Fd #define BSDDIALOG_CANCEL
+.Fd #define BSDDIALOG_NO
+.Fd #define BSDDIALOG_HELP
+.Fd #define BSDDIALOG_EXTRA
+.Fd #define BSDDIALOG_ITEM_HELP
+.Fd #define BSDDIALOG_TIMEOUT
+.Fd #define BSDDIALOG_ESC
+.Fd #define BSDDIALOG_GENERIC1
+.Fd #define BSDDIALOG_GENERIC2
+
+.Fd #define BSDDIALOG_FULLSCREEN
+.Fd #define BSDDIALOG_AUTOSIZE
+.Fd #define BSDDIALOG_CENTER
+
+.Fd struct bsddialog_conf
+.Fd struct bsddialog_menuitem
+.Fd enum bsddialog_grouptype
+.Fd struct bsddialog_menugroup
+.Fd struct bsddialog_formitem
+
+.Ft int
+.Fn bsddialog_backtitle "struct bsddialog_conf *conf" "char *backtitle"
+.Ft int
+.Fo bsddialog_buildlist
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int menurows"
+.Fa "int nitems"
+.Fa "struct bsddialog_menuitem *items"
+.Fa "int *focusitem"
+.Fc
+.Ft int
+.Fo bsddialog_checklist
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int menurows"
+.Fa "int nitems"
+.Fa "struct bsddialog_menuitem *items"
+.Fa "int *focusitem"
+.Fc
+.Ft int
+.Fn bsddialog_clearterminal "void"
+.Ft int
+.Fo bsddialog_datebox"
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int *yy"
+.Fa "unsigned int *mm"
+.Fa "unsigned int *dd"
+.Fc
+.Ft int
+.Fn bsddialog_end "void"
+.Ft int
+.Fo bsddialog_form
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int formheight"
+.Fa "unsigned int nitems"
+.Fa "struct bsddialog_formitem *items"
+.Fc
+.Ft int
+.Fo bsddialog_gauge
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int perc"
+.Fc
+.Ft const char *
+.Fn bsddialog_geterror "void"
+.Ft int
+.Fo bsddialog_infobox
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fc
+.Ft int
+.Fn bsddialog_init "void"
+.Ft int
+.Fn bsddialog_initconf "struct bsddialog_conf *conf"
+.Ft int
+.Fo bsddialog_menu
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int menurows"
+.Fa "int nitems"
+.Fa "struct bsddialog_menuitem *items"
+.Fa "int *focusitem"
+.Fc
+.Ft int
+.Fo bsddialog_mixedgauge
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int mainperc"
+.Fa "unsigned int nminibars"
+.Fa "char **minilabels"
+.Fa "int *minipercs"
+.Fc
+.Ft int
+.Fo bsddialog_mixedlist
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int menurows"
+.Fa "int ngroups"
+.Fa "struct bsddialog_menugroup *groups"
+.Fa "int *focuslist"
+.Fa "int *focusitem"
+.Fc
+.Ft int
+.Fo bsddialog_msgbox
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fc
+.Ft int
+.Fo bsddialog_pause
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int sec"
+.Fc
+.Ft int
+.Fo bsddialog_radiolist
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int menurows"
+.Fa "int nitems"
+.Fa "struct bsddialog_menuitem *items"
+.Fa "int *focusitem"
+.Fc
+.Ft int
+.Fo bsddialog_rangebox
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "int min"
+.Fa "int max"
+.Fa "int *value"
+.Fc
+.Ft int
+.Fo bsddialog_textbox
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* file"
+.Fa "int rows"
+.Fa "int cols"
+.Fc
+.Ft int
+.Fo bsddialog_timebox
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int *hh"
+.Fa "unsigned int *mm"
+.Fa "unsigned int *ss"
+.Fc
+.Ft int
+.Fo bsddialog_yesno
+.Fa "struct bsddialog_conf *conf"
+.Fa "char* text"
+.Fa "int rows"
+.Fa "int cols"
+.Fc
+
+.In bsddialog_theme.h
+
+.Fd #define BSDDIALOG_BOLD
+.Fd #define BSDDIALOG_REVERSE
+.Fd #define BSDDIALOG_UNDERLINE
+
+.Fd enum bsddialog_color
+.Fd enum bsddialog_default_theme
+.Fd struct bsddialog_theme
+
+.Ft int
+.Fo bsddialog_color
+.Fa "enum bsddialog_color background"
+.Fa "enum bsddialog_color foreground"
+.Fa "unsigned int flags"
+.Fc
+.Ft int
+.Fn bsddialog_get_theme "struct bsddialog_theme *theme"
+.Ft int
+.Fn bsddialog_set_default_theme "enum bsddialog_default_theme theme"
+.Ft int
+.Fn bsddialog_set_theme "struct bsddialog_theme *theme"
 .Sh DESCRIPTION
 The
-.Nm
-utility processes files ...
-.\" .Sh CONTEXT
-.\" For section 9 functions only.
-.\" .Sh IMPLEMENTATION NOTES
-.\" Not used in OpenBSD.
-.\" .Sh RETURN VALUES
-.\" For sections 2, 3, and 9 function return values only.
-.\" .Sh ENVIRONMENT
-.\" For sections 1, 6, 7, and 8 only.
-.\" .Sh FILES
-.\" .Sh EXIT STATUS
-.\" For sections 1, 6, and 8 only.
-.\" .Sh EXAMPLES
-.\" .Sh DIAGNOSTICS
-.\" For sections 1, 4, 6, 7, 8, and 9 printf/stderr messages only.
-.\" .Sh ERRORS
-.\" For sections 2, 3, 4, and 9 errno settings only.
-.\" .Sh SEE ALSO
-.\" .Xr foobar 1
-.\" .Sh STANDARDS
-.\" .Sh HISTORY
-.\" .Sh AUTHORS
-.\" .Sh CAVEATS
-.\" .Sh BUGS
-.\" .Sh SECURITY CONSIDERATIONS
-.\" Not used in OpenBSD.
+.Nm BSDDialog
+library is an API to write a tools with a Text User Interface. It can build
+dialogs and widgets: to show messages, to get input and to inform about a
+computation status.
+.Pp
+.Bd -literal -offset indent -compact
+/* size and position */
+#define BSDDIALOG_FULLSCREEN	-1
+#define BSDDIALOG_AUTOSIZE	 0
+#define BSDDIALOG_CENTER	-1
+
+struct bsddialog_conf {
+	bool ascii_lines;
+	unsigned int aspect_ratio;
+	unsigned int auto_minheight;
+	unsigned int auto_minwidth;
+	char *bottomtitle;
+	bool clear;
+	char *f1_file;
+	char *f1_message;
+	int  *get_height;
+	int  *get_width;
+	bool no_lines;
+	bool shadow;
+	unsigned int sleep;
+	char *title;
+	int  y;
+	int  x;
+	struct {
+		bool colors;
+	} text;
+	struct {
+		bool align_left;
+		char *default_item;
+		bool no_desc;
+		bool no_name;
+		bool shortcut_buttons;
+	} menu;
+	struct {
+		int  securech;
+		bool value_withcancel;
+		bool value_withextra;
+		bool value_withhelp;
+	} form;
+	struct {
+		bool without_ok;
+		char *ok_label;
+		bool with_extra;
+		char *extra_label;
+		bool without_cancel;
+		char *cancel_label;
+		bool default_cancel;
+		bool with_help;
+		char *help_label;
+		char *exit_label;
+		char *generic1_label;
+		char *generic2_label;
+		char *default_label;
+	} button;
+};
+.Ed
+.Pp
+
+.Ss Dialogs
+.Pp
+.Bd -literal -offset indent -compact
+struct bsddialog_menuitem {
+	char *prefix;
+	bool on;
+	unsigned int depth;
+	char *name;
+	char *desc;
+	char *bottomdesc;
+};
+
+enum bsddialog_grouptype {
+	BSDDIALOG_CHECKLIST,
+	BSDDIALOG_RADIOLIST,
+	BSDDIALOG_SEPARATOR,
+};
+
+struct bsddialog_menugroup {
+	enum bsddialog_grouptype type;
+	unsigned int nitems;
+	struct bsddialog_menuitem *items;
+};
+
+struct bsddialog_formitem {
+	char *label;
+	unsigned int ylabel;
+	unsigned int xlabel;
+
+	char *init;
+	unsigned int yfield;
+	unsigned int xfield;
+	unsigned int fieldlen;
+	unsigned int maxvaluelen;
+	char *value; /* allocated memory */
+#define BSDDIALOG_FIELDHIDDEN    1U
+#define BSDDIALOG_FIELDREADONLY  2U
+	unsigned int flags;
+
+	char *bottomdesc;
+};
+.Ed
+.Pp
+
+.Ss Theme
+.Pp
+.Bd -literal -offset indent -compact
+/* f_ focus/active element */
+struct bsddialog_theme {
+	struct {
+		int color;
+	} terminal;
+	struct {
+		int color;
+		unsigned int h;
+		unsigned int w;
+	} shadow;
+	struct {
+		int  color;
+		bool delimtitle;
+		int  titlecolor;
+		int  lineraisecolor;
+		int  linelowercolor;
+		int  bottomtitlecolor;
+	} dialog;
+	struct {
+		unsigned int hmargin;
+	} text;
+	struct {
+		int arrowcolor;
+		int selectorcolor;
+		int f_namecolor;
+		int namecolor;
+		int f_desccolor;
+		int desccolor;
+		int namesepcolor;
+		int descsepcolor;
+		int f_shortcutcolor;
+		int shortcutcolor;
+	} menu;
+	struct {
+		int f_fieldcolor;
+		int fieldcolor;
+		int readonlycolor;
+	} form;
+	struct {
+		int f_color;
+		int color;
+	} bar;
+	struct {
+		unsigned int space;
+		int leftch;
+		int rightch;
+		int delimcolor;
+		int f_delimcolor;
+		int color;
+		int f_color;
+		int shortcutcolor;
+		int f_shortcutcolor;
+	} button;
+};
+
+enum bsddialog_default_theme {
+	BSDDIALOG_THEME_BLACKWHITE,
+	BSDDIALOG_THEME_BSDDIALOG,
+	BSDDIALOG_THEME_DEFAULT,
+	BSDDIALOG_THEME_DIALOG,
+};
+
+enum bsddialog_color {
+	BSDDIALOG_BLACK = 0,
+	BSDDIALOG_RED,
+	BSDDIALOG_GREEN,
+	BSDDIALOG_YELLOW,
+	BSDDIALOG_BLUE,
+	BSDDIALOG_MAGENTA,
+	BSDDIALOG_CYAN,
+	BSDDIALOG_WHITE,
+};
+
+#define BSDDIALOG_BOLD         1U
+#define BSDDIALOG_REVERSE      2U
+#define BSDDIALOG_UNDERLINE    4U
+.Ed
+.Pp
+
+.Sh RETURN VALUES
+The sysctlmif_oidbyname(),	sysctlmif_oidextendedbyname(),
+     sysctlmif_name(), sysctlmif_desc(), sysctlmif_descbyname(),
+     sysctlmif_label(),	sysctlmif_labelbyname(), sysctlmif_fmt(),
+     sysctlmif_fmtbyname(), sysctlmif_oidbyname0(), sysctlmif_oidbyname1(),
+     sysctlmif_oidbyname2(), sysctlmif_oidbyname3(), sysctlmif_oidbyname4(),
+     sysctlmif_oidbyname5(), sysctlmif_oidbyname6(), and
+     sysctlmif_oidbyname7() functions return the value 0 if successful;	other-
+     wise the value -1 is returned and the global variable errno is set	to in-
+     dicate the	error.
+     
+     
+functions return NULL upon	error or a pointer to allo-
+     cated memory for success.
+     
+.Sh EXAMPLES
+Complete set of examples:
+.Lk https://gitlab.com/alfix/bsddialog/-/blob/main/examples_library/
+.Pp
+If installed:
+.Dl /usr/local/share/examples/libbsddialog
+.Pp
+"Yes-No Question" Example:
+.Pp
+.Bd -literal -offset indent -compact
+int output;
+struct bsddialog_conf conf;
+
+bsddialog_initconf(&conf);
+conf.title = "yesno";
+if (bsddialog_init() == BSDDIALOG_ERROR)
+	return (1);
+
+output = bsddialog_yesno(&conf, "Example", 7, 25);
+
+bsddialog_end();
+
+switch (output) {
+case BSDDIALOG_YES:
+	printf("OK\\n");
+	break;
+case BSDDIALOG_NO
+	printf("NO\\n");
+	break;
+case BSDDIALOG_ESC;
+	printf("ESC\\n");
+	break;
+case BSDDIALOG_ERROR:
+	printf("Error: %s\\n", bsddialog_geterror());
+}
+.Ed
+.Sh SEE ALSO
+.Xr bsddialog 1
+.Sh HISTORY
+The
+.Nm bsddialog
+library first appeared in
+.Fx 14.0 .
+.Sh AUTHORS
+.Nm bsddialog
+was written by
+.An Alfonso Sabato Siciliano Aq Mt alf.siciliano@gmail.com .
+.Sh CAVEATS
+See
+.Xr bsddialog 
+.Sh BUGS
+See
+.Xr bsddialog 1
diff --git a/lib/bsddialog.h b/lib/bsddialog.h
index 29b9b5240706..94342199439e 100644
--- a/lib/bsddialog.h
+++ b/lib/bsddialog.h
@@ -1,218 +1,217 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _LIBBSDDIALOG_H_
 #define _LIBBSDDIALOG_H_
 
 #include <stdbool.h>
 
-#define LIBBSDDIALOG_VERSION    "0.0.1"
+#define LIBBSDDIALOG_VERSION    "0.0.2"
 
 /* Exit status */
 #define BSDDIALOG_ERROR		-1
 #define BSDDIALOG_OK             0
 #define BSDDIALOG_YES            BSDDIALOG_OK
 #define BSDDIALOG_CANCEL         1
 #define BSDDIALOG_NO             BSDDIALOG_CANCEL
 #define BSDDIALOG_HELP		 2
 #define BSDDIALOG_EXTRA		 3
-#define BSDDIALOG_ITEM_HELP	 4
-#define BSDDIALOG_TIMEOUT        5
-#define BSDDIALOG_ESC		 6
-#define BSDDIALOG_GENERIC1       7
-#define BSDDIALOG_GENERIC2       8
+#define BSDDIALOG_TIMEOUT        4
+#define BSDDIALOG_ESC		 5
+#define BSDDIALOG_GENERIC1       6
+#define BSDDIALOG_GENERIC2       7
 
-/* size and position */
+/* Size and position */
 #define BSDDIALOG_FULLSCREEN	-1
 #define BSDDIALOG_AUTOSIZE	 0
 #define BSDDIALOG_CENTER	-1
 
 struct bsddialog_conf {
 	bool ascii_lines;
 	unsigned int aspect_ratio;
 	unsigned int auto_minheight;
 	unsigned int auto_minwidth;
 	char *bottomtitle;
 	bool clear;
 	char *f1_file;
 	char *f1_message;
 	int  *get_height;
 	int  *get_width;
 	bool no_lines;
 	bool shadow;
 	unsigned int sleep;
 	char *title;
 	int  y;
 	int  x;
 	struct {
 		bool colors;
 	} text;
 	struct {
 		bool align_left;
 		char *default_item;
 		bool no_desc;
 		bool no_name;
 		bool shortcut_buttons;
 	} menu;
 	struct {
 		int  securech;
 		bool value_withcancel;
 		bool value_withextra;
 		bool value_withhelp;
 	} form;
 	struct {
 		bool without_ok;
 		char *ok_label;
 		bool with_extra;
 		char *extra_label;
 		bool without_cancel;
 		char *cancel_label;
 		bool default_cancel;
 		bool with_help;
 		char *help_label;
 		char *exit_label;
 		char *generic1_label;
 		char *generic2_label;
 		char *default_label;
 	} button;
 };
 
 struct bsddialog_menuitem {
 	char *prefix;
 	bool on;
 	unsigned int depth;
 	char *name;
 	char *desc;
 	char *bottomdesc;
 };
 
 enum bsddialog_grouptype {
 	BSDDIALOG_CHECKLIST,
 	BSDDIALOG_RADIOLIST,
 	BSDDIALOG_SEPARATOR,
 };
 
 struct bsddialog_menugroup {
 	enum bsddialog_grouptype type;
 	unsigned int nitems;
 	struct bsddialog_menuitem *items;
 };
 
 struct bsddialog_formitem {
 	char *label;
 	unsigned int ylabel;
 	unsigned int xlabel;
 
 	char *init;
 	unsigned int yfield;
 	unsigned int xfield;
 	unsigned int fieldlen;
 	unsigned int maxvaluelen;
-	char *value; /* allocated memory */
+	char *value;
 #define BSDDIALOG_FIELDHIDDEN    1U
 #define BSDDIALOG_FIELDREADONLY  2U
 	unsigned int flags;
 
 	char *bottomdesc;
 };
 
 int bsddialog_init(void);
 int bsddialog_end(void);
 int bsddialog_backtitle(struct bsddialog_conf *conf, char *backtitle);
 int bsddialog_initconf(struct bsddialog_conf *conf);
 int bsddialog_clearterminal(void);
 const char *bsddialog_geterror(void);
 
-/* widgets */
+/* Dialogs */
 int
 bsddialog_buildlist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem);
 
 int
 bsddialog_checklist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem);
 
 int
 bsddialog_datebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int *yy, unsigned int *mm, unsigned int *dd);
 
 int
 bsddialog_form(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int formheight, unsigned int nitems, 
     struct bsddialog_formitem *items);
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int perc);
 
 int
 bsddialog_infobox(struct bsddialog_conf *conf, char* text, int rows, int cols);
 
 int
 bsddialog_menu(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem);
 
 int
 bsddialog_mixedgauge(struct bsddialog_conf *conf, char* text, int rows,
     int cols, unsigned int mainperc, unsigned int nminibars, char **minilabels,
     int *minipercs);
 
 int
 bsddialog_mixedlist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int ngroups, struct bsddialog_menugroup *groups,
     int *focuslist, int *focusitem);
 
 int
 bsddialog_msgbox(struct bsddialog_conf *conf, char* text, int rows, int cols);
 
 int
 bsddialog_pause(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int sec);
 
 int
 bsddialog_radiolist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem);
 
 int
 bsddialog_rangebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     int min, int max, int *value);
 
 int
 bsddialog_textbox(struct bsddialog_conf *conf, char* file, int rows, int cols);
 
 int
 bsddialog_timebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int *hh, unsigned int *mm, unsigned int *ss);
 
 int
 bsddialog_yesno(struct bsddialog_conf *conf, char* text, int rows, int cols);
 
 #endif
diff --git a/lib/bsddialog_progressview.h b/lib/bsddialog_progressview.h
new file mode 100644
index 000000000000..453d46a242e6
--- /dev/null
+++ b/lib/bsddialog_progressview.h
@@ -0,0 +1,54 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Alfonso Sabato Siciliano
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _LIBBSDDIALOG_PROGRESSVIEW_H_
+#define _LIBBSDDIALOG_PROGRESSVIEW_H_
+
+extern bool bsddialog_interruptprogview;
+extern bool bsddialog_abortprogview;
+extern int  bsddialog_total_progview;
+
+struct bsddialog_fileminibar {
+	char *path;
+	char *label;
+	int  status; /* mixedgauge: 1 failed - 5 done - 7 in progress*/
+	long long size;
+	long long read;
+};
+
+struct bsddialog_progviewconf {
+	char *fmtbottomstr;
+	unsigned int refresh; /* in seconds */
+	int (*callback)(struct bsddialog_fileminibar *minibar);
+};
+
+int
+bsddialog_progressview (struct bsddialog_conf *conf, char * text, int rows,
+    int cols, struct bsddialog_progviewconf *pvconf, unsigned int nminibar,
+    struct bsddialog_fileminibar *minibar);
+
+#endif
diff --git a/lib/bsddialog_theme.h b/lib/bsddialog_theme.h
index d20985e66b18..853eb5f9d864 100644
--- a/lib/bsddialog_theme.h
+++ b/lib/bsddialog_theme.h
@@ -1,115 +1,115 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _LIBBSDDIALOG_THEME_H_
 #define _LIBBSDDIALOG_THEME_H_
 
 /* f_ focus/active element */
 struct bsddialog_theme {
 	struct {
 		int color;
 	} terminal;
 	struct {
 		int color;
 		unsigned int h;
 		unsigned int w;
 	} shadow;
 	struct {
 		int  color;
 		bool delimtitle;
 		int  titlecolor;
 		int  lineraisecolor;
 		int  linelowercolor;
 		int  bottomtitlecolor;
 	} dialog;
 	struct {
 		unsigned int hmargin;
 	} text;
 	struct {
 		int arrowcolor;
 		int selectorcolor;
 		int f_namecolor;
 		int namecolor;
 		int f_desccolor;
 		int desccolor;
 		int namesepcolor;
 		int descsepcolor;
 		int f_shortcutcolor;
 		int shortcutcolor;
 	} menu;
 	struct {
 		int f_fieldcolor;
 		int fieldcolor;
 		int readonlycolor;
 	} form;
 	struct {
 		int f_color;
 		int color;
 	} bar;
 	struct {
 		unsigned int space;
 		int leftch;
 		int rightch;
 		int delimcolor;
 		int f_delimcolor;
 		int color;
 		int f_color;
 		int shortcutcolor;
 		int f_shortcutcolor;
 	} button;
 };
 
 enum bsddialog_default_theme {
 	BSDDIALOG_THEME_BLACKWHITE,
 	BSDDIALOG_THEME_BSDDIALOG,
 	BSDDIALOG_THEME_DEFAULT,
 	BSDDIALOG_THEME_DIALOG,
 };
 
 enum bsddialog_color {
 	BSDDIALOG_BLACK = 0,
 	BSDDIALOG_RED,
 	BSDDIALOG_GREEN,
 	BSDDIALOG_YELLOW,
 	BSDDIALOG_BLUE,
 	BSDDIALOG_MAGENTA,
 	BSDDIALOG_CYAN,
 	BSDDIALOG_WHITE,
 };
 
 #define BSDDIALOG_BOLD         1U
 #define BSDDIALOG_REVERSE      2U
 #define BSDDIALOG_UNDERLINE    4U
 
 int
-bsddialog_color(enum bsddialog_color background,
-    enum bsddialog_color foreground, unsigned int flags);
+bsddialog_color(enum bsddialog_color foreground,
+    enum bsddialog_color background, unsigned int flags);
 int bsddialog_get_theme(struct bsddialog_theme *theme);
 int bsddialog_set_default_theme(enum bsddialog_default_theme theme);
 int bsddialog_set_theme(struct bsddialog_theme *theme);
 
 #endif
diff --git a/lib/formbox.c b/lib/formbox.c
index fd497174a7ce..3a5d8a49e359 100644
--- a/lib/formbox.c
+++ b/lib/formbox.c
@@ -1,507 +1,530 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/form.h>
 #else
 #include <form.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 #define REDRAWFORM 14021986 /* magic number */
 #define ISFIELDHIDDEN(item)   (item.flags & BSDDIALOG_FIELDHIDDEN)
 #define ISFIELDREADONLY(item) (item.flags & BSDDIALOG_FIELDREADONLY)
 
 /* "Form": inputbox - passwordbox - form - passwordform - mixedform */
 
 extern struct bsddialog_theme t;
 
 /* util struct for private buffer and view options */
 struct myfield {
-	int len;
+	int buflen;
 	char *buf;
 	int pos;
-	int size;
+	int maxpos;
 	bool secure;
 	int securech;
 	char *bottomdesc;
 };
 #define GETMYFIELD(field) ((struct myfield*)field_userptr(field))
 #define GETMYFIELD2(form) ((struct myfield*)field_userptr(current_field(form)))
 
 static void insertch(struct myfield *mf, int ch)
 {
 	int i;
 
-	if (mf->len == mf->size)
+	if (mf->buflen > mf->maxpos)
 		return;
 
-	for (i=mf->len-1; i>=mf->pos; i--) {
+	for (i = mf->buflen; i >= mf->pos; i--) {
 		mf->buf[i+1] = mf->buf[i];
 	}
 
 	mf->buf[mf->pos] = ch;
 	mf->pos += 1;
-	mf->len += 1;
-	mf->buf[mf->len] = '\0';
+	if (mf->pos > mf->maxpos)
+		mf->pos = mf->maxpos;
+	mf->buflen += 1;
+	mf->buf[mf->buflen] = '\0';
 }
 
 static void shiftleft(struct myfield *mf)
 {
 	int i, last;
 
-	for (i=mf->pos; i<mf->len; i++) {
+	for (i = mf->pos; i < mf->buflen -1; i++) {
 		mf->buf[i] = mf->buf[i+1];
 	}
 
-	last = mf->len > 0 ? mf->len -1 : 0;
+	last = mf->buflen > 0 ? mf->buflen -1 : 0;
 	mf->buf[last] = '\0';
-		mf->len = last;
+		mf->buflen = last;
 }
 
 static void print_bottomdesc(struct myfield *mf)
 {
 
 	move(LINES-1, 2);
 	clrtoeol();
 	if (mf->bottomdesc != NULL) {
 		addstr(mf->bottomdesc);
 		refresh();
 	}
 }
 
+int
+return_values(struct bsddialog_conf *conf, struct buttons bs, int nitems,
+    struct bsddialog_formitem *items, FORM *form, FIELD **cfield)
+{
+	int i, output;
+	struct myfield *mf;
+
+	output = bs.value[bs.curr];
+	if (output == BSDDIALOG_HELP && conf->form.value_withhelp == false)
+		return output;
+	if (output == BSDDIALOG_EXTRA && conf->form.value_withextra == false)
+		return output;
+	if (output == BSDDIALOG_CANCEL && conf->form.value_withcancel == false)
+		return output;
+	if (output == BSDDIALOG_GENERIC1 || output == BSDDIALOG_GENERIC2)
+		return output;
+
+	/* BSDDIALOG_OK */
+	form_driver(form, REQ_NEXT_FIELD);
+	form_driver(form, REQ_PREV_FIELD);
+	for (i=0; i<nitems; i++) {
+		mf = GETMYFIELD(cfield[i]);
+		items[i].value = strdup(mf->buf);
+		if (items[i].value == NULL)
+			RETURN_ERROR("Cannot allocate memory for form value");
+	}
+
+	return (output);
+}
+
 static int
 form_handler(struct bsddialog_conf *conf, WINDOW *widget, int y, int cols,
     struct buttons bs, WINDOW *formwin, FORM *form, FIELD **cfield, int nitems,
     struct bsddialog_formitem *items)
 {
 	bool loop, buttupdate, informwin = true;
 	int i, input, output;
 	struct myfield *mf;
 
-	curs_set(2);
-	pos_form_cursor(form);
-	loop = buttupdate = true;
-	bs.curr = -1;
-	form_driver(form, REQ_END_LINE);
-	form_driver(form, REQ_END_LINE);
 	mf = GETMYFIELD2(form);
 	print_bottomdesc(mf);
-	mf->pos = mf->len;
+	pos_form_cursor(form);
+	form_driver(form, REQ_END_LINE);
+	mf->pos = MIN(mf->buflen, mf->maxpos);
+	curs_set(2);
+	bs.curr = -1;
+	loop = buttupdate = true;
 	while(loop) {
 		if (buttupdate) {
 			draw_buttons(widget, y, cols, bs, !informwin);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 		wrefresh(formwin);
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			if (informwin)
 				break;
 			loop = false;
-			output = bs.value[bs.curr];
-			if (output == BSDDIALOG_HELP &&
-			    conf->form.value_withhelp == false)
-				break;
-	    		if (output == BSDDIALOG_EXTRA &&
-			    conf->form.value_withextra == false)
-				break;
-	    		if (output == BSDDIALOG_CANCEL &&
-			    conf->form.value_withcancel == false)
-				break;
-			if (output == BSDDIALOG_GENERIC1 ||
-			    output == BSDDIALOG_GENERIC2)
-				break;
-			
-			/* BSDDIALOG_OK */
-			form_driver(form, REQ_NEXT_FIELD);
-			form_driver(form, REQ_PREV_FIELD);
-			for (i=0; i<nitems; i++) {
-				mf = GETMYFIELD(cfield[i]);
-				items[i].value = strdup(mf->buf);
-				if (items[i].value == NULL)
-					RETURN_ERROR("Cannot allocate memory "
-					    "for form value");
-			}
+			output = return_values(conf, bs, nitems, items, form, cfield);
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			if (informwin) {
 				bs.curr = 0;
 				informwin = false;
 				curs_set(0);
 			} else {
 				bs.curr++;
 				informwin = bs.curr >= (int) bs.nbuttons ?
 				    true : false;
 				if (informwin) {
 					curs_set(2);
 					pos_form_cursor(form);
 				}
 			}
 			buttupdate = true;
 			break;
 		case KEY_LEFT:
 			if (informwin) {
 				form_driver(form, REQ_PREV_CHAR);
 				mf = GETMYFIELD2(form);
 				if (mf->pos > 0)
 					mf->pos -= 1;
 			} else {
 				if (bs.curr > 0) {
 					bs.curr--;
 					buttupdate = true;
 				}
 			}
 			break;
 		case KEY_RIGHT:
 			if (informwin) {
 				mf = GETMYFIELD2(form);
-				if (mf->pos >= mf->len)
+				if (mf->pos >= mf->buflen)
 					break;
 				mf->pos += 1;
 				form_driver(form, REQ_NEXT_CHAR);
 			} else {
 				if (bs.curr < (int) bs.nbuttons - 1) {
 					bs.curr++;
 					buttupdate = true;
 				}
 			}
 			break;
 		case KEY_UP:
 			if (nitems < 2)
 				break;
 			set_field_fore(current_field(form), t.form.fieldcolor);
 			set_field_back(current_field(form), t.form.fieldcolor);
 			form_driver(form, REQ_PREV_FIELD);
 			form_driver(form, REQ_END_LINE);
 			mf = GETMYFIELD2(form);
 			print_bottomdesc(mf);
-			mf->pos = mf->len;
+			mf->pos = MIN(mf->buflen, mf->maxpos);
 			set_field_fore(current_field(form), t.form.f_fieldcolor);
 			set_field_back(current_field(form), t.form.f_fieldcolor);
 			break;
 		case KEY_DOWN:
 			if (nitems < 2)
 				break;
 			set_field_fore(current_field(form), t.form.fieldcolor);
 			set_field_back(current_field(form), t.form.fieldcolor);
 			form_driver(form, REQ_NEXT_FIELD);
 			form_driver(form, REQ_END_LINE);
 			mf = GETMYFIELD2(form);
 			print_bottomdesc(mf);
-			mf->pos = mf->len;
+			mf->pos = MIN(mf->buflen, mf->maxpos);
 			set_field_fore(current_field(form), t.form.f_fieldcolor);
 			set_field_back(current_field(form), t.form.f_fieldcolor);
 			break;
 		case KEY_BACKSPACE:
 		case 127: /* Backspace */
 			mf = GETMYFIELD2(form);
 			if (mf->pos <= 0)
 				break;
 			form_driver(form, REQ_DEL_PREV);
-			mf = GETMYFIELD2(form);
-			mf->pos -= 1;
+			form_driver(form, REQ_BEG_LINE);
+			mf->pos = mf->pos - 1;
+			for (i=0; i<mf->pos; i++)
+				form_driver(form, REQ_NEXT_CHAR);
 			shiftleft(mf);
 			break;
 		case KEY_DC:
 			form_driver(form, REQ_DEL_CHAR);
 			mf = GETMYFIELD2(form);
-			if (mf->len-1 >= mf->pos)
+			if (mf->pos < mf->buflen)
 				shiftleft(mf);
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No Break */
 		case KEY_RESIZE:
 			output = REDRAWFORM;
 			loop = false;
 			break;
 		default:
 			/*
 			 * user input, add unicode chars to "public" buffer
 			 */
 			if (informwin) {
 				mf = GETMYFIELD2(form);
 				if (mf->secure)
 					form_driver(form, mf->securech);
 				else
 					form_driver(form, input);
 				insertch(mf, input);
 			}
 			else {
 				for (i = 0; i < (int) bs.nbuttons; i++) {
 					if (tolower(input) ==
 					    tolower((bs.label[i])[0])) {
-						output = bs.value[i];
+						bs.curr = i;
+						output = return_values(conf, bs,
+						    nitems, items, form, cfield);
 						loop = false;
 					}
 				}
 			}
 			break;
 		}
 	}
 
 	curs_set(0);
 
 	return output;
 }
 
 static void
 form_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     char *text, int linelen, unsigned int *formheight, int nitems,
     struct buttons bs)
 {
 	int textrow, menusize;
 
 	textrow = text != NULL && strlen(text) > 0 ? 1 : 0;
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += bs.nbuttons * bs.sizebutton;
 		*w += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 		/* line size */
 		*w = MAX(*w, linelen + 3);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/*
 		* avoid terminal overflow,
 		* -1 fix false negative with big menu over the terminal and
 		* autosize, for example "portconfig /usr/ports/www/apache24/".
 		*/
 		*w = MIN(*w, widget_max_width(conf)-1);
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = HBORDERS + 2 /* buttons */ + textrow;
 
 		if (*formheight == 0) {
 			*h += nitems + 2;
 			*h = MIN(*h, widget_max_height(conf));
 			menusize = MIN(nitems + 2, *h - (HBORDERS + 2 + textrow));
 			menusize -=2;
 			*formheight = menusize < 0 ? 0 : menusize;
 		}
 		else /* h autosize with a fixed formheight */
 			*h = *h + *formheight + 2;
 
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf));
 	}
 	else {
 		if (*formheight == 0)
 			*formheight = MIN(rows-6-textrow, nitems);
 	}
 }
 
 static int
 form_checksize(int rows, int cols, char *text, int formheight, int nitems,
     struct buttons bs)
 {
 	int mincols, textrow, formrows;
 
 	mincols = VBORDERS;
 	/* buttons */
 	mincols += bs.nbuttons * bs.sizebutton;
 	mincols += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 	/* line, comment to permet some cols hidden */
 	/* mincols = MAX(mincols, linelen); */
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, width < size buttons or "\
 		    "labels + forms");
 
 	textrow = text != NULL && strlen(text) > 0 ? 1 : 0;
 
 	if (nitems > 0 && formheight == 0)
 		RETURN_ERROR("fields > 0 but formheight == 0, probably "\
 		    "terminal too small");
 
 	formrows = nitems > 0 ? 3 : 0;
 	if (rows < 2  + 2 + formrows + textrow)
 		RETURN_ERROR("Few lines for this menus");
 
 	return 0;
 }
 
 int
 bsddialog_form(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int formheight, unsigned int nitems,
     struct bsddialog_formitem *items)
 {
 	WINDOW *widget, *formwin, *textpad, *shadow;
 	int i, output, color, y, x, h, w, htextpad;
 	FIELD **cfield;
 	FORM *form;
 	struct buttons bs;
 	struct myfield *myfields;
 	unsigned long maxline;
 
 	/* disable form scrolling like dialog */
 	if (formheight < nitems)
 		formheight = nitems;
 
+	for (i = 0; i < (int)nitems; i++) {
+		if (items[i].maxvaluelen == 0)
+			RETURN_ERROR("maxvaluelen cannot be zero");
+		if (items[i].fieldlen == 0)
+			RETURN_ERROR("fieldlen cannot be zero");
+		if (items[i].fieldlen > items[i].maxvaluelen)
+			RETURN_ERROR("fieldlen cannot be > maxvaluelen");
+	}
+
 	maxline = 0;
 	myfields = malloc(nitems * sizeof(struct myfield));
 	cfield = calloc(nitems + 1, sizeof(FIELD*));
 	for (i=0; i < (int)nitems; i++) {
 		cfield[i] = new_field(1, items[i].fieldlen, items[i].yfield-1,
 		    items[i].xfield-1, 0, 0);
 		field_opts_off(cfield[i], O_STATIC);
 		set_max_field(cfield[i], items[i].maxvaluelen);
 		set_field_buffer(cfield[i], 0, items[i].init);
 
-		myfields[i].pos  = strlen(items[i].init);
-		myfields[i].len  = strlen(items[i].init);
-		myfields[i].size = items[i].maxvaluelen;
-		myfields[i].buf  = malloc(myfields[i].size);
-		memset(myfields[i].buf, 0, myfields[i].size);
-		strcpy(myfields[i].buf, items[i].init);
+		myfields[i].buf = malloc(items[i].maxvaluelen + 1);
+		memset(myfields[i].buf, 0, items[i].maxvaluelen + 1); // end with '\0' for strdup
+		strncpy(myfields[i].buf, items[i].init, items[i].maxvaluelen);
+
+		myfields[i].buflen = strlen(myfields[i].buf);
+
+		myfields[i].maxpos = items[i].maxvaluelen -1;
+		myfields[i].pos = MIN(myfields[i].buflen, myfields[i].maxpos);
+
 		myfields[i].bottomdesc = items[i].bottomdesc;
 		set_field_userptr(cfield[i], &myfields[i]);
 
 		field_opts_off(cfield[i], O_AUTOSKIP);
 		field_opts_off(cfield[i], O_BLANK);
 		/* field_opts_off(field[i], O_BS_OVERLOAD); */
 
 		if (ISFIELDHIDDEN(items[i])) {
 			/* field_opts_off(field[i], O_PUBLIC); old hidden */
 			myfields[i].secure = true;
 			myfields[i].securech = ' ';
 			if (conf->form.securech != '\0')
 				myfields[i].securech = conf->form.securech;
 		}
 		else myfields[i].secure = false;
 
 		if (ISFIELDREADONLY(items[i])) {
 			field_opts_off(cfield[i], O_EDIT);
 			field_opts_off(cfield[i], O_ACTIVE);
 			color = t.form.readonlycolor;
 		} else {
 			color = i == 0 ? t.form.f_fieldcolor : t.form.fieldcolor;
 		}
 		set_field_fore(cfield[i], color);
 		set_field_back(cfield[i], color);
 
 		maxline = MAX(maxline, items[i].xlabel + strlen(items[i].label));
 		maxline = MAX(maxline, items[i].xfield + items[i].fieldlen);
 	}
 	cfield[i] = NULL;
 
 	 /* disable focus with 1 item (inputbox or passwordbox) */
 	if (formheight == 1 && nitems == 1 && strlen(items[0].label) == 0 &&
 	    items[0].xfield == 1 ) {
 		set_field_fore(cfield[0], t.dialog.color);
 		set_field_back(cfield[0], t.dialog.color);
 	}
 	
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	form_autosize(conf, rows, cols, &h, &w, text, maxline, &formheight,
 	    nitems, bs);
 	if (form_checksize(h, w, text, formheight, nitems, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	prefresh(textpad, 0, 0, y + 1, x + 1 + t.text.hmargin,
 	    y + h - formheight, x + 1 + w - t.text.hmargin);
 	
 	formwin = new_boxed_window(conf, y + h - 3 - formheight -2, x +1,
 	    formheight+2, w-2, LOWERED);
 
 	form = new_form(cfield);
 	set_form_win(form, formwin);
 	/* should be formheight */
 	set_form_sub(form, derwin(formwin, nitems, w-4, 1, 1));
 	post_form(form);
 
 	for (i=0; i < (int)nitems; i++)
 		mvwaddstr(formwin, items[i].ylabel, items[i].xlabel, items[i].label);
 
 	wrefresh(formwin);
 
 	do {
 		output = form_handler(conf, widget, h-2, w, bs, formwin, form,
 		    cfield, nitems, items);
 
 		if(update_widget_withtextpad(conf, shadow, widget, h, w,
 		    RAISED, textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 			
 		draw_buttons(widget, h-2, w, bs, true);
 		wrefresh(widget);
 
 		prefresh(textpad, 0, 0, y + 1, x + 1 + t.text.hmargin,
 		    y + h - formheight, x + 1 + w - t.text.hmargin);
 
 		draw_borders(conf, formwin, formheight+2, w-2, LOWERED);
 		/* wrefresh(formwin); */
 	} while (output == REDRAWFORM);
 
 	unpost_form(form);
 	free_form(form);
 	for (i=0; i < (int)nitems; i++) {
 		free_field(cfield[i]);
 		free(myfields[i].buf);
 	}
 	free(cfield);
 	free(myfields);
 
 	delwin(formwin);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
diff --git a/lib/lib_util.c b/lib/lib_util.c
index b9bb29ba58cf..81c2b7642aac 100644
--- a/lib/lib_util.c
+++ b/lib/lib_util.c
@@ -1,778 +1,777 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 extern struct bsddialog_theme t;
 
 /* Error buffer */
 
 #define ERRBUFLEN 1024
 static char errorbuffer[ERRBUFLEN];
 
 const char *get_error_string(void)
 {
 	return errorbuffer;
 }
 
 void set_error_string(char *str)
 {
 
 	strncpy(errorbuffer, str, ERRBUFLEN-1);
 }
 
 /* cleaner */
 int hide_widget(int y, int x, int h, int w, bool withshadow)
 {
 	WINDOW *clear;
 
 	/* no check: y, x, h and w are checked by the builders */
 	if ((clear = newwin(h, w, y + t.shadow.h, x + t.shadow.w)) == NULL)
 		RETURN_ERROR("Cannot hide the widget");
 	wbkgd(clear, t.terminal.color);
 
 	if (withshadow)
 		wrefresh(clear);
 
 	mvwin(clear, y, x);
 	wrefresh(clear);
 
 	delwin(clear);
 
 	return 0;
 }
 
 /* F1 help */
 int f1help(struct bsddialog_conf *conf)
 {
 	int output;
 	struct bsddialog_conf hconf;
 
 	//memcpy(&hconf, conf, sizeof(struct bsddialog_conf));
 	bsddialog_initconf(&hconf);
 	hconf.title = "HELP";
 	hconf.button.ok_label = "EXIT";
 	hconf.clear = true;
 	hconf.ascii_lines = conf->ascii_lines;
 	hconf.no_lines = conf->no_lines;
 	hconf.shadow = conf->shadow;
 	hconf.text.colors = conf->text.colors;
 
 	output = BSDDIALOG_OK;
 	if (conf->f1_message != NULL)
 		output = bsddialog_msgbox(&hconf, conf->f1_message, 0, 0);
 
 	if (output != BSDDIALOG_ERROR && conf->f1_file != NULL)
 		output = bsddialog_textbox(&hconf, conf->f1_file, 0, 0);
 
 	return (output == BSDDIALOG_ERROR ? BSDDIALOG_ERROR : 0);
 }
 
 /* Buttons */
 void
 draw_button(WINDOW *window, int y, int x, int size, char *text, bool selected,
     bool shortkey)
 {
 	int i, color_arrows, color_shortkey, color_button;
 
 	if (selected) {
 		color_arrows = t.button.f_delimcolor;
 		color_shortkey = t.button.f_shortcutcolor;
 		color_button = t.button.f_color;
 	} else {
 		color_arrows = t.button.delimcolor;
 		color_shortkey = t.button.shortcutcolor;
 		color_button = t.button.color;
 	}
 
 	wattron(window, color_arrows);
 	mvwaddch(window, y, x, t.button.leftch);
 	wattroff(window, color_arrows);
 	wattron(window, color_button);
 	for(i = 1; i < size - 1; i++)
 		waddch(window, ' ');
 	wattroff(window, color_button);
 	wattron(window, color_arrows);
 	mvwaddch(window, y, x + i, t.button.rightch);
 	wattroff(window, color_arrows);
 
 	x = x + 1 + ((size - 2 - strlen(text))/2);
 	wattron(window, color_button);
 	mvwaddstr(window, y, x, text);
 	wattroff(window, color_button);
 
 	if (shortkey) {
 		wattron(window, color_shortkey);
 		mvwaddch(window, y, x, text[0]);
 		wattroff(window, color_shortkey);
 	}
 }
 
 void
 draw_buttons(WINDOW *window, int y, int cols, struct buttons bs, bool shortkey)
 {
 	int i, x, start_x;
 
 	start_x = bs.sizebutton * bs.nbuttons + (bs.nbuttons - 1) * t.button.space;
 	start_x = cols/2 - start_x/2;
 
 	for (i = 0; i < (int) bs.nbuttons; i++) {
 		x = i * (bs.sizebutton + t.button.space);
 		draw_button(window, y, start_x + x, bs.sizebutton, bs.label[i],
 		    i == bs.curr, shortkey);
 	}
 }
 
 void
 get_buttons(struct bsddialog_conf *conf, struct buttons *bs, char *yesoklabel,
     char *extralabel, char *nocancellabel, char *helplabel)
 {
 	int i;
 #define SIZEBUTTON  8
 #define DEFAULT_BUTTON_LABEL	LABEL_ok_label
 #define DEFAULT_BUTTON_VALUE	BSDDIALOG_OK
 
 
 	bs->nbuttons = 0;
 	bs->curr = 0;
 	bs->sizebutton = 0;
 
 	if (yesoklabel != NULL && conf->button.without_ok == false) {
 		bs->label[0] = yesoklabel;
 		bs->value[0] = BSDDIALOG_OK;
 		bs->nbuttons += 1;
 	}
 
 	if (extralabel != NULL && conf->button.with_extra) {
 		bs->label[bs->nbuttons] = extralabel;
 		bs->value[bs->nbuttons] = BSDDIALOG_EXTRA;
 		bs->nbuttons += 1;
 	}
 
 	if (nocancellabel != NULL && conf->button.without_cancel == false) {
 		bs->label[bs->nbuttons] = nocancellabel;
 		bs->value[bs->nbuttons] = BSDDIALOG_CANCEL;
 		if (conf->button.default_cancel)
 			bs->curr = bs->nbuttons;
 		bs->nbuttons += 1;
 	}
 
 	if (helplabel != NULL && conf->button.with_help) {
 		bs->label[bs->nbuttons] = helplabel;
 		bs->value[bs->nbuttons] = BSDDIALOG_HELP;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.generic1_label != NULL) {
 		bs->label[bs->nbuttons] = conf->button.generic1_label;
 		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC1;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.generic2_label != NULL) {
 		bs->label[bs->nbuttons] = conf->button.generic2_label;
 		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC2;
 		bs->nbuttons += 1;
 	}
 
 	if (bs->nbuttons == 0) {
 		bs->label[0] = DEFAULT_BUTTON_LABEL;
 		bs->value[0] = DEFAULT_BUTTON_VALUE;
 		bs->nbuttons = 1;
 	}
 
 	if (conf->button.default_label != NULL) {
 		for (i=0; i<(int)bs->nbuttons; i++) {
 			if (strcmp(conf->button.default_label, bs->label[i]) == 0)
 				bs->curr = i;
 		}
 	}
 
 	bs->sizebutton = MAX(SIZEBUTTON - 2, strlen(bs->label[0]));
 	for (i=1; i < (int) bs->nbuttons; i++)
 		bs->sizebutton = MAX(bs->sizebutton, strlen(bs->label[i]));
 	bs->sizebutton += 2;
 }
 
 /* Text */
 static bool is_ncurses_attr(char *text)
 {
 
 	if (strnlen(text, 3) < 3)
 		return false;
 
 	if (text[0] != '\\' || text[1] != 'Z')
 		return false;
 
 	return (strchr("nbBrRuU01234567", text[2]) == NULL ? false : true);
 }
 
 static bool check_set_ncurses_attr(WINDOW *win, char *text)
 {
 	
 	if (is_ncurses_attr(text) == false)
 		return false;
 
 	if ((text[2] - '0') >= 0 && (text[2] - '0') < 8) {
 		wattron(win, bsddialog_color( text[2] - '0', COLOR_WHITE, 0));
 		return true;
 	}
 
 	switch (text[2]) {
 	case 'n':
 		wattrset(win, A_NORMAL);
 		break;
 	case 'b':
 		wattron(win, A_BOLD);
 		break;
 	case 'B':
 		wattroff(win, A_BOLD);
 		break;
 	case 'r':
 		wattron(win, A_REVERSE);
 		break;
 	case 'R':
 		wattroff(win, A_REVERSE);
 		break;
 	case 'u':
 		wattron(win, A_UNDERLINE);
 		break;
 	case 'U':
 		wattroff(win, A_UNDERLINE);
 		break;
 	}
 
 	return true;
 }
 
 static void
 print_str(WINDOW *win, int *rows, int *y, int *x, int cols, char *str, bool color)
 {
 	int i, j, len, reallen;
 
 	if(strlen(str) == 0)
 		return;
 
 	len = reallen = strlen(str);
 	if (color) {
 		i=0;
 		while (i < len) {
 			if (is_ncurses_attr(str+i))
 				reallen -= 3;
 			i++;
 		}
 	}
 
 	i = 0;
 	while (i < len) {
 		if (*x + reallen > cols) {
 			*y = (*x != 0 ? *y+1 : *y);
 			if (*y >= *rows) {
 				*rows = *y + 1;
 				wresize(win, *rows, cols);
 			}
 			*x = 0;
 		}
 		j = *x;
 		while (j < cols && i < len) {
 			if (color && check_set_ncurses_attr(win, str+i)) {
 				i += 3;
 			} else {
 				mvwaddch(win, *y, j, str[i]);
 				i++;
 				reallen--;
 				j++;
 				*x = j;
 			}
 		}
 	}
 }
 
 int
 get_text_properties(struct bsddialog_conf *conf, char *text, int *maxword,
     int *maxline, int *nlines)
 {
 	int i, buflen, wordlen, linelen;
 
 
 	buflen = strlen(text) + 1;
 	*maxword = 0;
 	wordlen = 0;
 	for (i=0; i < buflen; i++) {
 		if (text[i] == '\t' || text[i] == '\n' || text[i] == ' ' || text[i] == '\0')
 			if (wordlen != 0) {
 				*maxword = MAX(*maxword, wordlen);
 				wordlen = 0;
 				continue;
 			}
 		if (conf->text.colors && is_ncurses_attr(text + i))
 			i += 3;
 		else
 			wordlen++;
 	}
 
 	*maxline = linelen = 0;
 	*nlines = 1;
 	for (i=0; i < buflen; i++) {
 		switch (text[i]) {
 		case '\n':
 			*nlines = *nlines + 1;
 		case '\0':
 			*maxline = MAX(*maxline, linelen);
 			linelen = 0;
 			break;
 		default:
 			if (conf->text.colors && is_ncurses_attr(text + i))
 				i += 3;
 			else
 				linelen++;
 		}
 	}
 	if (*nlines == 1 && *maxline == 0)
 		*nlines = 0;
 
 	//free(buf);
 
 	return 0;
 }
 
 int
 print_textpad(struct bsddialog_conf *conf, WINDOW *pad, int *rows, int cols,
     char *text)
 {
 	char *string;
 	int i, j, x, y;
 	bool loop;
 
 	if ((string = malloc(strlen(text) + 1)) == NULL)
 		RETURN_ERROR("Cannot build (analyze) text");
 
 	i = j = x = y = 0;
 	loop = true;
 	while (loop) {
 		string[j] = text[i];
 
 		if (string[j] == '\0' || string[j] == '\n' ||
 		    string[j] == '\t' || string[j] == ' ') {
 			if (j != 0) {
 				string[j] = '\0';
 				print_str(pad, rows, &y, &x, cols, string,
 				    conf->text.colors);
 			}
 		}
 
 		switch (text[i]) {
 		case '\0':
 			loop = false;
 			break;
 		case '\n':
 			j = -1;
 			x = 0;
 			y++;
 			break;
 		case '\t':
 			for (j=0; j<4 /*tablen*/; j++) {
 				x++;
 				if (x >= cols) {
 					x = 0;
 					y++;
 				}
 			}
 			j = -1;
 			break;
 		case ' ':
 			x++;
 			if (x >= cols) {
 				x = 0;
 				y++;
 			}
 			j = -1;
 		}
 
 		if (y >= *rows) { /* check for whitespaces */
 			*rows = y + 1;
 			wresize(pad, *rows, cols);
 		}
 
 		j++;
 		i++;
 	}
 
 	free(string);
 
 	return 0;
 }
 
 /* autosize */
 
 /*
  * max y, that is from 0 to LINES - 1 - t.shadowrows,
  * could not be max height but avoids problems with checksize
  */
 int widget_max_height(struct bsddialog_conf *conf)
 {
 	int maxheight;
 
 	if ((maxheight = conf->shadow ? LINES - 1 - t.shadow.h : LINES - 1) <= 0)
 		RETURN_ERROR("Terminal too small, LINES - shadow <= 0");
 
 	if (conf->y > 0)
 		if ((maxheight -= conf->y) <=0)
 			RETURN_ERROR("Terminal too small, LINES - shadow - y <= 0");
 
 	return maxheight;
 }
 
 /*
  * max x, that is from 0 to COLS - 1 - t.shadowcols,
  *  * could not be max height but avoids problems with checksize
  */
 int widget_max_width(struct bsddialog_conf *conf)
 {
 	int maxwidth;
 
 	if ((maxwidth = conf->shadow ? COLS - 1 - t.shadow.w : COLS - 1)  <= 0)
 		RETURN_ERROR("Terminal too small, COLS - shadow <= 0");
 	if (conf->x > 0)
 		if ((maxwidth -= conf->x) <=0)
 			RETURN_ERROR("Terminal too small, COLS - shadow - x <= 0");
 
 	return maxwidth;
 }
 
 int
 set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w)
 {
 	int maxheight, maxwidth;
 
 	if ((maxheight = widget_max_height(conf)) == BSDDIALOG_ERROR)
 		return BSDDIALOG_ERROR;
 
 	if (rows == BSDDIALOG_FULLSCREEN)
 		*h = maxheight;
 	else if (rows < BSDDIALOG_FULLSCREEN)
 		RETURN_ERROR("Negative (less than -1) height");
 	else if (rows > BSDDIALOG_AUTOSIZE) {
 		if ((*h = rows) > maxheight)
 			RETURN_ERROR("Height too big (> terminal height - "\
 			    "shadow");
 	}
 	/* rows == AUTOSIZE: each widget has to set its size */
 
 	if ((maxwidth = widget_max_width(conf)) == BSDDIALOG_ERROR)
 		return BSDDIALOG_ERROR;
 
 	if (cols == BSDDIALOG_FULLSCREEN)
 		*w = maxwidth;
 	else if (cols < BSDDIALOG_FULLSCREEN)
 		RETURN_ERROR("Negative (less than -1) width");
 	else if (cols > BSDDIALOG_AUTOSIZE) {
 		if ((*w = cols) > maxwidth)
 			RETURN_ERROR("Width too big (> terminal width - shadow)");
 	}
 	/* cols == AUTOSIZE: each widget has to set its size */
 
 	return 0;
 }
 
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w)
 {
 
 	if (conf->y == BSDDIALOG_CENTER)
 		*y = LINES/2 - h/2;
 	else if (conf->y < BSDDIALOG_CENTER)
 		RETURN_ERROR("Negative begin y (less than -1)");
 	else if (conf->y >= LINES)
 		RETURN_ERROR("Begin Y under the terminal");
 	else
 		*y = conf->y;
 
 	if ((*y + h + (conf->shadow ? (int) t.shadow.h : 0)) > LINES)
 		RETURN_ERROR("The lower of the box under the terminal "\
 		    "(begin Y + height (+ shadow) > terminal lines)");
 
 
 	if (conf->x == BSDDIALOG_CENTER)
 		*x = COLS/2 - w/2;
 	else if (conf->x < BSDDIALOG_CENTER)
 		RETURN_ERROR("Negative begin x (less than -1)");
 	else if (conf->x >= COLS)
 		RETURN_ERROR("Begin X over the right of the terminal");
 	else
 		*x = conf->x;
 
 	if ((*x + w + (conf->shadow ? (int) t.shadow.w : 0)) > COLS)
 		RETURN_ERROR("The right of the box over the terminal "\
 		    "(begin X + width (+ shadow) > terminal cols)");
 
 	return 0;
 }
 
 /* Widgets builders */
 void
 draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
     enum elevation elev)
 {
 	int leftcolor, rightcolor;
 	int ls, rs, ts, bs, tl, tr, bl, br;
 	int ltee, rtee;
 
 	ls = rs = ACS_VLINE;
 	ts = bs = ACS_HLINE;
 	tl = ACS_ULCORNER;
 	tr = ACS_URCORNER;
 	bl = ACS_LLCORNER;
 	br = ACS_LRCORNER;
 	ltee = ACS_LTEE;
 	rtee = ACS_RTEE;
 
 	if (conf->no_lines == false) {
 		if (conf->ascii_lines) {
 			ls = rs = '|';
 			ts = bs = '-';
 			tl = tr = bl = br = ltee = rtee = '+';
 		}
 		leftcolor  = elev == RAISED ?
 		    t.dialog.lineraisecolor : t.dialog.linelowercolor;
 		rightcolor = elev == RAISED ?
 		    t.dialog.linelowercolor : t.dialog.lineraisecolor;
 		wattron(win, leftcolor);
 		wborder(win, ls, rs, ts, bs, tl, tr, bl, br);
 		wattroff(win, leftcolor);
 
 		wattron(win, rightcolor);
 		mvwaddch(win, 0, cols-1, tr);
 		mvwvline(win, 1, cols-1, rs, rows-2);
 		mvwaddch(win, rows-1, cols-1, br);
 		mvwhline(win, rows-1, 1, bs, cols-2);
 		wattroff(win, rightcolor);
 	}
 }
 
 WINDOW *
 new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
     enum elevation elev)
 {
 	WINDOW *win;
 
 	if ((win = newwin(rows, cols, y, x)) == NULL) {
 		set_error_string("Cannot build boxed window");
 		return NULL;
 	}
 
 	wbkgd(win, t.dialog.color);
 
 	draw_borders(conf, win, rows, cols, elev);
 
 	return win;
 }
 
 /*
  * `enum elevation elev` could be useless because it should be always RAISED,
  * to check at the end.
  */
 static int
 draw_widget_withtextpad(struct bsddialog_conf *conf, WINDOW *shadow,
     WINDOW *widget, int h, int w, enum elevation elev,
     WINDOW *textpad, int *htextpad, char *text, bool buttons)
 {
 	int ts, ltee, rtee;
 	int colordelimtitle;
 
 	ts = conf->ascii_lines ? '-' : ACS_HLINE;
 	ltee = conf->ascii_lines ? '+' : ACS_LTEE;
 	rtee = conf->ascii_lines ? '+' : ACS_RTEE;
 	colordelimtitle = elev == RAISED ?
 	    t.dialog.lineraisecolor : t.dialog.linelowercolor;
 
 	if (shadow != NULL)
 		wnoutrefresh(shadow);
 
 	// move / resize now or the caller?
 	draw_borders(conf, widget, h, w, elev);
 
 	if (conf->title != NULL) {
 		if (t.dialog.delimtitle && conf->no_lines == false) {
 			wattron(widget, colordelimtitle);
 			mvwaddch(widget, 0, w/2 - strlen(conf->title)/2 - 1, rtee);
 			wattroff(widget, colordelimtitle);
 		}
 		wattron(widget, t.dialog.titlecolor);
 		mvwaddstr(widget, 0, w/2 - strlen(conf->title)/2, conf->title);
 		wattroff(widget, t.dialog.titlecolor);
 		if (t.dialog.delimtitle && conf->no_lines == false) {
 			wattron(widget, colordelimtitle);
 			waddch(widget, ltee);
 			wattroff(widget, colordelimtitle);
 		}
 	}
 
 	if (conf->bottomtitle != NULL) {
 		wattron(widget, t.dialog.bottomtitlecolor);
 		wmove(widget, h - 1, w/2 - strlen(conf->bottomtitle)/2 - 1);
 		waddch(widget, '[');
 		waddstr(widget, conf->bottomtitle);
 		waddch(widget, ']');
 		wattroff(widget, t.dialog.bottomtitlecolor);
 	}
 
 	//if (textpad == NULL && text != NULL) /* no pad, text null for textbox */
 	//	print_text(conf, widget, 1, 2, w-3, text);
 
 	if (buttons && conf->no_lines == false) {
 		wattron(widget, t.dialog.lineraisecolor);
 		mvwaddch(widget, h-3, 0, ltee);
 		mvwhline(widget, h-3, 1, ts, w-2);
 		wattroff(widget, t.dialog.lineraisecolor);
 
 		wattron(widget, t.dialog.linelowercolor);
 		mvwaddch(widget, h-3, w-1, rtee);
 		wattroff(widget, t.dialog.linelowercolor);
 	}
 
 	wnoutrefresh(widget);
 
 	if (textpad == NULL)
 		return 0; /* widget_init() ends */
 
 	if (text != NULL) /* programbox etc */
 		if (print_textpad(conf, textpad, htextpad,
 		    w - HBORDERS - t.text.hmargin * 2, text) !=0)
 			return BSDDIALOG_ERROR;
 
 	return 0;
 }
 
 /*
  * `enum elevation elev` could be useless because it should be always RAISED,
  * to check at the end.
  */
 int
 update_widget_withtextpad(struct bsddialog_conf *conf, WINDOW *shadow,
     WINDOW *widget, int h, int w, enum elevation elev,
     WINDOW *textpad, int *htextpad, char *text, bool buttons)
 {
 	int error;
 
 	/* nothing for now */
 
 	error =  draw_widget_withtextpad(conf, shadow, widget, h, w,
 	    elev, textpad, htextpad, text, buttons);
 
 	return error;
 }
 
 /*
  * `enum elevation elev` could be useless because it should be always RAISED,
  * to check at the end.
  */
 int
 new_widget_withtextpad(struct bsddialog_conf *conf, WINDOW **shadow,
     WINDOW **widget, int y, int x, int h, int w, enum elevation elev,
     WINDOW **textpad, int *htextpad, char *text, bool buttons)
 {
 	int error;
 
 	if (conf->shadow) {
 		*shadow = newwin(h, w, y + t.shadow.h, x + t.shadow.w);
 		if (*shadow == NULL)
 			RETURN_ERROR("Cannot build shadow");
 		wbkgd(*shadow, t.shadow.color);
 	}
 
 	if ((*widget = new_boxed_window(conf, y, x, h, w, elev)) == NULL) {
 		if (conf->shadow)
 			delwin(*shadow);
 		return BSDDIALOG_ERROR;
 	}
 
 	if (textpad == NULL) { /* widget_init() */
 		error =  draw_widget_withtextpad(conf, *shadow, *widget, h, w,
 		    elev, NULL, NULL, text, buttons);
 		return error;
 	}
 
 	if (text != NULL) { /* programbox etc */
 		*htextpad = 1;
 		*textpad = newpad(*htextpad, w - HBORDERS - t.text.hmargin * 2);
 		if (*textpad == NULL) {
 			delwin(*textpad);
 			if (conf->shadow)
 				delwin(*shadow);
 			RETURN_ERROR("Cannot build the pad window for text");
 		}
 		wbkgd(*textpad, t.dialog.color);
 	}
 
 	error =  draw_widget_withtextpad(conf, *shadow, *widget, h, w, elev,
 	    *textpad, htextpad, text, buttons);
 
 	return error;
 }
 
 void
 end_widget_withtextpad(struct bsddialog_conf *conf, WINDOW *window, int h, int w,
     WINDOW *textpad, WINDOW *shadow)
 {
 	int y, x;
 
 	getbegyx(window, y, x); /* for clear, add y & x to args? */
 
 	if (conf->sleep > 0)
 		sleep(conf->sleep);
 
 	if (textpad != NULL)
 		delwin(textpad);
 
 	delwin(window);
 
 	if (conf->shadow)
 		delwin(shadow);
 
 	if (conf->clear)
 		hide_widget(y, x, h, w, shadow != NULL);
 
 	if (conf->get_height != NULL)
 		*conf->get_height = h;
 	if (conf->get_width != NULL)
 		*conf->get_width = w;
 }
diff --git a/lib/lib_util.h b/lib/lib_util.h
index 2c552a36c6a9..e9791b1894a7 100644
--- a/lib/lib_util.h
+++ b/lib/lib_util.h
@@ -1,136 +1,139 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _LIBBSDDIALOG_UTIL_H_
 #define _LIBBSDDIALOG_UTIL_H_
 
 /*
  * Utils to implement widgets - Internal library  API - Dafult values
  */
 
-#define HBORDERS	2
-#define VBORDERS	2
+#define HBORDER		1
+#define HBORDERS	(HBORDER + HBORDER)
+#define VBORDER		1
+#define VBORDERS	(VBORDER + VBORDER)
+#define PADDING(p)	(p)
 
 /* ncurses has not a Ctrl key macro */
 #define KEY_CTRL(x) ((x) & 0x1f)
 
 /* Set default aspect ratio to 9 */
 #define GET_ASPECT_RATIO(conf) (conf->aspect_ratio > 0 ? conf->aspect_ratio : 9)
 
 /* debug */
 #define BSDDIALOG_DEBUG(y,x,fmt, ...) do {	\
 	mvprintw(y, x, fmt, __VA_ARGS__);	\
 	refresh();				\
 } while (0)
 
 /* error buffer */
 const char *get_error_string(void);
 void set_error_string(char *string);
 
 #define RETURN_ERROR(str) do {			\
 	set_error_string(str);			\
 	return BSDDIALOG_ERROR;			\
 } while (0)
 
 /* Buttons */
 #define LABEL_cancel_label	"Cancel"
 #define LABEL_exit_label	"EXIT"
 #define LABEL_extra_label	"Extra"
 #define LABEL_help_label	"Help"
 #define LABEL_ok_label		"OK"
 #define BUTTONLABEL(l) (conf->button.l != NULL ? conf->button.l : LABEL_ ##l)
 
 #define MAXBUTTONS	6 /* yes|ok + extra + no|cancel + help + 2 generics */
 struct buttons {
 	unsigned int nbuttons;
 	char *label[MAXBUTTONS];
 	int value[MAXBUTTONS];
 	int curr;
 	unsigned int sizebutton; /* including left and right delimiters */
 };
 
 void
 get_buttons(struct bsddialog_conf *conf, struct buttons *bs, char *yesoklabel,
     char *extralabel, char *nocancellabel, char *helplabel);
 
 void
 draw_button(WINDOW *window, int y, int x, int size, char *text, bool selected,
     bool shortkey);
 
 void
 draw_buttons(WINDOW *window, int y, int cols, struct buttons bs, bool shortkey);
 
 /* help window with F1 key */
 int f1help(struct bsddialog_conf *conf);
 
 /* cleaner */
 int hide_widget(int y, int x, int h, int w, bool withshadow);
 
 /* (auto) size and (auto) position */
 int
 get_text_properties(struct bsddialog_conf *conf, char *text, int *maxword,
     int *maxline, int *nlines);
 
 int widget_max_height(struct bsddialog_conf *conf);
 int widget_max_width(struct bsddialog_conf *conf);
 
 int
 set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w);
 
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w);
 
 /* widget builders */
 int
 print_textpad(struct bsddialog_conf *conf, WINDOW *pad, int *rows, int cols,
     char *text);
 
 enum elevation { RAISED, LOWERED };
 
 void
 draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
     enum elevation elev);
 
 WINDOW *
 new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
     enum elevation elev);
 
 int
 new_widget_withtextpad(struct bsddialog_conf *conf, WINDOW **shadow,
     WINDOW **widget, int y, int x, int h, int w, enum elevation elev,
     WINDOW **textpad, int *htextpad, char *text, bool buttons);
 
 int
 update_widget_withtextpad(struct bsddialog_conf *conf, WINDOW *shadow,
     WINDOW *widget, int h, int w, enum elevation elev, WINDOW *textpad,
     int *htextpad, char *text, bool buttons);
 
 void
 end_widget_withtextpad(struct bsddialog_conf *conf, WINDOW *window, int h, int w,
     WINDOW *textpad, WINDOW *shadow);
 
 #endif
diff --git a/lib/libbsddialog.c b/lib/libbsddialog.c
index a3cbe6bf9748..aea3b152adfd 100644
--- a/lib/libbsddialog.c
+++ b/lib/libbsddialog.c
@@ -1,147 +1,143 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 /*
  * This file implements public functions not related to a specific dialog.
- * utils.h/c: private functions to implement the library.
+ * lib_utils.h/c: private functions to implement the library.
  * theme.h/c: public API related to themes.
  * Dialogs implementation:
  *  infobox.c    infobox
  *  messgebox.c  msgbox - yesno
  *  menubox.c    buildlist - checklist - menu - mixedlist - radiolist
  *  formbox.c    inputbox - passwordbox - form - passwordform - mixedform
- *  barbox.c     gauge - mixedgauge - rangebox - pause
+ *  barbox.c     gauge - mixedgauge - rangebox - pause - progressview
  *  textbox.c    textbox
  *  timebox.c    timebox - calendar
  */
 
 extern struct bsddialog_theme t;
 
 int bsddialog_init(void)
 {
-	int i, j, c = 1, error = OK;
+	int i, j, c, error;
 
 	set_error_string("");
 
 	if(initscr() == NULL)
 		RETURN_ERROR("Cannot init ncurses (initscr)");
 
+	error = OK;
 	error += keypad(stdscr, TRUE);
 	nl();
 	error += cbreak();
 	error += noecho();
 	curs_set(0);
 	if(error != OK) {
 		bsddialog_end();
 		RETURN_ERROR("Cannot init ncurses (keypad and cursor)");
 	}
 
+	c = 1;
 	error += start_color();
 	for (i=0; i<8; i++)
 		for(j=0; j<8; j++) {
 			error += init_pair(c, i, j);
 			c++;
 	}
 	if(error != OK) {
 		bsddialog_end();
 		RETURN_ERROR("Cannot init ncurses (colors)");
 	}
 
 	if (bsddialog_set_default_theme(BSDDIALOG_THEME_DEFAULT) != 0) {
 		bsddialog_end();
 		return (BSDDIALOG_ERROR);
 	}
 
-	return (0);
+	return (BSDDIALOG_OK);
 }
 
 int bsddialog_end(void)
 {
-
 	if (endwin() != OK)
 		RETURN_ERROR("Cannot end ncurses (endwin)");
 
-	return (0);
+	return (BSDDIALOG_OK);
 }
 
 int bsddialog_backtitle(struct bsddialog_conf *conf, char *backtitle)
 {
-
 	mvaddstr(0, 1, backtitle);
 	if (conf->no_lines != true)
 		mvhline(1, 1, conf->ascii_lines ? '-' : ACS_HLINE, COLS-2);
 
 	refresh();
 
-	return (0);
+	return (BSDDIALOG_OK);
 }
 
 const char *bsddialog_geterror(void)
 {
-
 	return (get_error_string());
 }
 
 int bsddialog_initconf(struct bsddialog_conf *conf)
 {
-
 	if (conf == NULL)
 		RETURN_ERROR("conf is NULL");
 	if (sizeof(*conf) != sizeof(struct bsddialog_conf))
 		RETURN_ERROR("Bad conf size");
 
 	memset(conf, 0, sizeof(struct bsddialog_conf));
 	conf->y = BSDDIALOG_CENTER;
 	conf->x = BSDDIALOG_CENTER;
 	conf->shadow = true;
 
-	return (0);
+	return (BSDDIALOG_OK);
 }
 
 int bsddialog_clearterminal(void)
 {
-
 	if (clear() != OK)
 		RETURN_ERROR("Cannot clear the terminal");
 	refresh();
 
-	return (0);
+	return (BSDDIALOG_OK);
 }
diff --git a/lib/menubox.c b/lib/menubox.c
index 147fa66c8c27..c9fb182422ea 100644
--- a/lib/menubox.c
+++ b/lib/menubox.c
@@ -1,1158 +1,1158 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
-#include <string.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <string.h>
+
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 /* "Menu": checklist - menu - mixedlist - radiolist - buildlist */
 
 #define DEPTHSPACE	4
 #define MIN_HEIGHT	VBORDERS + 6 /* 2 buttons 1 text 3 menu */
 
 extern struct bsddialog_theme t;
 
 enum menumode {
 	BUILDLISTMODE,
 	CHECKLISTMODE,
 	MENUMODE,
 	MIXEDLISTMODE,
 	RADIOLISTMODE,
 	SEPARATORMODE
 };
 
 struct lineposition {
 	unsigned int maxsepstr;
 	unsigned int maxprefix;
 	unsigned int xselector;
 	unsigned int selectorlen;
 	unsigned int maxdepth;
 	unsigned int xname;
 	unsigned int maxname;
 	unsigned int xdesc;
 	unsigned int maxdesc;
 	unsigned int line;
 };
 
 static int checkradiolist(int nitems, struct bsddialog_menuitem *items)
 {
 	int i, error;
 
 	error = 0;
 	for (i=0; i<nitems; i++) {
 		if (error > 0)
 			items[i].on = false;
 
 		if (items[i].on == true)
 			error++;
 	}
 
 	return (error == 0 ? 0 : -1);
 }
 
 static int checkmenu(int nitems, struct bsddialog_menuitem *items) // useful?
 {
 	int i, error;
 
 	error = 0;
 	for (i=0; i<nitems; i++) {
 		if (items[i].on == true)
 			error++;
 
 		items[i].on = false;
 	}
 
 	return (error == 0 ? 0 : -1);
 }
 
 static void
 getfirst(int ngroups, struct bsddialog_menugroup *groups, int *abs, int *group,
     int *rel)
 {
 	int i, a;
 
 	*abs = *rel = *group = -1;
 	a = 0;
 	for (i=0; i<ngroups; i++) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a += groups[i].nitems;
 			continue;
 		}
 		if (groups[i].nitems != 0) {
 			*group = i;
 			*abs = a;
 			*rel = 0;
 			break;
 		}
 	}
 }
 
 static void
 getfirst_with_default(struct bsddialog_conf *conf, int ngroups,
     struct bsddialog_menugroup *groups, int *abs, int *group, int *rel)
 {
 	int i, j, a;
 	struct bsddialog_menuitem *item;
 
 	getfirst(ngroups, groups, abs, group, rel);
 	if (*abs < 0)
 		return;
 	
 	a = *abs;
 
 	for (i=*group; i<ngroups; i++) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a += groups[i].nitems;
 			continue;
 		}
 		for (j = 0; j < (int) groups[i].nitems; j++) {
 			item = &groups[i].items[j];
 			if (conf->menu.default_item != NULL && item->name != NULL) {
 				if (strcmp(item->name, conf->menu.default_item) == 0) {
 					*abs = a;
 					*group = i;
 					*rel = j;
 					return;
 				}
 			}
 			a++;
 		}
 	}
 }
 
 static void
 getlast(int totnitems, int ngroups, struct bsddialog_menugroup *groups,
     int *abs, int *group, int *rel)
 {
 	int i, a;
 
 	a = totnitems - 1;
 	for (i = ngroups-1; i>=0; i--) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a -= groups[i].nitems;
 			continue;
 		}
 		if (groups[i].nitems != 0) {
 			*group = i;
 			*abs = a;
 			*rel = groups[i].nitems - 1;
 			break;
 		}
 	}
 }
 
 static void
 getnext(int ngroups, struct bsddialog_menugroup *groups, int *abs, int *group,
     int *rel)
 {
 	int i, a;
 
 	if (*abs < 0 || *group < 0 || *rel < 0)
 		return;
 
 	if (*rel + 1 < (int) groups[*group].nitems) {
 		*rel = *rel + 1;
 		*abs = *abs + 1;
 		return;
 	}
 
 	if (*group + 1 > ngroups)
 		return;
 
 	a = *abs;
 	for (i = *group + 1; i < ngroups; i++) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a += groups[i].nitems;
 			continue;
 		}
 		if (groups[i].nitems != 0) {
 			*group = i;
 			*abs = a + 1;
 			*rel = 0;
 			break;
 		}
 	}
 }
 
 static void
 getfastnext(int menurows, int ngroups, struct bsddialog_menugroup *groups,
     int *abs, int *group, int *rel)
 {
 	int a, start, i;
 
 	start = *abs;
 	i = menurows;
 	do {
 		a = *abs;
 		getnext(ngroups, groups, abs, group, rel);
 		i--;
 	} while (*abs != a && *abs < start + menurows && i > 0);
 }
 
 static void
 getprev(struct bsddialog_menugroup *groups, int *abs, int *group, int *rel)
 {
 	int i, a;
 
 	if (*abs < 0 || *group < 0 || *rel < 0)
 		return;
 
 	if (*rel > 0) {
 		*rel = *rel - 1;
 		*abs = *abs - 1;
 		return;
 	}
 
 	if (*group - 1 < 0)
 		return;
 
 	a = *abs;
 	for (i = *group - 1; i >= 0; i--) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a -= (int) groups[i].nitems;
 			continue;
 		}
 		if (groups[i].nitems != 0) {
 			*group = i;
 			*abs = a - 1;
 			*rel = (int) groups[i].nitems - 1;
 			break;
 		}
 	}
 }
 
 static void
 getfastprev(int menurows, struct bsddialog_menugroup *groups, int *abs,
     int *group, int *rel)
 {
 	int a, start, i;
 
 	start = *abs;
 	i = menurows;
 	do {
 		a = *abs;
 		getprev(groups, abs, group, rel);
 		i--;
 	} while (*abs != a && *abs > start - menurows && i > 0);
 }
 
 static bool
 getnextshortcut(struct bsddialog_conf *conf, enum menumode mode, int ngroups,
     struct bsddialog_menugroup *groups, int *abs, int *group, int *rel,
     int key)
 {
 	int i, j, a, ch, ng, nr, na;
 	bool mainloop;
 
 	if (*abs < 0 || ngroups < 0 || *rel < 0 || mode == BUILDLISTMODE)
 		return false;
 
 	na = a = -1;
 	mainloop = true;
 	for (i = 0; i < ngroups && mainloop; i++) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			a += groups[i].nitems;
 			continue;
 		}
 		for (j = 0; j < (int)groups[i].nitems; j++) {
 			a++;
 			if (a == *abs)
 				continue;
 
 			if (conf->menu.no_name)
 				ch = groups[i].items[j].desc[0];
 			else
 				ch = groups[i].items[j].name[0];
 	
 			if (ch == key) {
 				if (a < *abs && na == -1) {
 					na = a;
 					ng = i;
 					nr = j;
 				}
 				if (a > *abs) {
 					na = a;
 					ng = i;
 					nr = j;
 					mainloop = false;
 					break;
 				}
 			}
 		}
 	}
 
 	if (na != -1) {
 		*abs = na;
 		*group = ng;
 		*rel = nr;
 		return (true);
 	}
 
 	return (false);
 }
 
 static enum menumode
 getmode(enum menumode mode, struct bsddialog_menugroup group)
 {
 
 	if (mode == MIXEDLISTMODE) {
 		if (group.type == BSDDIALOG_SEPARATOR)
 			mode = SEPARATORMODE;
 		else if (group.type == BSDDIALOG_RADIOLIST)
 			mode = RADIOLISTMODE;
 		else if (group.type == BSDDIALOG_CHECKLIST)
 			mode = CHECKLISTMODE;
 	}
 
 	return mode;
 }
 
 static void
 drawitem(struct bsddialog_conf *conf, WINDOW *pad, int y,
     struct bsddialog_menuitem item, enum menumode mode, struct lineposition pos,
     bool curr)
 {
 	int colordesc, colorname, colorshortcut, linech;
 	char *shortcut;
 
 	if (mode == SEPARATORMODE) {
 		if (conf->no_lines == false) {
 			wattron(pad, t.menu.desccolor);
 			linech = conf->ascii_lines ? '-' : ACS_HLINE;
 			mvwhline(pad, y, 0, linech, pos.line);
 			wattroff(pad, t.menu.desccolor);
 		}
 		wmove(pad, y, pos.line/2 - (strlen(item.name)+strlen(item.desc))/2);
 		wattron(pad, t.menu.namesepcolor);
 		waddstr(pad, item.name);
 		wattroff(pad, t.menu.namesepcolor);
 		if (strlen(item.name) > 0 && strlen(item.desc) > 0)
 			waddch(pad, ' ');
 		wattron(pad, t.menu.descsepcolor);
 		waddstr(pad, item.desc);
 		wattroff(pad, t.menu.descsepcolor);
 		return;
 	}
 
 	/* prefix */
 	if (item.prefix != NULL && item.prefix[0] != '\0')
 		mvwaddstr(pad, y, 0, item.prefix);
 
 	/* selector */
 	wmove(pad, y, pos.xselector);
 	wattron(pad, t.menu.selectorcolor);
 	if (mode == CHECKLISTMODE)
 		wprintw(pad, "[%c]", item.on ? 'X' : ' ');
 	if (mode == RADIOLISTMODE)
 		wprintw(pad, "(%c)", item.on ? '*' : ' ');
 	wattroff(pad, t.menu.selectorcolor);
 
 	/* name */
 	colorname = curr ? t.menu.f_namecolor : t.menu.namecolor;
 	if (mode != BUILDLISTMODE && conf->menu.no_name == false) {
 		wattron(pad, colorname);
 		mvwaddstr(pad, y, pos.xname + item.depth * DEPTHSPACE, item.name);
 		wattroff(pad, colorname);
 	}
 
 	/* description */
 	if (mode == BUILDLISTMODE) {
 		if (curr == false)
 			colordesc = item.on ? t.menu.namecolor : t.menu.desccolor;
 		else
 			colordesc = t.menu.f_namecolor;
 	}
 	else {
 		if (conf->menu.no_name)
 			colordesc = curr ? t.menu.f_namecolor : t.menu.namecolor;
 		else
 			colordesc = curr ? t.menu.f_desccolor : t.menu.desccolor;
 	}
 	if (mode == BUILDLISTMODE || conf->menu.no_desc == false) {
 		wattron(pad, colordesc);
 		if (conf->menu.no_name)
 			mvwaddstr(pad, y, pos.xname + item.depth * DEPTHSPACE, item.desc);
 		else
 			mvwaddstr(pad, y, pos.xdesc, item.desc);
 		wattroff(pad, colordesc);
 	}
 
 	/* shortcut */
 	if (mode != BUILDLISTMODE && conf->menu.shortcut_buttons == false) {
 		colorshortcut = curr ? t.menu.f_shortcutcolor : t.menu.shortcutcolor;
 		wattron(pad, colorshortcut);
 
 		if (conf->menu.no_name)
 			shortcut = item.desc;
 		else
 			shortcut = item.name;
 		wmove(pad, y, pos.xname + item.depth * DEPTHSPACE);
 		if (shortcut != NULL && shortcut[0] != '\0')
 			waddch(pad, shortcut[0]);
 	wattroff(pad, colorshortcut);
 }
 
 	/* bottom description */
 	move(LINES-1, 2);
 	clrtoeol();
 	if (item.bottomdesc != NULL) {
 		addstr(item.bottomdesc);
 		refresh();
 	}
 }
 
 static void
 menu_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     char *text, int linelen, unsigned int *menurows, int nitems,
     struct buttons bs)
 {
 	int textrow, menusize;
 
 	textrow = text != NULL && strlen(text) > 0 ? 1 : 0;
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += bs.nbuttons * bs.sizebutton;
 		*w += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 		/* line size */
 		*w = MAX(*w, linelen + 6);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/*
 		* avoid terminal overflow,
 		* -1 fix false negative with big menu over the terminal and
 		* autosize, for example "portconfig /usr/ports/www/apache24/".
 		*/
 		*w = MIN(*w, widget_max_width(conf)-1);
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = HBORDERS + 2 /* buttons */ + textrow;
 
 		if (*menurows == 0) {
 			*h += nitems + 2;
 			*h = MIN(*h, widget_max_height(conf));
 			menusize = MIN(nitems + 2, *h - (HBORDERS + 2 + textrow));
 			menusize -=2;
 			*menurows = menusize < 0 ? 0 : menusize;
 		}
 		else /* h autosize with a fixed menurows */
 			*h = *h + *menurows + 2;
 
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf));
 		/* avoid menurows overflow */
 		/* manual: with rows=autosize menurows!=0 is maxmenurows */
 		*menurows = MIN(*h - 6 - textrow, (int)*menurows);
 	}
 	else {
 		if (*menurows == 0)
 			*menurows = MIN(rows-6-textrow, nitems);
 	}
 }
 
 static int
 menu_checksize(int rows, int cols, char *text, int menurows, int nitems,
     struct buttons bs)
 {
 	int mincols, textrow, menusize;
 
 	mincols = VBORDERS;
 	/* buttons */
 	mincols += bs.nbuttons * bs.sizebutton;
 	mincols += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 	/* line, comment to permet some cols hidden */
 	/* mincols = MAX(mincols, linelen); */
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, width < size buttons or "\
 		    "name+descripion of the items");
 
 	textrow = text != NULL && strlen(text) > 0 ? 1 : 0;
 
 	if (nitems > 0 && menurows == 0)
 		RETURN_ERROR("items > 0 but menurows == 0, probably terminal "\
 		    "too small");
 
 	menusize = nitems > 0 ? 3 : 0;
 	if (rows < 2  + 2 + menusize + textrow)
 		RETURN_ERROR("Few lines for this menus");
 
 	return 0;
 }
 
 /* the caller has to call prefresh(menupad, ymenupad, 0, ys, xs, ye, xe); */
 static void
 update_menuwin(struct bsddialog_conf *conf, WINDOW *menuwin, int h, int w,
     int totnitems, unsigned int menurows, int ymenupad)
 {
 
 	draw_borders(conf, menuwin, h, w, LOWERED);
 
 	if (totnitems > (int) menurows) {
 		wattron(menuwin, t.menu.arrowcolor);
 
 		if (ymenupad > 0)
 			mvwprintw(menuwin, 0, 2, "^^^");
 
 		if ((int) (ymenupad + menurows) < totnitems)
 			mvwprintw(menuwin, h-1, 2, "vvv");
 
 		wattroff(menuwin, t.menu.arrowcolor);
 
 		mvwprintw(menuwin, h-1, w-10, "%3d%%",
 		    100 * (ymenupad + menurows) / totnitems);
 	}
 }
 
 static int
 do_mixedlist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, enum menumode mode, int ngroups,
     struct bsddialog_menugroup *groups, int *focuslist, int *focusitem)
 {
 	WINDOW  *shadow, *widget, *textpad, *menuwin, *menupad;
 	int i, j, y, x, h, w, htextpad, output, input;
 	int ymenupad, ys, ye, xs, xe, abs, g, rel, totnitems;
 	bool loop, automenurows, shortcut_buttons;
 	struct buttons bs;
 	struct bsddialog_menuitem *item;
 	enum menumode currmode;
 	struct lineposition pos = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 	shortcut_buttons = conf->menu.shortcut_buttons;
 
 	automenurows = menurows == BSDDIALOG_AUTOSIZE ? true : false;
 
 	totnitems = 0;
 	for (i=0; i < ngroups; i++) {
 		currmode = getmode(mode, groups[i]);
 		if (currmode == RADIOLISTMODE)
 			checkradiolist(groups[i].nitems, groups[i].items);
 
 		if (currmode == MENUMODE)
 			checkmenu(groups[i].nitems, groups[i].items);
 
 		if (currmode == RADIOLISTMODE || currmode == CHECKLISTMODE)
 			pos.selectorlen = 3;
 
 		for (j=0; j < (int) groups[i].nitems; j++) {
 			totnitems++;
 			item = &groups[i].items[j];
 
 			if (groups[i].type == BSDDIALOG_SEPARATOR) {
 				pos.maxsepstr = MAX(pos.maxsepstr,
 				    strlen(item->name) + strlen(item->desc));
 				continue;
 			}
 
 			pos.maxprefix = MAX(pos.maxprefix, strlen(item->prefix));
 			pos.maxdepth  = MAX(pos.maxdepth, item->depth);
 			pos.maxname   = MAX(pos.maxname, strlen(item->name));
 			pos.maxdesc   = MAX(pos.maxdesc, strlen(item->desc));
 		}
 	}
 	pos.maxname = conf->menu.no_name ? 0 : pos.maxname;
 	pos.maxdesc = conf->menu.no_desc ? 0 : pos.maxdesc;
 	pos.maxdepth *= DEPTHSPACE;
 
 	pos.xselector = pos.maxprefix + (pos.maxprefix != 0 ? 1 : 0);
 	pos.xname = pos.xselector + pos.selectorlen + (pos.selectorlen > 0 ? 1 : 0);
 	pos.xdesc = pos.maxdepth + pos.xname + pos.maxname;
 	pos.xdesc += (pos.maxname != 0 ? 1 : 0);
 	pos.line = MAX(pos.maxsepstr + 3, pos.xdesc + pos.maxdesc);
 
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	menu_autosize(conf, rows, cols, &h, &w, text, pos.line, &menurows,
 	    totnitems, bs);
 	if (menu_checksize(h, w, text, menurows, totnitems, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	prefresh(textpad, 0, 0, y + 1, x + 1 + t.text.hmargin,
 	    y + h - menurows, x + 1 + w - t.text.hmargin);
 
 	menuwin = new_boxed_window(conf, y + h - 5 - menurows, x + 2,
 	    menurows+2, w-4, LOWERED);
 
 	menupad = newpad(totnitems, pos.line);
 	wbkgd(menupad, t.dialog.color);
 
 	ymenupad = 0;
 	for (i=0; i<ngroups; i++) {
 		currmode = getmode(mode, groups[i]);
 		for (j=0; j < (int) groups[i].nitems; j++) {
 			item = &groups[i].items[j];
 			drawitem(conf, menupad, ymenupad, *item, currmode, pos,
 			    false);
 			ymenupad++;
 		}
 	}
 	getfirst_with_default(conf, ngroups, groups, &abs, &g, &rel);
 	currmode = getmode(mode, groups[g]);
 	item = &groups[g].items[rel];
 	drawitem(conf, menupad, abs, *item, currmode, pos, true);
 
 	ys = y + h - 5 - menurows + 1;
 	ye = y + h - 5 ;
 	if (conf->menu.align_left || (int)pos.line > w - 6) {
 		xs = x + 3;
 		xe = xs + w - 7;
 	}
 	else { /* center */
 		xs = x + 3 + (w-6)/2 - pos.line/2;
 		xe = xs + w - 5;
 	}
 
 	ymenupad = 0; /* now ymenupad is pminrow for prefresh() */
 	if ((int)(ymenupad + menurows) - 1 < abs)
 		ymenupad = abs - menurows + 1;
 	update_menuwin(conf, menuwin, menurows+2, w-4, totnitems, menurows, ymenupad);
 	wrefresh(menuwin);
 	prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 	
 	draw_buttons(widget, h-2, w, bs, shortcut_buttons);
 	wrefresh(widget);
 
 	loop = true;
 	while(loop) {
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			if (currmode == MENUMODE)
 				item->on = true;
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			draw_buttons(widget, h-2, w, bs, shortcut_buttons);
 			wrefresh(widget);
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, h-2, w, bs, shortcut_buttons);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, h-2, w, bs, shortcut_buttons);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_CTRL('E'): /* add conf->menu.extrahelpkey ? */
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			menurows = automenurows ? 0 : menurows;
 			menu_autosize(conf, rows, cols, &h, &w, text, pos.line,
 			    &menurows, totnitems, bs);
 			if (menu_checksize(h, w, text, menurows, totnitems, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 			return BSDDIALOG_ERROR;
 			
 			draw_buttons(widget, h-2, w, bs, shortcut_buttons);
 			wrefresh(widget);
 
 			prefresh(textpad, 0, 0, y + 1, x + 1 + t.text.hmargin,
 			    y + h - menurows, x + 1 + w - t.text.hmargin);
 
 			wclear(menuwin);
 			mvwin(menuwin, y + h - 5 - menurows, x + 2);
 			wresize(menuwin,menurows+2, w-4);
 			update_menuwin(conf, menuwin, menurows+2, w-4, totnitems,
 			    menurows, ymenupad);
 			wrefresh(menuwin);
 			
 			ys = y + h - 5 - menurows + 1;
 			ye = y + h - 5 ;
 			if (conf->menu.align_left || (int)pos.line > w - 6) {
 				xs = x + 3;
 				xe = xs + w - 7;
 			}
 			else { /* center */
 				xs = x + 3 + (w-6)/2 - pos.line/2;
 				xe = xs + w - 5;
 			}
 
 			if ((int)(ymenupad + menurows) - 1 < abs)
 				ymenupad = abs - menurows + 1;
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 
 			refresh();
 
 			break;
 		}
 
 		if (abs < 0)
 			continue;
 		switch(input) {
 		case KEY_HOME:
 		case KEY_UP:
 		case KEY_PPAGE:
 			if (abs == 0) /* useless, just to save cpu refresh */
 				break;
 			drawitem(conf, menupad, abs, *item, currmode, pos, false);
 			if (input == KEY_HOME)
 				getfirst(ngroups, groups, &abs, &g, &rel);
 			else if (input == KEY_UP)
 				getprev(groups, &abs, &g, &rel);
 			else /* input == KEY_PPAGE*/
 				getfastprev(menurows, groups, &abs, &g, &rel);
 			item = &groups[g].items[rel];
 			currmode= getmode(mode, groups[g]);
 			drawitem(conf, menupad, abs, *item, currmode, pos, true);
 			if (ymenupad > abs && ymenupad > 0)
 				ymenupad = abs;
 			update_menuwin(conf, menuwin, menurows+2, w-4, totnitems,
 			    menurows, ymenupad);
 			wrefresh(menuwin);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 			break;
 		case KEY_END:
 		case KEY_DOWN:
 		case KEY_NPAGE:
 			if (abs == totnitems -1)
 				break; /* useless, just to save cpu refresh */
 			drawitem(conf, menupad, abs, *item, currmode, pos, false);
 			if (input == KEY_END)
 				getlast(totnitems, ngroups, groups, &abs, &g, &rel);
 			else if (input == KEY_DOWN)
 				getnext(ngroups, groups, &abs, &g, &rel);
 			else /* input == KEY_NPAGE*/
 				getfastnext(menurows, ngroups, groups, &abs, &g, &rel);
 			item = &groups[g].items[rel];
 			currmode= getmode(mode, groups[g]);
 			drawitem(conf, menupad, abs, *item, currmode, pos, true);
 			if ((int)(ymenupad + menurows) <= abs)
 				ymenupad = abs - menurows + 1;
 			update_menuwin(conf, menuwin, menurows+2, w-4, totnitems,
 			    menurows, ymenupad);
 			wrefresh(menuwin);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 			break;
 		case ' ': /* Space */
 			if (currmode == MENUMODE)
 				break;
 			else if (currmode == CHECKLISTMODE)
 				item->on = !item->on;
 			else { /* RADIOLISTMODE */
 				for (i=0; i < (int) groups[g].nitems; i++)
 					if (groups[g].items[i].on == true && i != rel) {
 						groups[g].items[i].on = false;
 						drawitem(conf, menupad,
 						    abs - rel + i, groups[g].items[i],
 						    currmode, pos, false);
 					}
 				item->on = !item->on;
 			}
 			drawitem(conf, menupad, abs, *item, currmode, pos, true);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 		default:
 			if (shortcut_buttons) {
 				for (i = 0; i < (int) bs.nbuttons; i++)
 					if (tolower(input) == tolower((bs.label[i])[0])) {
 						output = bs.value[i];
 						if (currmode == MENUMODE)
 							item->on = true;
 						loop = false;
 					}
 				break;
 			}
 
 			drawitem(conf, menupad, abs, *item, currmode, pos, false);
 			getnextshortcut(conf, currmode, ngroups, groups, &abs,
 			    &g, &rel, input);
 			item = &groups[g].items[rel];
 			currmode = getmode(mode, groups[g]);
 			drawitem(conf, menupad, abs, *item, currmode, pos, true);
 			if (ymenupad > abs && ymenupad > 0)
 				ymenupad = abs;
 			if ((int)(ymenupad + menurows) <= abs)
 				ymenupad = abs - menurows + 1;
 			update_menuwin(conf, menuwin, menurows+2, w-4, totnitems,
 			    menurows, ymenupad);
 			wrefresh(menuwin);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 		}
 	}
 
 	if (focuslist != NULL)
 		*focuslist = g;
 	if (focusitem !=NULL)
 		*focusitem = rel;
 
 	delwin(menupad);
 	delwin(menuwin);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
 
 /*
  * API
  */
 
 int bsddialog_mixedlist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int ngroups, struct bsddialog_menugroup *groups,
     int *focuslist, int *focusitem)
 {
 	int output;
 
 	output = do_mixedlist(conf, text, rows, cols, menurows, MIXEDLISTMODE,
 	    ngroups, groups, focuslist, focusitem);
 
 	return output;
 }
 
 int
 bsddialog_checklist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem)
 {
 	int output;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
 
 	output = do_mixedlist(conf, text, rows, cols, menurows, CHECKLISTMODE,
 	    1, &group, NULL, focusitem);
 
 	return output;
 }
 
 int
 bsddialog_menu(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem)
 {
 	int output;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
 
 	output = do_mixedlist(conf, text, rows, cols, menurows, MENUMODE, 1,
 	    &group, NULL, focusitem);
 
 	return output;
 }
 
 int
 bsddialog_radiolist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem)
 {
 	int output;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_RADIOLIST /* unused */, nitems, items};
 
 	output = do_mixedlist(conf, text, rows, cols, menurows, RADIOLISTMODE,
 	    1, &group, NULL, focusitem);
 
 	return output;
 }
 
 /* todo */
 static int buildlist_autosize(int rows, int cols)
 {
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		RETURN_ERROR("Unimplemented cols autosize for buildlist");
 
 	if (rows == BSDDIALOG_AUTOSIZE)
 		RETURN_ERROR("Unimplemented rows autosize for buildlist");
 
 	return 0;
 }
 
 /* to improve */
 static int
 buildlist_checksize(int rows, int cols, char *text, int menurows, int nitems,
     struct buttons bs)
 {
 	int mincols, textrow, menusize;
 
 	mincols = VBORDERS;
 	/* buttons */
 	mincols += bs.nbuttons * bs.sizebutton;
 	mincols += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 	/* line, comment to permet some cols hidden */
 	/* mincols = MAX(mincols, linelen); */
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, width < size buttons or "\
 		    "name+descripion of the items");
 
 	textrow = text != NULL && strlen(text) > 0 ? 1 : 0;
 
 	if (nitems > 0 && menurows == 0)
 		RETURN_ERROR("items > 0 but menurows == 0, probably terminal "\
 		    "too small");
 
 	menusize = nitems > 0 ? 3 : 0;
 	if (rows < 2 + 2 + menusize + textrow)
 		RETURN_ERROR("Few lines for this menus");
 
 	return 0;
 }
 
 int
 bsddialog_buildlist(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int menurows, int nitems, struct bsddialog_menuitem *items,
     int *focusitem)
 {
 	WINDOW *widget, *textpad, *leftwin, *leftpad, *rightwin, *rightpad, *shadow;
 	int output, i, x, y, h, w, htextpad, input;
 	bool loop, buttupdate, padsupdate, startleft;
 	int nlefts, nrights, leftwinx, rightwinx, winsy, padscols, curr;
 	enum side {LEFT, RIGHT} currV;
 	int currH;
 	struct buttons bs;
 	struct lineposition pos = {0,0,0,0,0,0,0,0,0,0};
 
 	startleft = false;
 	for (i=0; i<nitems; i++) {
 		pos.line = MAX(pos.line, strlen(items[i].desc));
 		if (items[i].on == false)
 			startleft = true;
 	}
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (buildlist_autosize(rows, cols) != 0)
 		return BSDDIALOG_ERROR;
 	if (buildlist_checksize(h, w, text, menurows, nitems, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	prefresh(textpad, 0, 0, y + 1, x + 1 + t.text.hmargin,
 	    y + h - menurows, x + 1 + w - t.text.hmargin);
 
 	winsy = y + h - 5 - menurows;
 	leftwinx = x+2;
 	leftwin = new_boxed_window(conf, winsy, leftwinx, menurows+2, (w-5)/2,
 	    LOWERED);
 	rightwinx = x + w - 2 -(w-5)/2;
 	rightwin = new_boxed_window(conf, winsy, rightwinx, menurows+2,
 	    (w-5)/2, LOWERED);
 
 	wrefresh(leftwin);
 	wrefresh(rightwin);
 
 	padscols = (w-5)/2 - 2;
 	leftpad  = newpad(nitems, pos.line);
 	rightpad = newpad(nitems, pos.line);
 	wbkgd(leftpad, t.dialog.color);
 	wbkgd(rightpad, t.dialog.color);
 
 	currH = 0;
 	currV = startleft ? LEFT : RIGHT;
 	loop = buttupdate = padsupdate = true;
 	while(loop) {
 		if (buttupdate) {
 			draw_buttons(widget, h-2, w, bs, true);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 
 		if (padsupdate) {
 			werase(leftpad);
 			werase(rightpad);
 			curr = -1;
 			nlefts = nrights = 0;
 			for (i=0; i<nitems; i++) {
 				if (items[i].on == false) {
 					if (currV == LEFT && currH == nlefts)
 						curr = i;
 					drawitem(conf, leftpad, nlefts, items[i],
 					    BUILDLISTMODE, pos, curr == i);
 					nlefts++;
 				} else {
 					if (currV == RIGHT && currH == nrights)
 						curr = i;
 					drawitem(conf, rightpad, nrights, items[i],
 					    BUILDLISTMODE, pos, curr == i);
 					nrights++;
 				}
 			}
 			prefresh(leftpad, 0, 0, winsy+1, leftwinx+1,
 			    winsy+1+menurows, leftwinx + 1 + padscols);
 			prefresh(rightpad, 0, 0, winsy+1, rightwinx+1,
 			    winsy+1+menurows, rightwinx + 1 + padscols);
 			padsupdate = false;
 		}
 
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ERROR;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			buttupdate = true;
 			break;
 		}
 
 		if (nitems <= 0)
 			continue;
 
 		switch(input) {
 		case KEY_LEFT:
 			if (currV == RIGHT && nrights > 0) {
 				currV = LEFT;
 				currH = 0;
 				padsupdate = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (currV == LEFT && nrights > 0) {
 				currV = RIGHT;
 				currH = 0;
 				padsupdate = true;
 			}
 			break;
 		case KEY_UP:
 			currH = (currH > 0) ? currH - 1 : 0;
 			padsupdate = true;
 			break;
 		case KEY_DOWN:
 			if (currV == LEFT)
 				currH = (currH < nlefts-1) ? currH +1 : currH;
 			else
 				currH = (currH < nrights-1)? currH +1 : currH;
 			padsupdate = true;
 			break;
 		case ' ': /* Space */
 			items[curr].on = ! items[curr].on;
 			if (currV == LEFT) {
 				if (nlefts > 1)
 					currH = currH > 0 ? currH-1 : 0;
 				else {
 					currH = 0;
 					currV = RIGHT;
 				}
 			} else {
 				if (nrights > 1)
 					currH = currH > 0 ? currH-1 : 0;
 				else {
 					currH = 0;
 					currV = LEFT;
 				}
 			}
 			padsupdate = true;
 			break;
 		default:
 
 			break;
 		}
 	}
 
 	if(focusitem != NULL)
 		*focusitem = curr;
 
 	delwin(leftpad);
 	delwin(leftwin);
 	delwin(rightpad);
 	delwin(rightwin);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
diff --git a/lib/messagebox.c b/lib/messagebox.c
index e2b91e1bdc5c..6fe775cfcbc9 100644
--- a/lib/messagebox.c
+++ b/lib/messagebox.c
@@ -1,285 +1,273 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
-#include <string.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <string.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
-/* "Message": msgbox - yesno */
-
 #define AUTO_WIDTH	(COLS / 3U)
-/*
- * Min height = 5: 2 up & down borders + 2 label & up border buttons + 1 line
- * for text, at least 1 line is important for widget_withtextpad_init() to avoid
- * "Cannot build the pad window for text".
- */
-#define MIN_HEIGHT	5
+/* at least 1 line text for its pad building in widget_withtextpad_init() */
+#define MIN_HEIGHT	(HBORDERS + 2 /*buttons*/ + 1 /*text*/)
 
 extern struct bsddialog_theme t;
 
 static int
-message_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
-    char *text, struct buttons bs)
+message_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
+    int *w, char *text, struct buttons bs)
 {
 	int maxword, maxline, nlines, line;
 
 	if (get_text_properties(conf, text, &maxword, &maxline, &nlines) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += bs.nbuttons * bs.sizebutton;
 		*w += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 		/* text size */
 		line = MIN(maxline + VBORDERS + t.text.hmargin * 2, AUTO_WIDTH);
 		line = MAX(line, (int) (maxword + VBORDERS + t.text.hmargin * 2));
 		*w = MAX(*w, line);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/* avoid terminal overflow */
 		*w = MIN(*w, widget_max_width(conf));
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = MIN_HEIGHT - 1;
 		if (maxword > 0)
 			*h += MAX(nlines, (int)(*w / GET_ASPECT_RATIO(conf)));
 		*h = MAX(*h, MIN_HEIGHT);
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf));
 	}
 
 	return 0;
 }
 
 static int message_checksize(int rows, int cols, struct buttons bs)
 {
 	int mincols;
 
 	mincols = VBORDERS;
 	mincols += bs.nbuttons * bs.sizebutton;
 	mincols += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, Msgbox and Yesno need at least width "\
 		    "for borders, buttons and spaces between buttons");
 
 	if (rows < MIN_HEIGHT)
 		RETURN_ERROR("Msgbox and Yesno need at least height 5");
 
 	return 0;
 }
 
 static void
-buttonsupdate(WINDOW *widget, int h, int w, struct buttons bs, bool shortkey)
+buttonsupdate(WINDOW *widget, int h, int w, struct buttons bs)
 {
-	draw_buttons(widget, h-2, w, bs, shortkey);
+	draw_buttons(widget, h-2, w, bs, true);
 	wnoutrefresh(widget);
 }
 
 static void
 textupdate(WINDOW *widget, int y, int x, int h, int w, WINDOW *textpad,
     int htextpad, int textrow)
 {
-
 	if (htextpad > h - 4) {
 		mvwprintw(widget, h-3, w-6, "%3d%%",
 		    100 * (textrow+h-4)/ htextpad);
 		wnoutrefresh(widget);
 	}
 
 	pnoutrefresh(textpad, textrow, 0, y+1, x+2, y+h-4, x+w-2);
 }
 
 static int
-do_widget(struct bsddialog_conf *conf, char *text, int rows, int cols,
-    struct buttons bs, bool shortkey)
+do_dialog(struct bsddialog_conf *conf, char *text, int rows, int cols,
+    struct buttons bs)
 {
 	WINDOW *widget, *textpad, *shadow;
 	bool loop;
 	int i, y, x, h, w, input, output, htextpad, textrow;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (message_autosize(conf, rows, cols, &h, &w, text, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (message_checksize(h, w, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	textrow = 0;
 	loop = true;
-	buttonsupdate(widget, h, w, bs, shortkey);
+	buttonsupdate(widget, h, w, bs);
 	textupdate(widget, y, x, h, w, textpad, htextpad, textrow);
 	while(loop) {
 		doupdate();
 		input = getch();
 		switch (input) {
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
-			buttonsupdate(widget, h, w, bs, shortkey);
+			buttonsupdate(widget, h, w, bs);
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			if (message_autosize(conf, rows, cols, &h, &w, text, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (message_checksize(h, w, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 				return BSDDIALOG_ERROR;
 
-			buttonsupdate(widget, h, w, bs, shortkey);
+			buttonsupdate(widget, h, w, bs);
 			textupdate(widget, y, x, h, w, textpad, htextpad, textrow);
 
 			/* Important to fix grey lines expanding screen */
 			refresh();
 			break;
 		case KEY_UP:
 			if (textrow == 0)
 				break;
 			textrow--;
 			textupdate(widget, y, x, h, w, textpad, htextpad, textrow);
 			break;
 		case KEY_DOWN:
 			if (textrow + h - 4 >= htextpad)
 				break;
 			textrow++;
 			textupdate(widget, y, x, h, w, textpad, htextpad, textrow);
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
-				buttonsupdate(widget, h, w, bs, shortkey);
+				buttonsupdate(widget, h, w, bs);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
-				buttonsupdate(widget, h, w, bs, shortkey);
+				buttonsupdate(widget, h, w, bs);
 			}
 			break;
 		default:
-			if (shortkey == false)
-				break;
-
 			for (i = 0; i < (int) bs.nbuttons; i++)
-				if (tolower(input) == tolower((bs.label[i])[0])) {
+				if (tolower(input) == tolower(bs.label[i][0])) {
 					output = bs.value[i];
 					loop = false;
 			}
 		}
 	}
 
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
 
 /* API */
-
 int
 bsddialog_msgbox(struct bsddialog_conf *conf, char* text, int rows, int cols)
 {
 	struct buttons bs;
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
-	    NULL /* nocancel */, BUTTONLABEL(help_label));
+	    NULL, BUTTONLABEL(help_label));
 
-	return (do_widget(conf, text, rows, cols, bs, true));
+	return (do_dialog(conf, text, rows, cols, bs));
 }
 
 int
 bsddialog_yesno(struct bsddialog_conf *conf, char* text, int rows, int cols)
 {
 	struct buttons bs;
 
 	get_buttons(conf, &bs,
 	    conf->button.ok_label == NULL ? "Yes" : conf->button.ok_label,
 	    BUTTONLABEL(extra_label),
 	    conf->button.cancel_label == NULL ? "No" : conf->button.cancel_label,
 	    BUTTONLABEL(help_label));
 
-	return (do_widget(conf, text, rows, cols, bs, true));
+	return (do_dialog(conf, text, rows, cols, bs));
 }
diff --git a/lib/textbox.c b/lib/textbox.c
index 22dd21470c3a..6dae6c81343b 100644
--- a/lib/textbox.c
+++ b/lib/textbox.c
@@ -1,249 +1,248 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 
 #include <sys/param.h>
 
-#include <string.h>
-
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
+#include <string.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 /* "Text": textbox */
 
 #define BUTTON_TEXTBOX "EXIT"
 
 extern struct bsddialog_theme t;
 
 static void
 textbox_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     int hpad, int wpad)
 {
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += strlen(BUTTON_TEXTBOX) + 2 /* text delims*/;
 		/* text size */
 		*w = MAX(*w, wpad + VBORDERS);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/* avoid terminal overflow */
 		*w = MIN(*w, widget_max_width(conf)-1); /* again -1, fix util.c */
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = hpad + 4; /* HBORDERS + button border */
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf));
 	}
 }
 
 static int textbox_checksize(int rows, int cols, int hpad)
 {
 	int mincols;
 
 	mincols = VBORDERS + strlen(BUTTON_TEXTBOX) + 2 /* text delims */;
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols for the textbox");
 
 	if (rows < 4 /* HBORDERS + button*/ + (hpad > 0 ? 1 : 0))
 		RETURN_ERROR("Few rows for the textbox");
 
 	return 0;
 }
 
 int
 bsddialog_textbox(struct bsddialog_conf *conf, char* file, int rows, int cols)
 {
 	WINDOW *widget, *pad, *shadow;
 	int i, input, y, x, h, w, hpad, wpad, ypad, xpad, ys, ye, xs, xe, printrows;
 	char buf[BUFSIZ], *exitbutt;
 	FILE *fp;
 	bool loop;
 	int output;
 
 	if ((fp = fopen(file, "r")) == NULL)
 		RETURN_ERROR("Cannot open file");
 
 	hpad = 1;
 	wpad = 1;
 	pad = newpad(hpad, wpad);
 	wbkgd(pad, t.dialog.color);
 	i = 0;
 	while(fgets(buf, BUFSIZ, fp) != NULL) {
 		if ((int) strlen(buf) > wpad) {
 			wpad = strlen(buf);
 			wresize(pad, hpad, wpad);
 		}
 		if (i > hpad-1) {
 			hpad++;
 			wresize(pad, hpad, wpad);
 		}
 		mvwaddstr(pad, i, 0, buf);
 		i++;
 	}
 	fclose(fp);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	textbox_autosize(conf, rows, cols, &h, &w, hpad, wpad);
 	if (textbox_checksize(h, w, hpad) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    NULL, NULL, NULL, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	exitbutt = conf->button.exit_label == NULL ? BUTTON_TEXTBOX : conf->button.exit_label;
 	draw_button(widget, h-2, (w-2)/2 - strlen(exitbutt)/2, strlen(exitbutt)+2,
 	    exitbutt, true, false);
 
 	wrefresh(widget);
 
 	ys = y + 1;
 	xs = x + 1;
 	ye = ys + h - 5;
 	xe = xs + w - 3;
 	ypad = xpad = 0;
 	printrows = h-4;
 	loop = true;
 	while(loop) {
 		prefresh(pad, ypad, xpad, ys, xs, ye, xe);
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = BSDDIALOG_OK;
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case KEY_HOME:
 			ypad = 0;
 			break;
 		case KEY_END:
 			ypad = hpad - printrows;
 			ypad = ypad < 0 ? 0 : ypad;
 			break;
 		case KEY_PPAGE:
 			ypad -= printrows;
 			ypad = ypad < 0 ? 0 : ypad;
 			break;
 		case KEY_NPAGE:
 			ypad += printrows;
 			ypad = ypad + printrows > hpad ? hpad - printrows : ypad;
 			break;
 		case '0':
 			xpad = 0;
 		case KEY_LEFT:
 		case 'h':
 			xpad = xpad > 0 ? xpad - 1 : 0;
 			break;
 		case KEY_RIGHT:
 		case 'l':
 			xpad = (xpad + w-2) < wpad-1 ? xpad + 1 : xpad;
 			break;
 		case KEY_UP:
 		case 'k':
 			ypad = ypad > 0 ? ypad - 1 : 0;
 			break;
 		case KEY_DOWN:
 		case'j':
 			ypad = ypad + printrows <= hpad -1 ? ypad + 1 : ypad;
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			textbox_autosize(conf, rows, cols, &h, &w, hpad, wpad);
 			if (textbox_checksize(h, w, hpad) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			ys = y + 1;
 			xs = x + 1;
 			ye = ys + h - 5;
 			xe = xs + w - 3;
 			ypad = xpad = 0;
 			printrows = h - 4;
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, NULL, NULL, NULL, true) != 0)
 			return BSDDIALOG_ERROR;
 
 			draw_button(widget, h-2, (w-2)/2 - strlen(exitbutt)/2,
 			    strlen(exitbutt)+2, exitbutt, true, false);
 
 			wrefresh(widget); /* for button */
 
 			/* Important to fix grey lines expanding screen */
 			refresh();
 			break;
 		}
 	}
 
 	end_widget_withtextpad(conf, widget, h, w, pad, shadow);
 
 	return output;
 }
diff --git a/lib/theme.c b/lib/theme.c
index 3bcd8ee8fc53..0948501e52ff 100644
--- a/lib/theme.c
+++ b/lib/theme.c
@@ -1,288 +1,288 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 #define GET_COLOR(bg, fg) (COLOR_PAIR(bg * 8 + fg +1))
 
 struct bsddialog_theme t;
 
 static struct bsddialog_theme bsddialogtheme = {
 #define bgwidget  COLOR_WHITE
 #define bgcurr    COLOR_YELLOW
 	.terminal.color = GET_COLOR(COLOR_BLACK, COLOR_CYAN),
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.h       = 1,
 	.shadow.w       = 2,
 
 	.dialog.delimtitle       = true,
 	.dialog.titlecolor       = GET_COLOR(COLOR_YELLOW, bgwidget),
 	.dialog.lineraisecolor   = GET_COLOR(COLOR_BLACK,  bgwidget),
 	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK,  bgwidget),
 	.dialog.color            = GET_COLOR(COLOR_BLACK,  bgwidget),
 	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK,  bgwidget),
 
 	.text.hmargin = 1,
 
 	.menu.arrowcolor      = GET_COLOR(COLOR_YELLOW, bgwidget),
 	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK,  bgwidget) | A_BOLD,
 	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE,  bgcurr),
 	.menu.desccolor       = GET_COLOR(COLOR_BLACK,  bgwidget),
 	.menu.f_namecolor     = GET_COLOR(COLOR_BLACK,  bgcurr),
 	.menu.namecolor       = GET_COLOR(COLOR_YELLOW, bgwidget),
 	.menu.namesepcolor    = GET_COLOR(COLOR_YELLOW, bgwidget),
 	.menu.descsepcolor    = GET_COLOR(COLOR_YELLOW, bgwidget),
 	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,    bgcurr),
 	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,    bgwidget),
 
 	.form.f_fieldcolor  = GET_COLOR(COLOR_WHITE,  COLOR_BLUE),
 	.form.fieldcolor    = GET_COLOR(COLOR_WHITE,  COLOR_CYAN),
 	.form.readonlycolor = GET_COLOR(COLOR_CYAN,COLOR_WHITE),
 
 	.bar.f_color = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.bar.color   = GET_COLOR(COLOR_BLUE,  COLOR_WHITE),
 
 	.button.space        = 3,
 	.button.leftch       = '[',
 	.button.rightch      = ']',
 	.button.f_delimcolor = GET_COLOR(COLOR_WHITE,  bgcurr),
 	.button.delimcolor   = GET_COLOR(COLOR_BLACK,  bgwidget),
 	.button.f_color      = GET_COLOR(COLOR_WHITE,  bgcurr)    | A_UNDERLINE,
 	.button.color        = GET_COLOR(COLOR_BLACK,  bgwidget)  | A_UNDERLINE,
 	.button.f_shortcutcolor = GET_COLOR(COLOR_BLACK, bgcurr)  | A_UNDERLINE,
 	.button.shortcutcolor = GET_COLOR(COLOR_YELLOW, bgwidget) | A_UNDERLINE
 };
 
 static struct bsddialog_theme blackwhite = {
-#define bk  COLOR_BLACK
 #define fg  COLOR_WHITE
+#define bk  COLOR_BLACK
 	.terminal.color = GET_COLOR(fg, bk),
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.h       = 1,
 	.shadow.w       = 2,
 
 	.dialog.delimtitle       = true,
 	.dialog.titlecolor       = GET_COLOR(fg, bk),
 	.dialog.lineraisecolor   = GET_COLOR(fg, bk),
 	.dialog.linelowercolor   = GET_COLOR(fg, bk),
 	.dialog.color            = GET_COLOR(fg, bk),
 	.dialog.bottomtitlecolor = GET_COLOR(fg, bk),
 
 	.text.hmargin = 1,
 
 	.menu.arrowcolor      = GET_COLOR(fg, bk),
 	.menu.selectorcolor   = GET_COLOR(fg, bk),
 	.menu.f_desccolor     = GET_COLOR(fg, bk) | A_REVERSE,
 	.menu.desccolor       = GET_COLOR(fg, bk),
 	.menu.f_namecolor     = GET_COLOR(fg, bk) | A_REVERSE,
 	.menu.namecolor       = GET_COLOR(fg, bk),
 	.menu.namesepcolor    = GET_COLOR(fg, bk),
 	.menu.descsepcolor    = GET_COLOR(fg, bk),
 	.menu.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.menu.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE,
 
 	.form.f_fieldcolor  = GET_COLOR(fg, bk) | A_REVERSE,
 	.form.fieldcolor    = GET_COLOR(fg, bk),
 	.form.readonlycolor = GET_COLOR(fg, bk),
 
 	.bar.f_color = GET_COLOR(fg, bk) | A_REVERSE,
 	.bar.color   = GET_COLOR(fg, bk),
 
 	.button.space           = 3,
 	.button.leftch          = '[',
 	.button.rightch         = ']',
 	.button.f_delimcolor    = GET_COLOR(fg, bk),
 	.button.delimcolor      = GET_COLOR(fg, bk),
 	.button.f_color         = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.button.color           = GET_COLOR(fg, bk) | A_UNDERLINE,
 	.button.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.button.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE
 };
 
 static struct bsddialog_theme dialogtheme = {
 	.terminal.color = GET_COLOR(COLOR_CYAN,  COLOR_BLUE)  | A_BOLD,
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.h       = 1,
 	.shadow.w       = 2,
 
 	.dialog.delimtitle       = false,
 	.dialog.titlecolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE) | A_BOLD,
 	.dialog.lineraisecolor   = GET_COLOR(COLOR_WHITE, COLOR_WHITE) | A_BOLD,
 	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
 	.dialog.color            = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
 
 	.text.hmargin = 1,
 
 	.menu.arrowcolor      = GET_COLOR(COLOR_GREEN,  COLOR_WHITE),
 	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK,  bgwidget)    | A_BOLD,
 	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.menu.desccolor       = GET_COLOR(COLOR_BLACK,  COLOR_WHITE) | A_BOLD,
 	.menu.f_namecolor     = GET_COLOR(COLOR_YELLOW, COLOR_BLUE)  | A_BOLD,
 	.menu.namecolor       = GET_COLOR(COLOR_BLUE,   COLOR_WHITE) | A_BOLD,
 	.menu.namesepcolor    = GET_COLOR(COLOR_RED,    COLOR_WHITE),
 	.menu.descsepcolor    = GET_COLOR(COLOR_RED,    COLOR_WHITE),
 	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,    COLOR_BLUE)  | A_BOLD,
 	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,    COLOR_WHITE) | A_BOLD,
 
 	.form.f_fieldcolor  = GET_COLOR(COLOR_WHITE, COLOR_BLUE) | A_BOLD,
 	.form.fieldcolor    = GET_COLOR(COLOR_WHITE, COLOR_CYAN) | A_BOLD,
 	.form.readonlycolor = GET_COLOR(COLOR_CYAN,  COLOR_WHITE)| A_BOLD,
 
 	.bar.f_color = GET_COLOR(COLOR_WHITE, COLOR_BLUE)  | A_BOLD,
 	.bar.color   = GET_COLOR(COLOR_BLUE,  COLOR_WHITE) | A_BOLD,
 
 	.button.space           = 3,
 	.button.leftch          = '<',
 	.button.rightch         = '>',
 	.button.f_delimcolor    = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.button.delimcolor      = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.button.f_color         = GET_COLOR(COLOR_YELLOW, COLOR_BLUE)  | A_BOLD,
 	.button.color           = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.button.f_shortcutcolor = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.button.shortcutcolor   = GET_COLOR(COLOR_RED,    COLOR_WHITE) | A_BOLD
 };
 
 static void
 set_theme(struct bsddialog_theme *dst, struct bsddialog_theme *src)
 {
 	dst->shadow.color = src->shadow.color;
 	dst->shadow.h     = src->shadow.h;
 	dst->shadow.w     = src->shadow.w;
 
 	dst->terminal.color          = src->terminal.color;
 	dst->dialog.delimtitle       = src->dialog.delimtitle;
 	dst->dialog.titlecolor       = src->dialog.titlecolor;
 	dst->dialog.lineraisecolor   = src->dialog.lineraisecolor;
 	dst->dialog.linelowercolor   = src->dialog.linelowercolor;
 	dst->dialog.color            = src->dialog.color;
 	dst->dialog.bottomtitlecolor = src->dialog.bottomtitlecolor;
 
 	dst->text.hmargin = src->text.hmargin;
 
 	dst->menu.arrowcolor      = src->menu.arrowcolor;
 	dst->menu.selectorcolor   = src->menu.selectorcolor;
 	dst->menu.f_desccolor     = src->menu.f_desccolor;
 	dst->menu.desccolor       = src->menu.desccolor;
 	dst->menu.f_namecolor     = src->menu.f_namecolor;
 	dst->menu.namecolor       = src->menu.namecolor;
 	dst->menu.namesepcolor    = src->menu.namesepcolor;
 	dst->menu.descsepcolor    = src->menu.descsepcolor;
 	dst->menu.f_shortcutcolor = src->menu.f_shortcutcolor;
 	dst->menu.shortcutcolor   = src->menu.shortcutcolor;
 
 	dst->form.f_fieldcolor  = src->form.f_fieldcolor;
 	dst->form.fieldcolor    = src->form.fieldcolor;
 	dst->form.readonlycolor = src->form.readonlycolor;
 
 	dst->bar.f_color = src->bar.f_color;
 	dst->bar.color   = src->bar.color;
 
 	dst->button.space           = src->button.space;
 	dst->button.leftch          = src->button.leftch;
 	dst->button.rightch         = src->button.rightch;
 	dst->button.f_delimcolor    = src->button.f_delimcolor;
 	dst->button.delimcolor      = src->button.delimcolor;
 	dst->button.f_color         = src->button.f_color;
 	dst->button.color           = src->button.color;
 	dst->button.f_shortcutcolor = src->button.f_shortcutcolor;
 	dst->button.shortcutcolor   = src->button.shortcutcolor;
 
 	bkgd(dst->terminal.color);
 	refresh();
 }
 
 /* API */
 int bsddialog_get_theme(struct bsddialog_theme *theme)
 {
 	if (theme == NULL)
 		RETURN_ERROR("theme is NULL");
 	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
 		RETURN_ERROR("Bad suze struct bsddialog_theme");
 
 	set_theme(theme, &t);
 
 	return (0);
 }
 
 int bsddialog_set_theme(struct bsddialog_theme *theme)
 {
 	if (theme == NULL)
 		RETURN_ERROR("theme is NULL");
 	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
 		RETURN_ERROR("Bad size struct bsddialog_theme");
 
 	set_theme(&t, theme);
 
 	return (0);
 }
 
 int bsddialog_set_default_theme(enum bsddialog_default_theme newtheme)
 {
 
 	if (newtheme == BSDDIALOG_THEME_DEFAULT) {
 		bsddialog_set_theme(&dialogtheme);
 		t.dialog.lineraisecolor = t.dialog.linelowercolor;
 	}
 	else if (newtheme == BSDDIALOG_THEME_BSDDIALOG)
 		bsddialog_set_theme(&bsddialogtheme);
 	else if (newtheme == BSDDIALOG_THEME_BLACKWHITE)
 		bsddialog_set_theme(&blackwhite);
 	else if (newtheme == BSDDIALOG_THEME_DIALOG)
 		bsddialog_set_theme(&dialogtheme);
 	else
 		RETURN_ERROR("Unknow default theme");
 
 	return (0);
 }
 
 int
-bsddialog_color(enum bsddialog_color background,
-    enum bsddialog_color foreground, unsigned int flags)
+bsddialog_color(enum bsddialog_color foreground,
+    enum bsddialog_color background, unsigned int flags)
 {
 	unsigned int cursesflags = 0;
 
 	if (flags & BSDDIALOG_BOLD)
 		cursesflags |= A_BOLD;
 	if (flags & BSDDIALOG_REVERSE)
 		cursesflags |= A_REVERSE;
 	if (flags & BSDDIALOG_UNDERLINE)
 		cursesflags |= A_UNDERLINE;
 
-	return (GET_COLOR(background, foreground) | cursesflags);
+	return (GET_COLOR(foreground, background) | cursesflags);
 }
diff --git a/lib/timebox.c b/lib/timebox.c
index 2597cbf0c152..04e058448149 100644
--- a/lib/timebox.c
+++ b/lib/timebox.c
@@ -1,535 +1,534 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
+#include <ctype.h>
 #ifdef PORTNCURSES
 #include <ncurses/ncurses.h>
 #else
 #include <ncurses.h>
 #endif
-
-#include <ctype.h>
 #include <string.h>
 
 #include "bsddialog.h"
 #include "lib_util.h"
 #include "bsddialog_theme.h"
 
 #define MINWDATE 25 /* 23 wins + 2 VBORDERS */
 #define MINWTIME 16 /*14 wins + 2 VBORDERS */
 #define MINHEIGHT 8 /* 2 for text */
 
 /* "Time": timebox - datebox */
 
 extern struct bsddialog_theme t;
 
 static int
 datetime_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
     int *w, int minw, char *text, struct buttons bs)
 {
 	int maxword, maxline, nlines, line;
 
 	if (get_text_properties(conf, text, &maxword, &maxline, &nlines) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		*w = VBORDERS;
 		/* buttons size */
 		*w += bs.nbuttons * bs.sizebutton;
 		*w += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 		/* text size */
 		line = maxline + VBORDERS + t.text.hmargin * 2;
 		line = MAX(line, (int) (maxword + VBORDERS + t.text.hmargin * 2));
 		*w = MAX(*w, line);
 		/* date windows */
 		*w = MAX(*w, minw);
 		/* conf.auto_minwidth */
 		*w = MAX(*w, (int)conf->auto_minwidth);
 		/* avoid terminal overflow */
 		*w = MIN(*w, widget_max_width(conf) -1);
 	}
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
 		*h = MINHEIGHT;
 		if (maxword > 0)
 			*h += MAX(nlines, (int)(*w / GET_ASPECT_RATIO(conf)));
 		/* conf.auto_minheight */
 		*h = MAX(*h, (int)conf->auto_minheight);
 		/* avoid terminal overflow */
 		*h = MIN(*h, widget_max_height(conf) -1);
 	}
 
 	return 0;
 }
 
 static int
 datetime_checksize(int rows, int cols, char *text, int minw, struct buttons bs)
 {
 	int mincols;
 
 	mincols = VBORDERS;
 	mincols += bs.nbuttons * bs.sizebutton;
 	mincols += bs.nbuttons > 0 ? (bs.nbuttons-1) * t.button.space : 0;
 	mincols = MAX(minw, mincols);
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols for this timebox/datebox");
 
 	if (rows < MINHEIGHT + (strlen(text) > 0 ? 1 : 0))
 		RETURN_ERROR("Few rows for this timebox/datebox");
 
 	return 0;
 }
 
 int bsddialog_timebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int *hh, unsigned int *mm, unsigned int *ss)
 {
 	WINDOW *widget, *textpad, *shadow;
 	int i, input, output, y, x, h, w, sel, htextpad;
 	struct buttons bs;
 	bool loop;
 	struct myclockstruct {
 		unsigned int max;
 		unsigned int value;
 		WINDOW *win;
 	};
 
 	if (hh == NULL || mm == NULL || ss == NULL)
 		RETURN_ERROR("hh / mm / ss cannot be NULL");
 
 	struct myclockstruct c[3] = {
 		{23, *hh, NULL},
 		{59, *mm, NULL},
 		{59, *ss, NULL}
 	};
 
 	for (i = 0 ; i < 3; i++) {
 		if (c[i].value > c[i].max)
 			c[i].value = c[i].max;
 	}
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (datetime_autosize(conf, rows, cols, &h, &w, MINWTIME, text, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (datetime_checksize(h, w, text, MINWTIME, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 	
 	draw_buttons(widget, h-2, w, bs, true);
 
 	wrefresh(widget);
 
 	prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 	c[0].win = new_boxed_window(conf, y + h - 6, x + w/2 - 7, 3, 4, LOWERED);
 	mvwaddch(widget, h - 5, w/2 - 3, ':');
 	c[1].win = new_boxed_window(conf, y + h - 6, x + w/2 - 2, 3, 4, LOWERED);
 	mvwaddch(widget, h - 5, w/2 + 2, ':');
 	c[2].win = new_boxed_window(conf, y + h - 6, x + w/2 + 3, 3, 4, LOWERED);
 
 	wrefresh(widget);
 
 	sel = 0;
 	curs_set(2);
 	loop = true;
 	while(loop) {
 		for (i=0; i<3; i++) {
 			mvwprintw(c[i].win, 1, 1, "%2d", c[i].value);
 			wrefresh(c[i].win);
 		}
 		wmove(c[sel].win, 1, 2);
 		wrefresh(c[sel].win);
 
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			if (output == BSDDIALOG_OK) {
 				*hh = c[0].value;
 				*mm = c[1].value;
 				*ss = c[2].value;
 			}
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			sel = (sel + 1) % 3;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, h-2, w, bs, true);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, h-2, w, bs, true);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_UP:
 			c[sel].value = c[sel].value < c[sel].max ? c[sel].value + 1 : 0;
 			break;
 		case KEY_DOWN:
 			c[sel].value = c[sel].value > 0 ? c[sel].value - 1 : c[sel].max;
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			curs_set(0);
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			curs_set(2);
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			if (datetime_autosize(conf, rows, cols, &h, &w, MINWTIME, text, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (datetime_checksize(h, w, text, MINWTIME, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 				return BSDDIALOG_ERROR;
 				
 			mvwaddch(widget, h - 5, w/2 - 3, ':');
 			mvwaddch(widget, h - 5, w/2 + 2, ':');
 			
 			draw_buttons(widget, h-2, w, bs, true);
 
 			wrefresh(widget);
 
 			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 			wclear(c[0].win);
 			mvwin(c[0].win, y + h - 6, x + w/2 - 7);
 			draw_borders(conf, c[0].win, 3, 4, LOWERED);
 			wrefresh(c[0].win);
 
 			wclear(c[1].win);
 			mvwin(c[1].win, y + h - 6, x + w/2 - 2);
 			draw_borders(conf, c[1].win, 3, 4, LOWERED);
 			wrefresh(c[1].win);
 
 			wclear(c[2].win);
 			mvwin(c[2].win, y + h - 6, x + w/2 + 3);
 			draw_borders(conf, c[2].win, 3, 4, LOWERED);
 			wrefresh(c[2].win);
 
 			/* Important to avoid grey lines expanding screen */
 			refresh();
 			break;
 		default:
 			for (i = 0; i < (int) bs.nbuttons; i++)
 				if (tolower(input) == tolower((bs.label[i])[0])) {
 					output = bs.value[i];
 					loop = false;
 			}
 		}
 	}
 
 	curs_set(0);
 
 	for (i=0; i<3; i++)
 		delwin(c[i].win);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }
 
 int
 bsddialog_datebox(struct bsddialog_conf *conf, char* text, int rows, int cols,
     unsigned int *yy, unsigned int *mm, unsigned int *dd)
 {
 	WINDOW *widget, *textpad, *shadow;
 	int i, input, output, y, x, h, w, sel, htextpad;
 	struct buttons bs;
 	bool loop;
 	struct calendar {
 		int max;
 		int value;
 		WINDOW *win;
 		unsigned int x;
 	};
 	struct month {
 		char *name;
 		unsigned int days;
 	};
 
 	if (yy == NULL || mm == NULL || dd == NULL)
 		RETURN_ERROR("yy / mm / dd cannot be NULL");
 
 	struct calendar c[3] = {
 		{9999, *yy, NULL, 4 },
 		{12,   *mm, NULL, 9 },
 		{31,   *dd, NULL, 2 }
 	};
 
 	struct month m[12] = {
 		{ "January", 31 }, { "February", 28 }, { "March",     31 },
 		{ "April",   30 }, { "May",      31 }, { "June",      30 },
 		{ "July",    31 }, { "August",   31 }, { "September", 30 },
 		{ "October", 31 }, { "November", 30 }, { "December",  31 }
 	};
 
 #define ISLEAF(year) ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
 
 	for (i = 0 ; i < 3; i++) {
 		if (c[i].value > c[i].max)
 			c[i].value = c[i].max;
 		if (c[i].value < 1)
 			c[i].value = 1;
 	}
 	c[2].max = m[c[1].value -1].days;
 	if (c[1].value == 2 && ISLEAF(c[0].value))
 		c[2].max = 29;
 	if (c[2].value > c[2].max)
 		c[2].value = c[2].max;
 
 	get_buttons(conf, &bs, BUTTONLABEL(ok_label), BUTTONLABEL(extra_label),
 	    BUTTONLABEL(cancel_label), BUTTONLABEL(help_label));
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return BSDDIALOG_ERROR;
 	if (datetime_autosize(conf, rows, cols, &h, &w, MINWDATE, text, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (datetime_checksize(h, w, text, MINWDATE, bs) != 0)
 		return BSDDIALOG_ERROR;
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return BSDDIALOG_ERROR;
 
 	if (new_widget_withtextpad(conf, &shadow, &widget, y, x, h, w, RAISED,
 	    &textpad, &htextpad, text, true) != 0)
 		return BSDDIALOG_ERROR;
 
 	draw_buttons(widget, h-2, w, bs, true);
 
 	wrefresh(widget);
 
 	prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 	c[0].win = new_boxed_window(conf, y + h - 6, x + w/2 - 11, 3, 6, LOWERED);
 	mvwaddch(widget, h - 5, w/2 - 5, '/');
 	c[1].win = new_boxed_window(conf, y + h - 6, x + w/2 - 4, 3, 11, LOWERED);
 	mvwaddch(widget, h - 5, w/2 + 7, '/');
 	c[2].win = new_boxed_window(conf, y + h - 6, x + w/2 + 8, 3, 4, LOWERED);
 	
 	wrefresh(widget);
 
 	sel = 2;
 	curs_set(2);
 	loop = true;
 	while(loop) {
 		mvwprintw(c[0].win, 1, 1, "%4d", c[0].value);
 		mvwprintw(c[1].win, 1, 1, "%9s", m[c[1].value-1].name);
 		mvwprintw(c[2].win, 1, 1, "%2d", c[2].value);
 		for (i=0; i<3; i++) {
 			wrefresh(c[i].win);
 		}
 		wmove(c[sel].win, 1, c[sel].x);
 		wrefresh(c[sel].win);
 
 		input = getch();
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			output = bs.value[bs.curr];
 			if (output == BSDDIALOG_OK) {
 				*yy = c[0].value;
 				*mm = c[1].value;
 				*dd = c[2].value;
 			}
 			loop = false;
 			break;
 		case 27: /* Esc */
 			output = BSDDIALOG_ESC;
 			loop = false;
 			break;
 		case '\t': /* TAB */
 			sel = (sel + 1) % 3;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, h-2, w, bs, true);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, h-2, w, bs, true);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_UP:
 			c[sel].value = c[sel].value > 1 ? c[sel].value - 1 : c[sel].max ;
 			/* if mount change */
 			c[2].max = m[c[1].value -1].days;
 			/* if year change */
 			if (c[1].value == 2 && ISLEAF(c[0].value))
 				c[2].max = 29;
 			/* set new day */
 			if (c[2].value > c[2].max)
 				c[2].value = c[2].max;
 			break;
 		case KEY_DOWN:
 			c[sel].value = c[sel].value < c[sel].max ? c[sel].value + 1 : 1;
 			/* if mount change */
 			c[2].max = m[c[1].value -1].days;
 			/* if year change */
 			if (c[1].value == 2 && ISLEAF(c[0].value))
 				c[2].max = 29;
 			/* set new day */
 			if (c[2].value > c[2].max)
 				c[2].value = c[2].max;
 			break;
 		case KEY_F(1):
 			if (conf->f1_file == NULL && conf->f1_message == NULL)
 				break;
 			curs_set(0);
 			if (f1help(conf) != 0)
 				return BSDDIALOG_ERROR;
 			curs_set(2);
 			/* No break! the terminal size can change */
 		case KEY_RESIZE:
 			hide_widget(y, x, h, w,conf->shadow);
 
 			/*
 			 * Unnecessary, but, when the columns decrease the
 			 * following "refresh" seem not work
 			 */
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return BSDDIALOG_ERROR;
 			if (datetime_autosize(conf, rows, cols, &h, &w, MINWDATE, text, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (datetime_checksize(h, w, text, MINWDATE, bs) != 0)
 				return BSDDIALOG_ERROR;
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return BSDDIALOG_ERROR;
 
 			wclear(shadow);
 			mvwin(shadow, y + t.shadow.h, x + t.shadow.w);
 			wresize(shadow, h, w);
 
 			wclear(widget);
 			mvwin(widget, y, x);
 			wresize(widget, h, w);
 
 			htextpad = 1;
 			wclear(textpad);
 			wresize(textpad, 1, w - HBORDERS - t.text.hmargin * 2);
 
 			if(update_widget_withtextpad(conf, shadow, widget, h, w,
 			    RAISED, textpad, &htextpad, text, true) != 0)
 				return BSDDIALOG_ERROR;
 				
 			mvwaddch(widget, h - 5, w/2 - 5, '/');
 			mvwaddch(widget, h - 5, w/2 + 7, '/');
 			
 			draw_buttons(widget, h-2, w, bs, true);
 
 			wrefresh(widget);
 
 			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 			wclear(c[0].win);
 			mvwin(c[0].win, y + h - 6, x + w/2 - 11);
 			draw_borders(conf, c[0].win, 3, 6, LOWERED);
 			wrefresh(c[0].win);
 
 			wclear(c[1].win);
 			mvwin(c[1].win, y + h - 6, x + w/2 - 4);
 			draw_borders(conf, c[1].win, 3, 11, LOWERED);
 			wrefresh(c[1].win);
 
 			wclear(c[2].win);
 			mvwin(c[2].win, y + h - 6, x + w/2 + 8);
 			draw_borders(conf, c[2].win, 3, 4, LOWERED);
 			wrefresh(c[2].win);
 
 			/* Important to avoid grey lines expanding screen */
 			refresh();
 			break;
 		default:
 			for (i = 0; i < (int) bs.nbuttons; i++)
 				if (tolower(input) == tolower((bs.label[i])[0])) {
 					output = bs.value[i];
 					loop = false;
 			}
 		}
 	}
 
 	curs_set(0);
 
 	for (i=0; i<3; i++)
 		delwin(c[i].win);
 	end_widget_withtextpad(conf, widget, h, w, textpad, shadow);
 
 	return output;
 }