<!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>[122840] branches/gsoc14-interactive/base/src/port/port.tcl</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/122840">122840</a></dd>
<dt>Author</dt> <dd>shasha@macports.org</dd>
<dt>Date</dt> <dd>2014-07-31 10:04:52 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixed Ctrl-C issues</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14interactivebasesrcportporttcl">branches/gsoc14-interactive/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14interactivebasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-interactive/base/src/port/port.tcl (122839 => 122840)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-interactive/base/src/port/port.tcl 2014-07-31 16:41:42 UTC (rev 122839)
+++ branches/gsoc14-interactive/base/src/port/port.tcl 2014-07-31 17:04:52 UTC (rev 122840)
</span><span class="lines">@@ -5236,6 +5236,7 @@
</span><span class="cx"> # Create namespace for questions
</span><span class="cx"> namespace eval portclient::questions {
</span><span class="cx">
</span><ins>+ package require Tclx
</ins><span class="cx"> ##
</span><span class="cx"> # Function that handles printing of a timeout.
</span><span class="cx"> #
</span><span class="lines">@@ -5244,23 +5245,25 @@
</span><span class="cx"> # @param def
</span><span class="cx"> # The default action to be taken in the occurence of a timeout.
</span><span class="cx"> proc ui_timeout {def timeout} {
</span><del>- # Gap between printing of each dot
- set sec 0
-
- # Prints time like 5...4...3...2...1...0
- while {$timeout >= 0} {
- after $sec {puts -nonewline "\r"}
- after $sec {puts -nonewline "Continuing in "}
- incr sec 1000
- after $sec puts -nonewline [format "%02d" $timeout]
- after $sec flush stdout
- after $sec {puts -nonewline ". Press Ctrl-C to exit: "}
- after $sec flush stdout
</del><ins>+ fconfigure stdin -blocking 0
+
+ signal error {TERM INT}
+ while {$timeout >= 0} {
+ if {[catch {set inp [read stdin]} err]} {
+ return -code error "Ctrl-C"
+ }
+ if {$inp eq "\n"} {
+ return $def
+ }
+ puts -nonewline "\r"
+ puts -nonewline [format "Continuing in %02d s. Press Ctrl-C to exit: " $timeout]
+ flush stdout
+ after 1000
</ins><span class="cx"> incr timeout -1
</span><span class="cx"> }
</span><del>- after $sec set result def
- vwait result
</del><span class="cx"> puts ""
</span><ins>+ fconfigure stdin -blocking 1
+ signal -restart error {TERM INT}
</ins><span class="cx"> return $def
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5339,7 +5342,11 @@
</span><span class="cx">
</span><span class="cx"> # User input (probably requires some input error checking code)
</span><span class="cx"> while 1 {
</span><del>- set input [gets stdin]
</del><ins>+ signal error {TERM INT}
+ if {[catch {set input [gets stdin]} err]} {
+ return -code error "Ctrl-C"
+ }
+ signal -restart error {TERM INT}
</ins><span class="cx"> if {$input in {y Y}} {
</span><span class="cx"> return 0
</span><span class="cx"> } elseif {$input in {n N}} {
</span><span class="lines">@@ -5362,14 +5369,18 @@
</span><span class="cx"> # @param ports
</span><span class="cx"> # The port/list of ports for which the question is being asked.
</span><span class="cx"> proc ui_ask_singlechoice {msg name ports} {
</span><del>-
</del><ins>+ package require Tclx
</ins><span class="cx"> ui_choice $msg $name $ports
</span><span class="cx">
</span><span class="cx"> # User Input (single input restriction)
</span><span class="cx"> while 1 {
</span><span class="cx"> puts -nonewline "Enter a number to select an option: "
</span><span class="cx"> flush stdout
</span><del>- set input [gets stdin]
</del><ins>+ signal error {TERM INT}
+ if {[catch {set input [gets stdin]} err]} {
+ return -code error "Ctrl-C"
+ }
+ signal -restart error {TERM INT}
</ins><span class="cx"> if {($input <= [llength $ports] && [string is integer -strict $input])} {
</span><span class="cx"> return $input
</span><span class="cx"> } else {
</span><span class="lines">@@ -5395,7 +5406,11 @@
</span><span class="cx"> while 1 {
</span><span class="cx"> puts -nonewline "Enter the numbers to select the options: "
</span><span class="cx"> flush stdout
</span><del>- set input [gets stdin]
</del><ins>+ signal error {TERM INT}
+ if {[catch {set input [gets stdin]} err]} {
+ return -code error "Ctrl-C"
+ }
+ signal -restart error {TERM INT}
</ins><span class="cx"> set count 0
</span><span class="cx"> # check if input is non-empty and otherwise fine
</span><span class="cx"> if {$input == ""} {
</span></span></pre>
</div>
</div>
</body>
</html>