Changeset b3adfb5

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:

dffb8b8

Parents:

8099357

git-author:

David Benjamin <davidben@mit.edu> (02/27/10 17:08:00)

git-committer:

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

Message:

Remove {rec,sep,msg,typ}win from owl_global

With libpanel, the WINDOWs are actually owned by the corresponding PANEL
object. To avoid confusion, we remove the pointers to them in the
owl_window altogether.

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

Files:

• global.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

global.c

@@ -134 +134 @@
 {
   WINDOW *oldwin;
+
+  if (win == NULL) {
+    owl_function_debugmsg("_owl_panel_set_window: passed NULL win (failed to allocate?)\n");
+    endwin();
+    exit(50);
+  }
+
   if (*pan) {
     oldwin = panel_window(*pan);
@@ -159 +166 @@
 
   /* create the new windows */
-  g->recwin = newwin(g->recwinlines, cols, 0, 0);
-  if (g->recwin==NULL) {
-    owl_function_debugmsg("_owl_global_setup_windows: newwin returned NULL\n");
-    endwin();
-    exit(50);
-  }
-  _owl_panel_set_window(&g->recpan, g->recwin);
-      
-  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);
-
-  idlok(g->typwin, FALSE);
-  idlok(g->recwin, FALSE);
-  idlok(g->sepwin, FALSE);
-  idlok(g->msgwin, FALSE);
-
-  nodelay(g->typwin, 1);
-  keypad(g->typwin, TRUE);
-  wmove(g->typwin, 0, 0);
-
-  meta(g->typwin, TRUE);
+  _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_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
+
+  idlok(owl_global_get_curs_typwin(g), FALSE);
+  idlok(owl_global_get_curs_recwin(g), FALSE);
+  idlok(owl_global_get_curs_sepwin(g), FALSE);
+  idlok(owl_global_get_curs_msgwin(g), FALSE);
+
+  nodelay(owl_global_get_curs_typwin(g), 1);
+  keypad(owl_global_get_curs_typwin(g), TRUE);
+  wmove(owl_global_get_curs_typwin(g), 0, 0);
+
+  meta(owl_global_get_curs_typwin(g), TRUE);
 }
 
@@ -306 +303 @@
 
 WINDOW *owl_global_get_curs_recwin(const owl_global *g) {
-  return(g->recwin);
+  return panel_window(g->recpan);
 }
 
 WINDOW *owl_global_get_curs_sepwin(const owl_global *g) {
-  return(g->sepwin);
+  return panel_window(g->seppan);
 }
 
 WINDOW *owl_global_get_curs_msgwin(const owl_global *g) {
-  return(g->msgwin);
+  return panel_window(g->msgpan);
 }
 
 WINDOW *owl_global_get_curs_typwin(const owl_global *g) {
-  return(g->typwin);
+  return panel_window(g->typpan);
 }
 

owl.h

@@ -557 +557 @@
   owl_view current_view;
   owl_messagelist msglist;
-  WINDOW *recwin, *sepwin, *msgwin, *typwin;
   PANEL *recpan, *seppan, *msgpan, *typpan;
   int needrefresh;