Changeset 237d02c

Timestamp:

Feb 26, 2011, 12:58:30 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

cb6c9e1

Parents:

7659079

git-author:

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

git-committer:

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

Message:

Remove default_{attrs,fgcolor,bgcolor} from owl_fmtext

They didn't quite behave when appending two owl_fmtexts together; what
does it mean to append a string whose default color is red to one whose
default color is blue? (And then you set the default to green
afterwards...)

Now owl_fmtext is merely a unicode string with formatting characters.
Default attributes are instead a property of how you view the string and
are passed to owl_fmtext_curs_waddstr. Which unfortunately means it has
a lot of arguments. :-/

Files:

• fmtext.c (modified) (11 diffs)
• message.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• viewwin.c (modified) (1 diff)

fmtext.c

@@ -7 +7 @@
 {
   f->buff = g_string_new("");
-  f->default_attrs = OWL_FMTEXT_ATTR_NONE;
-  f->default_fgcolor = OWL_COLOR_DEFAULT;
-  f->default_bgcolor = OWL_COLOR_DEFAULT;
 }
 
@@ -17 +14 @@
 {
   g_string_truncate(f->buff, 0);
-  f->default_attrs = OWL_FMTEXT_ATTR_NONE;
-  f->default_fgcolor = OWL_COLOR_DEFAULT;
-  f->default_bgcolor = OWL_COLOR_DEFAULT;
 }
 
@@ -100 +94 @@
 }
 
-/* Add the attribute 'attr' to the default atts for the text in 'f' */
-void owl_fmtext_addattr(owl_fmtext *f, char attr)
-{
-  /* add the attribute to all text */
-  f->default_attrs |= attr;
-}
-
-/* Set the default foreground color for this fmtext to 'color'.
- * Only affects text that is colored default.
- */
-void owl_fmtext_colorize(owl_fmtext *f, int color)
-{
-  f->default_fgcolor = color;
-}
-
-/* Set the default foreground color for this fmtext to 'color'.
- * Only affects text that is colored default.
- */
-void owl_fmtext_colorizebg(owl_fmtext *f, int color)
-{
-  f->default_bgcolor = color;
-}
-
 /* Internal function. Parse attrbute character. */
 static void _owl_fmtext_update_attributes(gunichar c, char *attr, short *fgcolor, short *bgcolor)
@@ -235 +206 @@
  * must already be initiatlized with curses
  */
-static void _owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w, int do_search)
+static void _owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w, int do_search, char default_attrs, short default_fgcolor, short default_bgcolor)
 {
   /* char *tmpbuff; */
@@ -250 +221 @@
   s = f->buff->str;
   /* Set default attributes. */
-  attr = f->default_attrs;
-  fg = f->default_fgcolor;
-  bg = f->default_bgcolor;
+  attr = default_attrs;
+  fg = default_fgcolor;
+  bg = default_bgcolor;
   _owl_fmtext_wattrset(w, attr);
   _owl_fmtext_update_colorpair(fg, bg, &pair);
@@ -295 +266 @@
       /* Deal with new attributes. Initialize to defaults, then
          process all consecutive formatting characters. */
-      attr = f->default_attrs;
-      fg = f->default_fgcolor;
-      bg = f->default_bgcolor;
+      attr = default_attrs;
+      fg = default_fgcolor;
+      bg = default_bgcolor;
       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 | f->default_attrs);
-      if (fg == OWL_COLOR_DEFAULT) fg = f->default_fgcolor;
-      if (bg == OWL_COLOR_DEFAULT) bg = f->default_bgcolor;
+      _owl_fmtext_wattrset(w, attr | default_attrs);
+      if (fg == OWL_COLOR_DEFAULT) fg = default_fgcolor;
+      if (bg == OWL_COLOR_DEFAULT) bg = default_bgcolor;
       _owl_fmtext_update_colorpair(fg, bg, &pair);
       _owl_fmtext_wcolor_set(w, pair);
@@ -322 +293 @@
 }
 
-void owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w)
-{
-  _owl_fmtext_curs_waddstr(f, w, 1);
-}
-
-void owl_fmtext_curs_waddstr_without_search(const owl_fmtext *f, WINDOW *w)
-{
-  _owl_fmtext_curs_waddstr(f, w, 0);
+void owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w, char default_attrs, short default_fgcolor, short default_bgcolor)
+{
+  _owl_fmtext_curs_waddstr(f, w, 1, default_attrs, default_fgcolor, default_bgcolor);
+}
+
+void owl_fmtext_curs_waddstr_without_search(const owl_fmtext *f, WINDOW *w, char default_attrs, short default_fgcolor, short default_bgcolor)
+{
+  _owl_fmtext_curs_waddstr(f, w, 0, default_attrs, default_fgcolor, default_bgcolor);
 }
 
@@ -336 +307 @@
   int col = start, numcopied = 0;
   char *ptr;
-
-  /* Copy the default attributes. */
-  out->default_attrs = in->default_attrs;
-  out->default_fgcolor = in->default_fgcolor;
-  out->default_bgcolor = in->default_bgcolor;
 
   for (ptr = in->buff->str;
@@ -387 +353 @@
   /* ptr1 now holds the starting point */
 
-  /* copy the default attributes */
-  out->default_attrs = in->default_attrs;
-  out->default_fgcolor = in->default_fgcolor;
-  out->default_bgcolor = in->default_bgcolor;
-    
   /* copy in the next 'lines' lines */
   if (lines < 1) return(-1);
@@ -415 +376 @@
   const char *ptr_s, *ptr_e, *ptr_c, *last;
   int col, st, padding, chwidth;
-
-  /* copy the default attributes */
-  out->default_attrs = in->default_attrs;
-  out->default_fgcolor = in->default_fgcolor;
-  out->default_bgcolor = in->default_bgcolor;
 
   last = in->buff->str + in->buff->len - 1;
@@ -588 +544 @@
 {
   dst->buff = g_string_new(src->buff->str);
-  dst->default_attrs = src->default_attrs;
-  dst->default_fgcolor = src->default_fgcolor;
-  dst->default_bgcolor = src->default_bgcolor;
 }
 

message.c

@@ -525 +525 @@
   owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline, &a);
   owl_fmtext_truncate_cols(&a, acol, bcol, &b);
-  owl_fmtext_colorize(&b, fgcolor);
-  owl_fmtext_colorizebg(&b, bgcolor);
-
-  owl_fmtext_curs_waddstr(&b, win);
+
+  owl_fmtext_curs_waddstr(&b, win, OWL_FMTEXT_ATTR_NONE, fgcolor, bgcolor);
 
   owl_fmtext_cleanup(&a);

owl.h

@@ -276 +276 @@
 typedef struct _owl_fmtext {
   GString *buff;
-  char default_attrs;
-  short default_fgcolor;
-  short default_bgcolor;
 } owl_fmtext;
 

viewwin.c

@@ -106 +106 @@
   owl_fmtext_truncate_cols(&fm1, v->rightshift, wincols-1+v->rightshift, &fm2);
 
-  owl_fmtext_curs_waddstr(&fm2, curswin);
+  owl_fmtext_curs_waddstr(&fm2, curswin, OWL_FMTEXT_ATTR_NONE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
 
   owl_fmtext_cleanup(&fm1);