Changeset 2ec737f

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:

a728387

Parents:

09ceee3

git-author:

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

git-committer:

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

Message:

Add owl_function_set_search

Instead of allowing OWL_DIRECTION_NONE in owl_function_search_start,
make the setsearch command just call a more approriately named function.

Also, move the mainwin redisplay into owl_global_set_search_re.
Although, really it should just emit a signal.

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (2 diffs)
• global.c (modified) (1 diff)

commands.c

@@ -2551 +2551 @@
 
   buffstart=skiptokens(buff, 1);
-  owl_function_search_start(*buffstart ? buffstart : NULL, OWL_DIRECTION_NONE);
+  owl_function_set_search(*buffstart ? buffstart : NULL);
   
   return(NULL);

functions.c

@@ -2886 +2886 @@
 }
 
-void owl_function_search_start(const char *string, int direction)
-{
-  /* direction is OWL_DIRECTION_DOWNWARDS or OWL_DIRECTION_UPWARDS or
-   * OWL_DIRECTION_NONE */
+void owl_function_set_search(const char *string)
+{
   owl_regex re;
 
@@ -2898 +2896 @@
     owl_global_set_search_re(&g, NULL);
   }
-
-  if (direction == OWL_DIRECTION_NONE)
-    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  else
-    owl_function_search_helper(0, direction);
+}
+
+void owl_function_search_start(const char *string, int direction)
+{
+  /* direction is OWL_DIRECTION_DOWNWARDS or OWL_DIRECTION_UPWARDS */
+  owl_function_set_search(string);
+  owl_function_search_helper(0, direction);
 }
 

global.c

@@ -659 +659 @@
   if (re != NULL)
     owl_regex_copy(re, &g->search_re);
-  /* TODO: Emit a signal so we don't depend on the viewwin here. */
+  /* TODO: Emit a signal so we don't depend on the viewwin and mainwin */
   if (owl_global_get_viewwin(g))
     owl_viewwin_dirty(owl_global_get_viewwin(g));
+  owl_mainwin_redisplay(owl_global_get_mainwin(g));
 }