Changeset 6a35938 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:

38e2250

Parents:

fc5eef4

git-author:

David Benjamin <davidben@mit.edu> (08/15/10 15:56:44)

git-committer:

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

Message:

Add an unspeakably ugly version of reverse search

I think we really want the viewwin to have pre-split the output into
lines.

File:

• viewwin.c (modified) (3 diffs)

viewwin.c

@@ -224 +224 @@
 }
 
+/* This is a bit of a hack, because regexec doesn't have an 'n'
+ * version. */
+static int _re_memcompare(const owl_regex *re, const char *string, int start, int end)
+{
+  int ans;
+  char *tmp = g_strndup(string + start, end - start);
+  ans = owl_regex_compare(re, tmp, NULL, NULL);
+  g_free(tmp);
+  return !ans;
+}
+
 /* Scroll in 'direction' to the next line containing 're' in 'v',
  * starting from the current line. Returns 0 if no occurrence is
@@ -233 +244 @@
 {
   int start, end, offset;
+  int lineend, linestart;
+  const char *buf, *linestartp;
   owl_fmtext_line_extents(&v->fmtext, v->topline, &start, &end);
   if (direction == OWL_DIRECTION_DOWNWARDS) {
@@ -242 +255 @@
     return 1;
   } else {
-    /* FIXME */
-    owl_function_error("Upwards searching is not implemented in viewwin.");
-    return 1;
+    /* TODO: This is a hack. Really, we should have an owl_fmlines or
+     * something containing an array of owl_fmtext split into
+     * lines. Also, it cannot handle multi-line regex, if we ever care about
+     * them. */
+    buf = owl_fmtext_get_text(&v->fmtext);
+    lineend = mode ? start : end;
+    while (lineend > 0) {
+      linestartp = memrchr(buf, '\n', lineend - 1);
+      linestart = linestartp ? linestartp - buf + 1 : 0;
+      if (_re_memcompare(re, buf, linestart, lineend)) {
+        v->topline = owl_fmtext_line_number(&v->fmtext, linestart);
+        owl_viewwin_dirty(v);
+        return 1;
+      }
+      lineend = linestart;
+    }
+    return 0;
   }
 }