Changeset 831

Timestamp:

03/05/08 15:46:50 (9 months ago)

Author:

sontag

Message:

Fixes ticket #20 by determining the num lines/cols via wutil when possible. Still requires a "stty resize" upon resize, as seems to have been the original intent

Files:

• trunk/lib/iraffunctions.py (modified) (2 diffs)

trunk/lib/iraffunctions.py

@@ -2031 +2031 @@
-                raise TypeError('unexpected keyword argument: '+key)
-        if terminal is None and len(kw) == 0:
+            # will need default values for the next step; try _wutil for them
+            dftNcol = '80'
+            dftNlin = '24'
+            try:
+               if _sys.stdout.isatty():
+                   nlines,ncols = _wutil.getTermWindowSize()
+                   dftNcol = str(ncols)
+                   dftNlin = str(nlines)
+            except: pass # No error message here - may not always be available
-            # no args: print terminal type and size
-            print '%s ncols=%s nlines=%s' % (envget('terminal','undefined'),
-'80'), envget('ttynlines','24'
+dftNcol), envget('ttynlines',dftNlin
-        elif expkw['resize'] or expkw['terminal'] == "resize":
-ironmental parameters giving screen size
+ parameters giving screen size; show errors
-            if _sys.stdout.isatty():
-                nlines,ncols = _wutil.getTermWindowSize()
@@ -2041 +2050 @@
-        elif expkw['terminal']:
-            set(terminal=expkw['terminal'])
+            # They are setting the terminal type.  Let's at least try to
+            # get the dimensions if not given. This is more than the CL does.
+            if (not kw.has_key('nlines')) and (not kw.has_key('ncols')) and \
+               _sys.stdout.isatty():
+                try:
+                    nlines,ncols = _wutil.getTermWindowSize()
+                    set(ttyncols=str(ncols), ttynlines=str(nlines))
+                except: pass # No error msg here - may not always be available
-        elif expkw['playback'] is not None:
-            _writeError("stty playback not implemented")