Changeset d2fd2f7

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:

dcd48ad

Parents:

b6cf72f

git-author:

David Benjamin <davidben@mit.edu> (08/22/10 04:05:20)

git-committer:

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

Message:

Add popless:start-search and bind to / and ?

The command line is considerably friendlier when it knows it's
searching.

Files:

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

commands.c

@@ -1013 +1013 @@
                   "default searches are done forwards; if -r is used the search\n"
                   "is performed backwards"),
+
+  OWLCMD_ARGS_CTX("popless:start-search", owl_viewwin_command_start_search, OWL_CTX_POPLESS,
+                  "starts a command line to search for particular string",
+                  "popless:search [-r] [inital-value]",
+                  "Initializes the command-line to search for initial-value. If\n"
+                  "-r is used, the search will be performed backwards."),
 
   OWLCMD_ALIAS("webzephyr", "zwrite daemon.webzephyr -c webzephyr -i"),

keys.c

@@ -215 +215 @@
   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("/",   "popless:start-search", "start a search command");
+  BIND_CMD("?",   "popless:start-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");

viewwin.c

@@ -163 +163 @@
   if (!owl_viewwin_search(v, owl_global_get_search_re(&g), mode, direction))
     owl_function_error("No more matches");
+  return NULL;
+}
+
+typedef struct _owl_viewwin_search_data { /*noproto*/
+  owl_viewwin *v;
+  int direction;
+} owl_viewwin_search_data;
+
+static void owl_viewwin_callback_search(owl_editwin *e)
+{
+  const char *line = owl_editwin_get_text(e);
+  owl_viewwin_search_data *data = owl_editwin_get_cbdata(e);
+  owl_function_set_search(line);
+  if (!owl_viewwin_search(data->v, owl_global_get_search_re(&g),
+                          OWL_SEARCH_MATCH_CURRENT, data->direction))
+    owl_function_error("No matches");
+}
+
+char *owl_viewwin_command_start_search(owl_viewwin *v, int argc, const char *const *argv, const char *buff)
+{
+  int direction;
+  const char *buffstart;
+  owl_editwin *tw;
+  owl_context *ctx;
+  owl_viewwin_search_data *data;
+
+  direction=OWL_DIRECTION_DOWNWARDS;
+  buffstart=skiptokens(buff, 1);
+  if (argc>1 && !strcmp(argv[1], "-r")) {
+    direction=OWL_DIRECTION_UPWARDS;
+    buffstart=skiptokens(buff, 2);
+  }
+
+  /* TODO: Add a search history? */
+  tw = owl_viewwin_set_typwin_active(v, NULL);
+  owl_editwin_set_locktext(tw, (direction == OWL_DIRECTION_DOWNWARDS) ? "/" : "?");
+  owl_editwin_insert_string(tw, buffstart);
+
+  data = owl_malloc(sizeof(owl_viewwin_search_data));
+  data->v = v;
+  data->direction = direction;
+
+  ctx = owl_editcontext_new(OWL_CTX_EDITLINE, tw, "editline");
+  ctx->deactivate_cb = owl_viewwin_deactivate_editcontext;
+  ctx->cbdata = v;
+  owl_global_push_context_obj(&g, ctx);
+  owl_editwin_set_callback(tw, owl_viewwin_callback_search);
+  owl_editwin_set_cbdata(tw, data, owl_free);
   return NULL;
 }