Changeset 8fa9562 for filter.c

Timestamp:

Jan 20, 2007, 9:49:55 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

575877f

Parents:

212764e

Message:

Added background color support to owl.

If we run out of color pairs during a painting of the screen, further
background colors will be silently dropped. I'm hoping this doesn't
happen often. The used pair list is reset with each draw, so only
what's actually on screen matters.

File:

• filter.c (modified) (3 diffs)

filter.c

@@ -21 +21 @@
   f->name=owl_strdup(name);
   f->polarity=0;
-  f->color=OWL_COLOR_DEFAULT;
+  f->fgcolor=OWL_COLOR_DEFAULT;
+  f->bgcolor=OWL_COLOR_DEFAULT;
   f->cachedmsgid=-1;
 
   /* first take arguments that have to come first */
   /* set the color */
-  if (argc>=2 && !strcmp(argv[0], "-c")) {
+  while ( argc>=2 && ( !strcmp(argv[0], "-c") ||
+                       !strcmp(argv[0], "-b") ) ) {
     if (owl_util_string_to_color(argv[1])==-1) {
       owl_function_error("The color '%s' is not available, using default.", argv[1]);
     } else {
-      f->color=owl_util_string_to_color(argv[1]);
+      switch (argv[0][1]) {
+      case 'c':
+        f->fgcolor=owl_util_string_to_color(argv[1]);
+        break;
+      case 'b':
+        f->bgcolor=owl_util_string_to_color(argv[1]);
+        break;
+      }
     }
     argc-=2;
@@ -159 +168 @@
 }
 
-void owl_filter_set_color(owl_filter *f, int color)
-{
-  f->color=color;
-}
-
-int owl_filter_get_color(owl_filter *f)
-{
-  return(f->color);
+void owl_filter_set_fgcolor(owl_filter *f, int color)
+{
+  f->fgcolor=color;
+}
+
+int owl_filter_get_fgcolor(owl_filter *f)
+{
+  return(f->fgcolor);
+}
+
+void owl_filter_set_bgcolor(owl_filter *f, int color)
+{
+  f->bgcolor=color;
+}
+
+int owl_filter_get_bgcolor(owl_filter *f)
+{
+  return(f->bgcolor);
 }
 
@@ -196 +215 @@
   strcat(out, ": ");
 
-  if (f->color!=OWL_COLOR_DEFAULT) {
+  if (f->fgcolor!=OWL_COLOR_DEFAULT) {
     strcat(out, "-c ");
-    strcat(out, owl_util_color_to_string(f->color));
+    strcat(out, owl_util_color_to_string(f->fgcolor));
+    strcat(out, " ");
+  }
+  if (f->bgcolor!=OWL_COLOR_DEFAULT) {
+    strcat(out, "-b ");
+    strcat(out, owl_util_color_to_string(f->bgcolor));
     strcat(out, " ");
   }