[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 18 of 22] Removed WINGs' dependency on rgb.txt (from X11)



# HG changeset patch
# User Dan Pascu <dan@ag-projects.com>
# Date 1146083304 25200
# Branch wm_0_92
# Node ID ca5197e5c8973e15eae8eedb6ed392600ed11be1
# Parent  bd0c670bda80aab916c22b627adfe8cc9978d1ab
Removed WINGs' dependency on rgb.txt (from X11).

This fixes issues with locating the file which is being stored on different
locations depending on the X server release/version
(transplanted from bd5b5958610357e78e2938a66292c0b5cce95d18)

diff -r bd0c670bda80 -r ca5197e5c897 ChangeLog
--- a/ChangeLog	Tue Apr 25 16:52:43 2006 -0700
+++ b/ChangeLog	Wed Apr 26 13:28:24 2006 -0700
@@ -37,6 +37,8 @@
   (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
 - Fixed segfault in WPrefs when some font description is missing from the 
   configuration file (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
+- Removed WINGs' dependency on rgb.txt (from X11) and issues with locating it
+  on the filesystem for different systems/distributions.
 
 
 
diff -r bd0c670bda80 -r ca5197e5c897 WINGs/ChangeLog
--- a/WINGs/ChangeLog	Tue Apr 25 16:52:43 2006 -0700
+++ b/WINGs/ChangeLog	Wed Apr 26 13:28:24 2006 -0700
@@ -10,6 +10,10 @@
   applications cannot interoperate with GNUstep applications (which uses
   xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
   version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
+- removed dependency on rgb.txt from X11 and issues with locating it on the
+  filesystem for different systems/distributions.
+- Removed dependency on rgb.txt (from X11) and issues with locating it on the
+  filesystem for different systems/distributions.
 
 
 Changes since wmaker 0.80.1:
diff -r bd0c670bda80 -r ca5197e5c897 WINGs/Makefile.am
--- a/WINGs/Makefile.am	Tue Apr 25 16:52:43 2006 -0700
+++ b/WINGs/Makefile.am	Wed Apr 26 13:28:24 2006 -0700
@@ -16,7 +16,7 @@
 LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
 
 
-EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
+EXTRA_DIST = BUGS make-rgb python/Makefile python/README python/WINGs.i \
 	python/WINGs.py python/setup.py python/test.py
 
 
@@ -40,6 +40,7 @@
 	misc.c \
 	notification.c \
 	proplist.c \
+	rgb.h \
 	selection.c \
 	snprintf.c \
 	string.c \
@@ -115,10 +116,6 @@
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
 
-
-wcolorpanel.o: wcolorpanel.c
-	$(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $<
-
 DISTCLEANFILES = WINGs.pc
 
 install-exec-local:
diff -r bd0c670bda80 -r ca5197e5c897 WINGs/make-rgb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WINGs/make-rgb	Wed Apr 26 13:28:24 2006 -0700
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+import sys
+import re
+from optparse import OptionParser
+
+parser = OptionParser(version="%prog 1.0")
+parser.add_option("-f", "--file", dest="rgbtxtFile", default='/etc/X11/rgb.txt',
+                  help="rgb.txt file containing X11 colors (/etc/X11/rgb.txt)",
+                  metavar="File")
+
+(options, args) = parser.parse_args()
+
+f = open(options.rgbtxtFile)
+lines = f.readlines()
+f.close()
+
+colorLine = re.compile(r'''\s*
+                           (?P<red>\d+)       # red
+                           \s+
+                           (?P<green>\d+)     # green
+                           \s+
+                           (?P<blue>\d+)      # blue
+                           \s+
+                           (?P<name>[^\s]+)   # name
+                           ''', re.VERBOSE)
+
+print '''
+/* Automatically generated file. Do NOT edit. Regenerate it using make-rgb */
+
+#ifndef RGB_H_
+#define RGB_H_
+
+#include <wraster.h>
+
+typedef struct RGBColor {
+    RColor color;
+    char *name;
+} RGBColor;
+
+RGBColor rgbColors[] = {'''
+
+for line in lines:
+    m = colorLine.match(line)
+    if m:
+        print '''    {{%(red)3s, %(green)3s, %(blue)3s, 0}, "%(name)s"},''' % m.groupdict()
+
+print '''    {{  0,   0,   0, 0}, NULL}
+};
+
+#endif
+'''
+
diff -r bd0c670bda80 -r ca5197e5c897 WINGs/rgb.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WINGs/rgb.h	Wed Apr 26 13:28:24 2006 -0700
@@ -0,0 +1,771 @@
+
+/* Automatically generated file. Do NOT edit. Regenerate it using make-rgb */
+
+#ifndef RGB_H_
+#define RGB_H_
+
+#include <wraster.h>
+
+typedef struct RGBColor {
+    RColor color;
+    char *name;
+} RGBColor;
+
+RGBColor rgbColors[] = {
+    {{255, 250, 250, 0}, "snow"},
+    {{248, 248, 255, 0}, "ghost"},
+    {{248, 248, 255, 0}, "GhostWhite"},
+    {{245, 245, 245, 0}, "white"},
+    {{245, 245, 245, 0}, "WhiteSmoke"},
+    {{220, 220, 220, 0}, "gainsboro"},
+    {{255, 250, 240, 0}, "floral"},
+    {{255, 250, 240, 0}, "FloralWhite"},
+    {{253, 245, 230, 0}, "old"},
+    {{253, 245, 230, 0}, "OldLace"},
+    {{250, 240, 230, 0}, "linen"},
+    {{250, 235, 215, 0}, "antique"},
+    {{250, 235, 215, 0}, "AntiqueWhite"},
+    {{255, 239, 213, 0}, "papaya"},
+    {{255, 239, 213, 0}, "PapayaWhip"},
+    {{255, 235, 205, 0}, "blanched"},
+    {{255, 235, 205, 0}, "BlanchedAlmond"},
+    {{255, 228, 196, 0}, "bisque"},
+    {{255, 218, 185, 0}, "peach"},
+    {{255, 218, 185, 0}, "PeachPuff"},
+    {{255, 222, 173, 0}, "navajo"},
+    {{255, 222, 173, 0}, "NavajoWhite"},
+    {{255, 228, 181, 0}, "moccasin"},
+    {{255, 248, 220, 0}, "cornsilk"},
+    {{255, 255, 240, 0}, "ivory"},
+    {{255, 250, 205, 0}, "lemon"},
+    {{255, 250, 205, 0}, "LemonChiffon"},
+    {{255, 245, 238, 0}, "seashell"},
+    {{240, 255, 240, 0}, "honeydew"},
+    {{245, 255, 250, 0}, "mint"},
+    {{245, 255, 250, 0}, "MintCream"},
+    {{240, 255, 255, 0}, "azure"},
+    {{240, 248, 255, 0}, "alice"},
+    {{240, 248, 255, 0}, "AliceBlue"},
+    {{230, 230, 250, 0}, "lavender"},
+    {{255, 240, 245, 0}, "lavender"},
+    {{255, 240, 245, 0}, "LavenderBlush"},
+    {{255, 228, 225, 0}, "misty"},
+    {{255, 228, 225, 0}, "MistyRose"},
+    {{255, 255, 255, 0}, "white"},
+    {{  0,   0,   0, 0}, "black"},
+    {{ 47,  79,  79, 0}, "dark"},
+    {{ 47,  79,  79, 0}, "DarkSlateGray"},
+    {{ 47,  79,  79, 0}, "dark"},
+    {{ 47,  79,  79, 0}, "DarkSlateGrey"},
+    {{105, 105, 105, 0}, "dim"},
+    {{105, 105, 105, 0}, "DimGray"},
+    {{105, 105, 105, 0}, "dim"},
+    {{105, 105, 105, 0}, "DimGrey"},
+    {{112, 128, 144, 0}, "slate"},
+    {{112, 128, 144, 0}, "SlateGray"},
+    {{112, 128, 144, 0}, "slate"},
+    {{112, 128, 144, 0}, "SlateGrey"},
+    {{119, 136, 153, 0}, "light"},
+    {{119, 136, 153, 0}, "LightSlateGray"},
+    {{119, 136, 153, 0}, "light"},
+    {{119, 136, 153, 0}, "LightSlateGrey"},
+    {{190, 190, 190, 0}, "gray"},
+    {{190, 190, 190, 0}, "grey"},
+    {{211, 211, 211, 0}, "light"},
+    {{211, 211, 211, 0}, "LightGrey"},
+    {{211, 211, 211, 0}, "light"},
+    {{211, 211, 211, 0}, "LightGray"},
+    {{ 25,  25, 112, 0}, "midnight"},
+    {{ 25,  25, 112, 0}, "MidnightBlue"},
+    {{  0,   0, 128, 0}, "navy"},
+    {{  0,   0, 128, 0}, "navy"},
+    {{  0,   0, 128, 0}, "NavyBlue"},
+    {{100, 149, 237, 0}, "cornflower"},
+    {{100, 149, 237, 0}, "CornflowerBlue"},
+    {{ 72,  61, 139, 0}, "dark"},
+    {{ 72,  61, 139, 0}, "DarkSlateBlue"},
+    {{106,  90, 205, 0}, "slate"},
+    {{106,  90, 205, 0}, "SlateBlue"},
+    {{123, 104, 238, 0}, "medium"},
+    {{123, 104, 238, 0}, "MediumSlateBlue"},
+    {{132, 112, 255, 0}, "light"},
+    {{132, 112, 255, 0}, "LightSlateBlue"},
+    {{  0,   0, 205, 0}, "medium"},
+    {{  0,   0, 205, 0}, "MediumBlue"},
+    {{ 65, 105, 225, 0}, "royal"},
+    {{ 65, 105, 225, 0}, "RoyalBlue"},
+    {{  0,   0, 255, 0}, "blue"},
+    {{ 30, 144, 255, 0}, "dodger"},
+    {{ 30, 144, 255, 0}, "DodgerBlue"},
+    {{  0, 191, 255, 0}, "deep"},
+    {{  0, 191, 255, 0}, "DeepSkyBlue"},
+    {{135, 206, 235, 0}, "sky"},
+    {{135, 206, 235, 0}, "SkyBlue"},
+    {{135, 206, 250, 0}, "light"},
+    {{135, 206, 250, 0}, "LightSkyBlue"},
+    {{ 70, 130, 180, 0}, "steel"},
+    {{ 70, 130, 180, 0}, "SteelBlue"},
+    {{176, 196, 222, 0}, "light"},
+    {{176, 196, 222, 0}, "LightSteelBlue"},
+    {{173, 216, 230, 0}, "light"},
+    {{173, 216, 230, 0}, "LightBlue"},
+    {{176, 224, 230, 0}, "powder"},
+    {{176, 224, 230, 0}, "PowderBlue"},
+    {{175, 238, 238, 0}, "pale"},
+    {{175, 238, 238, 0}, "PaleTurquoise"},
+    {{  0, 206, 209, 0}, "dark"},
+    {{  0, 206, 209, 0}, "DarkTurquoise"},
+    {{ 72, 209, 204, 0}, "medium"},
+    {{ 72, 209, 204, 0}, "MediumTurquoise"},
+    {{ 64, 224, 208, 0}, "turquoise"},
+    {{  0, 255, 255, 0}, "cyan"},
+    {{224, 255, 255, 0}, "light"},
+    {{224, 255, 255, 0}, "LightCyan"},
+    {{ 95, 158, 160, 0}, "cadet"},
+    {{ 95, 158, 160, 0}, "CadetBlue"},
+    {{102, 205, 170, 0}, "medium"},
+    {{102, 205, 170, 0}, "MediumAquamarine"},
+    {{127, 255, 212, 0}, "aquamarine"},
+    {{  0, 100,   0, 0}, "dark"},
+    {{  0, 100,   0, 0}, "DarkGreen"},
+    {{ 85, 107,  47, 0}, "dark"},
+    {{ 85, 107,  47, 0}, "DarkOliveGreen"},
+    {{143, 188, 143, 0}, "dark"},
+    {{143, 188, 143, 0}, "DarkSeaGreen"},
+    {{ 46, 139,  87, 0}, "sea"},
+    {{ 46, 139,  87, 0}, "SeaGreen"},
+    {{ 60, 179, 113, 0}, "medium"},
+    {{ 60, 179, 113, 0}, "MediumSeaGreen"},
+    {{ 32, 178, 170, 0}, "light"},
+    {{ 32, 178, 170, 0}, "LightSeaGreen"},
+    {{152, 251, 152, 0}, "pale"},
+    {{152, 251, 152, 0}, "PaleGreen"},
+    {{  0, 255, 127, 0}, "spring"},
+    {{  0, 255, 127, 0}, "SpringGreen"},
+    {{124, 252,   0, 0}, "lawn"},
+    {{124, 252,   0, 0}, "LawnGreen"},
+    {{  0, 255,   0, 0}, "green"},
+    {{127, 255,   0, 0}, "chartreuse"},
+    {{  0, 250, 154, 0}, "medium"},
+    {{  0, 250, 154, 0}, "MediumSpringGreen"},
+    {{173, 255,  47, 0}, "green"},
+    {{173, 255,  47, 0}, "GreenYellow"},
+    {{ 50, 205,  50, 0}, "lime"},
+    {{ 50, 205,  50, 0}, "LimeGreen"},
+    {{154, 205,  50, 0}, "yellow"},
+    {{154, 205,  50, 0}, "YellowGreen"},
+    {{ 34, 139,  34, 0}, "forest"},
+    {{ 34, 139,  34, 0}, "ForestGreen"},
+    {{107, 142,  35, 0}, "olive"},
+    {{107, 142,  35, 0}, "OliveDrab"},
+    {{189, 183, 107, 0}, "dark"},
+    {{189, 183, 107, 0}, "DarkKhaki"},
+    {{240, 230, 140, 0}, "khaki"},
+    {{238, 232, 170, 0}, "pale"},
+    {{238, 232, 170, 0}, "PaleGoldenrod"},
+    {{250, 250, 210, 0}, "light"},
+    {{250, 250, 210, 0}, "LightGoldenrodYellow"},
+    {{255, 255, 224, 0}, "light"},
+    {{255, 255, 224, 0}, "LightYellow"},
+    {{255, 255,   0, 0}, "yellow"},
+    {{255, 215,   0, 0}, "gold"},
+    {{238, 221, 130, 0}, "light"},
+    {{238, 221, 130, 0}, "LightGoldenrod"},
+    {{218, 165,  32, 0}, "goldenrod"},
+    {{184, 134,  11, 0}, "dark"},
+    {{184, 134,  11, 0}, "DarkGoldenrod"},
+    {{188, 143, 143, 0}, "rosy"},
+    {{188, 143, 143, 0}, "RosyBrown"},
+    {{205,  92,  92, 0}, "indian"},
+    {{205,  92,  92, 0}, "IndianRed"},
+    {{139,  69,  19, 0}, "saddle"},
+    {{139,  69,  19, 0}, "SaddleBrown"},
+    {{160,  82,  45, 0}, "sienna"},
+    {{205, 133,  63, 0}, "peru"},
+    {{222, 184, 135, 0}, "burlywood"},
+    {{245, 245, 220, 0}, "beige"},
+    {{245, 222, 179, 0}, "wheat"},
+    {{244, 164,  96, 0}, "sandy"},
+    {{244, 164,  96, 0}, "SandyBrown"},
+    {{210, 180, 140, 0}, "tan"},
+    {{210, 105,  30, 0}, "chocolate"},
+    {{178,  34,  34, 0}, "firebrick"},
+    {{165,  42,  42, 0}, "brown"},
+    {{233, 150, 122, 0}, "dark"},
+    {{233, 150, 122, 0}, "DarkSalmon"},
+    {{250, 128, 114, 0}, "salmon"},
+    {{255, 160, 122, 0}, "light"},
+    {{255, 160, 122, 0}, "LightSalmon"},
+    {{255, 165,   0, 0}, "orange"},
+    {{255, 140,   0, 0}, "dark"},
+    {{255, 140,   0, 0}, "DarkOrange"},
+    {{255, 127,  80, 0}, "coral"},
+    {{240, 128, 128, 0}, "light"},
+    {{240, 128, 128, 0}, "LightCoral"},
+    {{255,  99,  71, 0}, "tomato"},
+    {{255,  69,   0, 0}, "orange"},
+    {{255,  69,   0, 0}, "OrangeRed"},
+    {{255,   0,   0, 0}, "red"},
+    {{255, 105, 180, 0}, "hot"},
+    {{255, 105, 180, 0}, "HotPink"},
+    {{255,  20, 147, 0}, "deep"},
+    {{255,  20, 147, 0}, "DeepPink"},
+    {{255, 192, 203, 0}, "pink"},
+    {{255, 182, 193, 0}, "light"},
+    {{255, 182, 193, 0}, "LightPink"},
+    {{219, 112, 147, 0}, "pale"},
+    {{219, 112, 147, 0}, "PaleVioletRed"},
+    {{176,  48,  96, 0}, "maroon"},
+    {{199,  21, 133, 0}, "medium"},
+    {{199,  21, 133, 0}, "MediumVioletRed"},
+    {{208,  32, 144, 0}, "violet"},
+    {{208,  32, 144, 0}, "VioletRed"},
+    {{255,   0, 255, 0}, "magenta"},
+    {{238, 130, 238, 0}, "violet"},
+    {{221, 160, 221, 0}, "plum"},
+    {{218, 112, 214, 0}, "orchid"},
+    {{186,  85, 211, 0}, "medium"},
+    {{186,  85, 211, 0}, "MediumOrchid"},
+    {{153,  50, 204, 0}, "dark"},
+    {{153,  50, 204, 0}, "DarkOrchid"},
+    {{148,   0, 211, 0}, "dark"},
+    {{148,   0, 211, 0}, "DarkViolet"},
+    {{138,  43, 226, 0}, "blue"},
+    {{138,  43, 226, 0}, "BlueViolet"},
+    {{160,  32, 240, 0}, "purple"},
+    {{147, 112, 219, 0}, "medium"},
+    {{147, 112, 219, 0}, "MediumPurple"},
+    {{216, 191, 216, 0}, "thistle"},
+    {{255, 250, 250, 0}, "snow1"},
+    {{238, 233, 233, 0}, "snow2"},
+    {{205, 201, 201, 0}, "snow3"},
+    {{139, 137, 137, 0}, "snow4"},
+    {{255, 245, 238, 0}, "seashell1"},
+    {{238, 229, 222, 0}, "seashell2"},
+    {{205, 197, 191, 0}, "seashell3"},
+    {{139, 134, 130, 0}, "seashell4"},
+    {{255, 239, 219, 0}, "AntiqueWhite1"},
+    {{238, 223, 204, 0}, "AntiqueWhite2"},
+    {{205, 192, 176, 0}, "AntiqueWhite3"},
+    {{139, 131, 120, 0}, "AntiqueWhite4"},
+    {{255, 228, 196, 0}, "bisque1"},
+    {{238, 213, 183, 0}, "bisque2"},
+    {{205, 183, 158, 0}, "bisque3"},
+    {{139, 125, 107, 0}, "bisque4"},
+    {{255, 218, 185, 0}, "PeachPuff1"},
+    {{238, 203, 173, 0}, "PeachPuff2"},
+    {{205, 175, 149, 0}, "PeachPuff3"},
+    {{139, 119, 101, 0}, "PeachPuff4"},
+    {{255, 222, 173, 0}, "NavajoWhite1"},
+    {{238, 207, 161, 0}, "NavajoWhite2"},
+    {{205, 179, 139, 0}, "NavajoWhite3"},
+    {{139, 121,  94, 0}, "NavajoWhite4"},
+    {{255, 250, 205, 0}, "LemonChiffon1"},
+    {{238, 233, 191, 0}, "LemonChiffon2"},
+    {{205, 201, 165, 0}, "LemonChiffon3"},
+    {{139, 137, 112, 0}, "LemonChiffon4"},
+    {{255, 248, 220, 0}, "cornsilk1"},
+    {{238, 232, 205, 0}, "cornsilk2"},
+    {{205, 200, 177, 0}, "cornsilk3"},
+    {{139, 136, 120, 0}, "cornsilk4"},
+    {{255, 255, 240, 0}, "ivory1"},
+    {{238, 238, 224, 0}, "ivory2"},
+    {{205, 205, 193, 0}, "ivory3"},
+    {{139, 139, 131, 0}, "ivory4"},
+    {{240, 255, 240, 0}, "honeydew1"},
+    {{224, 238, 224, 0}, "honeydew2"},
+    {{193, 205, 193, 0}, "honeydew3"},
+    {{131, 139, 131, 0}, "honeydew4"},
+    {{255, 240, 245, 0}, "LavenderBlush1"},
+    {{238, 224, 229, 0}, "LavenderBlush2"},
+    {{205, 193, 197, 0}, "LavenderBlush3"},
+    {{139, 131, 134, 0}, "LavenderBlush4"},
+    {{255, 228, 225, 0}, "MistyRose1"},
+    {{238, 213, 210, 0}, "MistyRose2"},
+    {{205, 183, 181, 0}, "MistyRose3"},
+    {{139, 125, 123, 0}, "MistyRose4"},
+    {{240, 255, 255, 0}, "azure1"},
+    {{224, 238, 238, 0}, "azure2"},
+    {{193, 205, 205, 0}, "azure3"},
+    {{131, 139, 139, 0}, "azure4"},
+    {{131, 111, 255, 0}, "SlateBlue1"},
+    {{122, 103, 238, 0}, "SlateBlue2"},
+    {{105,  89, 205, 0}, "SlateBlue3"},
+    {{ 71,  60, 139, 0}, "SlateBlue4"},
+    {{ 72, 118, 255, 0}, "RoyalBlue1"},
+    {{ 67, 110, 238, 0}, "RoyalBlue2"},
+    {{ 58,  95, 205, 0}, "RoyalBlue3"},
+    {{ 39,  64, 139, 0}, "RoyalBlue4"},
+    {{  0,   0, 255, 0}, "blue1"},
+    {{  0,   0, 238, 0}, "blue2"},
+    {{  0,   0, 205, 0}, "blue3"},
+    {{  0,   0, 139, 0}, "blue4"},
+    {{ 30, 144, 255, 0}, "DodgerBlue1"},
+    {{ 28, 134, 238, 0}, "DodgerBlue2"},
+    {{ 24, 116, 205, 0}, "DodgerBlue3"},
+    {{ 16,  78, 139, 0}, "DodgerBlue4"},
+    {{ 99, 184, 255, 0}, "SteelBlue1"},
+    {{ 92, 172, 238, 0}, "SteelBlue2"},
+    {{ 79, 148, 205, 0}, "SteelBlue3"},
+    {{ 54, 100, 139, 0}, "SteelBlue4"},
+    {{  0, 191, 255, 0}, "DeepSkyBlue1"},
+    {{  0, 178, 238, 0}, "DeepSkyBlue2"},
+    {{  0, 154, 205, 0}, "DeepSkyBlue3"},
+    {{  0, 104, 139, 0}, "DeepSkyBlue4"},
+    {{135, 206, 255, 0}, "SkyBlue1"},
+    {{126, 192, 238, 0}, "SkyBlue2"},
+    {{108, 166, 205, 0}, "SkyBlue3"},
+    {{ 74, 112, 139, 0}, "SkyBlue4"},
+    {{176, 226, 255, 0}, "LightSkyBlue1"},
+    {{164, 211, 238, 0}, "LightSkyBlue2"},
+    {{141, 182, 205, 0}, "LightSkyBlue3"},
+    {{ 96, 123, 139, 0}, "LightSkyBlue4"},
+    {{198, 226, 255, 0}, "SlateGray1"},
+    {{185, 211, 238, 0}, "SlateGray2"},
+    {{159, 182, 205, 0}, "SlateGray3"},
+    {{108, 123, 139, 0}, "SlateGray4"},
+    {{202, 225, 255, 0}, "LightSteelBlue1"},
+    {{188, 210, 238, 0}, "LightSteelBlue2"},
+    {{162, 181, 205, 0}, "LightSteelBlue3"},
+    {{110, 123, 139, 0}, "LightSteelBlue4"},
+    {{191, 239, 255, 0}, "LightBlue1"},
+    {{178, 223, 238, 0}, "LightBlue2"},
+    {{154, 192, 205, 0}, "LightBlue3"},
+    {{104, 131, 139, 0}, "LightBlue4"},
+    {{224, 255, 255, 0}, "LightCyan1"},
+    {{209, 238, 238, 0}, "LightCyan2"},
+    {{180, 205, 205, 0}, "LightCyan3"},
+    {{122, 139, 139, 0}, "LightCyan4"},
+    {{187, 255, 255, 0}, "PaleTurquoise1"},
+    {{174, 238, 238, 0}, "PaleTurquoise2"},
+    {{150, 205, 205, 0}, "PaleTurquoise3"},
+    {{102, 139, 139, 0}, "PaleTurquoise4"},
+    {{152, 245, 255, 0}, "CadetBlue1"},
+    {{142, 229, 238, 0}, "CadetBlue2"},
+    {{122, 197, 205, 0}, "CadetBlue3"},
+    {{ 83, 134, 139, 0}, "CadetBlue4"},
+    {{  0, 245, 255, 0}, "turquoise1"},
+    {{  0, 229, 238, 0}, "turquoise2"},
+    {{  0, 197, 205, 0}, "turquoise3"},
+    {{  0, 134, 139, 0}, "turquoise4"},
+    {{  0, 255, 255, 0}, "cyan1"},
+    {{  0, 238, 238, 0}, "cyan2"},
+    {{  0, 205, 205, 0}, "cyan3"},
+    {{  0, 139, 139, 0}, "cyan4"},
+    {{151, 255, 255, 0}, "DarkSlateGray1"},
+    {{141, 238, 238, 0}, "DarkSlateGray2"},
+    {{121, 205, 205, 0}, "DarkSlateGray3"},
+    {{ 82, 139, 139, 0}, "DarkSlateGray4"},
+    {{127, 255, 212, 0}, "aquamarine1"},
+    {{118, 238, 198, 0}, "aquamarine2"},
+    {{102, 205, 170, 0}, "aquamarine3"},
+    {{ 69, 139, 116, 0}, "aquamarine4"},
+    {{193, 255, 193, 0}, "DarkSeaGreen1"},
+    {{180, 238, 180, 0}, "DarkSeaGreen2"},
+    {{155, 205, 155, 0}, "DarkSeaGreen3"},
+    {{105, 139, 105, 0}, "DarkSeaGreen4"},
+    {{ 84, 255, 159, 0}, "SeaGreen1"},
+    {{ 78, 238, 148, 0}, "SeaGreen2"},
+    {{ 67, 205, 128, 0}, "SeaGreen3"},
+    {{ 46, 139,  87, 0}, "SeaGreen4"},
+    {{154, 255, 154, 0}, "PaleGreen1"},
+    {{144, 238, 144, 0}, "PaleGreen2"},
+    {{124, 205, 124, 0}, "PaleGreen3"},
+    {{ 84, 139,  84, 0}, "PaleGreen4"},
+    {{  0, 255, 127, 0}, "SpringGreen1"},
+    {{  0, 238, 118, 0}, "SpringGreen2"},
+    {{  0, 205, 102, 0}, "SpringGreen3"},
+    {{  0, 139,  69, 0}, "SpringGreen4"},
+    {{  0, 255,   0, 0}, "green1"},
+    {{  0, 238,   0, 0}, "green2"},
+    {{  0, 205,   0, 0}, "green3"},
+    {{  0, 139,   0, 0}, "green4"},
+    {{127, 255,   0, 0}, "chartreuse1"},
+    {{118, 238,   0, 0}, "chartreuse2"},
+    {{102, 205,   0, 0}, "chartreuse3"},
+    {{ 69, 139,   0, 0}, "chartreuse4"},
+    {{192, 255,  62, 0}, "OliveDrab1"},
+    {{179, 238,  58, 0}, "OliveDrab2"},
+    {{154, 205,  50, 0}, "OliveDrab3"},
+    {{105, 139,  34, 0}, "OliveDrab4"},
+    {{202, 255, 112, 0}, "DarkOliveGreen1"},
+    {{188, 238, 104, 0}, "DarkOliveGreen2"},
+    {{162, 205,  90, 0}, "DarkOliveGreen3"},
+    {{110, 139,  61, 0}, "DarkOliveGreen4"},
+    {{255, 246, 143, 0}, "khaki1"},
+    {{238, 230, 133, 0}, "khaki2"},
+    {{205, 198, 115, 0}, "khaki3"},
+    {{139, 134,  78, 0}, "khaki4"},
+    {{255, 236, 139, 0}, "LightGoldenrod1"},
+    {{238, 220, 130, 0}, "LightGoldenrod2"},
+    {{205, 190, 112, 0}, "LightGoldenrod3"},
+    {{139, 129,  76, 0}, "LightGoldenrod4"},
+    {{255, 255, 224, 0}, "LightYellow1"},
+    {{238, 238, 209, 0}, "LightYellow2"},
+    {{205, 205, 180, 0}, "LightYellow3"},
+    {{139, 139, 122, 0}, "LightYellow4"},
+    {{255, 255,   0, 0}, "yellow1"},
+    {{238, 238,   0, 0}, "yellow2"},
+    {{205, 205,   0, 0}, "yellow3"},
+    {{139, 139,   0, 0}, "yellow4"},
+    {{255, 215,   0, 0}, "gold1"},
+    {{238, 201,   0, 0}, "gold2"},
+    {{205, 173,   0, 0}, "gold3"},
+    {{139, 117,   0, 0}, "gold4"},
+    {{255, 193,  37, 0}, "goldenrod1"},
+    {{238, 180,  34, 0}, "goldenrod2"},
+    {{205, 155,  29, 0}, "goldenrod3"},
+    {{139, 105,  20, 0}, "goldenrod4"},
+    {{255, 185,  15, 0}, "DarkGoldenrod1"},
+    {{238, 173,  14, 0}, "DarkGoldenrod2"},
+    {{205, 149,  12, 0}, "DarkGoldenrod3"},
+    {{139, 101,   8, 0}, "DarkGoldenrod4"},
+    {{255, 193, 193, 0}, "RosyBrown1"},
+    {{238, 180, 180, 0}, "RosyBrown2"},
+    {{205, 155, 155, 0}, "RosyBrown3"},
+    {{139, 105, 105, 0}, "RosyBrown4"},
+    {{255, 106, 106, 0}, "IndianRed1"},
+    {{238,  99,  99, 0}, "IndianRed2"},
+    {{205,  85,  85, 0}, "IndianRed3"},
+    {{139,  58,  58, 0}, "IndianRed4"},
+    {{255, 130,  71, 0}, "sienna1"},
+    {{238, 121,  66, 0}, "sienna2"},
+    {{205, 104,  57, 0}, "sienna3"},
+    {{139,  71,  38, 0}, "sienna4"},
+    {{255, 211, 155, 0}, "burlywood1"},
+    {{238, 197, 145, 0}, "burlywood2"},
+    {{205, 170, 125, 0}, "burlywood3"},
+    {{139, 115,  85, 0}, "burlywood4"},
+    {{255, 231, 186, 0}, "wheat1"},
+    {{238, 216, 174, 0}, "wheat2"},
+    {{205, 186, 150, 0}, "wheat3"},
+    {{139, 126, 102, 0}, "wheat4"},
+    {{255, 165,  79, 0}, "tan1"},
+    {{238, 154,  73, 0}, "tan2"},
+    {{205, 133,  63, 0}, "tan3"},
+    {{139,  90,  43, 0}, "tan4"},
+    {{255, 127,  36, 0}, "chocolate1"},
+    {{238, 118,  33, 0}, "chocolate2"},
+    {{205, 102,  29, 0}, "chocolate3"},
+    {{139,  69,  19, 0}, "chocolate4"},
+    {{255,  48,  48, 0}, "firebrick1"},
+    {{238,  44,  44, 0}, "firebrick2"},
+    {{205,  38,  38, 0}, "firebrick3"},
+    {{139,  26,  26, 0}, "firebrick4"},
+    {{255,  64,  64, 0}, "brown1"},
+    {{238,  59,  59, 0}, "brown2"},
+    {{205,  51,  51, 0}, "brown3"},
+    {{139,  35,  35, 0}, "brown4"},
+    {{255, 140, 105, 0}, "salmon1"},
+    {{238, 130,  98, 0}, "salmon2"},
+    {{205, 112,  84, 0}, "salmon3"},
+    {{139,  76,  57, 0}, "salmon4"},
+    {{255, 160, 122, 0}, "LightSalmon1"},
+    {{238, 149, 114, 0}, "LightSalmon2"},
+    {{205, 129,  98, 0}, "LightSalmon3"},
+    {{139,  87,  66, 0}, "LightSalmon4"},
+    {{255, 165,   0, 0}, "orange1"},
+    {{238, 154,   0, 0}, "orange2"},
+    {{205, 133,   0, 0}, "orange3"},
+    {{139,  90,   0, 0}, "orange4"},
+    {{255, 127,   0, 0}, "DarkOrange1"},
+    {{238, 118,   0, 0}, "DarkOrange2"},
+    {{205, 102,   0, 0}, "DarkOrange3"},
+    {{139,  69,   0, 0}, "DarkOrange4"},
+    {{255, 114,  86, 0}, "coral1"},
+    {{238, 106,  80, 0}, "coral2"},
+    {{205,  91,  69, 0}, "coral3"},
+    {{139,  62,  47, 0}, "coral4"},
+    {{255,  99,  71, 0}, "tomato1"},
+    {{238,  92,  66, 0}, "tomato2"},
+    {{205,  79,  57, 0}, "tomato3"},
+    {{139,  54,  38, 0}, "tomato4"},
+    {{255,  69,   0, 0}, "OrangeRed1"},
+    {{238,  64,   0, 0}, "OrangeRed2"},
+    {{205,  55,   0, 0}, "OrangeRed3"},
+    {{139,  37,   0, 0}, "OrangeRed4"},
+    {{255,   0,   0, 0}, "red1"},
+    {{238,   0,   0, 0}, "red2"},
+    {{205,   0,   0, 0}, "red3"},
+    {{139,   0,   0, 0}, "red4"},
+    {{255,  20, 147, 0}, "DeepPink1"},
+    {{238,  18, 137, 0}, "DeepPink2"},
+    {{205,  16, 118, 0}, "DeepPink3"},
+    {{139,  10,  80, 0}, "DeepPink4"},
+    {{255, 110, 180, 0}, "HotPink1"},
+    {{238, 106, 167, 0}, "HotPink2"},
+    {{205,  96, 144, 0}, "HotPink3"},
+    {{139,  58,  98, 0}, "HotPink4"},
+    {{255, 181, 197, 0}, "pink1"},
+    {{238, 169, 184, 0}, "pink2"},
+    {{205, 145, 158, 0}, "pink3"},
+    {{139,  99, 108, 0}, "pink4"},
+    {{255, 174, 185, 0}, "LightPink1"},
+    {{238, 162, 173, 0}, "LightPink2"},
+    {{205, 140, 149, 0}, "LightPink3"},
+    {{139,  95, 101, 0}, "LightPink4"},
+    {{255, 130, 171, 0}, "PaleVioletRed1"},
+    {{238, 121, 159, 0}, "PaleVioletRed2"},
+    {{205, 104, 137, 0}, "PaleVioletRed3"},
+    {{139,  71,  93, 0}, "PaleVioletRed4"},
+    {{255,  52, 179, 0}, "maroon1"},
+    {{238,  48, 167, 0}, "maroon2"},
+    {{205,  41, 144, 0}, "maroon3"},
+    {{139,  28,  98, 0}, "maroon4"},
+    {{255,  62, 150, 0}, "VioletRed1"},
+    {{238,  58, 140, 0}, "VioletRed2"},
+    {{205,  50, 120, 0}, "VioletRed3"},
+    {{139,  34,  82, 0}, "VioletRed4"},
+    {{255,   0, 255, 0}, "magenta1"},
+    {{238,   0, 238, 0}, "magenta2"},
+    {{205,   0, 205, 0}, "magenta3"},
+    {{139,   0, 139, 0}, "magenta4"},
+    {{255, 131, 250, 0}, "orchid1"},
+    {{238, 122, 233, 0}, "orchid2"},
+    {{205, 105, 201, 0}, "orchid3"},
+    {{139,  71, 137, 0}, "orchid4"},
+    {{255, 187, 255, 0}, "plum1"},
+    {{238, 174, 238, 0}, "plum2"},
+    {{205, 150, 205, 0}, "plum3"},
+    {{139, 102, 139, 0}, "plum4"},
+    {{224, 102, 255, 0}, "MediumOrchid1"},
+    {{209,  95, 238, 0}, "MediumOrchid2"},
+    {{180,  82, 205, 0}, "MediumOrchid3"},
+    {{122,  55, 139, 0}, "MediumOrchid4"},
+    {{191,  62, 255, 0}, "DarkOrchid1"},
+    {{178,  58, 238, 0}, "DarkOrchid2"},
+    {{154,  50, 205, 0}, "DarkOrchid3"},
+    {{104,  34, 139, 0}, "DarkOrchid4"},
+    {{155,  48, 255, 0}, "purple1"},
+    {{145,  44, 238, 0}, "purple2"},
+    {{125,  38, 205, 0}, "purple3"},
+    {{ 85,  26, 139, 0}, "purple4"},
+    {{171, 130, 255, 0}, "MediumPurple1"},
+    {{159, 121, 238, 0}, "MediumPurple2"},
+    {{137, 104, 205, 0}, "MediumPurple3"},
+    {{ 93,  71, 139, 0}, "MediumPurple4"},
+    {{255, 225, 255, 0}, "thistle1"},
+    {{238, 210, 238, 0}, "thistle2"},
+    {{205, 181, 205, 0}, "thistle3"},
+    {{139, 123, 139, 0}, "thistle4"},
+    {{  0,   0,   0, 0}, "gray0"},
+    {{  0,   0,   0, 0}, "grey0"},
+    {{  3,   3,   3, 0}, "gray1"},
+    {{  3,   3,   3, 0}, "grey1"},
+    {{  5,   5,   5, 0}, "gray2"},
+    {{  5,   5,   5, 0}, "grey2"},
+    {{  8,   8,   8, 0}, "gray3"},
+    {{  8,   8,   8, 0}, "grey3"},
+    {{ 10,  10,  10, 0}, "gray4"},
+    {{ 10,  10,  10, 0}, "grey4"},
+    {{ 13,  13,  13, 0}, "gray5"},
+    {{ 13,  13,  13, 0}, "grey5"},
+    {{ 15,  15,  15, 0}, "gray6"},
+    {{ 15,  15,  15, 0}, "grey6"},
+    {{ 18,  18,  18, 0}, "gray7"},
+    {{ 18,  18,  18, 0}, "grey7"},
+    {{ 20,  20,  20, 0}, "gray8"},
+    {{ 20,  20,  20, 0}, "grey8"},
+    {{ 23,  23,  23, 0}, "gray9"},
+    {{ 23,  23,  23, 0}, "grey9"},
+    {{ 26,  26,  26, 0}, "gray10"},
+    {{ 26,  26,  26, 0}, "grey10"},
+    {{ 28,  28,  28, 0}, "gray11"},
+    {{ 28,  28,  28, 0}, "grey11"},
+    {{ 31,  31,  31, 0}, "gray12"},
+    {{ 31,  31,  31, 0}, "grey12"},
+    {{ 33,  33,  33, 0}, "gray13"},
+    {{ 33,  33,  33, 0}, "grey13"},
+    {{ 36,  36,  36, 0}, "gray14"},
+    {{ 36,  36,  36, 0}, "grey14"},
+    {{ 38,  38,  38, 0}, "gray15"},
+    {{ 38,  38,  38, 0}, "grey15"},
+    {{ 41,  41,  41, 0}, "gray16"},
+    {{ 41,  41,  41, 0}, "grey16"},
+    {{ 43,  43,  43, 0}, "gray17"},
+    {{ 43,  43,  43, 0}, "grey17"},
+    {{ 46,  46,  46, 0}, "gray18"},
+    {{ 46,  46,  46, 0}, "grey18"},
+    {{ 48,  48,  48, 0}, "gray19"},
+    {{ 48,  48,  48, 0}, "grey19"},
+    {{ 51,  51,  51, 0}, "gray20"},
+    {{ 51,  51,  51, 0}, "grey20"},
+    {{ 54,  54,  54, 0}, "gray21"},
+    {{ 54,  54,  54, 0}, "grey21"},
+    {{ 56,  56,  56, 0}, "gray22"},
+    {{ 56,  56,  56, 0}, "grey22"},
+    {{ 59,  59,  59, 0}, "gray23"},
+    {{ 59,  59,  59, 0}, "grey23"},
+    {{ 61,  61,  61, 0}, "gray24"},
+    {{ 61,  61,  61, 0}, "grey24"},
+    {{ 64,  64,  64, 0}, "gray25"},
+    {{ 64,  64,  64, 0}, "grey25"},
+    {{ 66,  66,  66, 0}, "gray26"},
+    {{ 66,  66,  66, 0}, "grey26"},
+    {{ 69,  69,  69, 0}, "gray27"},
+    {{ 69,  69,  69, 0}, "grey27"},
+    {{ 71,  71,  71, 0}, "gray28"},
+    {{ 71,  71,  71, 0}, "grey28"},
+    {{ 74,  74,  74, 0}, "gray29"},
+    {{ 74,  74,  74, 0}, "grey29"},
+    {{ 77,  77,  77, 0}, "gray30"},
+    {{ 77,  77,  77, 0}, "grey30"},
+    {{ 79,  79,  79, 0}, "gray31"},
+    {{ 79,  79,  79, 0}, "grey31"},
+    {{ 82,  82,  82, 0}, "gray32"},
+    {{ 82,  82,  82, 0}, "grey32"},
+    {{ 84,  84,  84, 0}, "gray33"},
+    {{ 84,  84,  84, 0}, "grey33"},
+    {{ 87,  87,  87, 0}, "gray34"},
+    {{ 87,  87,  87, 0}, "grey34"},
+    {{ 89,  89,  89, 0}, "gray35"},
+    {{ 89,  89,  89, 0}, "grey35"},
+    {{ 92,  92,  92, 0}, "gray36"},
+    {{ 92,  92,  92, 0}, "grey36"},
+    {{ 94,  94,  94, 0}, "gray37"},
+    {{ 94,  94,  94, 0}, "grey37"},
+    {{ 97,  97,  97, 0}, "gray38"},
+    {{ 97,  97,  97, 0}, "grey38"},
+    {{ 99,  99,  99, 0}, "gray39"},
+    {{ 99,  99,  99, 0}, "grey39"},
+    {{102, 102, 102, 0}, "gray40"},
+    {{102, 102, 102, 0}, "grey40"},
+    {{105, 105, 105, 0}, "gray41"},
+    {{105, 105, 105, 0}, "grey41"},
+    {{107, 107, 107, 0}, "gray42"},
+    {{107, 107, 107, 0}, "grey42"},
+    {{110, 110, 110, 0}, "gray43"},
+    {{110, 110, 110, 0}, "grey43"},
+    {{112, 112, 112, 0}, "gray44"},
+    {{112, 112, 112, 0}, "grey44"},
+    {{115, 115, 115, 0}, "gray45"},
+    {{115, 115, 115, 0}, "grey45"},
+    {{117, 117, 117, 0}, "gray46"},
+    {{117, 117, 117, 0}, "grey46"},
+    {{120, 120, 120, 0}, "gray47"},
+    {{120, 120, 120, 0}, "grey47"},
+    {{122, 122, 122, 0}, "gray48"},
+    {{122, 122, 122, 0}, "grey48"},
+    {{125, 125, 125, 0}, "gray49"},
+    {{125, 125, 125, 0}, "grey49"},
+    {{127, 127, 127, 0}, "gray50"},
+    {{127, 127, 127, 0}, "grey50"},
+    {{130, 130, 130, 0}, "gray51"},
+    {{130, 130, 130, 0}, "grey51"},
+    {{133, 133, 133, 0}, "gray52"},
+    {{133, 133, 133, 0}, "grey52"},
+    {{135, 135, 135, 0}, "gray53"},
+    {{135, 135, 135, 0}, "grey53"},
+    {{138, 138, 138, 0}, "gray54"},
+    {{138, 138, 138, 0}, "grey54"},
+    {{140, 140, 140, 0}, "gray55"},
+    {{140, 140, 140, 0}, "grey55"},
+    {{143, 143, 143, 0}, "gray56"},
+    {{143, 143, 143, 0}, "grey56"},
+    {{145, 145, 145, 0}, "gray57"},
+    {{145, 145, 145, 0}, "grey57"},
+    {{148, 148, 148, 0}, "gray58"},
+    {{148, 148, 148, 0}, "grey58"},
+    {{150, 150, 150, 0}, "gray59"},
+    {{150, 150, 150, 0}, "grey59"},
+    {{153, 153, 153, 0}, "gray60"},
+    {{153, 153, 153, 0}, "grey60"},
+    {{156, 156, 156, 0}, "gray61"},
+    {{156, 156, 156, 0}, "grey61"},
+    {{158, 158, 158, 0}, "gray62"},
+    {{158, 158, 158, 0}, "grey62"},
+    {{161, 161, 161, 0}, "gray63"},
+    {{161, 161, 161, 0}, "grey63"},
+    {{163, 163, 163, 0}, "gray64"},
+    {{163, 163, 163, 0}, "grey64"},
+    {{166, 166, 166, 0}, "gray65"},
+    {{166, 166, 166, 0}, "grey65"},
+    {{168, 168, 168, 0}, "gray66"},
+    {{168, 168, 168, 0}, "grey66"},
+    {{171, 171, 171, 0}, "gray67"},
+    {{171, 171, 171, 0}, "grey67"},
+    {{173, 173, 173, 0}, "gray68"},
+    {{173, 173, 173, 0}, "grey68"},
+    {{176, 176, 176, 0}, "gray69"},
+    {{176, 176, 176, 0}, "grey69"},
+    {{179, 179, 179, 0}, "gray70"},
+    {{179, 179, 179, 0}, "grey70"},
+    {{181, 181, 181, 0}, "gray71"},
+    {{181, 181, 181, 0}, "grey71"},
+    {{184, 184, 184, 0}, "gray72"},
+    {{184, 184, 184, 0}, "grey72"},
+    {{186, 186, 186, 0}, "gray73"},
+    {{186, 186, 186, 0}, "grey73"},
+    {{189, 189, 189, 0}, "gray74"},
+    {{189, 189, 189, 0}, "grey74"},
+    {{191, 191, 191, 0}, "gray75"},
+    {{191, 191, 191, 0}, "grey75"},
+    {{194, 194, 194, 0}, "gray76"},
+    {{194, 194, 194, 0}, "grey76"},
+    {{196, 196, 196, 0}, "gray77"},
+    {{196, 196, 196, 0}, "grey77"},
+    {{199, 199, 199, 0}, "gray78"},
+    {{199, 199, 199, 0}, "grey78"},
+    {{201, 201, 201, 0}, "gray79"},
+    {{201, 201, 201, 0}, "grey79"},
+    {{204, 204, 204, 0}, "gray80"},
+    {{204, 204, 204, 0}, "grey80"},
+    {{207, 207, 207, 0}, "gray81"},
+    {{207, 207, 207, 0}, "grey81"},
+    {{209, 209, 209, 0}, "gray82"},
+    {{209, 209, 209, 0}, "grey82"},
+    {{212, 212, 212, 0}, "gray83"},
+    {{212, 212, 212, 0}, "grey83"},
+    {{214, 214, 214, 0}, "gray84"},
+    {{214, 214, 214, 0}, "grey84"},
+    {{217, 217, 217, 0}, "gray85"},
+    {{217, 217, 217, 0}, "grey85"},
+    {{219, 219, 219, 0}, "gray86"},
+    {{219, 219, 219, 0}, "grey86"},
+    {{222, 222, 222, 0}, "gray87"},
+    {{222, 222, 222, 0}, "grey87"},
+    {{224, 224, 224, 0}, "gray88"},
+    {{224, 224, 224, 0}, "grey88"},
+    {{227, 227, 227, 0}, "gray89"},
+    {{227, 227, 227, 0}, "grey89"},
+    {{229, 229, 229, 0}, "gray90"},
+    {{229, 229, 229, 0}, "grey90"},
+    {{232, 232, 232, 0}, "gray91"},
+    {{232, 232, 232, 0}, "grey91"},
+    {{235, 235, 235, 0}, "gray92"},
+    {{235, 235, 235, 0}, "grey92"},
+    {{237, 237, 237, 0}, "gray93"},
+    {{237, 237, 237, 0}, "grey93"},
+    {{240, 240, 240, 0}, "gray94"},
+    {{240, 240, 240, 0}, "grey94"},
+    {{242, 242, 242, 0}, "gray95"},
+    {{242, 242, 242, 0}, "grey95"},
+    {{245, 245, 245, 0}, "gray96"},
+    {{245, 245, 245, 0}, "grey96"},
+    {{247, 247, 247, 0}, "gray97"},
+    {{247, 247, 247, 0}, "grey97"},
+    {{250, 250, 250, 0}, "gray98"},
+    {{250, 250, 250, 0}, "grey98"},
+    {{252, 252, 252, 0}, "gray99"},
+    {{252, 252, 252, 0}, "grey99"},
+    {{255, 255, 255, 0}, "gray100"},
+    {{255, 255, 255, 0}, "grey100"},
+    {{169, 169, 169, 0}, "dark"},
+    {{169, 169, 169, 0}, "DarkGrey"},
+    {{169, 169, 169, 0}, "dark"},
+    {{169, 169, 169, 0}, "DarkGray"},
+    {{  0,   0, 139, 0}, "dark"},
+    {{  0,   0, 139, 0}, "DarkBlue"},
+    {{  0, 139, 139, 0}, "dark"},
+    {{  0, 139, 139, 0}, "DarkCyan"},
+    {{139,   0, 139, 0}, "dark"},
+    {{139,   0, 139, 0}, "DarkMagenta"},
+    {{139,   0,   0, 0}, "dark"},
+    {{139,   0,   0, 0}, "DarkRed"},
+    {{144, 238, 144, 0}, "light"},
+    {{144, 238, 144, 0}, "LightGreen"},
+    {{  0,   0,   0, 0}, NULL}
+};
+
+#endif
+
diff -r bd0c670bda80 -r ca5197e5c897 WINGs/wcolorpanel.c
--- a/WINGs/wcolorpanel.c	Tue Apr 25 16:52:43 2006 -0700
+++ b/WINGs/wcolorpanel.c	Wed Apr 26 13:28:24 2006 -0700
@@ -26,6 +26,7 @@
 
 #include "wconfig.h"
 #include "WINGsP.h"
+#include "rgb.h"
 #include <math.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -47,11 +48,6 @@
 
 #ifdef SHAPE
 # include <X11/extensions/shape.h>
-#endif
-
-
-#ifndef PATH_MAX
-# define PATH_MAX	1024
 #endif
 
 
@@ -258,25 +254,21 @@
 } colorListMenuItem;
 
 
-#define	PWIDTH			194
-#define	PHEIGHT			266
-#define	colorWheelSize		150
-#define	customPaletteWidth	182
-#define	customPaletteHeight	106
-#define	knobThickness		8
+#define	PWIDTH                  194
+#define	PHEIGHT                 266
+#define	colorWheelSize          150
+#define	customPaletteWidth      182
+#define	customPaletteHeight     106
+#define	knobThickness           8
 
-#define	SPECTRUM_WIDTH		511
-#define	SPECTRUM_HEIGHT		360
+#define	SPECTRUM_WIDTH          511
+#define	SPECTRUM_HEIGHT         360
 
-#define	COLORWHEEL_PART		1
-#define	CUSTOMPALETTE_PART	2
-#define	BUFSIZE			1024
+#define	COLORWHEEL_PART         1
+#define	CUSTOMPALETTE_PART      2
+#define	BUFSIZE                 1024
 
-#ifndef RGBTXT
-#define RGBTXT "/usr/X11R6/lib/X11/rgb.txt"
-#endif
-
-#define MAX_LENGTH  1024
+#define MAX_LENGTH              1024
 
 
 #ifndef M_PI
@@ -1267,42 +1259,19 @@
         }
         wfree(path);
     }
-    (void)closedir(dPtr);
+    closedir(dPtr);
 }
 
 
 static void
 readXColors(W_ColorPanel *panel)
 {
-    struct stat		stat_buf;
-    FILE		*rgbtxt;
-    char		line[MAX_LENGTH];
-    int			red, green, blue;
-    char		name[48];
-    RColor		*color;
-    WMListItem		*item;
+    WMListItem *item;
+    RGBColor *entry;
 
-    if (stat(RGBTXT, &stat_buf) != 0) {
-        wsyserror(_("Color Panel: Could not find file"), " %s", RGBTXT);
-        return;
-    }
-    else {
-        if ((rgbtxt = fopen(RGBTXT, "rb"))) {
-            while (fgets(line, MAX_LENGTH, rgbtxt)) {
-                if (sscanf(line, "%d%d%d %[^\n]", &red, &green, &blue, name)) {
-                    color = wmalloc(sizeof(RColor));
-                    color->red = (unsigned char)red;
-                    color->green = (unsigned char)green;
-                    color->blue = (unsigned char)blue;
-                    item = WMAddListItem(panel->colorListContentLst, name);
-                    item->clientData = (void *)color;
-                }
-            }
-            fclose(rgbtxt);
-        }
-        else {
-            wsyserror(_("Color Panel: Could not find file"), "%s", RGBTXT);
-        }
+    for (entry=rgbColors; entry->name!=NULL; entry++) {
+        item = WMAddListItem(panel->colorListContentLst, entry->name);
+        item->clientData = (void *)&(entry->color);
     }
 }
 
@@ -1310,7 +1279,7 @@
 void
 WMSetColorPanelPickerMode(WMColorPanel *panel, WMColorPanelMode mode)
 {
-    W_Screen	*scr = WMWidgetScreen(panel->win);
+    W_Screen *scr = WMWidgetScreen(panel->win);
 
     if (mode != WMWheelModeColorPanel) {
         WMUnmapWidget(panel->wheelFrm);
@@ -3426,7 +3395,7 @@
     WMScreen *scr = WMWidgetScreen(lPtr);
     Display *dpy = WMScreenDisplay(scr);
     WMView *view = W_VIEW(lPtr);
-    RColor color = *((RColor *)WMGetListItem(lPtr, index)->clientData);
+    RColor *color = (RColor *)WMGetListItem(lPtr, index)->clientData;
     W_ColorPanel *panel = WMGetHangedData(lPtr);
     int	width, height, x, y;
     WMColor *fillColor;
@@ -3441,8 +3410,8 @@
     else
         XFillRectangle(dpy, d, WMColorGC(view->backColor), x, y, width, height);
 
-    fillColor = WMCreateRGBColor(scr, color.red<<8, color.green<<8,
-                                 color.blue<<8, True);
+    fillColor = WMCreateRGBColor(scr, color->red<<8, color->green<<8,
+                                 color->blue<<8, True);
 
     XFillRectangle(dpy, d, WMColorGC(fillColor), x, y, 15, height);
     WMReleaseColor(fillColor);
@@ -3454,8 +3423,8 @@
 static void
 colorListSelect(WMWidget *w, void *data)
 {
-    W_ColorPanel	*panel = (W_ColorPanel *)data;
-    CPColor		cpColor;
+    W_ColorPanel *panel = (W_ColorPanel *)data;
+    CPColor cpColor;
 
     cpColor.rgb = *((RColor *)WMGetListSelectedItem(w)->clientData);
     cpColor.set = cpRGB;


-- 
To unsubscribe, send mail to wmaker-dev-unsubscribe@lists.windowmaker.info.