[dev] [dvtm] Color patch for dvtm

[Ross Mohn]

 Attached is a patch for madtty.c at the head of dvtm. It fixes a couple
of things with the color_hash calls and adds support for the 8 bright
colors. With this patch dvtm passes the following color tests:

    xterm/vttests/8colors.sh
    xterm/vttests/16colors.sh

Cheers! -Ross


Index: madtty.c
===================================================================
--- madtty.c    (.../vendor/dvtm/current/madtty.c)      (revision 20)
+++ madtty.c    (.../trunk/dvtm/madtty.c)       (revision 20)
@@ -54,8 +54,8 @@
 #define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
 
 static int has_default, is_utf8, use_palette;
-static const unsigned palette_start = 1;
-static const unsigned palette_end = 256;
+#define palette_start 1
+#define palette_end   512
 static unsigned palette_cur;
 static short *color2palette;
 
@@ -417,6 +419,11 @@
           case 49:
             t->curbg = -1;
             break;
+          case 90 ... 97: /* hi fg */
+            t->curfg = param[i] - 82;
+            break;
+          case 100 ... 107: /*hi bg */
+            t->curbg = param[i] - 92;
           default:
             break;
         }
@@ -1439,7 +1475,7 @@
 
 static unsigned color_hash(short f, short b)
 {
-       return ((f+1) * (COLORS+1)) + b + 1;
+       return ((f+1) * COLORS) + b + 1;
 }
 
 void madtty_color_set(WINDOW *win, short fg, short bg)
@@ -1488,8 +1524,8 @@
         color2palette = calloc((COLORS+1)*(COLORS+1), sizeof(short));
         int bg = 0, fg = 0;
         for (int i = palette_start; i < palette_end; i++) {
-            init_pair(i, bg, fg);
-            color2palette[color_hash(bg, fg)] = i;
+            init_pair(i, fg, bg);
+            color2palette[color_hash(fg, bg)] = i;
             if (++fg == COLORS) {
                 fg = 0;
                 bg++;