Changeset cb6c9e1

Timestamp:

Feb 26, 2011, 12:59:00 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

f54b07d

Parents:

237d02c

git-author:

David Benjamin <davidben@mit.edu> (02/25/11 15:34:47)

git-committer:

David Benjamin <davidben@mit.edu> (02/26/11 00:59:00)

Message:

Apply default attributes after processing commands

Otherwise we reset the color after every clump of formatting characters,
whether it includes a color or not. (Though this never happens because
of how we generate fmtext.) Also, actually modify the current attr so
that default_attrs works with search.

(While I'm at it, simplify _owl_fmtext_append_fmtext a bit.)

File:

• fmtext.c (modified) (3 diffs)

fmtext.c

@@ -131 +131 @@
 static void _owl_fmtext_append_fmtext(owl_fmtext *f, const owl_fmtext *in, int start, int stop)
 {
-  int a = 0, fg = 0, bg = 0;
   char attr = 0;
   short fgcolor = OWL_COLOR_DEFAULT;
@@ -137 +136 @@
 
   _owl_fmtext_scan_attributes(in, start, &attr, &fgcolor, &bgcolor);
-  if (attr != OWL_FMTEXT_ATTR_NONE) a=1;
-  if (fgcolor != OWL_COLOR_DEFAULT) fg=1;
-  if (bgcolor != OWL_COLOR_DEFAULT) bg=1;
-
-  if (a)
+
+  if (attr != OWL_FMTEXT_ATTR_NONE)
     g_string_append_unichar(f->buff, OWL_FMTEXT_UC_ATTR | attr);
-  if (fg)
+  if (fgcolor != OWL_COLOR_DEFAULT)
     g_string_append_unichar(f->buff, OWL_FMTEXT_UC_FGCOLOR | fgcolor);
-  if (bg)
+  if (bgcolor != OWL_COLOR_DEFAULT)
     g_string_append_unichar(f->buff, OWL_FMTEXT_UC_BGCOLOR | bgcolor);
 
@@ -264 +260 @@
       p[0] = tmp;
 
-      /* Deal with new attributes. Initialize to defaults, then
-         process all consecutive formatting characters. */
-      attr = default_attrs;
-      fg = default_fgcolor;
-      bg = default_bgcolor;
+      /* Deal with new attributes. Process all consecutive formatting
+       * characters, and then apply defaults where relevant. */
       while (owl_fmtext_is_format_char(g_utf8_get_char(p))) {
         _owl_fmtext_update_attributes(g_utf8_get_char(p), &attr, &fg, &bg);
         p = g_utf8_next_char(p);
       }
-      _owl_fmtext_wattrset(w, attr | default_attrs);
+      attr |= default_attrs;
       if (fg == OWL_COLOR_DEFAULT) fg = default_fgcolor;
       if (bg == OWL_COLOR_DEFAULT) bg = default_bgcolor;
+      _owl_fmtext_wattrset(w, attr);
       _owl_fmtext_update_colorpair(fg, bg, &pair);
       _owl_fmtext_wcolor_set(w, pair);