Changeset 9c1e61d4 for viewwin.c

Timestamp:

Sep 18, 2010, 5:07:40 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

b6cf72f

Parents:

a728387

git-author:

David Benjamin <davidben@mit.edu> (08/15/10 19:40:03)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:40)

Message:

Add OWL_SEARCH_CONTINUE and OWL_SEARCH_MATCH_CURRENT

Instead of having a confusing mode argument, define more constants.

File:

• viewwin.c (modified) (3 diffs)

viewwin.c

@@ -300 +300 @@
  * found.
  *
- * If mode==0 then stay on the current line if it matches.
+ * If mode is OWL_SEARCH_MATCH_CURRENT then stay on the current line
+ * if it matches.
  */
 int owl_viewwin_search(owl_viewwin *v, const owl_regex *re, int mode, int direction)
@@ -309 +310 @@
   owl_fmtext_line_extents(&v->fmtext, v->topline, &start, &end);
   if (direction == OWL_DIRECTION_DOWNWARDS) {
-    offset = owl_fmtext_search(&v->fmtext, re, mode ? end : start);
+    offset = owl_fmtext_search(&v->fmtext, re,
+                               (mode == OWL_SEARCH_CONTINUE) ? end : start);
     if (offset < 0)
       return 0;
@@ -321 +323 @@
      * them. */
     buf = owl_fmtext_get_text(&v->fmtext);
-    lineend = mode ? start : end;
+    lineend = (mode == OWL_SEARCH_CONTINUE) ? start : end;
     while (lineend > 0) {
       linestartp = memrchr(buf, '\n', lineend - 1);