Changeset b6cf72f

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:

d2fd2f7

Parents:

9c1e61d4

git-author:

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

git-committer:

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

Message:

FINALLY! Add a popless:search command

That took a while.

Files:

• commands.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• viewwin.c (modified) (1 diff)

commands.c

@@ -1004 +1004 @@
                   "popless:start-command [initial-value]",
                   "Initializes the command field to initial-value"),
+
+  OWLCMD_ARGS_CTX("popless:search", owl_viewwin_command_search, OWL_CTX_POPLESS,
+                  "search lines for a particular string",
+                  "popless:search [-r] [<string>]",
+                  "The popless:search command will find lines that contain the\n"
+                  "specified string and scroll the popwin there.  If no string\n"
+                  "argument is supplied then the previous one is used.  By\n"
+                  "default searches are done forwards; if -r is used the search\n"
+                  "is performed backwards"),
 
   OWLCMD_ALIAS("webzephyr", "zwrite daemon.webzephyr -c webzephyr -i"),

keys.c

@@ -214 +214 @@
   BIND_CMD(":",           "popless:start-command",  "start a new command");
   BIND_CMD("M-x",         "popless:start-command",  "start a new command");
+
+  BIND_CMD("/",   "popless:start-command popless:search ", "start a search command");
+  BIND_CMD("?",   "popless:start-command popless:search -r ", "start a reverse search command");
+  BIND_CMD("n",   "popless:search", "find next occurrence of search");
+  BIND_CMD("N",   "popless:search -r", "find previous occurrence of search");
 
   BIND_CMD("C-l",         "redisplay", "");

viewwin.c

@@ -140 +140 @@
   }
   wattroff(curswin, A_REVERSE);
+}
+
+char *owl_viewwin_command_search(owl_viewwin *v, int argc, const char *const *argv, const char *buff)
+{
+  int direction, mode;
+  const char *buffstart;
+
+  direction=OWL_DIRECTION_DOWNWARDS;
+  buffstart=skiptokens(buff, 1);
+  if (argc>1 && !strcmp(argv[1], "-r")) {
+    direction=OWL_DIRECTION_UPWARDS;
+    buffstart=skiptokens(buff, 2);
+  }
+
+  if (argc==1 || (argc==2 && !strcmp(argv[1], "-r"))) {
+    mode = OWL_SEARCH_CONTINUE;
+  } else {
+    owl_function_set_search(buffstart);
+    mode = OWL_SEARCH_MATCH_CURRENT;
+  }
+
+  if (!owl_viewwin_search(v, owl_global_get_search_re(&g), mode, direction))
+    owl_function_error("No more matches");
+  return NULL;
 }