[svn] r6305 - in trunk/tools/dstat: . docs

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-05-06 15:16:48 +0100 (Tue, 06 May 2008)
New Revision: 6305

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/docs/dstat.1.txt
   trunk/tools/dstat/dstat
Log:
Default to 25/80 when terminal height/width is set to zero, eg. XEmacs shell (Jeff Mincy)

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2008-05-05 09:25:15 UTC (rev 6304)
+++ trunk/tools/dstat/ChangeLog	2008-05-06 14:16:48 UTC (rev 6305)
@@ -15,6 +15,7 @@
 - dstat_int plugin now allows -I total (Radek Brich)
 - Fixed typo in dstat_topio and dstat_topbio when using CSV output (Bharvani Toshaan)
 - Added external dstat_net_packets plugin to show the number of packets per interface
+- Default to 25/80 when terminal height/width is set to zero, eg. XEmacs shell (Jeff Mincy)
 
 * 0.6.7 - Cambridge overdue - released 26/02/2008
 - Only rewrite xterm title when XTERM_SHELL is set to bash

Modified: trunk/tools/dstat/docs/dstat.1.txt
===================================================================
--- trunk/tools/dstat/docs/dstat.1.txt	2008-05-05 09:25:15 UTC (rev 6304)
+++ trunk/tools/dstat/docs/dstat.1.txt	2008-05-06 14:16:48 UTC (rev 6305)
@@ -190,7 +190,7 @@
 
 
 == BUGS
-Since it's practically impossible to test dstat on every possible
+Since it is practically impossible to test dstat on every possible
 permutation of kernel, python or distribution version, I need your
 help and your feedback to fix the remaining problems. If you have
 improvements or bugreports, please send them to:
@@ -217,7 +217,7 @@
     ifstat(1), iftop(8), iostat(1), mpstat(1), netstat(1), nfsstat(1), nstat, vmstat(1), xosview(1)
 
 === Debugging tools
-    htop, lslk(1), lsof(8), top(1)
+    htop(1), lslk(1), lsof(8), top(1)
 
 === Process tracing
     ltrace(1), pmap(1), ps(1), pstack(1), strace(1)

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2008-05-05 09:25:15 UTC (rev 6304)
+++ trunk/tools/dstat/dstat	2008-05-06 14:16:48 UTC (rev 6305)
@@ -1662,7 +1662,7 @@
     "Return the dynamic terminal geometry"
     global termsize
 
-    if not termsize[0]:
+    if not termsize[0] and not termsize[1]:
         try:
             if termsize[1] == 1:
                 s = struct.pack('HHHH', 0, 0, 0, 0)
@@ -1675,6 +1675,8 @@
                 termsize = (int(os.environ['LINES']), int(os.environ['COLUMNS']))
         except:
             termsize = 25, 80
+    else:
+        termsize = 25, 80
     return termsize
 
 def gettermcolor(color=True):
@@ -1981,6 +1983,7 @@
         if loop == 0:
             tick = ticks()
             rows, cols = 0, 0
+            vislist = []
             oldvislist = []
             showheader = True
         else: