colors: Allow using 256 colors

Return the corresponding value when integers are passed to str2color. This
allows high colors to be used with 256 color terminals. Bright colors can be
used by adding 256 to integer.

COLOR_BRIGHT_MASK changed to avoid conflicts with >127 colors.

diff --git a/src/colors.c b/src/colors.c
index 1b3300de8a40a0dc5a55b19609305963133a1fa8..75aef550bd4a9a5deb1d9cb4f11581efdde7138a 100644 (file)
--- a/src/colors.c
+++ b/src/colors.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <glib.h>
 
-#define COLOR_BRIGHT_MASK (1<<7)
+#define COLOR_BRIGHT_MASK (1<<8)
 
 #define COLOR_BRIGHT_BLACK (COLOR_BLACK | COLOR_BRIGHT_MASK)
 #define COLOR_BRIGHT_RED (COLOR_RED | COLOR_BRIGHT_MASK)
@@ -136,6 +136,8 @@ colors_update_pair(enum color id)
 short
 colors_str2color(const char *str)
 {
+       short color;
+
        if (!strcasecmp(str, "black"))
                return COLOR_BLACK;
        else if (!strcasecmp(str, "red"))
@@ -171,6 +173,12 @@ colors_str2color(const char *str)
        else if (!strcasecmp(str, "none"))
                return -1;
 
+       if (!strcmp(str, "0"))
+               return 0;
+       color = atoi(str);
+       if (color > 0)
+               return color;
+
        fprintf(stderr,_("Warning: Unknown color - %s\n"), str);
        return -2;
 }