Add 8 colors to the supported color list (aqua, crimson, fuchsia, indigo, lime, olive, silver and teal), part of TIP #403

6 files changed, 96 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ae297f7..1b0daed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-28  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tkInt.h:     Add 8 colors to the supported color list
+	* generic/tkColor.c:   (aqua, crimson, fuchsia, indigo, lime,
+	* unix/tkUnixColor.c:  olive, silver and teal), part of TIP #403
+	* xlib/rgb.txt
+	* xlib/xcolors.c
+
 2012-09-26  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/Makefile.in:    Compile win32 binaries with -DTCL_NO_DEPRECATED
diff --git a/generic/tkColor.c b/generic/tkColor.c
index 1111c51..76d0baa 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
@@ -416,8 +416,8 @@ Tk_GCForColor(
 
     if (tkColPtr->gc == None) {
 	gcValues.foreground = tkColPtr->color.pixel;
-	tkColPtr->gc = XCreateGC(DisplayOfScreen(tkColPtr->screen),
-		drawable, GCForeground, &gcValues);
+	tkColPtr->gc = XCreateGC(DisplayOfScreen(tkColPtr->screen), drawable,
+		GCForeground, &gcValues);
     }
     return tkColPtr->gc;
 }
@@ -800,8 +800,35 @@ TkDebugColor(
 }
 
 #ifndef __WIN32__
+
 /* This function is not necessary for Win32,
  * since XParseColor already does the right thing */
+
+#undef XParseColor
+
+CONST char *CONST tkWebColors[20] = {
+    /* 'a' */ "qua\0#0000ffffffff",
+    /* 'b' */ NULL,
+    /* 'c' */ "rimson\0#dcdc14143c3c",
+    /* 'd' */ NULL,
+    /* 'e' */ NULL,
+    /* 'f' */ "uchsia\0#ffff0000ffff",
+    /* 'g' */ NULL,
+    /* 'h' */ NULL,
+    /* 'i' */ "ndigo\0#4b4b00008282",
+    /* 'j' */ NULL,
+    /* 'k' */ NULL,
+    /* 'l' */ "ime\0#0000ffff0000",
+    /* 'm' */ NULL,
+    /* 'n' */ NULL,
+    /* 'o' */ "live\0#808080800000",
+    /* 'p' */ NULL,
+    /* 'q' */ NULL,
+    /* 'r' */ NULL,
+    /* 's' */ "ilver\0#c0c0c0c0c0c0",
+    /* 't' */ "eal\0#000080808080"
+};
+
 Status
 TkParseColor(
     Display *display,		/* The display */
@@ -854,12 +881,24 @@ TkParseColor(
 	} else {
 	    name -= 13;
 	}
-    } else {
-	if (strlen(name) > 99) {
-	    /* Don't bother to parse this. [Bug 2809525]*/
-	    return 0;
+	goto done;
+    } else if (((*name - 'A') & 0xdf) < sizeof(tkWebColors)/sizeof(tkWebColors[0])) {
+	const char *p = tkWebColors[((*name - 'A') & 0x1f)];
+	if (p) {
+	    const char *q = name;
+	    while (!((*p - *(++q)) & 0xdf)) {
+		if (!*p++) {
+		    name = p;
+		    goto done;
+		}
+	    }
 	}
     }
+    if (strlen(name) > 99) {
+	/* Don't bother to parse this. [Bug 2809525]*/
+	return 0;
+    }
+done:
     return XParseColor(display, map, name, color);
 }
 #endif /* __WIN32__ */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index c30eceb..9a36e1e 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -971,6 +971,8 @@ MODULE_SCOPE TkMainInfo		*tkMainWindowList;
 MODULE_SCOPE Tk_ImageType	tkPhotoImageType;
 MODULE_SCOPE Tcl_HashTable	tkPredefBitmapTable;
 
