Changeset 9a2dd0c

Timestamp:

Jan 23, 2012, 5:28:46 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

8135737 (diff), d126a19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge d126a19eb5f8a883b722fb26d21fb7b62b2aedeb into 813573732b0f3417b980267c0277caba41fb2cb3

Files:

• global.c (modified) (4 diffs)
• mainwin.c (modified) (2 diffs)
• messagelist.c (modified) (1 diff)
• owl.h (modified) (3 diffs)
• variable.c (modified) (2 diffs)
• view.c (modified) (6 diffs)

global.c

@@ -75 +75 @@
   g_free(cd);
 
-  owl_messagelist_create(&(g->msglist));
+  g->msglist = owl_messagelist_new();
 
   _owl_global_init_windows(g);
@@ -109 +109 @@
 
   /* Create the widgets */
-  owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
+  g->mw = owl_mainwin_new(g->mainpanel.recwin);
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
   owl_sepbar_init(g->mainpanel.sepwin);
@@ -241 +241 @@
 /* windows */
 
-owl_mainwin *owl_global_get_mainwin(owl_global *g) {
-  return(&(g->mw));
+owl_mainwin *owl_global_get_mainwin(owl_global *g)
+{
+  return g->mw;
 }
 
@@ -256 +257 @@
 
 owl_messagelist *owl_global_get_msglist(owl_global *g) {
-  return(&(g->msglist));
+  return g->msglist;
 }
 

mainwin.c

@@ -4 +4 @@
 static void owl_mainwin_resized(owl_window *w, void *user_data);
 
-void owl_mainwin_init(owl_mainwin *mw, owl_window *window)
+CALLER_OWN owl_mainwin *owl_mainwin_new(owl_window *window)
 {
+  owl_mainwin *mw = g_new(owl_mainwin, 1);
   mw->curtruncated=0;
   mw->lastdisplayed=-1;
@@ -16 +17 @@
   /* For now, we do not bother with connecting up dependencies; that'll be a
    * future refactor of the mainwin */
+
+  return mw;
 }
 

messagelist.c

@@ -1 +1 @@
 #include "owl.h"
 
-void owl_messagelist_create(owl_messagelist *ml)
+CALLER_OWN owl_messagelist *owl_messagelist_new(void)
 {
+  owl_messagelist *ml = g_new(owl_messagelist, 1);
   ml->list = g_ptr_array_new();
+  return ml;
 }
 
-void owl_messagelist_cleanup(owl_messagelist *ml, bool free_messages)
+void owl_messagelist_delete(owl_messagelist *ml, bool free_messages)
 {
   if (free_messages)
     g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL);
   g_ptr_array_free(ml->list, true);
+  g_free(ml);
 }
 

owl.h

@@ -452 +452 @@
   char *name;
   owl_filter *filter;
-  owl_messagelist ml;
+  owl_messagelist *ml;
   const owl_style *style;
   int cachedmsgid;
@@ -533 +533 @@
 
 typedef struct _owl_global {
-  owl_mainwin mw;
+  owl_mainwin *mw;
   owl_popwin *pw;
   owl_msgwin msgwin;
@@ -551 +551 @@
   int curmsg_vert_offset;
   owl_view current_view;
-  owl_messagelist msglist;
+  owl_messagelist *msglist;
   WINDOW *input_pad;
   owl_mainpanel mainpanel;

variable.c

@@ -116 +116 @@
                "both,in,out"),
 
-  OWLVAR_BOOL( "colorztext" /* %OwlVarStub */, 1,
-               "allow @color() in zephyrs to change color",
-               "Note that only messages received after this variable\n"
-               "is set will be affected." ),
+  OWLVAR_BOOL_FULL( "colorztext" /* %OwlVarStub */, 1,
+                    "allow @color() in zephyrs to change color",
+                    NULL, NULL, owl_variable_colorztext_set, NULL),
 
   OWLVAR_BOOL( "fancylines" /* %OwlVarStub */, 1,
@@ -496 +495 @@
   }
   return owl_variable_bool_set_default(v, newval);
+}
+
+int owl_variable_colorztext_set(owl_variable *v, const void *newval)
+{
+  int ret = owl_variable_bool_set_default(v, newval);
+  /* flush the format cache so that we see the update, but only if we're done initializing BarnOwl */
+  if (owl_global_get_msglist(&g) != NULL)
+    owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
+  if (owl_global_get_mainwin(&g) != NULL) {
+    owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  }
+  return ret;
 }
 

view.c

@@ -6 +6 @@
   v->filter=f;
   v->style=s;
-  owl_messagelist_create(&(v->ml));
+  v->ml = owl_messagelist_new();
   owl_view_recalculate(v);
 }
@@ -19 +19 @@
 {
   if (owl_filter_message_match(v->filter, m)) {
-    owl_messagelist_append_element(&(v->ml), m);
+    owl_messagelist_append_element(v->ml, m);
   }
 }
@@ -30 +30 @@
   int i, j;
   const owl_messagelist *gml;
-  owl_messagelist *ml;
   owl_message *m;
 
   gml=owl_global_get_msglist(&g);
-  ml=&(v->ml);
 
   /* nuke the old list, don't free the messages */
-  owl_messagelist_cleanup(ml, false);
-  owl_messagelist_create(&(v->ml));
+  owl_messagelist_delete(v->ml, false);
+  v->ml = owl_messagelist_new();
 
   /* find all the messages we want */
@@ -45 +43 @@
     m=owl_messagelist_get_element(gml, i);
     if (owl_filter_message_match(v->filter, m)) {
-      owl_messagelist_append_element(ml, m);
+      owl_messagelist_append_element(v->ml, m);
     }
   }
@@ -72 +70 @@
 owl_message *owl_view_get_element(const owl_view *v, int index)
 {
-  return(owl_messagelist_get_element(&(v->ml), index));
+  return owl_messagelist_get_element(v->ml, index);
 }
 
 void owl_view_delete_element(owl_view *v, int index)
 {
-  owl_messagelist_delete_element(&(v->ml), index);
+  owl_messagelist_delete_element(v->ml, index);
 }
 
 void owl_view_undelete_element(owl_view *v, int index)
 {
-  owl_messagelist_undelete_element(&(v->ml), index);
+  owl_messagelist_undelete_element(v->ml, index);
 }
 
 int owl_view_get_size(const owl_view *v)
 {
-  return(owl_messagelist_get_size(&(v->ml)));
+  return owl_messagelist_get_size(v->ml);
 }
 
@@ -158 +156 @@
 void owl_view_cleanup(owl_view *v)
 {
-  owl_messagelist_cleanup(&v->ml, false);
+  owl_messagelist_delete(v->ml, false);
   g_free(v->name);
 }