Changeset 40d1eef for global.c

Timestamp:

Jun 2, 2010, 8:53:27 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:

fa65671

Parents:

a5a9572

git-author:

David Benjamin <davidben@mit.edu> (06/02/10 20:41:52)

git-committer:

David Benjamin <davidben@mit.edu> (06/02/10 20:53:27)

Message:

And a hacky port of the mainwin too

Some of the old relayout code should still be reorganized, but it's a
start.

File:

• global.c (modified) (5 diffs)

global.c

@@ -82 +82 @@
 
   owl_mainpanel_init(&(g->mainpanel));
-  _owl_global_setup_windows(g);
 
   /* Fill in some variables which don't have constant defaults */
@@ -95 +94 @@
 
   owl_messagelist_create(&(g->msglist));
-  owl_mainwin_init(&(g->mw));
+  owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
   owl_popwin_init(&(g->pw));
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
@@ -159 +158 @@
     *pan = new_panel(win);
   }
-}
-
-void _owl_global_setup_windows(owl_global *g) {
-  int cols, recwinlines;
-
-  cols=g->cols;
-
-  recwinlines = owl_global_get_recwin_lines(g);
-
-  /* create the new windows */
-  _owl_panel_set_window(&g->recpan, newwin(recwinlines, cols, 0, 0));
-  _owl_panel_set_window(&g->seppan, newwin(1, cols, recwinlines, 0));
 }
 
@@ -289 +276 @@
 
 /* curses windows */
-
-WINDOW *owl_global_get_curs_recwin(const owl_global *g) {
-  return panel_window(g->recpan);
-}
 
 owl_window *owl_global_get_curs_sepwin(const owl_global *g) {
@@ -508 +491 @@
   owl_function_debugmsg("Relayouting...");
 
-  /* re-initialize the windows */
-  _owl_global_setup_windows(g);
-
   /* in case any styles rely on the current width */
   owl_messagelist_invalidate_formats(owl_global_get_msglist(g));