Changeset 3abf28b for functions.c

Timestamp:

Jun 1, 2003, 9:11:25 PM (21 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:

75e3879

Parents:

df0d93a

Message:

make smartnarrow work for AIM
  (though it will crash on names with spaces)
don't set an away message by default
better default format
bold them like personal zephyrs
same with terminal bell
do some basic HTML stripping (buggy, in progress)

File:

• functions.c (modified) (10 diffs)

functions.c

@@ -134 +134 @@
   /* create the message */
   m=owl_malloc(sizeof(owl_message));
-  owl_message_create_aim(m, owl_global_get_aim_screenname(&g), to, body);
-  owl_message_set_direction_out(m);
+  owl_message_create_outgoing_aim(m, owl_global_get_aim_screenname(&g), to, body);
 
   /* add it to the global list and current view */
@@ -2116 +2115 @@
 }
 
-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.*/
+/* Create a filter for a class, instance if one doesn't exist.  If
+ * instance is NULL then catch all messgaes in the class.  Returns the
+ * name of the filter, which the caller must free.
+ */
+char *owl_function_classinstfilt(char *class, char *instance) 
+{
   owl_list *fl;
   owl_filter *f;
@@ -2173 +2173 @@
 }
 
-char *owl_function_fastuserfilt(char *user)
+/* Create a filter for personal zephyrs to or from the specified
+ * zephyr user.  Includes login/logout notifications for the user.
+ * The name of the filter will be 'user-<user>'.  If a filter already
+ * exists with this name, no new filter will be created.  This allows
+ * the configuration to override this function.  Returns the name of
+ * the filter, which the caller must free.
+ */
+char *owl_function_zuserfilt(char *user)
 {
   owl_filter *f;
@@ -2188 +2195 @@
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    return(filtname);
+    return(owl_strdup(filtname));
   }
 
@@ -2212 +2219 @@
 }
 
-char *owl_function_fasttypefilt(char *type)
+/* Create a filter for AIM IM messages to or from the specified
+ * screenname.  The name of the filter will be 'aimuser-<user>'.  If a
+ * filter already exists with this name, no new filter will be
+ * created.  This allows the configuration to override this function.
+ * Returns the name of the filter, which the caller must free.
+ */
+char *owl_function_aimuserfilt(char *user)
+{
+  owl_filter *f;
+  char *argbuff, *filtname;
+
+  /* name for the filter */
+  filtname=owl_malloc(strlen(user)+40);
+  sprintf(filtname, "aimuser-%s", user);
+
+  /* if it already exists then go with it.  This lets users override */
+  if (owl_global_get_filter(&g, filtname)) {
+    return(owl_strdup(filtname));
+  }
+
+  /* create the new-internal filter */
+  f=owl_malloc(sizeof(owl_filter));
+
+  argbuff=owl_malloc(1000);
+  sprintf(argbuff,
+          "( type ^aim$ and ( ( sender ^%s$ and recipient ^%s$ ) or ( sender ^%s$ and recipient ^%s$ ) ) )",
+          user, owl_global_get_aim_screenname(&g), owl_global_get_aim_screenname(&g), user);
+
+  owl_filter_init_fromstring(f, filtname, argbuff);
+
+  /* add it to the global list */
+  owl_global_add_filter(&g, f);
+
+  /* free stuff */
+  owl_free(argbuff);
+
+  return(filtname);
+}
+
+char *owl_function_typefilt(char *type)
 {
   owl_filter *f;
@@ -2263 +2309 @@
 }
 
+/* Create a filter based on the current message.  Returns the name of
+ * a filter or null.  The caller must free this name.
+ *
+ * if the curmsg is a personal zephyr return a filter name
+ *    to the zephyr converstaion with that user.
+ * If the curmsg is a zephyr class message, instance foo, recip *,
+ *    return a filter name to the class, inst.
+ * If the curmsg is a zephyr class message and type==0 then 
+ *    return a filter name for just the class.
+ * If the curmsg is a zephyr class message and type==1 then 
+ *    return a filter name for the class and instance.
+ * If the curmsg is a personal AIM message returna  filter
+ *    name to the AIM conversation with that user 
+ */
 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, 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;
@@ -2290 +2339 @@
   /* very simple handling of admin messages for now */
   if (owl_message_is_type_admin(m)) {
-    return(owl_function_fasttypefilt("admin"));
+    return(owl_function_typefilt("admin"));
+  }
+
+  /* aim messages */
+  if (owl_message_is_type_aim(m)) {
+    if (owl_message_is_direction_in(m)) {
+      filtname=owl_function_aimuserfilt(owl_message_get_sender(m));
+    } else if (owl_message_is_direction_out(m)) {
+      filtname=owl_function_aimuserfilt(owl_message_get_recipient(m));
+    }
+    return(filtname);
   }
 
@@ -2301 +2360 @@
         zperson=short_zuser(owl_message_get_recipient(m));
       }
-      filtname=owl_function_fastuserfilt(zperson);
+      filtname=owl_function_zuserfilt(zperson);
       owl_free(zperson);
       return(filtname);
@@ -2309 +2368 @@
 
   /* narrow class MESSAGE, instance foo, recip * messages to class, inst */
-  if (!strcasecmp(owl_message_get_class(m), "message") &&
-      !owl_message_is_personal(m)) {
-    filtname=owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+  if (!strcasecmp(owl_message_get_class(m), "message") && !owl_message_is_personal(m)) {
+    filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
     return(filtname);
   }
@@ -2317 +2375 @@
   /* otherwise narrow to the class */
   if (type==0) {
-    filtname=owl_function_fastclassinstfilt(owl_message_get_class(m), NULL);
+    filtname=owl_function_classinstfilt(owl_message_get_class(m), NULL);
   } else if (type==1) {
-    filtname=owl_function_fastclassinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+    filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
   }
   return(filtname);