Changes in fmtext.c [7b4f3be:f271129]

File:

• fmtext.c (modified) (6 diffs)

fmtext.c

@@ -1 +1 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
 
 /* initialize an fmtext with no data */
@@ -171 +169 @@
  * freeing the return
  */
-char *owl_fmtext_print_plain(const owl_fmtext *f)
+CALLER_OWN char *owl_fmtext_print_plain(const owl_fmtext *f)
 {
   return owl_strip_format_chars(f->buff->str);
@@ -186 +184 @@
 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
 {
+  cchar_t background;
+  wchar_t blank[2] = { ' ', 0 };
   if (has_colors()) {
-      wcolor_set(w,pair,NULL);
-      wbkgdset(w, COLOR_PAIR(pair));
+      wcolor_set(w, pair, NULL);
+      /* Set the background with wbkgrndset so that we can handle color-pairs
+       * past 256 on ncurses ABI 6 and later. */
+      setcchar(&background, blank, 0, pair, NULL);
+      wbkgrndset(w, &background);
   }
 }
@@ -686 +689 @@
          * but zwgc seems to be smarter about some screw cases than I am
          */
+        g_free(buff);
         owl_fmtext_append_attr(f, "@", curattrs, curcolor, OWL_COLOR_DEFAULT);
         txtptr++;
@@ -755 +759 @@
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
-void owl_fmtext_append_list(owl_fmtext *f, const owl_list *l, const char *join_with, char *(format_fn)(const char *))
-{
-  int i, size;
+void owl_fmtext_append_list(owl_fmtext *f, const GPtrArray *l, const char *join_with, char *(format_fn)(const char *))
+{
+  int i;
   const char *elem;
   char *text;
 
-  size = owl_list_get_size(l);
-  for (i=0; i<size; i++) {
-    elem = owl_list_get_element(l,i);
+  for (i = 0; i < l->len; i++) {
+    elem = l->pdata[i];
     if (elem && format_fn) {
       text = format_fn(elem);
@@ -773 +776 @@
       owl_fmtext_append_normal(f, elem);
     }
-    if ((i < size-1) && join_with) {
+    if ((i < l->len - 1) && join_with) {
       owl_fmtext_append_normal(f, join_with);
     }