Changes in mainwin.c [5cc7e5e:f449096]

File:

• mainwin.c (modified) (6 diffs)

mainwin.c

@@ -1 +1 @@
 #include "owl.h"
 
-static void owl_mainwin_redraw(owl_window *w, WINDOW *recwin, void *user_data);
-static void owl_mainwin_resized(owl_window *w, void *user_data);
-
-void owl_mainwin_init(owl_mainwin *mw, owl_window *window)
+void owl_mainwin_init(owl_mainwin *mw)
 {
   mw->curtruncated=0;
   mw->lastdisplayed=-1;
-  mw->window = g_object_ref(window);
-  /* for now, just assume this object lasts forever */
-  g_signal_connect(window, "redraw", G_CALLBACK(owl_mainwin_redraw), mw);
-  g_signal_connect(window, "resized", G_CALLBACK(owl_mainwin_resized), mw);
-  owl_window_dirty(window);
-
-  /* For now, we do not bother with connecting up dependencies; that'll be a
-   * future refactor of the mainwin */
-}
-
-static void owl_mainwin_resized(owl_window *w, void *user_data)
-{
-  owl_mainwin *mw = user_data;
-
-  /* in case any styles rely on the current width */
-  owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
-
-  /* recalculate the topmsg to make sure the current message is on
-   * screen */
-  owl_function_calculate_topmsg(OWL_DIRECTION_NONE);
-
-  /* Schedule a redraw */
-  owl_window_dirty(mw->window);
 }
 
 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;
@@ -44 +13 @@
   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);
@@ -73 +43 @@
     mw->curtruncated=0;
     mw->lastdisplayed=-1;
+    owl_global_set_needrefresh(&g);
     return;
   }
@@ -117 +88 @@
     if (y+lines > recwinlines-1) {
       isfull=1;
-      owl_message_curs_waddstr(m, recwin,
+      owl_message_curs_waddstr(m, owl_global_get_curs_recwin(&g),
                                start,
                                start+recwinlines-y,
@@ -125 +96 @@
     } else {
       /* otherwise print the whole thing */
-      owl_message_curs_waddstr(m, recwin,
+      owl_message_curs_waddstr(m, owl_global_get_curs_recwin(&g),
                                start,
                                start+lines,
@@ -168 +139 @@
   }
   mw->lastdisplayed=i-1;
+
+  owl_global_set_needrefresh(&g);
 }