Changeset 68f63a2 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:

1383b58

Parents:

7c8811c

git-author:

David Benjamin <davidben@mit.edu> (05/27/10 02:49:57)

git-committer:

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

Message:

Port owl_viewwin to owl_window

A number of hacks. This is just a test run of the API.

File:

• popwin.c (modified) (3 diffs)

popwin.c

@@ -11 +11 @@
 int owl_popwin_up(owl_popwin *pw)
 {
-  int glines, gcols, startcol, startline;
-  WINDOW *popwin, *borderwin;
+  /* 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);
 
-  /* calculate the size of the popwin */
-  glines=owl_global_get_lines(&g);
-  gcols=owl_global_get_cols(&g);
+  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);
 
-  pw->lines = owl_util_min(glines,24)*3/4 + owl_util_max(glines-24,0)/2;
-  startline = (glines-pw->lines)/2;
+  /* 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_map(pw->border, 1);
 
-  pw->cols = owl_util_min(gcols,90)*15/16 + owl_util_max(gcols-90,0)/2;
-  startcol = (gcols-pw->cols)/2;
+  pw->active=1;
+  return(0);
+}
 
-  borderwin = newwin(pw->lines, pw->cols, startline, startcol);
-  pw->borderpanel = new_panel(borderwin);
-  popwin = newwin(pw->lines-2, pw->cols-2, startline+1, startcol+1);
-  pw->poppanel = new_panel(popwin);
+void owl_popwin_reposition(owl_window *screen, void *user_data)
+{
+  owl_popwin *pw = user_data;
+  int lines, cols, startline, startcol;
+  int glines, gcols;
 
-  werase(popwin);
-  werase(borderwin);
+  owl_window_get_position(screen, &glines, &gcols, 0, 0);
+
+  lines = owl_util_min(glines,24)*3/4 + owl_util_max(glines-24,0)/2;
+  startline = (glines-lines)/2;
+  cols = owl_util_min(gcols,90)*15/16 + owl_util_max(gcols-90,0)/2;
+  startcol = (gcols-cols)/2;
+
+  owl_window_set_position(pw->border, lines, cols, startline, startcol);
+}
+
+void owl_popwin_resize_content(owl_window *w, void *user_data)
+{
+  owl_popwin *pw = user_data;
+  owl_window_get_position(w, &pw->lines, &pw->cols, 0, 0);
+  owl_window_set_position(pw->content, pw->lines-2, pw->cols-2, 1, 1);
+}
+
+void owl_popwin_draw_border(owl_window *w, WINDOW *borderwin, void *user_data)
+{
+  owl_popwin *pw = user_data;
   if (owl_global_is_fancylines(&g)) {
     box(borderwin, 0, 0);
@@ -44 +68 @@
     waddch(borderwin, '+');
   }
-    
-  owl_global_set_needrefresh(&g);
-  pw->active=1;
-  return(0);
 }
 
 int owl_popwin_close(owl_popwin *pw)
 {
-  WINDOW *popwin, *borderwin;
-
-  popwin = panel_window(pw->poppanel);
-  borderwin = panel_window(pw->borderpanel);
-
-  del_panel(pw->poppanel);
-  del_panel(pw->borderpanel);
-  delwin(popwin);
-  delwin(borderwin);
-
+  owl_window_delete(pw->border);
+  pw->border = 0;
+  pw->content = 0;
   pw->active=0;
-  owl_global_set_needrefresh(&g);
+  owl_window_set_resize_cb(owl_window_get_screen(), 0, 0, 0);
   return(0);
 }
@@ -72 +85 @@
 }
 
-WINDOW *owl_popwin_get_curswin(const owl_popwin *pw)
+owl_window *owl_popwin_get_content(const owl_popwin *pw)
 {
-  return panel_window(pw->poppanel);
+  return pw->content;
 }