Changeset 8fa9562 for functions.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:

• functions.c (modified) (6 diffs)

functions.c

@@ -2454 +2454 @@
       return;
     }
-    owl_filter_set_color(f, owl_util_string_to_color(argv[3]));
+    owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
+    owl_global_set_needrefresh(&g);
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+    return;
+  }
+  if (argc==4 && !strcmp(argv[2], "-b")) {
+    f=owl_global_get_filter(&g, argv[1]);
+    if (!f) {
+      owl_function_error("The filter '%s' does not exist.", argv[1]);
+      return;
+    }
+    if (owl_util_string_to_color(argv[3])==-1) {
+      owl_function_error("The color '%s' is not available.", argv[3]);
+      return;
+    }
+    owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
     owl_global_set_needrefresh(&g);
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
@@ -2545 +2560 @@
     owl_fmtext_append_normal(&fm, "   ");
     if (owl_global_get_hascolors(&g)) {
-      owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_color(f));
+      owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_fgcolor(f), owl_filter_get_bgcolor(f));
     } else {
       owl_fmtext_append_normal(&fm, owl_filter_get_name(f));
@@ -2924 +2939 @@
  * be 'color'
  */
-void owl_function_color_current_filter(char *color)
+void owl_function_color_current_filter(char *fgcolor, char *bgcolor)
 {
   char *name;
 
   name=owl_view_get_filtname(owl_global_get_current_view(&g));
-  owl_function_color_filter(name, color);
+  owl_function_color_filter(name, fgcolor, bgcolor);
 }
 
@@ -2936 +2951 @@
  * the "all" filter, return -2.  Return 0 on success
  */
-int owl_function_color_filter(char *filtname, char *color)
+int owl_function_color_filter(char *filtname, char *fgcolor, char *bgcolor)
 {
   owl_filter *f;
@@ -2952 +2967 @@
   }
 
-  if (owl_util_string_to_color(color)==-1) {
-    owl_function_error("No color named '%s' avilable.");
+  if (owl_util_string_to_color(fgcolor)==-1) {
+    owl_function_error("No color named '%s' avilable.", fgcolor);
     return(-1);
   }
-  owl_filter_set_color(f, owl_util_string_to_color(color));
+
+
+  if (bgcolor != NULL) {
+    if (owl_util_string_to_color(bgcolor)==-1) {
+      owl_function_error("No color named '%s' avilable.", bgcolor);
+      return(-1);
+    }
+    owl_filter_set_bgcolor(f, owl_util_string_to_color(bgcolor));
+  }
+  owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor));
+  
   owl_global_set_needrefresh(&g);
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
@@ -2968 +2993 @@
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_normal(&fm, "default: ");
-  owl_fmtext_append_normal_color(&fm, "default\n", OWL_COLOR_DEFAULT);
+  owl_fmtext_append_normal_color(&fm, "default\n", OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"red:      ");
-  owl_fmtext_append_normal_color(&fm, "red\n", OWL_COLOR_RED);
+  owl_fmtext_append_normal_color(&fm, "red\n", OWL_COLOR_RED, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"green:    ");
-  owl_fmtext_append_normal_color(&fm, "green\n", OWL_COLOR_GREEN);
+  owl_fmtext_append_normal_color(&fm, "green\n", OWL_COLOR_GREEN, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"yellow:   ");
-  owl_fmtext_append_normal_color(&fm, "yellow\n", OWL_COLOR_YELLOW);
+  owl_fmtext_append_normal_color(&fm, "yellow\n", OWL_COLOR_YELLOW, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"blue:     ");
-  owl_fmtext_append_normal_color(&fm, "blue\n", OWL_COLOR_BLUE);
+  owl_fmtext_append_normal_color(&fm, "blue\n", OWL_COLOR_BLUE, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"magenta:  ");
-  owl_fmtext_append_normal_color(&fm, "magenta\n", OWL_COLOR_MAGENTA);
+  owl_fmtext_append_normal_color(&fm, "magenta\n", OWL_COLOR_MAGENTA, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"cyan:     ");
-  owl_fmtext_append_normal_color(&fm, "cyan\n", OWL_COLOR_CYAN);
+  owl_fmtext_append_normal_color(&fm, "cyan\n", OWL_COLOR_CYAN, OWL_COLOR_DEFAULT);
 
   owl_fmtext_append_normal(&fm,"white:    ");
-  owl_fmtext_append_normal_color(&fm, "white\n", OWL_COLOR_WHITE);
+  owl_fmtext_append_normal_color(&fm, "white\n", OWL_COLOR_WHITE, OWL_COLOR_DEFAULT);
 
   owl_function_popless_fmtext(&fm);