Changeset 50031f0

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:

402ed3d3

Parents:

933aa7d

git-author:

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

git-committer:

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

Message:

Rename map/unmap to hide/show to match GTK+

Also, the names make much more sense.

Files:

• popwin.c (modified) (1 diff)
• window.c (modified) (9 diffs)
• window.h (modified) (1 diff)

popwin.c

@@ -14 +14 @@
   owl_window_set_size_cb(pw->border, owl_popwin_size_border, 0, 0);
   owl_window_set_size_cb(pw->content, owl_popwin_size_content, 0, 0);
-  owl_window_map(pw->border, 1);
+  owl_window_show(pw->border, 1);
 
   pw->active=1;

window.c

@@ -11 +11 @@
   int dirty : 1;
   int dirty_subtree : 1;
-  int mapped : 1;
+  int shown : 1;
   int is_screen : 1;
   /* window information */
@@ -68 +68 @@
   static owl_window *screen = NULL;
   if (!screen) {
-    /* The screen is magical. It's 'mapped', but the only mean of it going
+    /* The screen is magical. It's 'shown', but the only mean of it going
      * invisible is if we're tore down curses (i.e. screen resize) */
     screen = _owl_window_new(NULL, g.lines, g.cols, 0, 0);
     screen->is_screen = 1;
     owl_window_set_size_cb(screen, _screen_calculate_size, &g, 0);
-    owl_window_map(screen, 0);
+    owl_window_show(screen, 0);
   }
   return screen;
@@ -273 +273 @@
 static void _map_recurse_curry(owl_window *w)
 {
-  owl_window_map(w, 1);
-}
-
-void owl_window_map(owl_window *w, int recurse)
-{
-  w->mapped = 1;
+  owl_window_show(w, 1);
+}
+
+void owl_window_show(owl_window *w, int recurse)
+{
+  w->shown = 1;
   _owl_window_realize(w);
   if (w->pan)
@@ -286 +286 @@
 }
 
-void owl_window_unmap(owl_window *w)
+void owl_window_hide(owl_window *w)
 {
   /* you can't unmap the screen */
   if (w->is_screen)
     return;
-  w->mapped = 0;
+  w->shown = 0;
   if (w->pan)
     hide_panel(w->pan);
@@ -297 +297 @@
 }
 
-int owl_window_is_mapped(owl_window *w)
-{
-  return w->mapped;
+int owl_window_is_shown(owl_window *w)
+{
+  return w->shown;
 }
 
@@ -316 +316 @@
   /* check if we can create a window */
   if ((w->parent && w->parent->win == NULL)
-      || !w->mapped
+      || !w->shown
       || w->win != NULL)
     return;
@@ -414 +414 @@
   w->begin_y = begin_y;
   w->begin_x = begin_x;
-  if (w->mapped) {
-    /* Window is mapped, we must try to have a window at the end */
+  if (w->shown) {
+    /* Window is shown, we must try to have a window at the end */
     if (w->win) {
       /* We actually do have a window; let's move it */
@@ -453 +453 @@
   w->nlines = nlines;
   w->ncols = ncols;
-  /* window is mapped, we must try to have a window at the end */
-  if (w->mapped) {
+  /* window is shown, we must try to have a window at the end */
+  if (w->shown) {
     /* resizing in ncurses is hard: give up do a unrealize/realize */
     _owl_window_unrealize(w);
@@ -460 +460 @@
   /* recalculate children sizes BEFORE remapping, so that everything can resize */
   owl_window_children_foreach_onearg(w, owl_window_recompute_position);
-  if (w->mapped) {
+  if (w->shown) {
     _owl_window_realize(w);
   }

window.h

@@ -19 +19 @@
 owl_window *owl_window_get_parent(owl_window *w);
 
-void owl_window_map(owl_window *w, int recurse);
-void owl_window_unmap(owl_window *w);
-int owl_window_is_mapped(owl_window *w);
+void owl_window_show(owl_window *w, int recurse);
+void owl_window_hide(owl_window *w);
+int owl_window_is_shown(owl_window *w);
 int owl_window_is_realized(owl_window *w);
 int owl_window_is_toplevel(owl_window *w);