+MODULE_SCOPE CONST char *const tkWebColors[20];
+
 #include "tkIntDecls.h"
 
 #ifdef BUILD_tk
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index a455118..9474c95 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -136,6 +136,18 @@ TkpGetColor(
     if (*name != '#') {
 	XColor screen;
 
+	if (((*name - 'A') & 0xdf) < sizeof(tkWebColors)/sizeof(tkWebColors[0])) {
+	    const char *p = tkWebColors[((*name - 'A') & 0x1f)];
+	    if (p) {
+		const char *q = name;
+		while (!((*p - *(++q)) & 0xdf)) {
+		    if (!*p++) {
+			name = p;
+			goto gotWebColor;
+		    }
+		}
+	    }
+	}
 	if (strlen(name) > 99) {
 	/* Don't bother to parse this. [Bug 2809525]*/
 	return (TkColor *) NULL;
@@ -155,6 +167,7 @@ TkpGetColor(
 	    FindClosestColor(tkwin, &screen, &color);
 	}
     } else {
+    gotWebColor:
 	if (TkParseColor(display, colormap, name, &color) == 0) {
 	    return NULL;
 	}
diff --git a/xlib/rgb.txt b/xlib/rgb.txt
index 67b979e..3b7ba4d 100644
--- a/xlib/rgb.txt
+++ b/xlib/rgb.txt
@@ -1,3 +1,13 @@
+!      Changes compared to Xorg:rgb.txt
+!      name       old value       new value
+!      aqua           -            0 255 255
+!      crimson        -          220  20  60
+!      fuchsia        -          255   0 255
+!      indigo         -           75   0 130
+!      lime           -            0 255   0
+!      olive          -          128 128   0
+!      silver         -          192 192 192
+!      teal           -            0 128 128
 !
 240 248 255		aliceBlue
 250 235 215		antiqueWhite
@@ -5,6 +15,7 @@
 238 223 204		antiqueWhite2
 205 192 176		antiqueWhite3
 139 131 120		antiqueWhite4
+  0 255 255		aqua
 127 255 212		aquamarine
 127 255 212		aquamarine1
 118 238 198		aquamarine2
@@ -65,6 +76,7 @@
 238 232 205		cornsilk2
 205 200 177		cornsilk3
 139 136 120		cornsilk4
+220  20  60		crimson
   0 255 255		cyan
   0 255 255		cyan1
   0 238 238		cyan2
@@ -137,6 +149,7 @@
 139  26  26		firebrick4
 255 250 240		floralWhite
  34 139  34		forestGreen
+255   0 255		fuchsia
 220 220 220		gainsboro
 248 248 255		ghostWhite
 255 215   0		gold
@@ -374,6 +387,7 @@
 238  99  99		indianRed2
 205  85  85		indianRed3
 139  58  58		indianRed4
+ 75   0 130		indigo
 255 255 240		ivory
 255 255 240		ivory1
 238 238 224		ivory2
@@ -445,6 +459,7 @@
 238 238 209		lightYellow2
 205 205 180		lightYellow3
 139 139 122		lightYellow4
+  0 255   0		lime
  50 205  50		limeGreen
 250 240 230		linen
 255   0 255		magenta
@@ -490,6 +505,7 @@
   0   0 128		navy
   0   0 128		navyBlue
 253 245 230		oldLace
+128 128   0		olive
 107 142  35		oliveDrab
 192 255  62		oliveDrab1
 179 238  58		oliveDrab2
@@ -586,6 +602,7 @@
 238 121  66		sienna2
 205 104  57		sienna3
 139  71  38		sienna4
+192 192 192		silver
 135 206 235		skyBlue
 135 206 255		skyBlue1
 126 192 238		skyBlue2
@@ -622,6 +639,7 @@
 238 154  73		tan2
 205 133  63		tan3
 139  90  43		tan4
+  0 128 128		teal
 216 191 216		thistle
 255 225 255		thistle1
 238 210 238		thistle2
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 497f251..70ab3cb 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -17,8 +17,8 @@
  * Index array. For each of the characters 'a'-'y', this table gives the first color
  * starting with that character in the xColors table.
  */
-static const unsigned char az[] = {0, 4, 12, 19, 43, 44, 47, 57, 59, 61,
-	62, 63, 86, 101, 104, 109, 120, 121, 124, 137, 141, 142, 144, 147, 148, 150};
+static const unsigned char az[] = {0, 5, 13, 21, 45, 46, 50, 60, 62, 65, 66,
+	67, 91, 106, 109, 115, 126, 127, 130, 144, 149, 150, 152, 155, 156, 158};
 
 /*
  * Define an array that defines the mapping from color names to RGB values.
@@ -43,6 +43,7 @@ static const elem xColors[] = {
     /* Colors starting with 'a' */
     "liceBlue\0                   \360\370\377",
     "ntiqueWhite\0    \213\203\170\315\300\260\356\337\314\377\357\333\372\353\327\4",
+    "qua\0                        \000\377\377",
     "quamarine\0      \105\213\164\146\315\252\166\356\306\177\377\324\177\377\324\4",
     "zure\0           \203\213\213\301\315\315\340\356\356\360\377\377\360\377\377\4",
     /* Colors starting with 'b' */
@@ -61,6 +62,7 @@ static const elem xColors[] = {
     "oral\0           \213\076\057\315\133\105\356\152\120\377\162\126\377\177\120\4",
     "ornflowerBlue\0              \144\225\355",
     "ornsilk\0        \213\210\170\315\310\261\356\350\315\377\370\334\377\370\334\4",
+    "rimson\0                     \334\024\074",
     "yan\0            \000\213\213\000\315\315\000\356\356\000\377\377\000\377\377\4",
     /* Colors starting with 'd' */
     "arkBlue\0                    \000\000\213",
@@ -93,6 +95,7 @@ static const elem xColors[] = {
     "irebrick\0       \213\032\032\315\046\046\356\054\054\377\060\060\262\042\042\4",
     "loralWhite\0                 \377\372\360",
     "orestGreen\0                 \042\213\042",
+    "uchsia\0                     \377\000\377",
     /* Colors starting with 'g' */
     "ainsboro\0                   \334\334\334",
     "hostWhite\0                  \370\370\377",
@@ -111,6 +114,7 @@ static const elem xColors[] = {
     "otPink\0         \213\072\142\315\140\220\356\152\247\377\156\264\377\151\264\4",
     /* Colors starting with 'i' */
     "ndianRed\0       \213\072\072\315\125\125\356\143\143\377\152\152\315\134\134\4",
+    "ndigo\0                      \113\000\202",
     "vory\0           \213\213\203\315\315\301\356\356\340\377\377\360\377\377\360\4",
     /* Colors starting with 'j' */
     "\377" /* placeholder */,
@@ -138,6 +142,7 @@ static const elem xColors[] = {
     "ightSlateGrey\0              \167\210\231",
     "ightSteelBlue\0  \156\173\213\242\265\315\274\322\356\312\341\377\260\304\336\4",
     "ightYellow\0     \213\213\172\315\315\264\356\356\321\377\377\340\377\377\340\4",
+    "ime\0                        \000\377\000",
     "imeGreen\0                   \062\315\062",
     "inen\0                       \372\360\346",
     /* Colors starting with 'm' */
@@ -162,6 +167,7 @@ static const elem xColors[] = {
     "avyBlue\0                    \000\000\200",
     /* Colors starting with 'o' */
     "ldLace\0                     \375\365\346",
+    "live\0                       \200\200\000",
     "liveDrab\0       \151\213\042\232\315\062\263\356\072\300\377\076\153\216\043\4",
     "range\0          \213\132\000\315\205\000\356\232\000\377\245\000\377\245\000\4",
     "rangeRed\0       \213\045\000\315\067\000\356\100\000\377\105\000\377\105\000\4",
@@ -191,6 +197,7 @@ static const elem xColors[] = {
     "eaGreen\0        \056\213\127\103\315\200\116\356\224\124\377\237\056\213\127\4",
     "eashell\0        \213\206\202\315\305\277\356\345\336\377\365\356\377\365\356\4",
     "ienna\0          \213\107\046\315\150\071\356\171\102\377\202\107\240\122\055\4",
+    "ilver\0                      \300\300\300",
     "kyBlue\0         \112\160\213\154\246\315\176\300\356\207\316\377\207\316\353\4",
     "lateBlue\0       \107\074\213\151\131\315\172\147\356\203\157\377\152\132\315\4",
     "lateGray\0       \154\173\213\237\266\315\271\323\356\306\342\377\160\200\220\4",
@@ -200,6 +207,7 @@ static const elem xColors[] = {
     "teelBlue\0       \066\144\213\117\224\315\134\254\356\143\270\377\106\202\264\4",
     /* Colors starting with 't' */
     "an\0             \213\132\053\315\205\077\356\232\111\377\245\117\322\264\214\4",
+    "eal\0                        \000\200\200",
     "histle\0         \213\173\213\315\265\315\356\322\356\377\341\377\330\277\330\4",
     "omato\0          \213\066\046\315\117\071\356\134\102\377\143\107\377\143\107\4",
     "urquoise\0       \000\206\213\000\305\315\000\345\356\000\365\377\100\340\320\4",