summaryrefslogtreecommitdiffstats
path: root/contrib/dialog/inputbox.c
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-07-14 14:01:36 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-07-14 14:01:36 +0000
commit7c690c1aa838ce557a7140db128970d6149b34d6 (patch)
tree5205a5ffae5e2d9b6ee74c0df561f0dd164f7814 /contrib/dialog/inputbox.c
parente54e39a5004441432886ee2a43973c797fafdfd8 (diff)
parent94f19e002939203294adf4d18b410183682bd2de (diff)
downloadFreeBSD-src-7c690c1aa838ce557a7140db128970d6149b34d6.zip
FreeBSD-src-7c690c1aa838ce557a7140db128970d6149b34d6.tar.gz
Update dialog to 1.1-20110707.
Diffstat (limited to 'contrib/dialog/inputbox.c')
-rw-r--r--contrib/dialog/inputbox.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/dialog/inputbox.c b/contrib/dialog/inputbox.c
index 6e83cbc..14e2c28 100644
--- a/contrib/dialog/inputbox.c
+++ b/contrib/dialog/inputbox.c
@@ -1,9 +1,9 @@
/*
- * $Id: inputbox.c,v 1.64 2010/01/19 01:03:39 tom Exp $
+ * $Id: inputbox.c,v 1.67 2011/06/29 09:48:34 tom Exp $
*
- * inputbox.c -- implements the input box
+ * inputbox.c -- implements the input box
*
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ * Copyright 2000-2010,2011 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -46,12 +46,14 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
@@ -119,6 +121,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
dlg_draw_title(dialog, title);
wattrset(dialog, dialog_attr);
+ dlg_draw_helpline(dialog, FALSE);
dlg_print_autowrap(dialog, prompt, height, width);
/* Draw the input field box */
@@ -202,7 +205,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
case ' ': /* FIXME: conflict with inputstr.c */
case DLGK_ENTER:
dlg_del_window(dialog);
- result = (state >= 0) ? dlg_ok_buttoncode(state) : DLG_EXIT_OK;
+ result = (state >= 0) ? dlg_enter_buttoncode(state) : DLG_EXIT_OK;
break;
#ifdef KEY_RESIZE
case KEY_RESIZE:
OpenPOWER on IntegriCloud