Changeset b0cbde4

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:

6b93305

Parents:

2dfccc7

git-author:

David Benjamin <davidben@mit.edu> (05/27/10 13:04:19)

git-committer:

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

Message:

Move some things around

In case we want to make them static.

File:

• window.c (modified) (2 diffs)

window.c

@@ -386 +386 @@
   if (begin_y) *begin_y = w->begin_y;
   if (begin_x) *begin_x = w->begin_x;
-}
-
-void owl_window_set_position(owl_window *w, int nlines, int ncols, int begin_y, int begin_x)
-{
-  /* can't move the screen */
-  if (w->is_screen) {
-    begin_y = begin_x = 0;
-  }
-
-  if (w->nlines == nlines && w->ncols == ncols) {
-    /* moving is easier */
-    owl_window_move(w, begin_y, begin_x);
-    return;
-  }
-
-  w->begin_y = begin_y;
-  w->begin_x = begin_x;
-  w->nlines = nlines;
-  w->ncols = ncols;
-  /* window is mapped, we must try to have a window at the end */
-  if (w->mapped) {
-    /* resizing in ncurses is hard: give up do a unmap/map */
-    _owl_window_unmap_internal(w);
-  }
-  /* call the resize hooks BEFORE remapping, so that everything can resize */
-  if (w->resize_cb)
-    w->resize_cb(w, w->resize_cbdata);
-  if (w->mapped) {
-    _owl_window_map_internal(w);
-  }
-}
-
-void owl_window_resize(owl_window *w, int nlines, int ncols)
-{
-  owl_window_set_position(w, nlines, ncols, w->begin_y, w->begin_x);
 }
 
@@ -452 +417 @@
 }
 
+void owl_window_set_position(owl_window *w, int nlines, int ncols, int begin_y, int begin_x)
+{
+  /* can't move the screen */
+  if (w->is_screen) {
+    begin_y = begin_x = 0;
+  }
+
+  if (w->nlines == nlines && w->ncols == ncols) {
+    /* moving is easier */
+    owl_window_move(w, begin_y, begin_x);
+    return;
+  }
+
+  w->begin_y = begin_y;
+  w->begin_x = begin_x;
+  w->nlines = nlines;
+  w->ncols = ncols;
+  /* window is mapped, we must try to have a window at the end */
+  if (w->mapped) {
+    /* resizing in ncurses is hard: give up do a unmap/map */
+    _owl_window_unmap_internal(w);
+  }
+  /* call the resize hooks BEFORE remapping, so that everything can resize */
+  if (w->resize_cb)
+    w->resize_cb(w, w->resize_cbdata);
+  if (w->mapped) {
+    _owl_window_map_internal(w);
+  }
+}
+
+void owl_window_resize(owl_window *w, int nlines, int ncols)
+{
+  owl_window_set_position(w, nlines, ncols, w->begin_y, w->begin_x);
+}
+
 /** Stacking order **/