Changeset 9d59118 for global.c

Timestamp:

Mar 6, 2008, 3:29:18 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

5577606

Parents:

2d4ff14 (diff), 9815e2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 975-982 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r976 | nelhage | 2008-03-01 18:41:46 -0500 (Sat, 01 Mar 2008) | 2 lines
  
  Fix loading PAR modules that weren't present at startup
........
  r978 | nelhage | 2008-03-01 19:29:54 -0500 (Sat, 01 Mar 2008) | 2 lines
  
  Update perlwrap.pm documentation for the select() BarnOwl
........
  r980 | nelhage | 2008-03-03 11:44:52 -0500 (Mon, 03 Mar 2008) | 2 lines
  
  Render IRC notices as normal messages
........
  r981 | shadow | 2008-03-03 15:00:24 -0500 (Mon, 03 Mar 2008) | 3 lines
  
  ensure that even if ioctl(,TIOCGWINSZ,) returns 0s we never
  set g->lines (and g->cols) to 0
........
  r982 | nelhage | 2008-03-06 12:52:58 -0500 (Thu, 06 Mar 2008) | 2 lines
  
  Typo fix in docs
........

File:

• global.c (modified) (1 diff)

global.c

@@ -415 +415 @@
   ioctl(STDIN_FILENO, TIOCGWINSZ, &size);
   if (x==0) {
-    g->lines=size.ws_row;
+    if (size.ws_row) {
+      g->lines=size.ws_row;
+    } else {
+      g->lines=LINES;
+    } 
   } else {
-    g->lines=x;
+      g->lines=x;
   }
 
   if (y==0) {
-    g->cols=size.ws_col;
+    if (size.ws_col) {
+      g->cols=size.ws_col;
+    } else {
+      g->cols=COLS;
+    } 
   } else {
     g->cols=y;