Changeset 16c6cca

Timestamp:

Jan 9, 2008, 2:32:01 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a827529

Parents:

369479d

Message:

Preserve colors when highlighting search terms.

File:

• fmtext.c (modified) (6 diffs)

fmtext.c

@@ -245 +245 @@
   if (attrs & OWL_FMTEXT_ATTR_UNDERLINE) wattron(w, A_UNDERLINE);
 }
+
+void _owl_fmtext_update_colorpair(short fg, short bg, short *pair) /*noproto*/
+{
+  if (owl_global_get_hascolors(&g)) {
+    *pair = owl_fmtext_get_colorpair(fg, bg);
+  }
+}
+
+void _owl_fmtext_wcolor_set(WINDOW *w, short pair) /*noproto*/
+{
+  if (owl_global_get_hascolors(&g)) {
+      wcolor_set(w,pair,NULL);
+  }
+}
+
 /* add the formatted text to the curses window 'w'.  The window 'w'
  * must already be initiatlized with curses
@@ -254 +269 @@
   char *s, *p;
   char attr;
-  short fg, bg;
+  short fg, bg, pair;
   int search_results, search_len;
   
@@ -274 +289 @@
   bg = f->default_bgcolor;
   _owl_fmtext_wattrset(w, attr);
-  if (owl_global_get_hascolors(&g)) {
-    short pair;
-    pair = owl_fmtext_get_colorpair(fg, bg);
-    if (pair != -1) {
-      wcolor_set(w,pair,NULL);
-    }
-  }
+  _owl_fmtext_update_colorpair(fg, bg, &pair);
+  _owl_fmtext_wcolor_set(w, pair);
 
   /* Find next possible format character. */
@@ -304 +314 @@
 
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
-
+          _owl_fmtext_wcolor_set(w, pair);
+          
           tmp2 = ss[search_len];
           ss[search_len] = '\0';
@@ -310 +321 @@
           ss[search_len] = tmp2;
 
-          _owl_fmtext_wattrset(w,attr);
+          _owl_fmtext_wattrset(w, attr);
+          _owl_fmtext_wcolor_set(w, pair);
 
           s = ss + search_len;
@@ -330 +342 @@
       }
       _owl_fmtext_wattrset(w, attr | f->default_attrs);
-      if (owl_global_get_hascolors(&g)) {
-        if (fg == OWL_COLOR_DEFAULT) fg = f->default_fgcolor;
-        if (bg == OWL_COLOR_DEFAULT) bg = f->default_bgcolor;
-        short pair;
-        pair = owl_fmtext_get_colorpair(fg, bg);
-        if (pair != -1) {
-          wcolor_set(w,pair,NULL);
-        }
-      }
+      if (fg == OWL_COLOR_DEFAULT) fg = f->default_fgcolor;
+      if (bg == OWL_COLOR_DEFAULT) bg = f->default_bgcolor;
+      _owl_fmtext_update_colorpair(fg, bg, &pair);
+      _owl_fmtext_wcolor_set(w, pair);
+
       /* Advance to next non-formatting character. */
       s = p;