Changeset 46e2e56

Timestamp:

Jun 1, 2010, 12:25:27 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

fe49685

Parents:

7cbef8c

git-author:

David Benjamin <davidben@mit.edu> (05/31/10 20:04:05)

git-committer:

David Benjamin <davidben@mit.edu> (06/01/10 00:25:27)

Message:

Rename map_internal to realize

File:

• window.c (modified) (8 diffs)

window.c

@@ -40 +40 @@
 static void _owl_window_destroy_curses(owl_window *w);
 
-static void _owl_window_map_internal(owl_window *w);
-static void _owl_window_unmap_internal(owl_window *w);
+static void _owl_window_realize(owl_window *w);
+static void _owl_window_unrealize(owl_window *w);
 
 /** singletons **/
@@ -184 +184 @@
 {
   /* make sure the window is unmapped first */
-  _owl_window_unmap_internal(w);
+  _owl_window_unrealize(w);
   /* unlink parent/child information */
   if (w->parent) {
@@ -278 +278 @@
 {
   w->mapped = 1;
-  _owl_window_map_internal(w);
+  _owl_window_realize(w);
   if (w->pan)
     show_panel(w->pan);
@@ -293 +293 @@
   if (w->pan)
     hide_panel(w->pan);
-  _owl_window_unmap_internal(w);
+  _owl_window_unrealize(w);
 }
 
@@ -311 +311 @@
 }
 
-static void _owl_window_map_internal(owl_window *w)
+static void _owl_window_realize(owl_window *w)
 {
   /* check if we can create a window */
@@ -323 +323 @@
   /* map the children, unless we failed */
   if (w->win)
-    owl_window_children_foreach_onearg(w, _owl_window_map_internal);
-}
-
-static void _owl_window_unmap_internal(owl_window *w)
+    owl_window_children_foreach_onearg(w, _owl_window_realize);
+}
+
+static void _owl_window_unrealize(owl_window *w)
 {
   if (w->win == NULL)
     return;
   /* unmap all the children */
-  owl_window_children_foreach_onearg(w, _owl_window_unmap_internal);
+  owl_window_children_foreach_onearg(w, _owl_window_unrealize);
   _owl_window_destroy_curses(w);
   /* subwins leave a mess in the parent; dirty it */
@@ -429 +429 @@
     }
     /* We don't have a window or failed to move it. Fine. Brute force. */
-    _owl_window_unmap_internal(w);
-    _owl_window_map_internal(w);
+    _owl_window_unrealize(w);
+    _owl_window_realize(w);
   }
 }
@@ -453 +453 @@
   /* 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);
+    /* resizing in ncurses is hard: give up do a unrealize/realize */
+    _owl_window_unrealize(w);
   }
   /* recalculate children sizes BEFORE remapping, so that everything can resize */
   owl_window_children_foreach_onearg(w, owl_window_recompute_position);
   if (w->mapped) {
-    _owl_window_map_internal(w);
+    _owl_window_realize(w);
   }
 }