Changeset d106110

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:

d39f68c

Parents:

6b93305

git-author:

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

git-committer:

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

Message:

Make the size callbacks listen for parent sizing

This probably matches better with how we'll usually use it. Keep the
imperative functions around for now. They may be useful.

Files:

• popwin.c (modified) (4 diffs)
• window.c (modified) (6 diffs)

popwin.c

@@ -9 +9 @@
 int owl_popwin_up(owl_popwin *pw)
 {
-  /* make them zero-size for now */
-  pw->border = owl_window_new(0, 0, 0, 0, 0);
-  pw->content = owl_window_new(pw->border, 0, 0, 0, 0);
-
+  pw->border = owl_window_new(NULL);
+  pw->content = owl_window_new(pw->border);
   owl_window_set_redraw_cb(pw->border, owl_popwin_draw_border, pw, 0);
-  owl_window_set_resize_cb(pw->border, owl_popwin_resize_content, pw, 0);
-  /* HACK */
-  owl_window_set_resize_cb(owl_window_get_screen(), owl_popwin_reposition, pw, 0);
-
-  /* calculate position, THEN map the windows maybe setting a resize hook
-   * should just cause it to get called? */
-  owl_popwin_reposition(owl_window_get_screen(), pw);
+  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);
 
@@ -27 +20 @@
 }
 
-void owl_popwin_reposition(owl_window *screen, void *user_data)
+void owl_popwin_size_border(owl_window *border, void *user_data)
 {
-  owl_popwin *pw = user_data;
   int lines, cols, startline, startcol;
   int glines, gcols;
+  owl_window *parent = owl_window_get_parent(border);
 
-  owl_window_get_position(screen, &glines, &gcols, 0, 0);
+  owl_window_get_position(parent, &glines, &gcols, 0, 0);
 
   lines = owl_util_min(glines,24)*3/4 + owl_util_max(glines-24,0)/2;
@@ -40 +33 @@
   startcol = (gcols-cols)/2;
 
-  owl_window_set_position(pw->border, lines, cols, startline, startcol);
+  owl_window_set_position(border, lines, cols, startline, startcol);
 }
 
-void owl_popwin_resize_content(owl_window *w, void *user_data)
+void owl_popwin_size_content(owl_window *content, void *user_data)
 {
   int lines, cols;
-  owl_popwin *pw = user_data;
-  owl_window_get_position(w, &lines, &cols, 0, 0);
-  owl_window_set_position(pw->content, lines-2, cols-2, 1, 1);
+  owl_window *parent = owl_window_get_parent(content);
+  owl_window_get_position(parent, &lines, &cols, 0, 0);
+  owl_window_set_position(content, lines-2, cols-2, 1, 1);
 }
 
@@ -76 +69 @@
   pw->content = 0;
   pw->active=0;
-  owl_window_set_resize_cb(owl_window_get_screen(), 0, 0, 0);
   return(0);
 }

window.c

@@ -23 +23 @@
   void (*redraw_cbdata_destroy)(void *);
 
-  void (*resize_cb)(owl_window *, void *);
-  void *resize_cbdata;
-  void (*resize_cbdata_destroy)(void *);
+  void (*size_cb)(owl_window *, void *);
+  void *size_cbdata;
+  void (*size_cbdata_destroy)(void *);
 
   void (*destroy_cb)(owl_window *, void *);
@@ -69 +69 @@
 /** Creation and Destruction **/
 
-owl_window *owl_window_new(owl_window *parent, int nlines, int ncols, int begin_y, int begin_x)
+owl_window *owl_window_new(owl_window *parent)
 {
   if (!parent)
     parent = owl_window_get_screen();
-  return _owl_window_new(parent, nlines, ncols, begin_y, begin_x);
+  return _owl_window_new(parent, 0, 0, 0, 0);
 }
 
@@ -108 +108 @@
   /* clear all cbs */
   owl_window_set_redraw_cb(w, 0, 0, 0);
-  owl_window_set_resize_cb(w, 0, 0, 0);
+  owl_window_set_size_cb(w, 0, 0, 0);
   owl_window_set_destroy_cb(w, 0, 0, 0);
 
@@ -140 +140 @@
 }
 
-void owl_window_set_resize_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*))
-{
-  if (w->resize_cbdata_destroy) {
-    w->resize_cbdata_destroy(w->resize_cbdata);
-    w->resize_cbdata = 0;
-    w->resize_cbdata_destroy = 0;
-  }
-
-  w->resize_cb = cb;
-  w->resize_cbdata = cbdata;
-  w->resize_cbdata_destroy = cbdata_destroy;
+void owl_window_set_size_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*))
+{
+  if (w->size_cbdata_destroy) {
+    w->size_cbdata_destroy(w->size_cbdata);
+    w->size_cbdata = 0;
+    w->size_cbdata_destroy = 0;
+  }
+
+  w->size_cb = cb;
+  w->size_cbdata = cbdata;
+  w->size_cbdata_destroy = cbdata_destroy;
+
+  owl_window_recompute_position(w);
 }
 
@@ -439 +441 @@
     _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);
+  /* 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);
@@ -451 +452 @@
   owl_window_set_position(w, nlines, ncols, w->begin_y, w->begin_x);
 }
+
+void owl_window_recompute_position(owl_window *w)
+{
+  if (w->size_cb) {
+    /* TODO: size_cb probably wants to actually take four int*s */
+    w->size_cb(w, w->size_cbdata);
+  }
+}
+
 
 /** Stacking order **/