summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tkColor.c2
-rwxr-xr-xwin/configure22
-rw-r--r--win/configure.in2
-rw-r--r--xlib/xcolors.c938
4 files changed, 282 insertions, 682 deletions
diff --git a/generic/tkColor.c b/generic/tkColor.c
index fcc6581..edd8509 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
@@ -859,6 +859,8 @@ TkParseColor(display, map, spec, colorPtr)
buf[2] = *(--spec);
buf[1] = buf[4] = *(--spec);
spec = buf;
+ } else {
+ spec -= 10;
}
}
return XParseColor(display, map, spec, colorPtr);
diff --git a/win/configure b/win/configure
index 2dc6186..31fe393 100755
--- a/win/configure
+++ b/win/configure
@@ -1752,21 +1752,22 @@ fi
# Check for _strtoi64
#-------------------------------------------
+if test "${MACHINE}" = "X86" ; then
echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6
-echo "configure:1757: checking availability of _strtoi64" >&5
+echo "configure:1758: checking availability of _strtoi64" >&5
if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1763 "configure"
+#line 1764 "configure"
#include "confdefs.h"
#include <stdlib.h>
int main() {
_strtoi64(0,0,0)
; return 0; }
EOF
-if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
tcl_have_strtoi64=yes
else
@@ -1785,6 +1786,7 @@ if test $tcl_have_strtoi64 = no; then
EOF
fi
+fi
#--------------------------------------------------------------------
# Set the default compiler switches based on the --enable-symbols
@@ -1794,7 +1796,7 @@ fi
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1798: checking for build with symbols" >&5
+echo "configure:1800: checking for build with symbols" >&5
# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
enableval="$enable_symbols"
@@ -1855,7 +1857,7 @@ TK_DBGX=${DBGX}
echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6
-echo "configure:1859: checking whether to embed manifest" >&5
+echo "configure:1861: checking whether to embed manifest" >&5
# Check whether --enable-embedded-manifest or --disable-embedded-manifest was given.
if test "${enable_embedded_manifest+set}" = set; then
enableval="$enable_embedded_manifest"
@@ -1872,7 +1874,7 @@ fi
-a "$GCC" != "yes" ; then
# Add the magic to embed the manifest into the dll/exe
cat > conftest.$ac_ext <<EOF
-#line 1876 "configure"
+#line 1878 "configure"
#include "confdefs.h"
#if defined(_MSC_VER) && _MSC_VER >= 1400
@@ -1909,7 +1911,7 @@ rm -f conftest*
echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1913: checking the location of tclConfig.sh" >&5
+echo "configure:1915: checking the location of tclConfig.sh" >&5
if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then
TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win
@@ -1937,7 +1939,7 @@ fi
echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1941: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
echo "$ac_t""loading" 1>&6
@@ -1990,14 +1992,14 @@ echo "configure:1941: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6
-echo "configure:1994: checking for tclsh in Tcl build directory" >&5
+echo "configure:1996: checking for tclsh in Tcl build directory" >&5
BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
echo "$ac_t""$BUILD_TCLSH" 1>&6
echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:2001: checking for tclsh" >&5
+echo "configure:2003: checking for tclsh" >&5
if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/win/configure.in b/win/configure.in
index f6f71ca..ffad2c0 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -114,6 +114,7 @@ AC_SUBST(MAN2TCLFLAGS)
# Check for _strtoi64
#-------------------------------------------
+if test "${MACHINE}" = "X86" ; then
AC_CACHE_CHECK([availability of _strtoi64], tcl_have_strtoi64, [
AC_TRY_LINK([#include <stdlib.h>],
[_strtoi64(0,0,0)],
@@ -121,6 +122,7 @@ AC_CACHE_CHECK([availability of _strtoi64], tcl_have_strtoi64, [
if test $tcl_have_strtoi64 = no; then
AC_DEFINE(NO_STRTOI64, 1, [Is _strtoi64 function available?])
fi
+fi
#--------------------------------------------------------------------
# Set the default compiler switches based on the --enable-symbols
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index cc5ad69..399c1c4 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -5,683 +5,235 @@
* and pixel values.
*
* Copyright (c) 1996 by Sun Microsystems, Inc.
+ * Copyright (c) 2012 by Jan Nijtmans
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tkInt.h"
-#include <stdlib.h>
+
+/*
+ * Special array for the colors gray9-gray100 (and grey9-grey100, which are
+ * identical). (TODO: to be removed, because the values can be calculated)
+ */
+
+static const char graymap[] = "\377\377\377\374\374\374\372\372\372\367\367\367"
+ "\365\365\365\362\362\362\360\360\360\355\355\355\353\353\353\350\350\350"
+ "\345\345\345\343\343\343\340\340\340\336\336\336\333\333\333\331\331\331"
+ "\326\326\326\324\324\324\321\321\321\317\317\317\314\314\314\311\311\311"
+ "\307\307\307\304\304\304\302\302\302\277\277\277\275\275\275\272\272\272"
+ "\270\270\270\265\265\265\263\263\263\260\260\260\255\255\255\253\253\253"
+ "\250\250\250\246\246\246\243\243\243\241\241\241\236\236\236\234\234\234"
+ "\231\231\231\226\226\226\224\224\224\221\221\221\217\217\217\214\214\214"
+ "\212\212\212\207\207\207\205\205\205\202\202\202\177\177\177\175\175\175"
+ "\172\172\172\170\170\170\165\165\165\163\163\163\160\160\160\156\156\156"
+ "\153\153\153\151\151\151\146\146\146\143\143\143\141\141\141\136\136\136"
+ "\134\134\134\131\131\131\127\127\127\124\124\124\122\122\122\117\117\117"
+ "\115\115\115\112\112\112\107\107\107\105\105\105\102\102\102\100\100\100"
+ "\075\075\075\073\073\073\070\070\070\066\066\066\063\063\063\060\060\060"
+ "\056\056\056\053\053\053\051\051\051\046\046\046\044\044\044\041\041\041"
+ "\037\037\037\034\034\034\032\032\032\027\027\027";
+
+/*
+ * Index array. For each of the characters 'a'-'y', this table gives the first color
+ * starting with that character in the xColors table.
+ */
+static int az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99,
+ 102, 107, 118, 118, 121, 134, 138, 138, 140, 143, 143, 145};
/*
* Define an array that defines the mapping from color names to RGB values.
- * Note that this array must be kept sorted alphabetically so that the binary
- * search used in XParseColor will succeed.
+ * Note that this array must be kept sorted alphabetically so that the
+ * binary search used in XParseColor will succeed.
+ *
+ * Each color definition consists of exactly 32 characters, and starts with
+ * the color name, but without its first character (that character can be
+ * reproduced from the az index array). The last byte holds the number
+ * of additional color variants. For example "azure1" up to "azure4" are
+ * handled by the same table entry as "azure". From the last byte backwards,
+ * each group of 3 bytes contain the rgb values of the main color and
+ * the available variants.
+ *
+ * The colors gray and grey have more than 8 variants. gray1 up to gray8
+ * are handled by this table, above that is handled especially.
*/
-typedef struct {
- const char *name;
- unsigned char red, green, blue;
-} XColorEntry;
+typedef char elem[32];
-static const XColorEntry xColors[] = {
- { "aliceBlue", 240, 248, 255 },
- { "antiqueWhite", 250, 235, 215 },
- { "antiquewhite1", 255, 239, 219 },
- { "antiquewhite2", 238, 223, 204 },
- { "antiquewhite3", 205, 192, 176 },
- { "antiquewhite4", 139, 131, 120 },
- { "aquamarine", 127, 255, 212 },
- { "aquamarine1", 127, 255, 212 },
- { "aquamarine2", 118, 238, 198 },
- { "aquamarine3", 102, 205, 170 },
- { "aquamarine4", 69, 139, 116 },
- { "azure", 240, 255, 255 },
- { "azure1", 240, 255, 255 },
- { "azure2", 224, 238, 238 },
- { "azure3", 193, 205, 205 },
- { "azure4", 131, 139, 139 },
- { "beige", 245, 245, 220 },
- { "bisque", 255, 228, 196 },
- { "bisque1", 255, 228, 196 },
- { "bisque2", 238, 213, 183 },
- { "bisque3", 205, 183, 158 },
- { "bisque4", 139, 125, 107 },
- { "black", 0, 0, 0 },
- { "blanchedAlmond", 255, 235, 205 },
- { "blue", 0, 0, 255 },
- { "blue1", 0, 0, 255 },
- { "blue2", 0, 0, 238 },
- { "blue3", 0, 0, 205 },
- { "blue4", 0, 0, 139 },
- { "blueViolet", 138, 43, 226 },
- { "brown", 165, 42, 42 },
- { "brown1", 255, 64, 64 },
- { "brown2", 238, 59, 59 },
- { "brown3", 205, 51, 51 },
- { "brown4", 139, 35, 35 },
- { "burlywood", 222, 184, 135 },
- { "burlywood1", 255, 211, 155 },
- { "burlywood2", 238, 197, 145 },
- { "burlywood3", 205, 170, 125 },
- { "burlywood4", 139, 115, 85 },
- { "cadetBlue", 95, 158, 160 },
- { "cadetblue1", 152, 245, 255 },
- { "cadetblue2", 142, 229, 238 },
- { "cadetblue3", 122, 197, 205 },
- { "cadetblue4", 83, 134, 139 },
- { "chartreuse", 127, 255, 0 },
- { "chartreuse1", 127, 255, 0 },
- { "chartreuse2", 118, 238, 0 },
- { "chartreuse3", 102, 205, 0 },
- { "chartreuse4", 69, 139, 0 },
- { "chocolate", 210, 105, 30 },
- { "chocolate1", 255, 127, 36 },
- { "chocolate2", 238, 118, 33 },
- { "chocolate3", 205, 102, 29 },
- { "chocolate4", 139, 69, 19 },
- { "coral", 255, 127, 80 },
- { "coral1", 255, 114, 86 },
- { "coral2", 238, 106, 80 },
- { "coral3", 205, 91, 69 },
- { "coral4", 139, 62, 47 },
- { "cornflowerBlue", 100, 149, 237 },
- { "cornsilk", 255, 248, 220 },
- { "cornsilk1", 255, 248, 220 },
- { "cornsilk2", 238, 232, 205 },
- { "cornsilk3", 205, 200, 177 },
- { "cornsilk4", 139, 136, 120 },
- { "cyan", 0, 255, 255 },
- { "cyan1", 0, 255, 255 },
- { "cyan2", 0, 238, 238 },
- { "cyan3", 0, 205, 205 },
- { "cyan4", 0, 139, 139 },
- { "darkBlue", 0, 0, 139 },
- { "darkCyan", 0, 139, 139 },
- { "darkGoldenrod", 184, 134, 11 },
- { "darkgoldenrod1", 255, 185, 15 },
- { "darkgoldenrod2", 238, 173, 14 },
- { "darkgoldenrod3", 205, 149, 12 },
- { "darkgoldenrod4", 139, 101, 8 },
- { "darkGray", 169, 169, 169 },
- { "darkGreen", 0, 100, 0 },
- { "darkGrey", 169, 169, 169 },
- { "darkKhaki", 189, 183, 107 },
- { "darkMagenta", 139, 0, 139 },
- { "darkOliveGreen", 85, 107, 47 },
- { "darkolivegreen1", 202, 255, 112 },
- { "darkolivegreen2", 188, 238, 104 },
- { "darkolivegreen3", 162, 205, 90 },
- { "darkolivegreen4", 110, 139, 61 },
- { "darkOrange", 255, 140, 0 },
- { "darkorange1", 255, 127, 0 },
- { "darkorange2", 238, 118, 0 },
- { "darkorange3", 205, 102, 0 },
- { "darkorange4", 139, 69, 0 },
- { "darkOrchid", 153, 50, 204 },
- { "darkorchid1", 191, 62, 255 },
- { "darkorchid2", 178, 58, 238 },
- { "darkorchid3", 154, 50, 205 },
- { "darkorchid4", 104, 34, 139 },
- { "darkRed", 139, 0, 0 },
- { "darkSalmon", 233, 150, 122 },
- { "darkSeaGreen", 143, 188, 143 },
- { "darkseagreen1", 193, 255, 193 },
- { "darkseagreen2", 180, 238, 180 },
- { "darkseagreen3", 155, 205, 155 },
- { "darkseagreen4", 105, 139, 105 },
- { "darkSlateBlue", 72, 61, 139 },
- { "darkSlateGray", 47, 79, 79 },
- { "darkslategray1", 151, 255, 255 },
- { "darkslategray2", 141, 238, 238 },
- { "darkslategray3", 121, 205, 205 },
- { "darkslategray4", 82, 139, 139 },
- { "darkSlateGrey", 47, 79, 79 },
- { "darkTurquoise", 0, 206, 209 },
- { "darkViolet", 148, 0, 211 },
- { "deepPink", 255, 20, 147 },
- { "deeppink1", 255, 20, 147 },
- { "deeppink2", 238, 18, 137 },
- { "deeppink3", 205, 16, 118 },
- { "deeppink4", 139, 10, 80 },
- { "deepSkyBlue", 0, 191, 255 },
- { "deepskyblue1", 0, 191, 255 },
- { "deepskyblue2", 0, 178, 238 },
- { "deepskyblue3", 0, 154, 205 },
- { "deepskyblue4", 0, 104, 139 },
- { "dimGray", 105, 105, 105 },
- { "dimGrey", 105, 105, 105 },
- { "dodgerBlue", 30, 144, 255 },
- { "dodgerblue1", 30, 144, 255 },
- { "dodgerblue2", 28, 134, 238 },
- { "dodgerblue3", 24, 116, 205 },
- { "dodgerblue4", 16, 78, 139 },
- { "firebrick", 178, 34, 34 },
- { "firebrick1", 255, 48, 48 },
- { "firebrick2", 238, 44, 44 },
- { "firebrick3", 205, 38, 38 },
- { "firebrick4", 139, 26, 26 },
- { "floralWhite", 255, 250, 240 },
- { "forestGreen", 34, 139, 34 },
- { "gainsboro", 220, 220, 220 },
- { "ghostWhite", 248, 248, 255 },
- { "gold", 255, 215, 0 },
- { "gold1", 255, 215, 0 },
- { "gold2", 238, 201, 0 },
- { "gold3", 205, 173, 0 },
- { "gold4", 139, 117, 0 },
- { "goldenrod", 218, 165, 32 },
- { "goldenrod1", 255, 193, 37 },
- { "goldenrod2", 238, 180, 34 },
- { "goldenrod3", 205, 155, 29 },
- { "goldenrod4", 139, 105, 20 },
- { "gray", 190, 190, 190 },
- { "gray0", 0, 0, 0 },
- { "gray1", 3, 3, 3 },
- { "gray10", 26, 26, 26 },
- { "gray100", 255, 255, 255 },
- { "gray11", 28, 28, 28 },
- { "gray12", 31, 31, 31 },
- { "gray13", 33, 33, 33 },
- { "gray14", 36, 36, 36 },
- { "gray15", 38, 38, 38 },
- { "gray16", 41, 41, 41 },
- { "gray17", 43, 43, 43 },
- { "gray18", 46, 46, 46 },
- { "gray19", 48, 48, 48 },
- { "gray2", 5, 5, 5 },
- { "gray20", 51, 51, 51 },
- { "gray21", 54, 54, 54 },
- { "gray22", 56, 56, 56 },
- { "gray23", 59, 59, 59 },
- { "gray24", 61, 61, 61 },
- { "gray25", 64, 64, 64 },
- { "gray26", 66, 66, 66 },
- { "gray27", 69, 69, 69 },
- { "gray28", 71, 71, 71 },
- { "gray29", 74, 74, 74 },
- { "gray3", 8, 8, 8 },
- { "gray30", 77, 77, 77 },
- { "gray31", 79, 79, 79 },
- { "gray32", 82, 82, 82 },
- { "gray33", 84, 84, 84 },
- { "gray34", 87, 87, 87 },
- { "gray35", 89, 89, 89 },
- { "gray36", 92, 92, 92 },
- { "gray37", 94, 94, 94 },
- { "gray38", 97, 97, 97 },
- { "gray39", 99, 99, 99 },
- { "gray4", 10, 10, 10 },
- { "gray40", 102, 102, 102 },
- { "gray41", 105, 105, 105 },
- { "gray42", 107, 107, 107 },
- { "gray43", 110, 110, 110 },
- { "gray44", 112, 112, 112 },
- { "gray45", 115, 115, 115 },
- { "gray46", 117, 117, 117 },
- { "gray47", 120, 120, 120 },
- { "gray48", 122, 122, 122 },
- { "gray49", 125, 125, 125 },
- { "gray5", 13, 13, 13 },
- { "gray50", 127, 127, 127 },
- { "gray51", 130, 130, 130 },
- { "gray52", 133, 133, 133 },
- { "gray53", 135, 135, 135 },
- { "gray54", 138, 138, 138 },
- { "gray55", 140, 140, 140 },
- { "gray56", 143, 143, 143 },
- { "gray57", 145, 145, 145 },
- { "gray58", 148, 148, 148 },
- { "gray59", 150, 150, 150 },
- { "gray6", 15, 15, 15 },
- { "gray60", 153, 153, 153 },
- { "gray61", 156, 156, 156 },
- { "gray62", 158, 158, 158 },
- { "gray63", 161, 161, 161 },
- { "gray64", 163, 163, 163 },
- { "gray65", 166, 166, 166 },
- { "gray66", 168, 168, 168 },
- { "gray67", 171, 171, 171 },
- { "gray68", 173, 173, 173 },
- { "gray69", 176, 176, 176 },
- { "gray7", 18, 18, 18 },
- { "gray70", 179, 179, 179 },
- { "gray71", 181, 181, 181 },
- { "gray72", 184, 184, 184 },
- { "gray73", 186, 186, 186 },
- { "gray74", 189, 189, 189 },
- { "gray75", 191, 191, 191 },
- { "gray76", 194, 194, 194 },
- { "gray77", 196, 196, 196 },
- { "gray78", 199, 199, 199 },
- { "gray79", 201, 201, 201 },
- { "gray8", 20, 20, 20 },
- { "gray80", 204, 204, 204 },
- { "gray81", 207, 207, 207 },
- { "gray82", 209, 209, 209 },
- { "gray83", 212, 212, 212 },
- { "gray84", 214, 214, 214 },
- { "gray85", 217, 217, 217 },
- { "gray86", 219, 219, 219 },
- { "gray87", 222, 222, 222 },
- { "gray88", 224, 224, 224 },
- { "gray89", 227, 227, 227 },
- { "gray9", 23, 23, 23 },
- { "gray90", 229, 229, 229 },
- { "gray91", 232, 232, 232 },
- { "gray92", 235, 235, 235 },
- { "gray93", 237, 237, 237 },
- { "gray94", 240, 240, 240 },
- { "gray95", 242, 242, 242 },
- { "gray96", 245, 245, 245 },
- { "gray97", 247, 247, 247 },
- { "gray98", 250, 250, 250 },
- { "gray99", 252, 252, 252 },
- { "green", 0, 255, 0 },
- { "green1", 0, 255, 0 },
- { "green2", 0, 238, 0 },
- { "green3", 0, 205, 0 },
- { "green4", 0, 139, 0 },
- { "greenYellow", 173, 255, 47 },
- { "grey", 190, 190, 190 },
- { "grey0", 0, 0, 0 },
- { "grey1", 3, 3, 3 },
- { "grey10", 26, 26, 26 },
- { "grey100", 255, 255, 255 },
- { "grey11", 28, 28, 28 },
- { "grey12", 31, 31, 31 },
- { "grey13", 33, 33, 33 },
- { "grey14", 36, 36, 36 },
- { "grey15", 38, 38, 38 },
- { "grey16", 41, 41, 41 },
- { "grey17", 43, 43, 43 },
- { "grey18", 46, 46, 46 },
- { "grey19", 48, 48, 48 },
- { "grey2", 5, 5, 5 },
- { "grey20", 51, 51, 51 },
- { "grey21", 54, 54, 54 },
- { "grey22", 56, 56, 56 },
- { "grey23", 59, 59, 59 },
- { "grey24", 61, 61, 61 },
- { "grey25", 64, 64, 64 },
- { "grey26", 66, 66, 66 },
- { "grey27", 69, 69, 69 },
- { "grey28", 71, 71, 71 },
- { "grey29", 74, 74, 74 },
- { "grey3", 8, 8, 8 },
- { "grey30", 77, 77, 77 },
- { "grey31", 79, 79, 79 },
- { "grey32", 82, 82, 82 },
- { "grey33", 84, 84, 84 },
- { "grey34", 87, 87, 87 },
- { "grey35", 89, 89, 89 },
- { "grey36", 92, 92, 92 },
- { "grey37", 94, 94, 94 },
- { "grey38", 97, 97, 97 },
- { "grey39", 99, 99, 99 },
- { "grey4", 10, 10, 10 },
- { "grey40", 102, 102, 102 },
- { "grey41", 105, 105, 105 },
- { "grey42", 107, 107, 107 },
- { "grey43", 110, 110, 110 },
- { "grey44", 112, 112, 112 },
- { "grey45", 115, 115, 115 },
- { "grey46", 117, 117, 117 },
- { "grey47", 120, 120, 120 },
- { "grey48", 122, 122, 122 },
- { "grey49", 125, 125, 125 },
- { "grey5", 13, 13, 13 },
- { "grey50", 127, 127, 127 },
- { "grey51", 130, 130, 130 },
- { "grey52", 133, 133, 133 },
- { "grey53", 135, 135, 135 },
- { "grey54", 138, 138, 138 },
- { "grey55", 140, 140, 140 },
- { "grey56", 143, 143, 143 },
- { "grey57", 145, 145, 145 },
- { "grey58", 148, 148, 148 },
- { "grey59", 150, 150, 150 },
- { "grey6", 15, 15, 15 },
- { "grey60", 153, 153, 153 },
- { "grey61", 156, 156, 156 },
- { "grey62", 158, 158, 158 },
- { "grey63", 161, 161, 161 },
- { "grey64", 163, 163, 163 },
- { "grey65", 166, 166, 166 },
- { "grey66", 168, 168, 168 },
- { "grey67", 171, 171, 171 },
- { "grey68", 173, 173, 173 },
- { "grey69", 176, 176, 176 },
- { "grey7", 18, 18, 18 },
- { "grey70", 179, 179, 179 },
- { "grey71", 181, 181, 181 },
- { "grey72", 184, 184, 184 },
- { "grey73", 186, 186, 186 },
- { "grey74", 189, 189, 189 },
- { "grey75", 191, 191, 191 },
- { "grey76", 194, 194, 194 },
- { "grey77", 196, 196, 196 },
- { "grey78", 199, 199, 199 },
- { "grey79", 201, 201, 201 },
- { "grey8", 20, 20, 20 },
- { "grey80", 204, 204, 204 },
- { "grey81", 207, 207, 207 },
- { "grey82", 209, 209, 209 },
- { "grey83", 212, 212, 212 },
- { "grey84", 214, 214, 214 },
- { "grey85", 217, 217, 217 },
- { "grey86", 219, 219, 219 },
- { "grey87", 222, 222, 222 },
- { "grey88", 224, 224, 224 },
- { "grey89", 227, 227, 227 },
- { "grey9", 23, 23, 23 },
- { "grey90", 229, 229, 229 },
- { "grey91", 232, 232, 232 },
- { "grey92", 235, 235, 235 },
- { "grey93", 237, 237, 237 },
- { "grey94", 240, 240, 240 },
- { "grey95", 242, 242, 242 },
- { "grey96", 245, 245, 245 },
- { "grey97", 247, 247, 247 },
- { "grey98", 250, 250, 250 },
- { "grey99", 252, 252, 252 },
- { "honeydew", 240, 255, 240 },
- { "honeydew1", 240, 255, 240 },
- { "honeydew2", 224, 238, 224 },
- { "honeydew3", 193, 205, 193 },
- { "honeydew4", 131, 139, 131 },
- { "hotPink", 255, 105, 180 },
- { "hotpink1", 255, 110, 180 },
- { "hotpink2", 238, 106, 167 },
- { "hotpink3", 205, 96, 144 },
- { "hotpink4", 139, 58, 98 },
- { "indianRed", 205, 92, 92 },
- { "indianred1", 255, 106, 106 },
- { "indianred2", 238, 99, 99 },
- { "indianred3", 205, 85, 85 },
- { "indianred4", 139, 58, 58 },
- { "ivory", 255, 255, 240 },
- { "ivory1", 255, 255, 240 },
- { "ivory2", 238, 238, 224 },
- { "ivory3", 205, 205, 193 },
- { "ivory4", 139, 139, 131 },
- { "khaki", 240, 230, 140 },
- { "khaki1", 255, 246, 143 },
- { "khaki2", 238, 230, 133 },
- { "khaki3", 205, 198, 115 },
- { "khaki4", 139, 134, 78 },
- { "lavender", 230, 230, 250 },
- { "lavenderBlush", 255, 240, 245 },
- { "lavenderblush1", 255, 240, 245 },
- { "lavenderblush2", 238, 224, 229 },
- { "lavenderblush3", 205, 193, 197 },
- { "lavenderblush4", 139, 131, 134 },
- { "lawnGreen", 124, 252, 0 },
- { "lemonChiffon", 255, 250, 205 },
- { "lemonchiffon1", 255, 250, 205 },
- { "lemonchiffon2", 238, 233, 191 },
- { "lemonchiffon3", 205, 201, 165 },
- { "lemonchiffon4", 139, 137, 112 },
- { "lightBlue", 173, 216, 230 },
- { "lightblue1", 191, 239, 255 },
- { "lightblue2", 178, 223, 238 },
- { "lightblue3", 154, 192, 205 },
- { "lightblue4", 104, 131, 139 },
- { "lightCoral", 240, 128, 128 },
- { "lightCyan", 224, 255, 255 },
- { "lightcyan1", 224, 255, 255 },
- { "lightcyan2", 209, 238, 238 },
- { "lightcyan3", 180, 205, 205 },
- { "lightcyan4", 122, 139, 139 },
- { "lightGoldenrod", 238, 221, 130 },
- { "lightgoldenrod1", 255, 236, 139 },
- { "lightgoldenrod2", 238, 220, 130 },
- { "lightgoldenrod3", 205, 190, 112 },
- { "lightgoldenrod4", 139, 129, 76 },
- { "lightGoldenrodYellow", 250, 250, 210 },
- { "lightGray", 211, 211, 211 },
- { "lightGreen", 144, 238, 144 },
- { "lightGrey", 211, 211, 211 },
- { "lightPink", 255, 182, 193 },
- { "lightpink1", 255, 174, 185 },
- { "lightpink2", 238, 162, 173 },
- { "lightpink3", 205, 140, 149 },
- { "lightpink4", 139, 95, 101 },
- { "lightSalmon", 255, 160, 122 },
- { "lightsalmon1", 255, 160, 122 },
- { "lightsalmon2", 238, 149, 114 },
- { "lightsalmon3", 205, 129, 98 },
- { "lightsalmon4", 139, 87, 66 },
- { "lightSeaGreen", 32, 178, 170 },
- { "lightSkyBlue", 135, 206, 250 },
- { "lightskyblue1", 176, 226, 255 },
- { "lightskyblue2", 164, 211, 238 },
- { "lightskyblue3", 141, 182, 205 },
- { "lightskyblue4", 96, 123, 139 },
- { "lightSlateBlue", 132, 112, 255 },
- { "lightSlateGray", 119, 136, 153 },
- { "lightSlateGrey", 119, 136, 153 },
- { "lightSteelBlue", 176, 196, 222 },
- { "lightsteelblue1", 202, 225, 255 },
- { "lightsteelblue2", 188, 210, 238 },
- { "lightsteelblue3", 162, 181, 205 },
- { "lightsteelblue4", 110, 123, 139 },
- { "lightYellow", 255, 255, 224 },
- { "lightyellow1", 255, 255, 224 },
- { "lightyellow2", 238, 238, 209 },
- { "lightyellow3", 205, 205, 180 },
- { "lightyellow4", 139, 139, 122 },
- { "limeGreen", 50, 205, 50 },
- { "linen", 250, 240, 230 },
- { "magenta", 255, 0, 255 },
- { "magenta1", 255, 0, 255 },
- { "magenta2", 238, 0, 238 },
- { "magenta3", 205, 0, 205 },
- { "magenta4", 139, 0, 139 },
- { "maroon", 176, 48, 96 },
- { "maroon1", 255, 52, 179 },
- { "maroon2", 238, 48, 167 },
- { "maroon3", 205, 41, 144 },
- { "maroon4", 139, 28, 98 },
- { "mediumAquamarine", 102, 205, 170 },
- { "mediumBlue", 0, 0, 205 },
- { "mediumOrchid", 186, 85, 211 },
- { "mediumorchid1", 224, 102, 255 },
- { "mediumorchid2", 209, 95, 238 },
- { "mediumorchid3", 180, 82, 205 },
- { "mediumorchid4", 122, 55, 139 },
- { "mediumPurple", 147, 112, 219 },
- { "mediumpurple1", 171, 130, 255 },
- { "mediumpurple2", 159, 121, 238 },
- { "mediumpurple3", 137, 104, 205 },
- { "mediumpurple4", 93, 71, 139 },
- { "mediumSeaGreen", 60, 179, 113 },
- { "mediumSlateBlue", 123, 104, 238 },
- { "mediumSpringGreen", 0, 250, 154 },
- { "mediumTurquoise", 72, 209, 204 },
- { "mediumVioletRed", 199, 21, 133 },
- { "midnightBlue", 25, 25, 112 },
- { "mintCream", 245, 255, 250 },
- { "mistyRose", 255, 228, 225 },
- { "mistyrose1", 255, 228, 225 },
- { "mistyrose2", 238, 213, 210 },
- { "mistyrose3", 205, 183, 181 },
- { "mistyrose4", 139, 125, 123 },
- { "moccasin", 255, 228, 181 },
- { "navajoWhite", 255, 222, 173 },
- { "navajowhite1", 255, 222, 173 },
- { "navajowhite2", 238, 207, 161 },
- { "navajowhite3", 205, 179, 139 },
- { "navajowhite4", 139, 121, 94 },
- { "navy", 0, 0, 128 },
- { "navyBlue", 0, 0, 128 },
- { "oldLace", 253, 245, 230 },
- { "oliveDrab", 107, 142, 35 },
- { "olivedrab1", 192, 255, 62 },
- { "olivedrab2", 179, 238, 58 },
- { "olivedrab3", 154, 205, 50 },
- { "olivedrab4", 105, 139, 34 },
- { "orange", 255, 165, 0 },
- { "orange1", 255, 165, 0 },
- { "orange2", 238, 154, 0 },
- { "orange3", 205, 133, 0 },
- { "orange4", 139, 90, 0 },
- { "orangeRed", 255, 69, 0 },
- { "orangered1", 255, 69, 0 },
- { "orangered2", 238, 64, 0 },
- { "orangered3", 205, 55, 0 },
- { "orangered4", 139, 37, 0 },
- { "orchid", 218, 112, 214 },
- { "orchid1", 255, 131, 250 },
- { "orchid2", 238, 122, 233 },
- { "orchid3", 205, 105, 201 },
- { "orchid4", 139, 71, 137 },
- { "paleGoldenrod", 238, 232, 170 },
- { "paleGreen", 152, 251, 152 },
- { "palegreen1", 154, 255, 154 },
- { "palegreen2", 144, 238, 144 },
- { "palegreen3", 124, 205, 124 },
- { "palegreen4", 84, 139, 84 },
- { "paleTurquoise", 175, 238, 238 },
- { "paleturquoise1", 187, 255, 255 },
- { "paleturquoise2", 174, 238, 238 },
- { "paleturquoise3", 150, 205, 205 },
- { "paleturquoise4", 102, 139, 139 },
- { "paleVioletRed", 219, 112, 147 },
- { "palevioletred1", 255, 130, 171 },
- { "palevioletred2", 238, 121, 159 },
- { "palevioletred3", 205, 104, 137 },
- { "palevioletred4", 139, 71, 93 },
- { "papayaWhip", 255, 239, 213 },
- { "peachPuff", 255, 218, 185 },
- { "peachpuff1", 255, 218, 185 },
- { "peachpuff2", 238, 203, 173 },
- { "peachpuff3", 205, 175, 149 },
- { "peachpuff4", 139, 119, 101 },
- { "peru", 205, 133, 63 },
- { "pink", 255, 192, 203 },
- { "pink1", 255, 181, 197 },
- { "pink2", 238, 169, 184 },
- { "pink3", 205, 145, 158 },
- { "pink4", 139, 99, 108 },
- { "plum", 221, 160, 221 },
- { "plum1", 255, 187, 255 },
- { "plum2", 238, 174, 238 },
- { "plum3", 205, 150, 205 },
- { "plum4", 139, 102, 139 },
- { "powderBlue", 176, 224, 230 },
- { "purple", 160, 32, 240 },
- { "purple1", 155, 48, 255 },
- { "purple2", 145, 44, 238 },
- { "purple3", 125, 38, 205 },
- { "purple4", 85, 26, 139 },
- { "red", 255, 0, 0 },
- { "red1", 255, 0, 0 },
- { "red2", 238, 0, 0 },
- { "red3", 205, 0, 0 },
- { "red4", 139, 0, 0 },
- { "rosyBrown", 188, 143, 143 },
- { "rosybrown1", 255, 193, 193 },
- { "rosybrown2", 238, 180, 180 },
- { "rosybrown3", 205, 155, 155 },
- { "rosybrown4", 139, 105, 105 },
- { "royalBlue", 65, 105, 225 },
- { "royalblue1", 72, 118, 255 },
- { "royalblue2", 67, 110, 238 },
- { "royalblue3", 58, 95, 205 },
- { "royalblue4", 39, 64, 139 },
- { "saddleBrown", 139, 69, 19 },
- { "salmon", 250, 128, 114 },
- { "salmon1", 255, 140, 105 },
- { "salmon2", 238, 130, 98 },
- { "salmon3", 205, 112, 84 },
- { "salmon4", 139, 76, 57 },
- { "sandyBrown", 244, 164, 96 },
- { "seaGreen", 46, 139, 87 },
- { "seagreen1", 84, 255, 159 },
- { "seagreen2", 78, 238, 148 },
- { "seagreen3", 67, 205, 128 },
- { "seagreen4", 46, 139, 87 },
- { "seashell", 255, 245, 238 },
- { "seashell1", 255, 245, 238 },
- { "seashell2", 238, 229, 222 },
- { "seashell3", 205, 197, 191 },
- { "seashell4", 139, 134, 130 },
- { "sienna", 160, 82, 45 },
- { "sienna1", 255, 130, 71 },
- { "sienna2", 238, 121, 66 },
- { "sienna3", 205, 104, 57 },
- { "sienna4", 139, 71, 38 },
- { "skyBlue", 135, 206, 235 },
- { "skyblue1", 135, 206, 255 },
- { "skyblue2", 126, 192, 238 },
- { "skyblue3", 108, 166, 205 },
- { "skyblue4", 74, 112, 139 },
- { "slateBlue", 106, 90, 205 },
- { "slateblue1", 131, 111, 255 },
- { "slateblue2", 122, 103, 238 },
- { "slateblue3", 105, 89, 205 },
- { "slateblue4", 71, 60, 139 },
- { "slateGray", 112, 128, 144 },
- { "slategray1", 198, 226, 255 },
- { "slategray2", 185, 211, 238 },
- { "slategray3", 159, 182, 205 },
- { "slategray4", 108, 123, 139 },
- { "slateGrey", 112, 128, 144 },
- { "snow", 255, 250, 250 },
- { "snow1", 255, 250, 250 },
- { "snow2", 238, 233, 233 },
- { "snow3", 205, 201, 201 },
- { "snow4", 139, 137, 137 },
- { "springGreen", 0, 255, 127 },
- { "springgreen1", 0, 255, 127 },
- { "springgreen2", 0, 238, 118 },
- { "springgreen3", 0, 205, 102 },
- { "springgreen4", 0, 139, 69 },
- { "steelBlue", 70, 130, 180 },
- { "steelblue1", 99, 184, 255 },
- { "steelblue2", 92, 172, 238 },
- { "steelblue3", 79, 148, 205 },
- { "steelblue4", 54, 100, 139 },
- { "tan", 210, 180, 140 },
- { "tan1", 255, 165, 79 },
- { "tan2", 238, 154, 73 },
- { "tan3", 205, 133, 63 },
- { "tan4", 139, 90, 43 },
- { "thistle", 216, 191, 216 },
- { "thistle1", 255, 225, 255 },
- { "thistle2", 238, 210, 238 },
- { "thistle3", 205, 181, 205 },
- { "thistle4", 139, 123, 139 },
- { "tomato", 255, 99, 71 },
- { "tomato1", 255, 99, 71 },
- { "tomato2", 238, 92, 66 },
- { "tomato3", 205, 79, 57 },
- { "tomato4", 139, 54, 38 },
- { "turquoise", 64, 224, 208 },
- { "turquoise1", 0, 245, 255 },
- { "turquoise2", 0, 229, 238 },
- { "turquoise3", 0, 197, 205 },
- { "turquoise4", 0, 134, 139 },
- { "violet", 238, 130, 238 },
- { "violetRed", 208, 32, 144 },
- { "violetred1", 255, 62, 150 },
- { "violetred2", 238, 58, 140 },
- { "violetred3", 205, 50, 120 },
- { "violetred4", 139, 34, 82 },
- { "wheat", 245, 222, 179 },
- { "wheat1", 255, 231, 186 },
- { "wheat2", 238, 216, 174 },
- { "wheat3", 205, 186, 150 },
- { "wheat4", 139, 126, 102 },
- { "white", 255, 255, 255 },
- { "whiteSmoke", 245, 245, 245 },
- { "yellow", 255, 255, 0 },
- { "yellow1", 255, 255, 0 },
- { "yellow2", 238, 238, 0 },
- { "yellow3", 205, 205, 0 },
- { "yellow4", 139, 139, 0 },
- { "yellowGreen", 154, 205, 50 }
+static const elem xColors[] = {
+ /* Colors starting with 'a' */
+ "liceBlue\0 \360\370\377\0",
+ "ntiqueWhite\0 \213\203\170\315\300\260\356\337\314\377\357\333\372\353\327\4",
+ "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' */
+ "eige\0 \365\365\334\0",
+ "isque\0 \213\175\153\315\267\236\356\325\267\377\344\304\377\344\304\4",
+ "lack\0 \000\000\000\0",
+ "lanchedAlmond\0 \377\353\315\0",
+ "lue\0 \000\000\213\000\000\315\000\000\356\000\000\377\000\000\377\4",
+ "lueViolet\0 \212\053\342\0",
+ "rown\0 \213\043\043\315\063\063\356\073\073\377\100\100\245\052\052\4",
+ "urlywood\0 \213\163\125\315\252\175\356\305\221\377\323\233\336\270\207\4",
+ /* Colors starting with 'c' */
+ "adetBlue\0 \123\206\213\172\305\315\216\345\356\230\365\377\137\236\240\4",
+ "hartreuse\0 \105\213\000\146\315\000\166\356\000\177\377\000\177\377\000\4",
+ "hocolate\0 \213\105\023\315\146\035\356\166\041\377\177\044\322\151\036\4",
+ "oral\0 \213\076\057\315\133\105\356\152\120\377\162\126\377\177\120\4",
+ "ornflowerBlue\0 \144\225\355\0",
+ "ornsilk\0 \213\210\170\315\310\261\356\350\315\377\370\334\377\370\334\4",
+ "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\0",
+ "arkCyan\0 \000\213\213\0",
+ "arkGoldenrod\0 \213\145\010\315\225\014\356\255\016\377\271\017\270\206\013\4",
+ "arkGray\0 \251\251\251\0",
+ "arkGreen\0 \000\144\000\0",
+ "arkGrey\0 \251\251\251\0",
+ "arkKhaki\0 \275\267\153\0",
+ "arkMagenta\0 \213\000\213\0",
+ "arkOliveGreen\0 \156\213\075\242\315\132\274\356\150\312\377\160\125\153\057\4",
+ "arkOrange\0 \213\105\000\315\146\000\356\166\000\377\177\000\377\214\000\4",
+ "arkOrchid\0 \150\042\213\232\062\315\262\072\356\277\076\377\231\062\314\4",
+ "arkRed\0 \213\000\000\0",
+ "arkSalmon\0 \351\226\172\0",
+ "arkSeaGreen\0 \151\213\151\233\315\233\264\356\264\301\377\301\217\274\217\4",
+ "arkSlateBlue\0 \110\075\213\0",
+ "arkSlateGray\0 \122\213\213\171\315\315\215\356\356\227\377\377\057\117\117\4",
+ "arkSlateGrey\0 \057\117\117\0",
+ "arkTurquoise\0 \000\316\321\0",
+ "arkViolet\0 \224\000\323\0",
+ "eepPink\0 \213\012\120\315\020\166\356\022\211\377\024\223\377\024\223\4",
+ "eepSkyBlue\0 \000\150\213\000\232\315\000\262\356\000\277\377\000\277\377\4",
+ "imGray\0 \151\151\151\0",
+ "imGrey\0 \151\151\151\0",
+ "odgerBlue\0 \020\116\213\030\164\315\034\206\356\036\220\377\036\220\377\4",
+ /* Colors starting with 'e' */
+ /* Colors starting with 'f' */
+ "irebrick\0 \213\032\032\315\046\046\356\054\054\377\060\060\262\042\042\4",
+ "loralWhite\0 \377\372\360\0",
+ "orestGreen\0 \042\213\042\0",
+ /* Colors starting with 'g' */
+ "ainsboro\0 \334\334\334\0",
+ "hostWhite\0 \370\370\377\0",
+ "old\0 \213\165\000\315\255\000\356\311\000\377\327\000\377\327\000\4",
+ "oldenrod\0 \213\151\024\315\233\035\356\264\042\377\301\045\332\245\040\4",
+ "ray\0\024\024\024\022\022\022\017\017\017\015\015\015\012\012\012"
+ "\010\010\010\005\005\005\003\003\003\276\276\276\10",
+ "ray0\0 \000\000\000\0",
+ "reen\0 \000\213\000\000\315\000\000\356\000\000\377\000\000\377\000\4",
+ "reenYellow\0 \255\377\057\0",
+ "rey\0\024\024\024\022\022\022\017\017\017\015\015\015\012\012\012"
+ "\010\010\010\005\005\005\003\003\003\276\276\276\10",
+ "rey0\0 \000\000\000\0",
+ /* Colors starting with 'h' */
+ "oneydew\0 \203\213\203\301\315\301\340\356\340\360\377\360\360\377\360\4",
+ "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",
+ "vory\0 \213\213\203\315\315\301\356\356\340\377\377\360\377\377\360\4",
+ /* Colors starting with 'j' */
+ /* Colors starting with 'k' */
+ "haki\0 \213\206\116\315\306\163\356\346\205\377\366\217\360\346\214\4",
+ /* Colors starting with 'l' */
+ "avender\0 \346\346\372\0",
+ "avenderBlush\0 \213\203\206\315\301\305\356\340\345\377\360\365\377\360\365\4",
+ "awnGreen\0 \174\374\000\0",
+ "emonChiffon\0 \213\211\160\315\311\245\356\351\277\377\372\315\377\372\315\4",
+ "ightBlue\0 \150\203\213\232\300\315\262\337\356\277\357\377\255\330\346\4",
+ "ightCoral\0 \360\200\200\0",
+ "ightCyan\0 \172\213\213\264\315\315\321\356\356\340\377\377\340\377\377\4",
+ "ightGoldenrod\0 \213\201\114\315\276\160\356\334\202\377\354\213\356\335\202\4",
+ "ightGoldenrodYellow\0 \372\372\322\0",
+ "ightGray\0 \323\323\323\0",
+ "ightGreen\0 \220\356\220\0",
+ "ightGrey\0 \323\323\323\0",
+ "ightPink\0 \213\137\145\315\214\225\356\242\255\377\256\271\377\266\301\4",
+ "ightSalmon\0 \213\127\102\315\201\142\356\225\162\377\240\172\377\240\172\4",
+ "ightSeaGreen\0 \040\262\252\0",
+ "ightSkyBlue\0 \140\173\213\215\266\315\244\323\356\260\342\377\207\316\372\4",
+ "ightSlateBlue\0 \204\160\377\0",
+ "ightSlateGray\0 \167\210\231\0",
+ "ightSlateGrey\0 \167\210\231\0",
+ "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",
+ "imeGreen\0 \062\315\062\0",
+ "inen\0 \372\360\346\0",
+ /* Colors starting with 'm' */
+ "agenta\0 \213\000\213\315\000\315\356\000\356\377\000\377\377\000\377\4",
+ "aroon\0 \213\034\142\315\051\220\356\060\247\377\064\263\260\060\140\4",
+ "ediumAquamarine\0 \146\315\252\0",
+ "ediumBlue\0 \000\000\315\0",
+ "ediumOrchid\0 \172\067\213\264\122\315\321\137\356\340\146\377\272\125\323\4",
+ "ediumPurple\0 \135\107\213\211\150\315\237\171\356\253\202\377\223\160\333\4",
+ "ediumSeaGreen\0 \074\263\161\0",
+ "ediumSlateBlue\0 \173\150\356\0",
+ "ediumSpringGreen\0 \000\372\232\0",
+ "ediumTurquoise\0 \110\321\314\0",
+ "ediumVioletRed\0 \307\025\205\0",
+ "idnightBlue\0 \031\031\160\0",
+ "intCream\0 \365\377\372\0",
+ "istyRose\0 \213\175\173\315\267\265\356\325\322\377\344\341\377\344\341\4",
+ "occasin\0 \377\344\265\0",
+ /* Colors starting with 'n' */
+ "avajoWhite\0 \213\171\136\315\263\213\356\317\241\377\336\255\377\336\255\4",
+ "avy\0 \000\000\200\0",
+ "avyBlue\0 \000\000\200\0",
+ /* Colors starting with 'o' */
+ "ldLace\0 \375\365\346\0",
+ "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",
+ "rchid\0 \213\107\211\315\151\311\356\172\351\377\203\372\332\160\326\4",
+ /* Colors starting with 'p' */
+ "aleGoldenrod\0 \356\350\252\0",
+ "aleGreen\0 \124\213\124\174\315\174\220\356\220\232\377\232\230\373\230\4",
+ "aleTurquoise\0 \146\213\213\226\315\315\256\356\356\273\377\377\257\356\356\4",
+ "aleVioletRed\0 \213\107\135\315\150\211\356\171\237\377\202\253\333\160\223\4",
+ "apayaWhip\0 \377\357\325\0",
+ "eachPuff\0 \213\167\145\315\257\225\356\313\255\377\332\271\377\332\271\4",
+ "eru\0 \315\205\077\0",
+ "ink\0 \213\143\154\315\221\236\356\251\270\377\265\305\377\300\313\4",
+ "lum\0 \213\146\213\315\226\315\356\256\356\377\273\377\335\240\335\4",
+ "owderBlue\0 \260\340\346\0",
+ "urple\0 \125\032\213\175\046\315\221\054\356\233\060\377\240\040\360\4",
+ /* Colors starting with 'q' */
+ /* Colors starting with 'r' */
+ "ed\0 \213\000\000\315\000\000\356\000\000\377\000\000\377\000\000\4",
+ "osyBrown\0 \213\151\151\315\233\233\356\264\264\377\301\301\274\217\217\4",
+ "oyalBlue\0 \047\100\213\072\137\315\103\156\356\110\166\377\101\151\341\4",
+ /* Colors starting with 's' */
+ "addleBrown\0 \213\105\023\0",
+ "almon\0 \213\114\071\315\160\124\356\202\142\377\214\151\372\200\162\4",
+ "andyBrown\0 \364\244\140\0",
+ "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",
+ "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",
+ "lateGrey\0 \160\200\220\0",
+ "now\0 \213\211\211\315\311\311\356\351\351\377\372\372\377\372\372\4",
+ "pringGreen\0 \000\213\105\000\315\146\000\356\166\000\377\177\000\377\177\4",
+ "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",
+ "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",
+ /* Colors starting with 'u' */
+ /* Colors starting with 'v' */
+ "iolet\0 \356\202\356\0",
+ "ioletRed\0 \213\042\122\315\062\170\356\072\214\377\076\226\320\040\220\4",
+ /* Colors starting with 'w' */
+ "heat\0 \213\176\146\315\272\226\356\330\256\377\347\272\365\336\263\4",
+ "hite\0 \377\377\377\0",
+ "hiteSmoke\0 \365\365\365\0",
+ /* Colors starting with 'x' */
+ /* Colors starting with 'y' */
+ "ellow\0 \213\213\000\315\315\000\356\356\000\377\377\000\377\377\000\4",
+ "ellowGreen\0 \232\315\062\0"
};
/*
@@ -761,6 +313,10 @@ static int colorcmp(const char *spec, const char *pname) {
return r;
}
+#define RED(p) ((unsigned char)(p)[28])
+#define GREEN(p) ((unsigned char)(p)[29])
+#define BLUE(p) ((unsigned char)(p)[30])
+
Status
XParseColor(
Display *display,
@@ -797,14 +353,20 @@ XParseColor(
return 0;
}
} else {
+ int size;
+ const elem *p;
/*
* Perform a binary search on the sorted array of colors.
* size = current size of search range
* p = pointer to current element being considered.
*/
- int size = sizeof(xColors)/sizeof(xColors[0]);
- const XColorEntry *p = &xColors[size >> 1];
- int r = colorcmp(spec, p->name);
+ int r = (spec[0] - 'A') & 0xdf;
+ if (r > (sizeof(az)/sizeof(az[0] - 1))) {
+ return 0;
+ }
+ size = az[r + 1] - az[r];
+ p = &xColors[(az[r + 1] + az[r]) >> 1];
+ r = colorcmp(spec + 1, *p);
while (r != 0) {
if (r < 0) {
@@ -818,11 +380,11 @@ XParseColor(
if (!size) {
return 0;
}
- r = colorcmp(spec, p->name);
+ r = colorcmp(spec + 1, *p);
}
- colorPtr->red = ((p->red << 8) | p->red);
- colorPtr->green = ((p->green << 8) | p->green);
- colorPtr->blue = ((p->blue << 8) | p->blue);
+ colorPtr->red = ((RED(*p) << 8) | RED(*p));
+ colorPtr->green = ((GREEN(*p) << 8) | GREEN(*p));
+ colorPtr->blue = ((BLUE(*p) << 8) | BLUE(*p));
}
colorPtr->pixel = TkpGetPixel(colorPtr);
colorPtr->flags = DoRed|DoGreen|DoBlue;
@@ -830,6 +392,38 @@ XParseColor(
return 1;
}
+
+#if 0
+int main() {
+ XColor color;
+ char buf[32];
+ int charindex;
+ int i, result;
+ int repeat = 1;
+
+ while (repeat--) {
+ buf[0] = 'a';
+ charindex = 1;
+ for (i = 0; i < sizeof(xColors)/sizeof(xColors[0]); ++i) {
+ while (i >= az[charindex]) {
+ ++charindex;
+ ++(buf[0]);
+ }
+ strcpy(buf + 1, xColors[i]);
+ result = XParseColor(0, 0, buf, &color);
+ if (!result) {
+ break;
+ }
+ printf("color %d: %s %d %d %d %d\n", i, buf, result, color.red >> 8, color.green >> 8, color.blue >> 8);
+ }
+ }
+ if (!result) {
+ printf("NOT OK: %s\n", buf);
+ } else {
+ printf("OK\n");
+ }
+}
+#endif
/*
* Local Variables:
* mode: c
generated by cgit v0.12 at 2024-12-26 07:44:59 (GMT)