Changeset 41c9a96 for fmtext.c

Timestamp:

Jul 24, 2009, 12:59:23 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

64c9165

Parents:

ab225e0

git-author:

Anders Kaseorg <andersk@mit.edu> (07/24/09 00:51:10)

git-committer:

Anders Kaseorg <andersk@mit.edu> (07/24/09 00:59:23)

Message:

Reimplement search in terms of owl_regex.

The current implementation of stristr has problems and there isn’t a
good replacement available.  This was its only caller, so we can get
rid of it now.

Also, this will make it possible to search with arbitrary regexes if
someone feels like coming up with a syntax.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• fmtext.c (modified) (4 diffs)

fmtext.c

@@ -285 +285 @@
   char attr;
   short fg, bg, pair;
-  int search_results, search_len;
   
   if (w==NULL) {
@@ -292 +291 @@
   }
 
-  search_results = (do_search
-                    ? owl_fmtext_search(f, owl_global_get_search_string(&g))
-                    : 0);
-  search_len = (search_results
-                ? strlen(owl_global_get_search_string(&g))
-                : 0);
   s = f->textbuff;
   /* Set default attributes. */
@@ -316 +309 @@
       tmp = p[0];
       p[0] = '\0';
-      if (search_results) {
+      if (owl_global_is_search_active(&g)) {
         /* Search is active, so highlight search results. */
-        char tmp2, *ss;
-        ss = stristr(s, owl_global_get_search_string(&g));
-        while (ss) {
+        char tmp2;
+        int start, end;
+        while (owl_regex_compare(owl_global_get_search_re(&g), s, &start, &end) == 0) {
           /* Found search string, highlight it. */
 
-          tmp2 = ss[0];
-          ss[0] = '\0';
+          tmp2 = s[start];
+          s[start] = '\0';
           waddstr(w, s);
-          ss[0] = tmp2;
+          s[start] = tmp2;
 
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
           _owl_fmtext_wcolor_set(w, pair);
           
-          tmp2 = ss[search_len];
-          ss[search_len] = '\0';
-          waddstr(w, ss);
-          ss[search_len] = tmp2;
+          tmp2 = s[end];
+          s[end] = '\0';
+          waddstr(w, s + start);
+          s[end] = tmp2;
 
           _owl_fmtext_wattrset(w, attr);
           _owl_fmtext_wcolor_set(w, pair);
 
-          s = ss + search_len;
-          ss = stristr(s, owl_global_get_search_string(&g));
+          s += end;
         }
       }
@@ -563 +555 @@
  *  insensitive search.
  */
-int owl_fmtext_search(owl_fmtext *f, char *string)
-{
-  if (stristr(f->textbuff, string)) return(1);
+int owl_fmtext_search(owl_fmtext *f, owl_regex *re)
+{
+  if (owl_regex_compare(re, f->textbuff, NULL, NULL) == 0) return(1);
   return(0);
 }