Changes in fmtext.c [6f6330b:1490327]

File:

• fmtext.c (modified) (4 diffs)

fmtext.c

@@ -90 +90 @@
 }
 
+/* Append normal, uncolored text specified by format string to 'f' */
+void owl_fmtext_appendf_normal(owl_fmtext *f, char *fmt, ...)
+{
+  va_list ap;
+  char *buff;
+
+  va_start(ap, fmt);
+  buff = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+  if (!buff)
+    return;
+  owl_fmtext_append_attr(f, buff, OWL_FMTEXT_ATTR_NONE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
+}
+
 /* Append normal text 'text' to 'f' with color 'color' */
 void owl_fmtext_append_normal_color(owl_fmtext *f, char *text, int fgcolor, int bgcolor)
@@ -169 +183 @@
 
 /* Internal function.  Append text from 'in' between index 'start' and
- * 'stop' to the end of 'f'
+ * 'stop', inclusive, to the end of 'f'. This function works with
+ * bytes.
  */
 void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) /*noproto*/
@@ -474 +489 @@
         _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
       }
+      else if (chwidth > 1) {
+        /* Last char is wide, truncate. */
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
+        owl_fmtext_append_normal(out, "\n");
+      }
       else {
-        if (chwidth > 1) {
-          /* Last char is wide, truncate. */
-          _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
-          owl_fmtext_append_normal(out, "\n");
-        }
-        else {
-          /* Last char fits perfectly, leave alone.*/
-          _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
-        }
+        /* Last char fits perfectly, We skip to the next char and back
+         * up a byte to make sure we get it all.
+         */
+        ptr_c = g_utf8_next_char(ptr_c);
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
       }
     }
@@ -763 +779 @@
  * 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, owl_list *l, char *join_with, char *(format_fn)(void*))
+void owl_fmtext_append_list(owl_fmtext *f, owl_list *l, char *join_with, char *(format_fn)(char *))
 {
   int i, size;
-  void *elem;
+  char *elem;
   char *text;