Changeset d39f68c for global.c

Timestamp:

May 29, 2010, 1:14:57 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:

ae11191

Parents:

d106110

git-author:

David Benjamin <davidben@mit.edu> (05/27/10 16:33:36)

git-committer:

David Benjamin <davidben@mit.edu> (05/29/10 13:14:57)

Message:

Compute the terminal size in the screen's size callback

We do some roundabout thing with clearing g->lines and g->cols to
preserve the old logic of allowing us to force a value. (Not that it was
every used. We also apparently flipped x and y.

File:

• global.c (modified) (2 diffs)

global.c

@@ -475 +475 @@
  * fail.
  */
-static void _owl_global_get_size(int *lines, int *cols) {
+void owl_global_get_terminal_size(int *lines, int *cols) {
   struct winsize size;
   /* get the new size */
@@ -492 +492 @@
 }
 
-void owl_global_resize(owl_global *g, int x, int y) {
+void owl_global_resize(owl_global *g, int lines, int cols) {
   /* resize the screen.  If x or y is 0 use the terminal size */
   if (!g->resizepending) return;
   g->resizepending = 0;
 
-  _owl_global_get_size(&g->lines, &g->cols);
-  if (x != 0) {
-    g->lines = x;
-  }
-  if (y != 0) {
-    g->cols = y;
-  }
-
-  owl_window_resize(owl_window_get_screen(), g->lines, g->cols);
+  g->lines = lines;
+  g->cols = cols;
+  owl_window_recompute_position(owl_window_get_screen());
 
   owl_function_debugmsg("New size is %i lines, %i cols.", g->lines, g->cols);