d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24d3763284
freebsd-skq/usr.sbin/bsdconfig/console/font
dteske ea67b8239d Performance and debugging enhancements: 
+ Remove UNAME_P=$(...) from startup/misc -- already supplied by common.subr
+ Use f_getvar instead of $(eval echo \$$var) -- f_getvar is sub-shell free
+ Add `-e' and `-k var' options to f_eval_catch -- increasing use-cases
+ Use f_eval_catch to display errors on failure -- reducing duplicated code
+ Use f_eval_catch when we need output from a command -- improving debugging
+ Optimize f_isinter of strings.subr for performance -- now sub-shell free
+ Improve error checking on pidfiles -- using f_eval_catch and f_isinteger
+ Use $var_to_set arg of f_ifconfig_{inet,netmask} -- eliminate sub-shells
+ Use f_sprintf instead of $(printf ...) -- consolidate sub-shells
+ Use $var_to_set arg of f_route_get_default -- eliminate sub-shells
+ Add f_count to replace $(set -- ...;echo $#) -- eliminate sub-shells
+ Add f_count_ifs to replace $(IFS=x;set -- ...;echo $#) -- no sub-shells
+ Replace var="$var${var:+ }..." in loops with var="$var ..." with a follow-
  up var="${var# }" to trim leading whitespace -- optimize loops
+ Use $var_to_set arg of f_resolv_conf_nameservers -- eliminate sub-shells
+ Comments for the f_eval_catch function
+ Remove a duplicate `local ... desc ...' in f_device_get_all of device.subr
+ Use $var_to_set arg of f_device_capacity -- eliminate sub-shells
+ Whitespace fixes in f_dialog_init of dialog.subr
+ Optimize f_inet_atoi of media/tcpip.subr for performance -- sub-shell free
+ In several cases, send stderr to /dev/null -- clean up runtime execution
+ Change f_err of common.subr to go to program stderr not terminal stderr,
  allowing redirection of output from functions that use f_err
+ Disable debugging when using f_getvar to get variable argument to
  f_startup_rcconf_map_expand of startup/rcconf.subr
+ Use f_replace_all instead of $(echo ... | tr | sed) -- performance
+ Add a $var_to_set option to f_index_{file,menusel_{command,keyword}} of
  common.subr -- centralize sub-shells
2013-12-07 00:31:01 +00:00

194 lines
7.0 KiB
Bash
Executable File
Raw Blame History

#!/bin/sh
#-
# Copyright (c) 2012-2013 Devin Teske
# All rights reserved.
#
# 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.
#
# $FreeBSD$
#
############################################################ INCLUDES
BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
f_dprintf "%s: loading includes..." "$0"
f_include $BSDCFG_SHARE/dialog.subr
f_include $BSDCFG_SHARE/mustberoot.subr
f_include $BSDCFG_SHARE/sysrc.subr
BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
pgm="${ipgm:-$pgm}"
############################################################ FUNCTIONS
# dialog_menu_main
#
# Display the dialog(1)-based application main menu.
#
dialog_menu_main()
{
local prompt="$msg_font_menu_text"
local menu_list="
'1 $msg_none' '$msg_use_hardware_default_font'
'2 $msg_ibm_437' '$msg_ibm_437_desc'
'3 $msg_ibm_850' '$msg_ibm_850_desc'
'4 $msg_ibm_865' '$msg_ibm_865_desc'
'5 $msg_ibm_866' '$msg_ibm_866_desc'
'6 $msg_ibm_866u' '$msg_ibm_866u_desc'
'7 $msg_ibm_1251' '$msg_ibm_1251_desc'
'8 $msg_iso_8859_1' '$msg_iso_8859_1_desc'
'9 $msg_iso_8859_2' '$msg_iso_8859_2_desc'
'a $msg_iso_8859_4' '$msg_iso_8859_4_desc'
'b $msg_iso_8859_7' '$msg_iso_8859_7_desc'
'c $msg_iso_8859_8' '$msg_iso_8859_8_desc'
'd $msg_iso_8859_15' '$msg_iso_8859_15_desc'
'e $msg_swiss' '$msg_swiss_desc'
" # END-QUOTE
local defaultitem= # Calculated below
local hline="$hline_choose_a_font"
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get font8x8 )" in
[Nn][Oo]|'') defaultitem="1 $msg_none" ;;
cp437-8x8) defaultitem="2 $msg_ibm_437" ;;
cp850-8x8) defaultitem="3 $msg_ibm_850" ;;
cp865-8x8) defaultitem="4 $msg_ibm_865" ;;
cp866-8x8) defaultitem="5 $msg_ibm_866" ;;
cp866u-8x8) defaultitem="6 $msg_ibm_866u" ;;
cp1251-8x8) defaultitem="7 $msg_ibm_1251" ;;
iso-8x8) defaultitem="8 $msg_iso_8859_1" ;;
iso02-8x8) defaultitem="9 $msg_iso_8859_2" ;;
iso04-8x8) defaultitem="a $msg_iso_8859_4" ;;
iso07-8x8) defaultitem="b $msg_iso_8859_7" ;;
iso08-8x8) defaultitem="c $msg_iso_8859_8" ;;
iso15-8x8) defaultitem="d $msg_iso_8859_15" ;;
swiss-8x8) defaultitem="e $msg_swiss" ;;
esac
local menu_choice
menu_choice=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?
f_dialog_menutag_store -s "$menu_choice"
return $retval
}
############################################################ MAIN
# Incorporate rc-file if it exists
[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
#
# Process command-line arguments
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))
#
# Initialize
#
f_dialog_title "$msg_system_console_font"
f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
f_mustberoot_init
#
# Launch application main menu
#
dialog_menu_main || f_die
f_dialog_menutag_fetch mtag
f8= f14= f16= mc_start=
case "$mtag" in
"1 $msg_none") # Use hardware default font
f8="NO" f14="NO" f16="NO" ;;
"2 $msg_ibm_437") # English and others, VGA default
f8="cp437-8x8" f14="cp437-8x14" f16="cp437-8x16" ;;
"3 $msg_ibm_850") # Western Europe, IBM encoding
f8="cp850-8x8" f14="cp850-8x14" f16="cp850-8x16" ;;
"4 $msg_ibm_865") # Norwegian, IBM encoding
f8="cp865-8x8" f14="cp865-8x14" f16="cp865-8x16" ;;
"5 $msg_ibm_866") # Russian, IBM encoding (use with KOI8-R screenmap)
f8="cp866-8x8" f14="cp866-8x14" f16="cp866b-8x16" mc_start="3" ;;
"6 $msg_ibm_866u") # Ukrainian, IBM encoding (use w/ KOI8-U screenmap)
f8="cp866u-8x8" f14="cp866u-8x14" f16="cp866u-8x16" mc_start="3" ;;
"7 $msg_ibm_1251") # Cyrillic, MS Windows encoding
f8="cp1251-8x8" f14="cp1251-8x14" f16="cp1251-8x16" mc_start="3" ;;
"8 $msg_iso_8859_1") # Western Europe, ISO encoding
f8="iso-8x8" f14="iso-8x14" f16="iso-8x16" ;;
"9 $msg_iso_8859_2") # Eastern Europe, ISO encoding
f8="iso02-8x8" f14="iso02-8x14" f16="iso02-8x16" ;;
"a $msg_iso_8859_4") # Baltic, ISO encoding
f8="iso04-8x8" f14="iso04-8x14" f16="iso04-8x16" ;;
"b $msg_iso_8859_7") # Greek, ISO encoding
f8="iso07-8x8" f14="iso07-8x14" f16="iso07-8x16" ;;
"c $msg_iso_8859_8") # Hebrew, ISO encoding
f8="iso08-8x8" f14="iso08-8x14" f16="iso08-8x16" ;;
"d $msg_iso_8859_15") # Europe, ISO encoding
f8="iso15-8x8" f14="iso15-8x14" f16="iso15-8x16" ;;
"e $msg_swiss") # English, better resolution
f8="swiss-8x8" f14="NO" f16="swiss-8x16" ;;
esac
[ "$f8" -a "$f14" -a "$f16" ] || f_die 1 "$msg_unknown_font_selection"
f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x8 "%s"' "$f8" || f_die
f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x14 "%s"' "$f14" || f_die
f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x16 "%s"' "$f16" || f_die
if [ "$mc_start" ]; then
f_eval_catch "$0" f_sysrc_set \
'f_sysrc_set mousechar_start "%s"' "$mc_start" || f_die
else
f_eval_catch "$0" f_sysrc_delete \
'f_sysrc_delete mousechar_start' || f_die
fi
exit $SUCCESS
################################################################################
# END
################################################################################
Reference in New Issue View Git Blame Copy Permalink