Changeset d2a4534

Timestamp:

Jun 1, 2010, 3:31:48 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

cb5a9f3

Parents:

05ca0d8

Message:

Maintain an owl_mainpanel structure

This structure will contain all the other windows.

Files:

• Makefile.am (modified) (1 diff)
• global.c (modified) (3 diffs)
• mainpanel.c (added)
• owl.h (modified) (3 diffs)

Makefile.am

@@ -50 +50 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     glib_compat.c
+     glib_compat.c mainpanel.c
 
 NORMAL_SRCS = filterproc.c window.c

global.c

@@ -79 +79 @@
   g->nextmsgid=0;
 
+  owl_mainpanel_init(&(g->mainpanel));
   _owl_global_setup_windows(g);
 
@@ -157 +158 @@
 
 void _owl_global_setup_windows(owl_global *g) {
-  int cols, typwin_lines;
+  int cols, typwin_lines, recwinlines;
 
   cols=g->cols;
   typwin_lines=owl_global_get_typwin_lines(g);
 
-  /* set the new window sizes */
-  g->recwinlines=g->lines-(typwin_lines+2);
-  if (g->recwinlines<0) {
-    /* gotta deal with this */
-    g->recwinlines=0;
-  }
+  recwinlines = owl_global_get_recwin_lines(g);
 
   /* create the new windows */
-  _owl_panel_set_window(&g->recpan, newwin(g->recwinlines, cols, 0, 0));
-  _owl_panel_set_window(&g->seppan, newwin(1, cols, g->recwinlines, 0));
-  _owl_panel_set_window(&g->msgpan, newwin(1, cols, g->recwinlines+1, 0));
-  _owl_panel_set_window(&g->typpan, newwin(typwin_lines, cols, g->recwinlines+2, 0));
+  _owl_panel_set_window(&g->recpan, newwin(recwinlines, cols, 0, 0));
+  _owl_panel_set_window(&g->seppan, newwin(1, cols, recwinlines, 0));
+  _owl_panel_set_window(&g->msgpan, newwin(1, cols, recwinlines+1, 0));
+  _owl_panel_set_window(&g->typpan, newwin(typwin_lines, cols, recwinlines+2, 0));
 
   if (g->tw)
@@ -230 +226 @@
 
 int owl_global_get_recwin_lines(const owl_global *g) {
-  return(g->recwinlines);
+  return g->mainpanel.recwinlines;
 }
 

owl.h

@@ -463 +463 @@
 typedef struct _owl_editwin_excursion owl_editwin_excursion;
 
+typedef struct _owl_mainpanel {
+  owl_window *panel;
+  owl_window *typwin;
+  owl_window *sepwin;
+  owl_window *msgwin;
+  owl_window *recwin;
+  int recwinlines;
+} owl_mainpanel;
+
 typedef struct _owl_keybinding {
   int  *keys;                   /* keypress stack */
@@ -566 +575 @@
   owl_messagelist msglist;
   WINDOW *input_pad;
+  owl_mainpanel mainpanel;
   PANEL *recpan, *seppan, *msgpan, *typpan;
   int needrefresh;
@@ -571 +581 @@
   volatile sig_atomic_t resizepending;
   int relayoutpending;
-  int recwinlines;
   char *thishost;
   char *homedir;