From owner-svn-src-head@FreeBSD.ORG Tue Jun 4 17:08:27 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 808ADDE; Tue, 4 Jun 2013 17:08:27 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 631C81F27; Tue, 4 Jun 2013 17:08:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54H8RFC080273; Tue, 4 Jun 2013 17:08:27 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54H8RBP080272; Tue, 4 Jun 2013 17:08:27 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306041708.r54H8RBP080272@svn.freebsd.org> From: Devin Teske Date: Tue, 4 Jun 2013 17:08:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251390 - head/usr.sbin/bsdconfig/console X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 17:08:27 -0000 Author: dteske Date: Tue Jun 4 17:08:26 2013 New Revision: 251390 URL: http://svnweb.freebsd.org/changeset/base/251390 Log: Shift Console->Saver menu items to place the default item at the top, making this menu consistent with Console->Repeat, Console->Font, Console->Screenmap and many others which place the default choice at the top. NOTE: SVN r249751 changed things so that these menus highlight the active selection, so the idea that the default choice (now at top) "can be selected immediately by hitting ENTER" is not possible unless the default choice is the currently active setting (e.g., on first visit to the menu). However, it is still warranted to have the default choice at the top of the menu. PR: bin/169316 Modified: head/usr.sbin/bsdconfig/console/saver Modified: head/usr.sbin/bsdconfig/console/saver ============================================================================== --- head/usr.sbin/bsdconfig/console/saver Tue Jun 4 16:48:23 2013 (r251389) +++ head/usr.sbin/bsdconfig/console/saver Tue Jun 4 17:08:26 2013 (r251390) @@ -51,19 +51,19 @@ dialog_menu_main() { local prompt="$msg_saver_menu_text" local menu_list=" - '1 $msg_blank' '$msg_blank_desc' - '2 $msg_beastie' '$msg_beastie_desc' - '3 $msg_daemon' '$msg_daemon_desc' - '4 $msg_dragon' '$msg_dragon_desc' - '5 $msg_fade' '$msg_fade_desc' - '6 $msg_fire' '$msg_fire_desc' - '7 $msg_green' '$msg_green_desc' - '8 $msg_logo' '$msg_logo_desc' - '9 $msg_rain' '$msg_rain_desc' - 'a $msg_snake' '$msg_snake_desc' - 'b $msg_star' '$msg_star_desc' - 'c $msg_warp' '$msg_warp_desc' - 'd $msg_none' '$msg_none_saver_desc' + '1 $msg_none' '$msg_none_saver_desc' + '2 $msg_blank' '$msg_blank_desc' + '3 $msg_beastie' '$msg_beastie_desc' + '4 $msg_daemon' '$msg_daemon_desc' + '5 $msg_dragon' '$msg_dragon_desc' + '6 $msg_fade' '$msg_fade_desc' + '7 $msg_fire' '$msg_fire_desc' + '8 $msg_green' '$msg_green_desc' + '9 $msg_logo' '$msg_logo_desc' + 'a $msg_rain' '$msg_rain_desc' + 'b $msg_snake' '$msg_snake_desc' + 'c $msg_star' '$msg_star_desc' + 'd $msg_warp' '$msg_warp_desc' '$msg_timeout' '$msg_timeout_desc' " # END-QUOTE local defaultitem= # Calculated below @@ -78,19 +78,19 @@ dialog_menu_main() $menu_list case "$( f_sysrc_get saver )" in - blank) defaultitem="1 $msg_blank" ;; - beastie) defaultitem="2 $msg_beastie";; - daemon) defaultitem="3 $msg_daemon" ;; - dragon) defaultitem="4 $msg_dragon" ;; - fade) defaultitem="5 $msg_fade" ;; - fire) defaultitem="6 $msg_fire" ;; - green) defaultitem="7 $msg_green" ;; - logo) defaultitem="8 $msg_logo" ;; - rain) defaultitem="9 $msg_rain" ;; - snake) defaultitem="a $msg_snake" ;; - star) defaultitem="b $msg_star" ;; - warp) defaultitem="c $msg_warp" ;; - [Nn][Oo]|'') defaultitem="d $msg_none" ;; + [Nn][Oo]|'') defaultitem="1 $msg_none" ;; + blank) defaultitem="2 $msg_blank" ;; + beastie) defaultitem="3 $msg_beastie";; + daemon) defaultitem="4 $msg_daemon" ;; + dragon) defaultitem="5 $msg_dragon" ;; + fade) defaultitem="6 $msg_fade" ;; + fire) defaultitem="7 $msg_fire" ;; + green) defaultitem="8 $msg_green" ;; + logo) defaultitem="9 $msg_logo" ;; + rain) defaultitem="a $msg_rain" ;; + snake) defaultitem="b $msg_snake" ;; + star) defaultitem="c $msg_star" ;; + warp) defaultitem="d $msg_warp" ;; esac local menu_choice @@ -141,45 +141,45 @@ while :; do f_dialog_menutag_fetch mtag case "$mtag" in - "1 $msg_blank") # Simply blank the screen + "1 $msg_none") # Disable the screensaver + f_sysrc_set saver "NO" || f_die + break ;; + "2 $msg_blank") # Simply blank the screen f_sysrc_set saver "blank" || f_die break ;; - "2 $msg_beastie") # "BSD Daemon" animated screen saver (graphics) + "3 $msg_beastie") # "BSD Daemon" animated screen saver (graphics) f_sysrc_set saver "beastie" || f_die break ;; - "3 $msg_daemon") # "BSD Daemon" animated screen saver (text) + "4 $msg_daemon") # "BSD Daemon" animated screen saver (text) f_sysrc_set saver "daemon" || f_die break ;; - "4 $msg_dragon") # Dragon screensaver (graphics) + "5 $msg_dragon") # Dragon screensaver (graphics) f_sysrc_set saver "dragon" || f_die break ;; - "5 $msg_fade") # Fade out effect screen saver + "6 $msg_fade") # Fade out effect screen saver f_sysrc_set saver "fade" || f_die break ;; - "6 $msg_fire") # Flames effect screen saver + "7 $msg_fire") # Flames effect screen saver f_sysrc_set saver "fire" || f_die break ;; - "7 $msg_green") # "Green" power saving mode (if supported by monitor) + "8 $msg_green") # "Green" power saving mode (if supported by monitor) f_sysrc_set saver "green" || f_die break ;; - "8 $msg_logo") # FreeBSD "logo" animated screen saver (graphics) + "9 $msg_logo") # FreeBSD "logo" animated screen saver (graphics) f_sysrc_set saver "logo" || f_die break ;; - "9 $msg_rain") # Rain drops screen saver + "a $msg_rain") # Rain drops screen saver f_sysrc_set saver "rain" || f_die break ;; - "a $msg_snake") # Draw a FreeBSD "snake" on your screen + "b $msg_snake") # Draw a FreeBSD "snake" on your screen f_sysrc_set saver "snake" || f_die break ;; - "b $msg_star") # A "twinkling stars" effect + "c $msg_star") # A "twinkling stars" effect f_sysrc_set saver "star" || f_die break ;; - "c $msg_warp") # A "stars warping" effect + "d $msg_warp") # A "stars warping" effect f_sysrc_set saver "warp" || f_die break ;; - "d $msg_none") # Disable the screensaver - f_sysrc_set saver "NO" || f_die - break ;; "$msg_timeout") # Set the screen saver timeout interval f_dialog_title "$msg_value_required" f_dialog_input blanktime "$msg_enter_timeout_period" \