Changeset 8ae2de9 for global.c

Timestamp:

Mar 2, 2010, 9:14:44 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

b928b3a

Parents:

be1ae91

git-author:

David Benjamin <davidben@mit.edu> (10/30/09 14:31:56)

git-committer:

David Benjamin <davidben@mit.edu> (03/02/10 21:14:44)

Message:

Attach PANELs to all of our WINDOWs

We replace wnoutrefresh with update_panels (except in set cursor; there
we have to guarantee that the window is empty.). The viewwin does not
get a PANEL because it's weird and currently leeches onto someone else's
WINDOW.

Resizing is also rather fiddly because panel wants to know about window
resizes. Not completely sure I got it right yet. The only library I know
of that does something like with with ncurses (libgnt) and they
endwin/refresh to resize the screen.

Signed-off-by: David Benjamin <davidben@mit.edu>

File:

• global.c (modified) (4 diffs)

global.c

@@ -126 +126 @@
 }
 
+/* If *pan does not exist, we create a new panel, otherwise we replace the
+   window in *pan with win.
+
+   libpanel PANEL objects cannot exist without owner a valid window. This
+   maintains the invariant for _owl_global_setup_windows. */
+void _owl_panel_set_window(PANEL **pan, WINDOW *win)
+{
+  WINDOW *oldwin;
+  if (*pan) {
+    oldwin = panel_window(*pan);
+    replace_panel(*pan, win);
+    delwin(oldwin);
+  } else {
+    *pan = new_panel(win);
+  }
+}
+
 void _owl_global_setup_windows(owl_global *g) {
   int cols, typwin_lines;
@@ -142 +159 @@
 
   /* create the new windows */
-  g->recwin=newwin(g->recwinlines, cols, 0, 0);
+  g->recwin = newwin(g->recwinlines, cols, 0, 0);
   if (g->recwin==NULL) {
     owl_function_debugmsg("_owl_global_setup_windows: newwin returned NULL\n");
@@ -148 +165 @@
     exit(50);
   }
+  _owl_panel_set_window(&g->recpan, g->recwin);
       
-  g->sepwin=newwin(1, cols, g->recwinlines, 0);
-  g->msgwin=newwin(1, cols, g->recwinlines+1, 0);
-  g->typwin=newwin(typwin_lines, cols, g->recwinlines+2, 0);
+  g->sepwin = newwin(1, cols, g->recwinlines, 0);
+  _owl_panel_set_window(&g->seppan, g->sepwin);
+  g->msgwin = newwin(1, cols, g->recwinlines+1, 0);
+  _owl_panel_set_window(&g->msgpan, g->msgwin);
+  g->typwin = newwin(typwin_lines, cols, g->recwinlines+2, 0);
+  _owl_panel_set_window(&g->typpan, g->typwin);
 
   owl_editwin_set_curswin(g->tw, g->typwin, typwin_lines, g->cols);
@@ -469 +490 @@
   if (!g->resizepending) return;
 
-  /* delete the current windows */
-  delwin(g->recwin);
-  delwin(g->sepwin);
-  delwin(g->msgwin);
-  delwin(g->typwin);
   if (!isendwin()) {
     endwin();
   }
-
-  refresh();
 
   /* get the new size */