Changeset 1fd0b25 for fmtext.c

Timestamp:

Aug 17, 2002, 10:31:35 AM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

37c27cf

Parents:

8509c08

Message:

Added the 'search' command.
'/' is a keybinding for 'search'
'?' is a keybinding for 'search -r'
Fixed stristr, which was completely broken
renamed owl_fmtext_ztext_stylestrip to owl_function_ztext_styletsrip
     and put it in functions.c

File:

• fmtext.c (modified) (3 diffs)

fmtext.c

@@ -19 +19 @@
   for (i=first; i<=last; i++) {
     f->fmbuff[i]=(unsigned char) attr;
+  }
+}
+
+void _owl_fmtext_add_attr(owl_fmtext *f, int attr, int first, int last) {
+  int i;
+  for (i=first; i<=last; i++) {
+    f->fmbuff[i]|=(unsigned char) attr;
   }
 }
@@ -332 +339 @@
 }
 
-/* strips formatting from ztext and returns the unformatted text. 
- * caller is responsible for freeing. */
-char *owl_fmtext_ztext_stylestrip(char *zt) {
-  owl_fmtext fm;
-  char *plaintext;
-
-  owl_fmtext_init_null(&fm);
-  owl_fmtext_append_ztext(&fm, zt);
-  plaintext = owl_fmtext_print_plain(&fm);
-  owl_fmtext_free(&fm);
-  return(plaintext);
-}
-
 
 void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w) {
@@ -516 +510 @@
   memcpy(dst->colorbuff, src->colorbuff, src->textlen);
 }
+
+
+int owl_fmtext_search_and_highlight(owl_fmtext *f, char *string) {
+  /* highlight all instance of "string".  Return the number of
+   * instances found.  This is case insensitive. */
+
+  int found, len;
+  char *ptr1, *ptr2;
+
+  len=strlen(string);
+  found=0;
+  ptr1=f->textbuff;
+  while (ptr1-f->textbuff <= f->textlen) {
+    ptr2=stristr(ptr1, string);
+    if (!ptr2) return(found);
+
+    found++;
+    _owl_fmtext_add_attr(f, OWL_FMTEXT_ATTR_REVERSE,
+                         ptr2 - f->textbuff,
+                         ptr2 - f->textbuff + len - 1);
+
+    ptr1=ptr2+len;
+  }
+  return(found);
+}
+
+int owl_fmtext_search(owl_fmtext *f, char *string) {
+  /* return 1 if the string is found, 0 if not.  This is case
+   *  insensitive */
+
+  if (stristr(f->textbuff, string)) return(1);
+  return(0);
+}