Changeset d106110 for popwin.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:

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.

File:

• popwin.c (modified) (4 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);
 }