<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146738] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146738">146738</a></dd>
<dt>Author</dt> <dd>g5pw@macports.org</dd>
<dt>Date</dt> <dd>2016-03-16 08:33:59 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: Add ui_ask_alternative
Add a function to ask the user to select an alternative between n actions. This
is different from ui_ask_singlechoice beacuse will display actions inline and
the user will select an option by typing the first letters of the action name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (146737 => 146738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2016-03-16 14:38:38 UTC (rev 146737)
+++ trunk/base/src/macports1.0/macports.tcl 2016-03-16 15:33:59 UTC (rev 146738)
</span><span class="lines">@@ -891,7 +891,11 @@
</span><span class="cx"> # Set noninteractive mode if specified in config
</span><span class="cx"> if {[info exists ui_interactive] && !$ui_interactive} {
</span><span class="cx"> set macports::ui_options(ports_noninteractive) yes
</span><del>- unset -nocomplain macports::ui_options(questions_yesno) macports::ui_options(questions_singlechoice) macports::ui_options(questions_multichoice)
</del><ins>+ unset -nocomplain macports::ui_options(questions_yesno) \
+ macports::ui_options(questions_singlechoice) \
+ macports::ui_options(questions_multichoice) \
+ macports::ui_options(questions_alternative)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Archive type, what type of binary archive to use (CPIO, gzipped
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (146737 => 146738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2016-03-16 14:38:38 UTC (rev 146737)
+++ trunk/base/src/port/port.tcl 2016-03-16 15:33:59 UTC (rev 146738)
</span><span class="lines">@@ -5521,6 +5521,61 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ ##
+ # Displays alternative actions a user has to select by typing the text
+ # within the square brackets of the desired action name.
+ # Waits for user input indefinitely.
+ #
+ # @param msg
+ # The question specific message that is to be printed before asking the question.
+ # @param ???name???
+ # May be a qid will be of better use instead as the client does not do anything port specific.
+ # @param alts
+ # An array of action-text.
+ # @param def
+ # The default action. If empty, the first action is set as default
+ proc ui_ask_alternative {msg name alts def} {
+ puts $msg
+ upvar $alts alternatives
+
+ if {$def eq ""} {
+ # Default to first action
+ set def [lindex [array names alternatives] 0]
+ }
+
+ set alt_names []
+ foreach key [array names alternatives] {
+ set key_match [string first $key $alternatives($key)]
+ append alt_name [string range $alternatives($key) 0 [expr {$key_match - 1}]] \
+ \[ [expr {$def eq $key ? [string toupper $key] : $key}] \] \
+ [string range $alternatives($key) [expr {$key_match + [string length $key]}] end]
+ lappend alt_names $alt_name
+ unset alt_name
+ }
+
+ while 1 {
+ puts -nonewline "[join $alt_names /]: "
+ flush stdout
+ signal error {TERM INT}
+ try {
+ set input [gets stdin]
+ } catch {*} {
+ # An error occurred, print a newline so the error message
+ # doesn't occur on the prompt line and re-throw
+ puts ""
+ throw
+ }
+ set input [string tolower $input]
+ if {[info exists alternatives($input)]} {
+ return $input
+ } elseif {$input eq ""} {
+ return $def
+ } else {
+ puts "Please enter one of the alternatives"
+ }
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ##########################################
</span><span class="lines">@@ -5584,6 +5639,7 @@
</span><span class="cx"> set ui_options(questions_yesno) portclient::questions::ui_ask_yesno
</span><span class="cx"> set ui_options(questions_singlechoice) portclient::questions::ui_ask_singlechoice
</span><span class="cx"> set ui_options(questions_multichoice) portclient::questions::ui_ask_multichoice
</span><ins>+ set ui_options(questions_alternative) portclient::questions::ui_ask_alternative
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set ui_options(notifications_append) portclient::notifications::append
</span></span></pre>
</div>
</div>
</body>
</html>