Changeset 285bc9a for global.c

Timestamp:

Apr 28, 2010, 2:27:58 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

f9f88f3

Parents:

1f3a423

git-author:

David Benjamin <davidben@mit.edu> (04/28/10 13:12:12)

git-committer:

David Benjamin <davidben@mit.edu> (04/28/10 14:27:58)

Message:

Refactor the ioctl and size work into a separate function

File:

• global.c (modified) (2 diffs)

global.c

@@ -467 +467 @@
 }
 
+/*
+ * Compute the size of the terminal. Try a ioctl, fallback to other stuff on
+ * fail.
+ */
+static void _owl_global_get_size(int *lines, int *cols) {
+  struct winsize size;
+  /* get the new size */
+  ioctl(STDIN_FILENO, TIOCGWINSZ, &size);
+  if (size.ws_row) {
+    *lines = size.ws_row;
+  } else {
+    *lines = LINES;
+  }
+
+  if (size.ws_col) {
+    *cols = size.ws_col;
+  } else {
+    *cols = COLS;
+  }
+}
+
 void owl_global_resize(owl_global *g, int x, int y) {
   /* resize the screen.  If x or y is 0 use the terminal size */
-  struct winsize size;
-    
   if (!g->resizepending) return;
   g->resizepending = 0;
@@ -478 +497 @@
   }
 
-  /* get the new size */
-  ioctl(STDIN_FILENO, TIOCGWINSZ, &size);
-  if (x==0) {
-    if (size.ws_row) {
-      g->lines=size.ws_row;
-    } else {
-      g->lines=LINES;
-    } 
-  } else {
-      g->lines=x;
-  }
-
-  if (y==0) {
-    if (size.ws_col) {
-      g->cols=size.ws_col;
-    } else {
-      g->cols=COLS;
-    } 
-  } else {
-    g->cols=y;
+  _owl_global_get_size(&g->lines, &g->cols);
+  if (x != 0) {
+    g->lines = x;
+  }
+  if (y != 0) {
+    g->cols = y;
   }