better wrapper, with one less roundtrip through X11 server

1 files changed, 21 insertions, 2 deletions

diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index aa01f24..43500ad 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -133,10 +133,28 @@ TkpGetColor(
      * names.
      */
 
-    /* TODO: better wrapper for XAllocNamedColor, for now always use TkParseColor */
-    if (0 && *name != '#') {
+    if (*name != '#') {
 	XColor screen;
 
+	if (((*name - 'A') & 0xdf) < sizeof(tkWebColors)/sizeof(tkWebColors[0])) {
+	    if (!((name[0] - 'G') & 0xdf) && !((name[1] - 'R') & 0xdf)
+		    && !((name[2] - 'A') & 0xdb) && !((name[3] - 'Y') & 0xdf)
+		    && !name[4]) {
+		name = "#808080808080";
+		goto gotWebColor;
+	    } else {
+		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;
@@ -156,6 +174,7 @@ TkpGetColor(
 	    FindClosestColor(tkwin, &screen, &color);
 	}
     } else {
+    gotWebColor:
 	if (TkParseColor(display, colormap, name, &color) == 0) {
 	    return NULL;
 	}