Changeset 5e0b690

Timestamp:

Apr 10, 2004, 10:47:40 AM (20 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:

405d5e6

Parents:

f84bca8

Message:

The colorclass command is added, to make colorization easy

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)
• functions.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.1.7-pre-1
+        The colorclass command is added, to make colorization easy
+        
 2.1.6
         Fixed three bugs found by Valgrind.

commands.c

@@ -546 +546 @@
               "The color of messages in the current filter will be changed\n"
               "to <color>.  Use the 'show colors' command for a list\n"
+              "of valid colors.\n\n"
+              "SEE ALSO: 'show colors'\n"),
+
+  OWLCMD_ARGS("colorclass", owl_command_colorclass, OWL_CTX_INTERACTIVE,
+              "create a filter to color messages of the given class name",
+              "colorclass <class> <color>",
+              "A filter will be created to color messages in <class>"
+              "in <color>.  Use the 'show colors' command for a list\n"
               "of valid colors.\n\n"
               "SEE ALSO: 'show colors'\n"),
@@ -2232 +2240 @@
 }
 
+char *owl_command_colorclass(int argc, char **argv, char *buff)
+{
+  char *filtname;
+  
+  if (argc!=3) {
+    owl_function_makemsg("Wrong number of arguments to colorclass command");
+    return NULL;
+  }
+
+  filtname=owl_function_classinstfilt(argv[1], NULL);
+  (void) owl_function_color_filter(filtname, argv[2]);
+  return NULL;
+}
+
 char *owl_command_zpunt(int argc, char **argv, char *buff)
 {

functions.c

@@ -2301 +2301 @@
 }
 
+/* Change the filter associated with the current view.
+ * This also figures out which message in the new filter
+ * should have the pointer.
+ */
 void owl_function_change_currentview_filter(char *filtname)
 {
@@ -2346 +2350 @@
 }
 
+/* Create a new filter, or replace an existing one
+ * with a new definition.
+ */
 void owl_function_create_filter(int argc, char **argv)
 {
@@ -2839 +2846 @@
 }
 
+/* Set the color of the current view's filter to
+ * be 'color'
+ */
 void owl_function_color_current_filter(char *color)
 {
+  char *name;
+
+  name=owl_view_get_filtname(owl_global_get_current_view(&g));
+  owl_function_color_filter(name, color);
+}
+
+/* Set the color of the filter 'filter' to be 'color'.  If the color
+ * name does not exist, return -1, if the filter does not exist or is
+ * the "all" filter, return -2.  Return 0 on success
+ */
+int owl_function_color_filter(char *filtname, char *color)
+{
   owl_filter *f;
-  char *name;
-
-  name=owl_view_get_filtname(owl_global_get_current_view(&g));
-  f=owl_global_get_filter(&g, name);
+
+  f=owl_global_get_filter(&g, filtname);
   if (!f) {
     owl_function_error("Unknown filter");
-    return;
+    return(-2);
   }
 
   /* don't touch the all filter */
-  if (!strcmp(name, "all")) {
+  if (!strcmp(filtname, "all")) {
     owl_function_error("You may not change the 'all' filter.");
-    return;
-  }
-
-  /* deal with the case of trying change the filter color */
+    return(-2);
+  }
+
   if (owl_util_string_to_color(color)==-1) {
     owl_function_error("No color named '%s' avilable.");
-    return;
+    return(-1);
   }
   owl_filter_set_color(f, owl_util_string_to_color(color));
   owl_global_set_needrefresh(&g);
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  return(0);
 }
 

owl.h

@@ -59 +59 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.6
-#define OWL_VERSION_STRING "2.1.6"
+#define OWL_VERSION         2.1.7-pre-1
+#define OWL_VERSION_STRING "2.1.7-pre-1"
 
 /* Feature that is being tested to redirect stderr through a pipe.