Changeset 40d1eef

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.

Files:

• functions.c (modified) (1 diff)
• global.c (modified) (5 diffs)
• mainwin.c (modified) (5 diffs)
• owl.h (modified) (2 diffs)

functions.c

@@ -1250 +1250 @@
 void owl_function_full_redisplay(void)
 {
-  touchwin(owl_global_get_curs_recwin(&g));
-
-  sepbar_dirty();
-
-  owl_global_set_needrefresh(&g);
+  /* FIXME: this maybe should do something; dirty every window? */
 }
 

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));

mainwin.c

@@ -1 +1 @@
 #include "owl.h"
 
-void owl_mainwin_init(owl_mainwin *mw)
+static void owl_mainwin_redraw(owl_window *w, WINDOW *recwin, void *user_data);
+
+void owl_mainwin_init(owl_mainwin *mw, owl_window *window)
 {
   mw->curtruncated=0;
   mw->lastdisplayed=-1;
+  mw->window = g_object_ref(window);
+  g_signal_connect(window, "redraw", G_CALLBACK(owl_mainwin_redraw), mw);
 }
 
 void owl_mainwin_redisplay(owl_mainwin *mw)
+{
+  owl_window_dirty(mw->window);
+}
+
+static void owl_mainwin_redraw(owl_window *w, WINDOW *recwin, void *user_data)
 {
   owl_message *m;
@@ -13 +22 @@
   int x, y, savey, recwinlines, start;
   int topmsg, curmsg, markedmsgid, fgcolor, bgcolor;
-  WINDOW *recwin;
   const owl_view *v;
   GList *fl;
   const owl_filter *f;
+  owl_mainwin *mw = user_data;
 
-  recwin = owl_global_get_curs_recwin(&g);
   topmsg = owl_global_get_topmsg(&g);
   curmsg = owl_global_get_curmsg(&g);
@@ -88 +96 @@
     if (y+lines > recwinlines-1) {
       isfull=1;
-      owl_message_curs_waddstr(m, owl_global_get_curs_recwin(&g),
+      owl_message_curs_waddstr(m, recwin,
                                start,
                                start+recwinlines-y,
@@ -96 +104 @@
     } else {
       /* otherwise print the whole thing */
-      owl_message_curs_waddstr(m, owl_global_get_curs_recwin(&g),
+      owl_message_curs_waddstr(m, recwin,
                                start,
                                start+lines,
@@ -139 +147 @@
   }
   mw->lastdisplayed=i-1;
-
-  owl_global_set_needrefresh(&g);
 }
 

owl.h

@@ -396 +396 @@
   int lasttruncated;
   int lastdisplayed;
+  owl_window *window;
 } owl_mainwin;
 
@@ -587 +588 @@
   owl_mainpanel mainpanel;
   gulong typwin_erase_id;
-  PANEL *recpan, *seppan;
   int needrefresh;
   int rightshift;