Author: dteske
Date: Tue Nov 27 22:11:53 2012
New Revision: 243635
URL: http://svnweb.freebsd.org/changeset/base/243635
Log:
Change self-initialization to occur when loaded versus the previous behavior
which was to self-initialize during the first function-call. This didn't work
so well because the first call was may or may-not be within a sub-shell
(which prevented proper setup of the pass-thru file descriptor, resulting in
dialogs that would not display).
Approved by: adrian (co-mentor) (implicit)
Modified:
head/usr.sbin/bsdconfig/share/dialog.subr
Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr Tue Nov 27 22:05:01 2012
(r243634)
+++ head/usr.sbin/bsdconfig/share/dialog.subr Tue Nov 27 22:11:53 2012
(r243635)
@@ -72,8 +72,7 @@ unset XDIALOG_FORCE_AUTOSIZE
unset XDIALOG_INFOBOX_TIMEOUT
#
-# Default behavior is to call f_dialog_init() automatically if not already
-# called manually by the time the first f_dialog_*() function is used.
+# Default behavior is to call f_dialog_init() automatically when loaded.
#
: ${DIALOG_SELF_INITIALIZE=1}
@@ -185,8 +184,6 @@ f_dialog_backtitle_restore()
#
f_dialog_infobox_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n=0
local min_width max_size
@@ -308,8 +305,6 @@ f_dialog_infobox_size()
#
f_dialog_buttonbox_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4"
local size="$( f_dialog_infobox_size \
"$title" "$btitle" "$prompt" "$hline" )"
@@ -355,8 +350,6 @@ f_dialog_buttonbox_size()
#
f_dialog_inputbox_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" init="$4" hline="$5" n
local size="$( f_dialog_buttonbox_size \
"$title" "$btitle" "$prompt" "$hline" )"
@@ -422,8 +415,6 @@ f_dialog_inputbox_size()
#
f_xdialog_2inputsbox_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3"
local label1="$4" init1="$5" label2="$6" init2="$7" n
local size="$( f_dialog_inputbox_size \
@@ -519,8 +510,6 @@ f_xdialog_2inputsbox_size()
#
f_dialog_menu_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n=0
local min_width min_rows max_size
@@ -603,8 +592,6 @@ f_dialog_menu_size()
#
f_dialog_menu_with_help_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n=0
local min_width min_rows max_size
@@ -704,8 +691,6 @@ f_dialog_menu_with_help_size()
#
f_dialog_radiolist_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n=0
local min_width min_rows max_size
@@ -788,8 +773,6 @@ f_dialog_radiolist_size()
#
f_dialog_calendar_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n
local size="$( f_dialog_infobox_size \
"$title" "$btitle" "$prompt" "$hline" )"
@@ -869,8 +852,6 @@ f_dialog_calendar_size()
#
f_dialog_timebox_size()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local title="$1" btitle="$2" prompt="$3" hline="$4" n
local size="$( f_dialog_infobox_size \
"$title" "$btitle" "$prompt" "$hline" )"
@@ -934,8 +915,6 @@ f_dialog_timebox_size()
#
f_dialog_clear()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
$DIALOG --clear
}
@@ -948,8 +927,6 @@ f_dialog_clear()
#
f_dialog_info()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local info_text="$*"
local size="$( f_dialog_infobox_size \
"$DIALOG_TITLE" \
@@ -972,8 +949,6 @@ f_dialog_info()
#
f_xdialog_info()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local info_text="$*"
local size="$( f_dialog_infobox_size \
"$DIALOG_TITLE" \
@@ -1000,8 +975,6 @@ f_xdialog_info()
#
f_dialog_msgbox()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local msg_text="$*"
local size="$( f_dialog_buttonbox_size \
"$DIALOG_TITLE" \
@@ -1028,8 +1001,6 @@ f_dialog_msgbox()
#
f_dialog_textbox()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local file="$1"
local contents retval size
@@ -1070,8 +1041,6 @@ f_dialog_textbox()
#
f_dialog_yesno()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local msg_text="$*"
local hline="$hline_arrows_tab_enter"
local size="$( f_dialog_buttonbox_size \
@@ -1112,8 +1081,6 @@ f_dialog_yesno()
#
f_dialog_noyes()
{
- [ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
-
local msg_text="$*"
local hline="$hline_arrows_tab_enter"
local size="$( f_dialog_buttonbox_size \
@@ -1462,4 +1429,8 @@ f_dialog_init()
fi
}
+############################################################ MAIN
+
+[ "$DIALOG_SELF_INITIALIZE" ] && f_dialog_init
+
fi # ! $_DIALOG_SUBR
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
