Changeset 7360fab for functions.c

Timestamp:

Jun 29, 2002, 1:21:36 PM (22 years ago)

Author:

Erik Nygren <nygren@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:

d36f2cb

Parents:

855ebe7

Message:

	Made owl_function_fast*filt return a string and not do the
	        narrowing, to make it more general.
	Added a smartfilter command that creates a filter
	        based on the current message and returns the name
		of the filter.
	Added --smart-filter and --smart-filter-instance options
	        to the next and prev commands.
	Added M-C-n and M-C-p keybindings to "move to next message
	        matching current" and "move to previous message
		matching current"

File:

• functions.c (modified) (10 diffs)

functions.c

@@ -1683 +1683 @@
 }
 
-void owl_function_fastclassinstfilt(char *class, char *instance) {
-  /* narrow to the current class, instance.  If instance is null then
-     just narrow to the current class */
+char *owl_function_fastclassinstfilt(char *class, char *instance) {
+  /* creates a filter for a class, instance if one doesn't exist.
+   * If instance is null then apply for all messgaes in the class.
+   * returns the name of the filter, which the caller must free.*/
   owl_list *fl;
   owl_filter *f;
@@ -1706 +1707 @@
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    owl_function_change_view(filtname);
-    owl_free(filtname);
-    return;
+    return filtname;
   }
 
@@ -1724 +1723 @@
   owl_global_add_filter(&g, f);
 
-  /* set the current view to use it */
-  owl_function_change_view(filtname);
-
   owl_free(argbuff);
-  owl_free(filtname);
-}
-
-void owl_function_fastuserfilt(char *user) {
+  return filtname;
+}
+
+char *owl_function_fastuserfilt(char *user) {
   owl_filter *f;
   char *argbuff, *longuser, *shortuser, *filtname;
@@ -1745 +1741 @@
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    owl_function_change_view(filtname);
-    owl_free(filtname);
-    return;
+    return filtname;
   }
 
@@ -1763 +1757 @@
   owl_global_add_filter(&g, f);
 
-  /* set the current view to use it */
-  owl_function_change_view(filtname);
-
   /* free stuff */
   owl_free(argbuff);
-  owl_free(filtname);
   owl_free(longuser);
   owl_free(shortuser);
-    
+
+  return filtname;
 }
 
@@ -1795 +1786 @@
 }
 
-void owl_function_smartnarrow(int type) {
-  /* if the curmsg is a personal message narrow
+char *owl_function_smartfilter(int type) {
+  /* Returns the name of a filter, or null.  The caller 
+   * must free this name.  */
+  /* if the curmsg is a personal message return a filter name
    *    to the converstaion with that user.
    * If the curmsg is a class message, instance foo, recip *
-   *    message, narrow to the class, inst.
-   * If the curmsg is a class message and type==0 then narrow
-   *    to the class
-   * If the curmsg is a class message and type==1 then narrow
-   *    to the class, instance
+   *    message, return a filter name to the class, inst.
+   * If the curmsg is a class message and type==0 then 
+   *    return a filter name for just the class.
+   * If the curmsg is a class message and type==1 then 
+   *    return a filter name for the class and instance.
    */
   owl_view *v;
   owl_message *m;
-  char *sender;
+  char *sender, *filtname=NULL;
   
   v=owl_global_get_current_view(&g);
@@ -1814 +1807 @@
   if (owl_view_get_size(v)==0) {
     owl_function_makemsg("No message selected\n");
-    return;
+    return NULL;
   }
 
@@ -1820 +1813 @@
   if (owl_message_is_admin(m)) {
     owl_function_makemsg("Narrowing on an admin message has not been implemented yet.  Check back soon.");
-    return;
+    return NULL;
   }
 
@@ -1827 +1820 @@
     if (owl_message_is_zephyr(m)) {
       sender=pretty_sender(owl_message_get_sender(m));
-      owl_function_fastuserfilt(sender);
-      free(sender);
-    }
-    return;
+      filtname = owl_function_fastuserfilt(sender);
+      owl_free(sender);
+      return filtname;
+    }
+    return NULL;
   }
 
@@ -1836 +1830 @@
   if (!strcasecmp(owl_message_get_class(m), "message") &&
       !owl_message_is_personal(m)) {
-    owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
-    return;
+    filtname = owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+    return filtname;
   }
 
   /* otherwise narrow to the class */
   if (type==0) {
-    owl_function_fastclassinstfilt(owl_message_get_class(m), NULL);
+    filtname = owl_function_fastclassinstfilt(owl_message_get_class(m), NULL);
   } else if (type==1) {
-    owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
-  }
+    filtname = owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+  }
+  return filtname;
 }