Deleted Added
sdiff udiff text old ( 250633 ) new ( 251190 )
full compact
saver (250633) saver (251190)
1#!/bin/sh
2#-
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1#!/bin/sh
2#-
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/console/saver 250633 2013-05-14 03:21:13Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/console/saver 251190 2013-05-31 19:07:17Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." "$0"
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr

--- 8 unchanged lines hidden (view full) ---

44############################################################ FUNCTIONS
45
46# dialog_menu_main
47#
48# Display the dialog(1)-based application main menu.
49#
50dialog_menu_main()
51{
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." "$0"
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr

--- 8 unchanged lines hidden (view full) ---

44############################################################ FUNCTIONS
45
46# dialog_menu_main
47#
48# Display the dialog(1)-based application main menu.
49#
50dialog_menu_main()
51{
52 local menu_list size defaultitem=
52 local menu_list defaultitem=
53 local hline="$hline_choose_a_screen_saver"
54 local prompt="$msg_saver_menu_text"
55
56 menu_list="
57 '1 $msg_blank' '$msg_blank_desc'
58 '2 $msg_beastie' '$msg_beastie_desc'
59 '3 $msg_daemon' '$msg_daemon_desc'
60 '4 $msg_dragon' '$msg_dragon_desc'

--- 4 unchanged lines hidden (view full) ---

65 '9 $msg_rain' '$msg_rain_desc'
66 'a $msg_snake' '$msg_snake_desc'
67 'b $msg_star' '$msg_star_desc'
68 'c $msg_warp' '$msg_warp_desc'
69 'd $msg_none' '$msg_none_saver_desc'
70 '$msg_timeout' '$msg_timeout_desc'
71 " # END-QUOTE
72
53 local hline="$hline_choose_a_screen_saver"
54 local prompt="$msg_saver_menu_text"
55
56 menu_list="
57 '1 $msg_blank' '$msg_blank_desc'
58 '2 $msg_beastie' '$msg_beastie_desc'
59 '3 $msg_daemon' '$msg_daemon_desc'
60 '4 $msg_dragon' '$msg_dragon_desc'

--- 4 unchanged lines hidden (view full) ---

65 '9 $msg_rain' '$msg_rain_desc'
66 'a $msg_snake' '$msg_snake_desc'
67 'b $msg_star' '$msg_star_desc'
68 'c $msg_warp' '$msg_warp_desc'
69 'd $msg_none' '$msg_none_saver_desc'
70 '$msg_timeout' '$msg_timeout_desc'
71 " # END-QUOTE
72
73 size=$( eval f_dialog_menu_size \
74 \"\$DIALOG_TITLE\" \
75 \"\$DIALOG_BACKTITLE\" \
76 \"\$prompt\" \
77 \"\$hline\" \
78 $menu_list )
73 local height width rows
74 eval f_dialog_menu_size height width rows \
75 \"\$DIALOG_TITLE\" \
76 \"\$DIALOG_BACKTITLE\" \
77 \"\$prompt\" \
78 \"\$hline\" \
79 $menu_list
79
80 case "$( f_sysrc_get saver )" in
81 blank) defaultitem="1 $msg_blank" ;;
82 beastie) defaultitem="2 $msg_beastie";;
83 daemon) defaultitem="3 $msg_daemon" ;;
84 dragon) defaultitem="4 $msg_dragon" ;;
85 fade) defaultitem="5 $msg_fade" ;;
86 fire) defaultitem="6 $msg_fire" ;;

--- 9 unchanged lines hidden (view full) ---

96 local dialog_menu
97 dialog_menu=$( eval $DIALOG \
98 --title \"\$DIALOG_TITLE\" \
99 --backtitle \"\$DIALOG_BACKTITLE\" \
100 --hline \"\$hline\" \
101 --ok-label \"\$msg_ok\" \
102 --cancel-label \"\$msg_cancel\" \
103 --default-item \"\$defaultitem\" \
80
81 case "$( f_sysrc_get saver )" in
82 blank) defaultitem="1 $msg_blank" ;;
83 beastie) defaultitem="2 $msg_beastie";;
84 daemon) defaultitem="3 $msg_daemon" ;;
85 dragon) defaultitem="4 $msg_dragon" ;;
86 fade) defaultitem="5 $msg_fade" ;;
87 fire) defaultitem="6 $msg_fire" ;;

--- 9 unchanged lines hidden (view full) ---

97 local dialog_menu
98 dialog_menu=$( eval $DIALOG \
99 --title \"\$DIALOG_TITLE\" \
100 --backtitle \"\$DIALOG_BACKTITLE\" \
101 --hline \"\$hline\" \
102 --ok-label \"\$msg_ok\" \
103 --cancel-label \"\$msg_cancel\" \
104 --default-item \"\$defaultitem\" \
104 --menu \"\$prompt\" $size \
105 --menu \"\$prompt\" \
106 $height $width $rows \
105 $menu_list \
106 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
107 )
108 local retval=$?
109 setvar DIALOG_MENU_$$ "$dialog_menu"
110 return $retval
111}
112

--- 87 unchanged lines hidden --- 		107 $menu_list \
108 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
109 )
110 local retval=$?
111 setvar DIALOG_MENU_$$ "$dialog_menu"
112 return $retval
113}
114

--- 87 unchanged lines hidden ---