Changeset 38941 for trunk/base/src

Timestamp:

08/03/08 01:10:26 (4 months ago)

Author:

raimue@…

Message:

port/port.tcl:
Use isatty and term_get_size from pextlib to determine the size of the
connected terminal. This requires the Pextlib package.

Files:

• trunk/base/src/port/port.tcl (modified) (3 diffs)

trunk/base/src/port/port.tcl

@@ -42 +42 @@
     [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
 package require macports
+package require Pextlib 1.0
 
 
@@ -401 +402 @@
 ##
 # Makes sure we get the current terminal size
-proc set_term_size {} {
+proc term_init_size {} {
     global env
 
     if {![info exists env(COLUMNS)] || ![info exists env(LINES)]} {
-        if {![catch {exec stty size} err]} {
-            regexp {(\d+) (\d+)} $err -> rows cols
-            set env(COLUMNS) $cols
-            set env(LINES) $rows
+        if {[isatty stdout]} {
+            set size [term_get_size stdout]
+
+            if {![info exists env(LINES)]} {
+                set env(LINES) [lindex $size 0]
+            }
+
+            if {![info exists env(COLUMNS)]} {
+                set env(COLUMNS) [lindex $size 1]
+            }
         }
     }
@@ -3144 +3151 @@
 # Make sure we get the size of the terminal
 # We do this here to save it in the boot_env, in case we determined it manually
-set_term_size
+term_init_size
 
 # Save off a copy of the environment before mportinit monkeys with it