Changeset 7b4f3be for functions.c

Timestamp:

May 1, 2011, 5:29:25 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

1753ea0, 3fa0181

Parents:

9efa5bd

git-author:

David Benjamin <davidben@mit.edu> (04/26/11 21:46:58)

git-committer:

David Benjamin <davidben@mit.edu> (05/01/11 17:29:25)

Message:

Punt owl_global_hascolors

There's not much point as we're hardly abstracting ncurses away. Either
call has_colors directly or just don't bother and let another layer take
care of it.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -1817 +1817 @@
           owl_global_get_cols(&g));
 
-  if (owl_global_get_hascolors(&g)) {
+  if (has_colors()) {
     owl_fmtext_append_normal(&fm, "Color: Yes\n");
     owl_fmtext_appendf_normal(&fm, "Number of color pairs: %i\n", owl_util_get_colorpairs());
@@ -2226 +2226 @@
     f = fl->data;
     owl_fmtext_append_normal(&fm, "   ");
-    if (owl_global_get_hascolors(&g)) {
-      owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_fgcolor(f), owl_filter_get_bgcolor(f));
-    } else {
-      owl_fmtext_append_normal(&fm, owl_filter_get_name(f));
-    }
+    owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f),
+                                   owl_filter_get_fgcolor(f),
+                                   owl_filter_get_bgcolor(f));
     owl_fmtext_append_normal(&fm, "\n");
   }