Changeset 9e596f5

Timestamp:

Mar 3, 2018, 5:01:51 AM (7 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

396dc2c

Parents:

0480eef

git-author:

Anders Kaseorg <andersk@mit.edu> (03/03/18 04:56:54)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/03/18 05:01:51)

Message:

Allow changing the fg + bg colors of an existing filter simutaneously

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• filter.c (modified) (2 diffs)
• functions.c (modified) (4 diffs)

filter.c

@@ -16 +16 @@
 owl_filter *owl_filter_new(const char *name, int argc, const char *const *argv)
 {
+  return owl_filter_new_colored(name, argc, argv, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
+}
+
+owl_filter *owl_filter_new_colored(const char *name, int argc, const char *const *argv, int fgcolor, int bgcolor)
+{
   owl_filter *f;
 
@@ -21 +26 @@
 
   f->name=g_strdup(name);
-  f->fgcolor=OWL_COLOR_DEFAULT;
-  f->bgcolor=OWL_COLOR_DEFAULT;
-
-  /* first take arguments that have to come first */
-  /* set the color */
-  while ( argc>=2 && ( !strcmp(argv[0], "-c") ||
-                       !strcmp(argv[0], "-b") ) ) {
-    if (owl_util_string_to_color(argv[1])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available, using default.", argv[1]);
-    } else {
-      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;
-    argv+=2;
-  }
+  f->fgcolor = fgcolor;
+  f->bgcolor = bgcolor;
 
   if (!(f->root = owl_filter_parse_expression(argc, argv, NULL))) {

functions.c

@@ -1980 +1980 @@
   const owl_view *v;
   int inuse = 0;
+  int i = 2;
+  int fgcolor = OWL_COLOR_DEFAULT;
+  bool set_fgcolor = false;
+  int bgcolor = OWL_COLOR_DEFAULT;
+  bool set_bgcolor = false;
 
   if (argc < 2) {
@@ -1996 +2001 @@
   }
 
-  /* deal with the case of trying change the filter color */
-  if (argc==4 && !strcmp(argv[2], "-c")) {
+  /* set the color */
+  while (i + 2 <= argc && (!strcmp(argv[i], "-c") ||
+                           !strcmp(argv[i], "-b"))) {
+    int color = owl_util_string_to_color(argv[i + 1]);
+    if (color == OWL_COLOR_INVALID) {
+      owl_function_error("The color '%s' is not available.", argv[i + 1]);
+    } else if (argv[i][1] == 'c') {
+      fgcolor = color;
+      set_fgcolor = true;
+    } else {
+      bgcolor = color;
+      set_bgcolor = true;
+    }
+    i += 2;
+  }
+
+  if (i > 2 && i == argc) {
     f=owl_global_get_filter(&g, argv[1]);
     if (!f) {
@@ -2003 +2023 @@
       return false;
     }
-    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available.", argv[3]);
+    if (!set_fgcolor && !set_bgcolor)
       return false;
-    }
-    owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
-    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return false;
-  }
-  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 false;
-    }
-    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available.", argv[3]);
-      return false;
-    }
-    owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
+    if (set_fgcolor)
+      owl_filter_set_fgcolor(f, fgcolor);
+    if (set_bgcolor)
+      owl_filter_set_bgcolor(f, bgcolor);
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     return true;
@@ -2027 +2034 @@
 
   /* create the filter and check for errors */
-  f = owl_filter_new(argv[1], argc-2, argv+2);
+  f = owl_filter_new_colored(argv[1], argc - i, argv + i, fgcolor, bgcolor);
   if (f == NULL) {
     owl_function_error("Invalid filter: %s", argv[1]);