diff options
40 files changed, 1036 insertions, 857 deletions
diff --git a/config/cf/X11.tmpl b/config/cf/X11.tmpl index 420010af9..65fd0ecba 100644 --- a/config/cf/X11.tmpl +++ b/config/cf/X11.tmpl @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.103 2001/03/21 17:36:43 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.104 2001/03/22 18:30:10 dawes Exp $ /*************************************************************************** * * @@ -23,10 +23,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.103 2001/03/21 17:36:43 dawes Exp $ * InstallAppDefaults (class) * InstallAppDefaultsLong (file,class) * MakeFontsDir (deplist) + * MakeXftCache (deplist) * MakeFonts () * InstallFontObjs (objs,dest) * InstallFonts (dest) * InstallFontAliases (dest) + * InstallXftCache (dest) * FontSrc (basename) * FontBaseObj (basename) * InstallFontScale (dest) @@ -1260,6 +1262,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir + XFTCACHE = $(CLIENTENVSETUP) $(XBUILDBINDIR)/xftcache #if HasPerl MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) #else @@ -1906,6 +1909,28 @@ SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) #endif +#ifndef SharedLibXmuu +#define SharedLibXmuu HasSharedLibraries +#endif +#ifndef NormalLibXmuu +#define NormalLibXmuu (!SharedLibXmuu | ForceNormalLib) +#endif +#ifndef DebugLibXmuu +#define DebugLibXmuu NO /* debugged Xmuu library */ +#endif +#ifndef ProfileLibXmuu +#define ProfileLibXmuu NO /* profiled Xmuu library */ +#endif + XMUUSRC = $(LIBSRC)/Xmuu +#if SharedLibXmuu +#ifndef SharedXmuuRev +#define SharedXmuuRev 1.0 +#endif +SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) +#else +ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) +#endif + #ifndef SharedOldX #define SharedOldX HasSharedLibraries #endif @@ -2384,6 +2409,13 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) #endif #endif +#ifndef XmuuClientDepLibs +#define XmuuClientDepLibs $(DEPXMUULIB) $(DEPXLIB) +#endif +#ifndef XmuuClientLibs +#define XmuuClientLibs $(XMUULIB) $(XLIB) +#endif + #ifndef LdLibraryPath #define LdLibraryPath LD_LIBRARY_PATH #endif @@ -2505,6 +2537,41 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif /* InstallAppDefaultsLong */ /* + * MakeXftCache - generate rules to build XftCache database + */ + +#ifdef UseFreetype2 + +#ifndef MakeXftCache +#define MakeXftCache(deplist) @@\ +all:: XftCache @@\ + @@\ +XftCache: deplist @@\ + RunProgram(XFTCACHE, $(XFTCACHEOPTS) .) @@\ + @@\ +clean:: @@\ + RemoveFile(XftCache) +#endif /* MakeXftCache */ + +#ifndef InstallXftCache +#define InstallXftCache(dest) @@\ +InstallTarget(install,XftCache,$(INSTDATFLAGS),dest) +#endif /* InstallXftCache */ + +#else + +#ifndef MakeXftCache +#define MakeXftCache(deplist) +#endif + +#ifndef InstallXftCache +#define InstallXftCache(dest) +#endif + +#endif + + +/* * MakeFontsDir - generate rules to build fonts.dir database. */ #ifndef MakeFontsDir diff --git a/config/cf/cross.def b/config/cf/cross.def index 20b8ad6fc..f3048b089 100644 --- a/config/cf/cross.def +++ b/config/cf/cross.def @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */ /* * This file contains redefinitions of some symbols to enable * cross compilation: e.g. paths for include files and paths to @@ -20,6 +20,9 @@ #undef PostIncDir #define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include #define CcCmd /skiff/local/bin/arm-linux-gcc +#undef CplusplusCmd +#define HasCplusplus YES +#define CplusplusCmd /skiff/local/bin/arm-linux-g++ #define DoRanlibCmd YES #define RanlibCmd /skiff/local/bin/arm-linux-ranlib #undef ExtraLoadFlags diff --git a/fonts/scaled/Type1/Imakefile b/fonts/scaled/Type1/Imakefile index 7e7622fee..9c287d047 100644 --- a/fonts/scaled/Type1/Imakefile +++ b/fonts/scaled/Type1/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ -XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.9 2000/03/06 22:59:11 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.10 2001/01/17 17:33:11 dawes Exp $ #define PassCDebugFlags /* as nothing */ @@ -26,10 +26,12 @@ OBJS = $(FONTS) $(BHFONTS) $(AFMS) $(BHAFMS) FONTINSTDIR = $(FONTDIR)/Type1 MakeFontsDir(fonts.scale) +MakeXftCache($(FONTS)) InstallFonts($(FONTINSTDIR)) InstallFontScale($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) +InstallXftCache($(FONTINSTDIR)) #ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) diff --git a/lib/Imakefile b/lib/Imakefile index 9679b358b..c3dae9d59 100644 --- a/lib/Imakefile +++ b/lib/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:00 cpqbld Exp $ -XCOMM $XFree86: xc/lib/Imakefile,v 3.49 2001/03/18 14:50:32 dawes Exp $ +XCOMM $XFree86: xc/lib/Imakefile,v 3.50 2001/03/21 17:36:44 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -122,7 +122,7 @@ FONTSUBDIR = font #if !BuildServersOnly LINTSUBDIRS = Xau Xdmcp $(THRSTUBLIBDIR) X11 oldX ICE SM Xext Xt \ $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \ - $(XF86RUSHLIBDIR) Xmu Xpm Xaw $(XAW6LIBDIR) XIE Xi Xtst FS \ + $(XF86RUSHLIBDIR) Xmu Xmuu Xpm Xaw $(XAW6LIBDIR) XIE Xi Xtst FS \ PEX5 $(XKBLIBDIR) $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) \ Xp $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ diff --git a/lib/Xft/XftFreetype.h b/lib/Xft/XftFreetype.h index 8ea1e3035..f66d0df2d 100644 --- a/lib/Xft/XftFreetype.h +++ b/lib/Xft/XftFreetype.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/XftFreetype.h,v 1.11 2000/12/22 05:05:16 tsi Exp $ + * $XFree86: xc/lib/Xft/XftFreetype.h,v 1.12 2001/01/02 02:46:50 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -157,9 +157,6 @@ XftRenderExtentsUtf8 (Display *dpy, int len, XGlyphInfo *extents); -XftFontStruct * -XftFreeTypeGet (XftFont *font); - _XFUNCPROTOEND #endif /* _XFTFREETYPE_H_ */ diff --git a/lib/Xft/xftint.h b/lib/Xft/xftint.h index ae09758e7..2376d7bd9 100644 --- a/lib/Xft/xftint.h +++ b/lib/Xft/xftint.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftint.h,v 1.20 2001/01/02 02:46:51 keithp Exp $ + * $XFree86: xc/lib/Xft/xftint.h,v 1.21 2001/01/26 20:51:16 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -393,8 +393,6 @@ void XftEditDestroy (XftEdit *e); /* xftinit.c */ -Bool -XftInit (char *config); /* xftlex.l */ extern int XftConfigLineno; diff --git a/lib/Xmu/CursorName.c b/lib/Xmu/CursorName.c index 6371f51f2..a0c4dfc1b 100644 --- a/lib/Xmu/CursorName.c +++ b/lib/Xmu/CursorName.c @@ -21,9 +21,8 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.4 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.5 2001/01/17 19:42:54 dawes Exp $ */ -#include <X11/Intrinsic.h> #include <X11/Xmu/CharSet.h> #include <X11/Xmu/CurUtil.h> #include <X11/cursorfont.h> @@ -113,14 +112,15 @@ XmuCursorNameToIndex(_Xconst char *name) {"watch", XC_watch}, {"xterm", XC_xterm}, }; +#define NUM_CURSOR_NAMES (sizeof (cursor_names) / sizeof (cursor_names[0])) register _Xconst struct _CursorName *table; - register Cardinal i; + register int i; char tmp[40]; if (strlen (name) >= sizeof tmp) return -1; XmuCopyISOLatin1Lowered (tmp, name); - for (i=0, table=cursor_names; i < XtNumber(cursor_names); i++, table++ ) { + for (i=0, table=cursor_names; i < NUM_CURSOR_NAMES; i++, table++ ) { if (strcmp(tmp, table->name) == 0) return table->shape; } diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile index 33ac8eb31..79fd712cd 100644 --- a/programs/Xserver/Imakefile +++ b/programs/Xserver/Imakefile @@ -2,7 +2,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:47:01 cpqbld Exp $ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.213 2001/03/24 23:08:52 torrey Exp $ +XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.214 2001/03/29 02:06:50 torrey Exp $ #ifndef InstallXserverSetUID #define InstallXserverSetUID NO @@ -819,6 +819,37 @@ $(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS) ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS),$(TRIDENTLIBS),$(TRIDENTSYSLIBS)) #endif /* XTRIDENTServer */ +#if Xi810Server +XCOMM +XCOMM server with Intel i810 driver +XCOMM + + FBDEVDIR = $(KDRIVE)/fbdev + FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + VESADIR = $(KDRIVE)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + SHADOWDIR = miext/shadow + I810DIR = $(KDRIVE)/i810 + I810 = $(I810DIR)/LibraryTargetName(i810) + + KDDIRS = StdKdDirs + + I810DIRS = $(STDDIRS) $(KDDIRS) $(SHADOWDIR) $(I810DIR) + + I810LIBS = PreFbLibs $(I810) KdLibs FbPostFbLibs + I810SYSLIBS = StdKdSysLibs + +#if HasParallelMake +MakeMutex($(I810DIRS) $(I810LIBS) $(I810SYSLIBS)) +#endif +#if ForceServerRemake +$(I810OBJS) $(I810LIBS) $(I810SYSLIBS):: $(I810DIRS) + @if [ -f $@ ]; then touch $@; fi +#endif +ServerTarget(Xi810,$(I810DIRS),$(I810OBJS),$(I810LIBS),$(I810SYSLIBS)) +#endif /* Xi810Server */ + + #if XSis530Server XCOMM XCOMM server with Keith's SiS 530 driver @@ -951,7 +982,7 @@ $(VESAOBJS) $(XVESA) $(VESALIBS) $(VESASYSLIBS):: $(VESADIRS) ServerTarget(Xvesa,$(VESADIRS),$(VESAOBJS),$(VESALIBS),$(VESASYSLIBS)) #endif /* XvesaServer */ -KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \ +KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(I810DIR) $(SIS530DIR) \ $(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR) $(VESADIR) #endif /* KDriveXServer */ diff --git a/programs/Xserver/fb/fb.h b/programs/Xserver/fb/fb.h index 5e2a84f26..761290153 100644 --- a/programs/Xserver/fb/fb.h +++ b/programs/Xserver/fb/fb.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.24 2001/01/21 21:19:09 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.25 2001/03/28 14:37:03 alanh Exp $ * * Copyright © 1998 Keith Packard * @@ -1233,6 +1233,10 @@ Bool fbSetVisualTypes (int depth, int visuals, int bitsPerRGB); Bool +fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, + Pixel redMask, Pixel greenMask, Pixel blueMask); + +Bool fbInitVisuals (VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, diff --git a/programs/Xserver/hw/kdrive/Imakefile b/programs/Xserver/hw/kdrive/Imakefile index 0c1b9b652..874e16196 100644 --- a/programs/Xserver/hw/kdrive/Imakefile +++ b/programs/Xserver/hw/kdrive/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Imakefile,v 1.4 2000/09/15 15:19:00 keithp Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/Imakefile,v 1.5 2000/12/01 00:01:30 keithp Exp $ KDRIVE=. #include "Kdrive.tmpl" @@ -8,11 +8,16 @@ RENDERSRCS=kpict.c RENDEROBJS=kpict.o #endif +#if BuildXvExt +XVSRCS=kxv.c +XVOBJS=kxv.o +#endif + SRCS = kcmap.c kcolor.c kdrive.c kinfo.c kinput.c kmap.c knoop.c ktest.c \ - vga.c kasync.c kmode.c kcurscol.c kshadow.c $(RENDERSRCS) + vga.c kasync.c kmode.c kcurscol.c kshadow.c $(RENDERSRCS) $(XVSRCS) OBJS = kcmap.o kcolor.o kdrive.o kinfo.o kinput.o kmap.o knoop.o ktest.o \ - vga.o kasync.o kmode.o kcurscol.o kshadow.o $(RENDEROBJS) + vga.o kasync.o kmode.o kcurscol.o kshadow.o $(RENDEROBJS) $(XVOBJS) INCLUDES = $(KDINCS) diff --git a/programs/Xserver/hw/kdrive/fbdev/fbdev.c b/programs/Xserver/hw/kdrive/fbdev/fbdev.c index 040dc05b1..9cab4cfb8 100644 --- a/programs/Xserver/hw/kdrive/fbdev/fbdev.c +++ b/programs/Xserver/hw/kdrive/fbdev/fbdev.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.9 2000/09/27 20:46:36 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.10 2000/10/03 17:22:14 keithp Exp $ */ #include "fbdev.h" @@ -119,6 +119,11 @@ fbdevScreenInitialize (KdScreenInfo *screen, FbdevScrPriv *scrpriv) screen->fb[0].redMask = Mask (priv->var.red.offset, priv->var.red.length); screen->fb[0].greenMask = Mask (priv->var.green.offset, priv->var.green.length); screen->fb[0].blueMask = Mask (priv->var.blue.offset, priv->var.blue.length); +#ifdef ITSY + screen->fb[0].redMask = 0xf800; + screen->fb[0].greenMask = 0x07e0; + screen->fb[0].blueMask = 0x001f; +#endif allbits = screen->fb[0].redMask | screen->fb[0].greenMask | screen->fb[0].blueMask; depth = 32; while (depth && !(allbits & (1 << (depth - 1)))) diff --git a/programs/Xserver/hw/kdrive/kasync.c b/programs/Xserver/hw/kdrive/kasync.c index 4664e3f19..3dd86b851 100644 --- a/programs/Xserver/hw/kdrive/kasync.c +++ b/programs/Xserver/hw/kdrive/kasync.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.5 2000/08/26 00:24:37 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.7 2000/09/22 06:25:29 keithp Exp $ */ #include "kdrive.h" @@ -287,12 +287,12 @@ const GCOps kdAsyncPixmapGCOps = { KdCheckCopyPlane, fbPolyPoint, fbPolyLine, - miPolySegment, - miPolyRectangle, + fbPolySegment, + fbPolyRectangle, fbPolyArc, - miFillPolygon, + fbFillPolygon, fbPolyFillRect, - miPolyFillArc, + fbPolyFillArc, miPolyText8, miPolyText16, miImageText8, diff --git a/programs/Xserver/hw/kdrive/kcolor.c b/programs/Xserver/hw/kdrive/kcolor.c index ba289003b..e464b413f 100644 --- a/programs/Xserver/hw/kdrive/kcolor.c +++ b/programs/Xserver/hw/kdrive/kcolor.c @@ -73,758 +73,758 @@ typedef struct _kdNamedColor { #define C 0x101 const KdNamedColor KdColors[] = { -240*C, 248*C, 255*C, "alice blue", -240*C, 248*C, 255*C, "AliceBlue", -250*C, 235*C, 215*C, "antique white", -250*C, 235*C, 215*C, "AntiqueWhite", -255*C, 239*C, 219*C, "AntiqueWhite1", -238*C, 223*C, 204*C, "AntiqueWhite2", -205*C, 192*C, 176*C, "AntiqueWhite3", -139*C, 131*C, 120*C, "AntiqueWhite4", -127*C, 255*C, 212*C, "aquamarine", -127*C, 255*C, 212*C, "aquamarine1", -118*C, 238*C, 198*C, "aquamarine2", -102*C, 205*C, 170*C, "aquamarine3", - 69*C, 139*C, 116*C, "aquamarine4", -240*C, 255*C, 255*C, "azure", -240*C, 255*C, 255*C, "azure1", -224*C, 238*C, 238*C, "azure2", -193*C, 205*C, 205*C, "azure3", -131*C, 139*C, 139*C, "azure4", -245*C, 245*C, 220*C, "beige", -255*C, 228*C, 196*C, "bisque", -255*C, 228*C, 196*C, "bisque1", -238*C, 213*C, 183*C, "bisque2", -205*C, 183*C, 158*C, "bisque3", -139*C, 125*C, 107*C, "bisque4", - 0*C, 0*C, 0*C, "black", -255*C, 235*C, 205*C, "blanched almond", -255*C, 235*C, 205*C, "BlanchedAlmond", - 0*C, 0*C, 255*C, "blue", -138*C, 43*C, 226*C, "blue violet", - 0*C, 0*C, 255*C, "blue1", - 0*C, 0*C, 238*C, "blue2", - 0*C, 0*C, 205*C, "blue3", - 0*C, 0*C, 139*C, "blue4", -138*C, 43*C, 226*C, "BlueViolet", -165*C, 42*C, 42*C, "brown", -255*C, 64*C, 64*C, "brown1", -238*C, 59*C, 59*C, "brown2", -205*C, 51*C, 51*C, "brown3", -139*C, 35*C, 35*C, "brown4", -222*C, 184*C, 135*C, "burlywood", -255*C, 211*C, 155*C, "burlywood1", -238*C, 197*C, 145*C, "burlywood2", -205*C, 170*C, 125*C, "burlywood3", -139*C, 115*C, 85*C, "burlywood4", - 95*C, 158*C, 160*C, "cadet blue", - 95*C, 158*C, 160*C, "CadetBlue", -152*C, 245*C, 255*C, "CadetBlue1", -142*C, 229*C, 238*C, "CadetBlue2", -122*C, 197*C, 205*C, "CadetBlue3", - 83*C, 134*C, 139*C, "CadetBlue4", -127*C, 255*C, 0*C, "chartreuse", -127*C, 255*C, 0*C, "chartreuse1", -118*C, 238*C, 0*C, "chartreuse2", -102*C, 205*C, 0*C, "chartreuse3", -69*C, 139*C, 0*C, "chartreuse4", -210*C, 105*C, 30*C, "chocolate", -255*C, 127*C, 36*C, "chocolate1", -238*C, 118*C, 33*C, "chocolate2", -205*C, 102*C, 29*C, "chocolate3", -139*C, 69*C, 19*C, "chocolate4", -255*C, 127*C, 80*C, "coral", -255*C, 114*C, 86*C, "coral1", -238*C, 106*C, 80*C, "coral2", -205*C, 91*C, 69*C, "coral3", -139*C, 62*C, 47*C, "coral4", -100*C, 149*C, 237*C, "cornflower blue", -100*C, 149*C, 237*C, "CornflowerBlue", -255*C, 248*C, 220*C, "cornsilk", -255*C, 248*C, 220*C, "cornsilk1", -238*C, 232*C, 205*C, "cornsilk2", -205*C, 200*C, 177*C, "cornsilk3", -139*C, 136*C, 120*C, "cornsilk4", - 0*C, 255*C, 255*C, "cyan", - 0*C, 255*C, 255*C, "cyan1", - 0*C, 238*C, 238*C, "cyan2", - 0*C, 205*C, 205*C, "cyan3", - 0*C, 139*C, 139*C, "cyan4", -0*C, 0*C, 139*C, "dark blue", -0*C, 139*C, 139*C, "dark cyan", -184*C, 134*C, 11*C, "dark goldenrod", -169*C, 169*C, 169*C, "dark gray", - 0*C, 100*C, 0*C, "dark green", -169*C, 169*C, 169*C, "dark grey", -189*C, 183*C, 107*C, "dark khaki", -139*C, 0*C, 139*C, "dark magenta", - 85*C, 107*C, 47*C, "dark olive green", -255*C, 140*C, 0*C, "dark orange", -153*C, 50*C, 204*C, "dark orchid", -139*C, 0*C, 0*C, "dark red", -233*C, 150*C, 122*C, "dark salmon", -143*C, 188*C, 143*C, "dark sea green", - 72*C, 61*C, 139*C, "dark slate blue", - 47*C, 79*C, 79*C, "dark slate gray", - 47*C, 79*C, 79*C, "dark slate grey", - 0*C, 206*C, 209*C, "dark turquoise", -148*C, 0*C, 211*C, "dark violet", -0*C, 0*C, 139*C, "DarkBlue", -0*C, 139*C, 139*C, "DarkCyan", -184*C, 134*C, 11*C, "DarkGoldenrod", -255*C, 185*C, 15*C, "DarkGoldenrod1", -238*C, 173*C, 14*C, "DarkGoldenrod2", -205*C, 149*C, 12*C, "DarkGoldenrod3", -139*C, 101*C, 8*C, "DarkGoldenrod4", -169*C, 169*C, 169*C, "DarkGray", - 0*C, 100*C, 0*C, "DarkGreen", -169*C, 169*C, 169*C, "DarkGrey", -189*C, 183*C, 107*C, "DarkKhaki", -139*C, 0*C, 139*C, "DarkMagenta", - 85*C, 107*C, 47*C, "DarkOliveGreen", -202*C, 255*C, 112*C, "DarkOliveGreen1", -188*C, 238*C, 104*C, "DarkOliveGreen2", -162*C, 205*C, 90*C, "DarkOliveGreen3", -110*C, 139*C, 61*C, "DarkOliveGreen4", -255*C, 140*C, 0*C, "DarkOrange", -255*C, 127*C, 0*C, "DarkOrange1", -238*C, 118*C, 0*C, "DarkOrange2", -205*C, 102*C, 0*C, "DarkOrange3", -139*C, 69*C, 0*C, "DarkOrange4", -153*C, 50*C, 204*C, "DarkOrchid", -191*C, 62*C, 255*C, "DarkOrchid1", -178*C, 58*C, 238*C, "DarkOrchid2", -154*C, 50*C, 205*C, "DarkOrchid3", -104*C, 34*C, 139*C, "DarkOrchid4", -139*C, 0*C, 0*C, "DarkRed", -233*C, 150*C, 122*C, "DarkSalmon", -143*C, 188*C, 143*C, "DarkSeaGreen", -193*C, 255*C, 193*C, "DarkSeaGreen1", -180*C, 238*C, 180*C, "DarkSeaGreen2", -155*C, 205*C, 155*C, "DarkSeaGreen3", -105*C, 139*C, 105*C, "DarkSeaGreen4", - 72*C, 61*C, 139*C, "DarkSlateBlue", - 47*C, 79*C, 79*C, "DarkSlateGray", -151*C, 255*C, 255*C, "DarkSlateGray1", -141*C, 238*C, 238*C, "DarkSlateGray2", -121*C, 205*C, 205*C, "DarkSlateGray3", - 82*C, 139*C, 139*C, "DarkSlateGray4", - 47*C, 79*C, 79*C, "DarkSlateGrey", - 0*C, 206*C, 209*C, "DarkTurquoise", -148*C, 0*C, 211*C, "DarkViolet", -255*C, 20*C, 147*C, "deep pink", - 0*C, 191*C, 255*C, "deep sky blue", -255*C, 20*C, 147*C, "DeepPink", -255*C, 20*C, 147*C, "DeepPink1", -238*C, 18*C, 137*C, "DeepPink2", -205*C, 16*C, 118*C, "DeepPink3", -139*C, 10*C, 80*C, "DeepPink4", - 0*C, 191*C, 255*C, "DeepSkyBlue", - 0*C, 191*C, 255*C, "DeepSkyBlue1", - 0*C, 178*C, 238*C, "DeepSkyBlue2", - 0*C, 154*C, 205*C, "DeepSkyBlue3", - 0*C, 104*C, 139*C, "DeepSkyBlue4", -105*C, 105*C, 105*C, "dim gray", -105*C, 105*C, 105*C, "dim grey", -105*C, 105*C, 105*C, "DimGray", -105*C, 105*C, 105*C, "DimGrey", - 30*C, 144*C, 255*C, "dodger blue", - 30*C, 144*C, 255*C, "DodgerBlue", - 30*C, 144*C, 255*C, "DodgerBlue1", - 28*C, 134*C, 238*C, "DodgerBlue2", - 24*C, 116*C, 205*C, "DodgerBlue3", - 16*C, 78*C, 139*C, "DodgerBlue4", -178*C, 34*C, 34*C, "firebrick", -255*C, 48*C, 48*C, "firebrick1", -238*C, 44*C, 44*C, "firebrick2", -205*C, 38*C, 38*C, "firebrick3", -139*C, 26*C, 26*C, "firebrick4", -255*C, 250*C, 240*C, "floral white", -255*C, 250*C, 240*C, "FloralWhite", - 34*C, 139*C, 34*C, "forest green", - 34*C, 139*C, 34*C, "ForestGreen", -220*C, 220*C, 220*C, "gainsboro", -248*C, 248*C, 255*C, "ghost white", -248*C, 248*C, 255*C, "GhostWhite", -255*C, 215*C, 0*C, "gold", -255*C, 215*C, 0*C, "gold1", -238*C, 201*C, 0*C, "gold2", -205*C, 173*C, 0*C, "gold3", -139*C, 117*C, 0*C, "gold4", -218*C, 165*C, 32*C, "goldenrod", -255*C, 193*C, 37*C, "goldenrod1", -238*C, 180*C, 34*C, "goldenrod2", -205*C, 155*C, 29*C, "goldenrod3", -139*C, 105*C, 20*C, "goldenrod4", -190*C, 190*C, 190*C, "gray", - 0*C, 0*C, 0*C, "gray0", - 3*C, 3*C, 3*C, "gray1", - 26*C, 26*C, 26*C, "gray10", -255*C, 255*C, 255*C, "gray100", - 28*C, 28*C, 28*C, "gray11", - 31*C, 31*C, 31*C, "gray12", - 33*C, 33*C, 33*C, "gray13", - 36*C, 36*C, 36*C, "gray14", - 38*C, 38*C, 38*C, "gray15", - 41*C, 41*C, 41*C, "gray16", - 43*C, 43*C, 43*C, "gray17", - 46*C, 46*C, 46*C, "gray18", - 48*C, 48*C, 48*C, "gray19", - 5*C, 5*C, 5*C, "gray2", - 51*C, 51*C, 51*C, "gray20", - 54*C, 54*C, 54*C, "gray21", - 56*C, 56*C, 56*C, "gray22", - 59*C, 59*C, 59*C, "gray23", - 61*C, 61*C, 61*C, "gray24", - 64*C, 64*C, 64*C, "gray25", - 66*C, 66*C, 66*C, "gray26", - 69*C, 69*C, 69*C, "gray27", - 71*C, 71*C, 71*C, "gray28", - 74*C, 74*C, 74*C, "gray29", - 8*C, 8*C, 8*C, "gray3", - 77*C, 77*C, 77*C, "gray30", - 79*C, 79*C, 79*C, "gray31", - 82*C, 82*C, 82*C, "gray32", - 84*C, 84*C, 84*C, "gray33", - 87*C, 87*C, 87*C, "gray34", - 89*C, 89*C, 89*C, "gray35", - 92*C, 92*C, 92*C, "gray36", - 94*C, 94*C, 94*C, "gray37", - 97*C, 97*C, 97*C, "gray38", - 99*C, 99*C, 99*C, "gray39", - 10*C, 10*C, 10*C, "gray4", -102*C, 102*C, 102*C, "gray40", -105*C, 105*C, 105*C, "gray41", -107*C, 107*C, 107*C, "gray42", -110*C, 110*C, 110*C, "gray43", -112*C, 112*C, 112*C, "gray44", -115*C, 115*C, 115*C, "gray45", -117*C, 117*C, 117*C, "gray46", -120*C, 120*C, 120*C, "gray47", -122*C, 122*C, 122*C, "gray48", -125*C, 125*C, 125*C, "gray49", - 13*C, 13*C, 13*C, "gray5", -127*C, 127*C, 127*C, "gray50", -130*C, 130*C, 130*C, "gray51", -133*C, 133*C, 133*C, "gray52", -135*C, 135*C, 135*C, "gray53", -138*C, 138*C, 138*C, "gray54", -140*C, 140*C, 140*C, "gray55", -143*C, 143*C, 143*C, "gray56", -145*C, 145*C, 145*C, "gray57", -148*C, 148*C, 148*C, "gray58", -150*C, 150*C, 150*C, "gray59", - 15*C, 15*C, 15*C, "gray6", -153*C, 153*C, 153*C, "gray60", -156*C, 156*C, 156*C, "gray61", -158*C, 158*C, 158*C, "gray62", -161*C, 161*C, 161*C, "gray63", -163*C, 163*C, 163*C, "gray64", -166*C, 166*C, 166*C, "gray65", -168*C, 168*C, 168*C, "gray66", -171*C, 171*C, 171*C, "gray67", -173*C, 173*C, 173*C, "gray68", -176*C, 176*C, 176*C, "gray69", - 18*C, 18*C, 18*C, "gray7", -179*C, 179*C, 179*C, "gray70", -181*C, 181*C, 181*C, "gray71", -184*C, 184*C, 184*C, "gray72", -186*C, 186*C, 186*C, "gray73", -189*C, 189*C, 189*C, "gray74", -191*C, 191*C, 191*C, "gray75", -194*C, 194*C, 194*C, "gray76", -196*C, 196*C, 196*C, "gray77", -199*C, 199*C, 199*C, "gray78", -201*C, 201*C, 201*C, "gray79", - 20*C, 20*C, 20*C, "gray8", -204*C, 204*C, 204*C, "gray80", -207*C, 207*C, 207*C, "gray81", -209*C, 209*C, 209*C, "gray82", -212*C, 212*C, 212*C, "gray83", -214*C, 214*C, 214*C, "gray84", -217*C, 217*C, 217*C, "gray85", -219*C, 219*C, 219*C, "gray86", -222*C, 222*C, 222*C, "gray87", -224*C, 224*C, 224*C, "gray88", -227*C, 227*C, 227*C, "gray89", - 23*C, 23*C, 23*C, "gray9", -229*C, 229*C, 229*C, "gray90", -232*C, 232*C, 232*C, "gray91", -235*C, 235*C, 235*C, "gray92", -237*C, 237*C, 237*C, "gray93", -240*C, 240*C, 240*C, "gray94", -242*C, 242*C, 242*C, "gray95", -245*C, 245*C, 245*C, "gray96", -247*C, 247*C, 247*C, "gray97", -250*C, 250*C, 250*C, "gray98", -252*C, 252*C, 252*C, "gray99", - 0*C, 255*C, 0*C, "green", -173*C, 255*C, 47*C, "green yellow", -0*C, 255*C, 0*C, "green1", -0*C, 238*C, 0*C, "green2", -0*C, 205*C, 0*C, "green3", -0*C, 139*C, 0*C, "green4", -173*C, 255*C, 47*C, "GreenYellow", -190*C, 190*C, 190*C, "grey", - 0*C, 0*C, 0*C, "grey0", - 3*C, 3*C, 3*C, "grey1", - 26*C, 26*C, 26*C, "grey10", -255*C, 255*C, 255*C, "grey100", - 28*C, 28*C, 28*C, "grey11", - 31*C, 31*C, 31*C, "grey12", - 33*C, 33*C, 33*C, "grey13", - 36*C, 36*C, 36*C, "grey14", - 38*C, 38*C, 38*C, "grey15", - 41*C, 41*C, 41*C, "grey16", - 43*C, 43*C, 43*C, "grey17", - 46*C, 46*C, 46*C, "grey18", - 48*C, 48*C, 48*C, "grey19", - 5*C, 5*C, 5*C, "grey2", - 51*C, 51*C, 51*C, "grey20", - 54*C, 54*C, 54*C, "grey21", - 56*C, 56*C, 56*C, "grey22", - 59*C, 59*C, 59*C, "grey23", - 61*C, 61*C, 61*C, "grey24", - 64*C, 64*C, 64*C, "grey25", - 66*C, 66*C, 66*C, "grey26", - 69*C, 69*C, 69*C, "grey27", - 71*C, 71*C, 71*C, "grey28", - 74*C, 74*C, 74*C, "grey29", - 8*C, 8*C, 8*C, "grey3", - 77*C, 77*C, 77*C, "grey30", - 79*C, 79*C, 79*C, "grey31", - 82*C, 82*C, 82*C, "grey32", - 84*C, 84*C, 84*C, "grey33", - 87*C, 87*C, 87*C, "grey34", - 89*C, 89*C, 89*C, "grey35", - 92*C, 92*C, 92*C, "grey36", - 94*C, 94*C, 94*C, "grey37", - 97*C, 97*C, 97*C, "grey38", - 99*C, 99*C, 99*C, "grey39", - 10*C, 10*C, 10*C, "grey4", -102*C, 102*C, 102*C, "grey40", -105*C, 105*C, 105*C, "grey41", -107*C, 107*C, 107*C, "grey42", -110*C, 110*C, 110*C, "grey43", -112*C, 112*C, 112*C, "grey44", -115*C, 115*C, 115*C, "grey45", -117*C, 117*C, 117*C, "grey46", -120*C, 120*C, 120*C, "grey47", -122*C, 122*C, 122*C, "grey48", -125*C, 125*C, 125*C, "grey49", - 13*C, 13*C, 13*C, "grey5", -127*C, 127*C, 127*C, "grey50", -130*C, 130*C, 130*C, "grey51", -133*C, 133*C, 133*C, "grey52", -135*C, 135*C, 135*C, "grey53", -138*C, 138*C, 138*C, "grey54", -140*C, 140*C, 140*C, "grey55", -143*C, 143*C, 143*C, "grey56", -145*C, 145*C, 145*C, "grey57", -148*C, 148*C, 148*C, "grey58", -150*C, 150*C, 150*C, "grey59", - 15*C, 15*C, 15*C, "grey6", -153*C, 153*C, 153*C, "grey60", -156*C, 156*C, 156*C, "grey61", -158*C, 158*C, 158*C, "grey62", -161*C, 161*C, 161*C, "grey63", -163*C, 163*C, 163*C, "grey64", -166*C, 166*C, 166*C, "grey65", -168*C, 168*C, 168*C, "grey66", -171*C, 171*C, 171*C, "grey67", -173*C, 173*C, 173*C, "grey68", -176*C, 176*C, 176*C, "grey69", - 18*C, 18*C, 18*C, "grey7", -179*C, 179*C, 179*C, "grey70", -181*C, 181*C, 181*C, "grey71", -184*C, 184*C, 184*C, "grey72", -186*C, 186*C, 186*C, "grey73", -189*C, 189*C, 189*C, "grey74", -191*C, 191*C, 191*C, "grey75", -194*C, 194*C, 194*C, "grey76", -196*C, 196*C, 196*C, "grey77", -199*C, 199*C, 199*C, "grey78", -201*C, 201*C, 201*C, "grey79", - 20*C, 20*C, 20*C, "grey8", -204*C, 204*C, 204*C, "grey80", -207*C, 207*C, 207*C, "grey81", -209*C, 209*C, 209*C, "grey82", -212*C, 212*C, 212*C, "grey83", -214*C, 214*C, 214*C, "grey84", -217*C, 217*C, 217*C, "grey85", -219*C, 219*C, 219*C, "grey86", -222*C, 222*C, 222*C, "grey87", -224*C, 224*C, 224*C, "grey88", -227*C, 227*C, 227*C, "grey89", - 23*C, 23*C, 23*C, "grey9", -229*C, 229*C, 229*C, "grey90", -232*C, 232*C, 232*C, "grey91", -235*C, 235*C, 235*C, "grey92", -237*C, 237*C, 237*C, "grey93", -240*C, 240*C, 240*C, "grey94", -242*C, 242*C, 242*C, "grey95", -245*C, 245*C, 245*C, "grey96", -247*C, 247*C, 247*C, "grey97", -250*C, 250*C, 250*C, "grey98", -252*C, 252*C, 252*C, "grey99", -240*C, 255*C, 240*C, "honeydew", -240*C, 255*C, 240*C, "honeydew1", -224*C, 238*C, 224*C, "honeydew2", -193*C, 205*C, 193*C, "honeydew3", -131*C, 139*C, 131*C, "honeydew4", -255*C, 105*C, 180*C, "hot pink", -255*C, 105*C, 180*C, "HotPink", -255*C, 110*C, 180*C, "HotPink1", -238*C, 106*C, 167*C, "HotPink2", -205*C, 96*C, 144*C, "HotPink3", -139*C, 58*C, 98*C, "HotPink4", -205*C, 92*C, 92*C, "indian red", -205*C, 92*C, 92*C, "IndianRed", -255*C, 106*C, 106*C, "IndianRed1", -238*C, 99*C, 99*C, "IndianRed2", -205*C, 85*C, 85*C, "IndianRed3", -139*C, 58*C, 58*C, "IndianRed4", -255*C, 255*C, 240*C, "ivory", -255*C, 255*C, 240*C, "ivory1", -238*C, 238*C, 224*C, "ivory2", -205*C, 205*C, 193*C, "ivory3", -139*C, 139*C, 131*C, "ivory4", -240*C, 230*C, 140*C, "khaki", -255*C, 246*C, 143*C, "khaki1", -238*C, 230*C, 133*C, "khaki2", -205*C, 198*C, 115*C, "khaki3", -139*C, 134*C, 78*C, "khaki4", -230*C, 230*C, 250*C, "lavender", -255*C, 240*C, 245*C, "lavender blush", -255*C, 240*C, 245*C, "LavenderBlush", -255*C, 240*C, 245*C, "LavenderBlush1", -238*C, 224*C, 229*C, "LavenderBlush2", -205*C, 193*C, 197*C, "LavenderBlush3", -139*C, 131*C, 134*C, "LavenderBlush4", -124*C, 252*C, 0*C, "lawn green", -124*C, 252*C, 0*C, "LawnGreen", -255*C, 250*C, 205*C, "lemon chiffon", -255*C, 250*C, 205*C, "LemonChiffon", -255*C, 250*C, 205*C, "LemonChiffon1", -238*C, 233*C, 191*C, "LemonChiffon2", -205*C, 201*C, 165*C, "LemonChiffon3", -139*C, 137*C, 112*C, "LemonChiffon4", -173*C, 216*C, 230*C, "light blue", -240*C, 128*C, 128*C, "light coral", -224*C, 255*C, 255*C, "light cyan", -238*C, 221*C, 130*C, "light goldenrod", -250*C, 250*C, 210*C, "light goldenrod yellow", -211*C, 211*C, 211*C, "light gray", -144*C, 238*C, 144*C, "light green", -211*C, 211*C, 211*C, "light grey", -255*C, 182*C, 193*C, "light pink", -255*C, 160*C, 122*C, "light salmon", - 32*C, 178*C, 170*C, "light sea green", -135*C, 206*C, 250*C, "light sky blue", -132*C, 112*C, 255*C, "light slate blue", -119*C, 136*C, 153*C, "light slate gray", -119*C, 136*C, 153*C, "light slate grey", -176*C, 196*C, 222*C, "light steel blue", -255*C, 255*C, 224*C, "light yellow", -173*C, 216*C, 230*C, "LightBlue", -191*C, 239*C, 255*C, "LightBlue1", -178*C, 223*C, 238*C, "LightBlue2", -154*C, 192*C, 205*C, "LightBlue3", -104*C, 131*C, 139*C, "LightBlue4", -240*C, 128*C, 128*C, "LightCoral", -224*C, 255*C, 255*C, "LightCyan", -224*C, 255*C, 255*C, "LightCyan1", -209*C, 238*C, 238*C, "LightCyan2", -180*C, 205*C, 205*C, "LightCyan3", -122*C, 139*C, 139*C, "LightCyan4", -238*C, 221*C, 130*C, "LightGoldenrod", -255*C, 236*C, 139*C, "LightGoldenrod1", -238*C, 220*C, 130*C, "LightGoldenrod2", -205*C, 190*C, 112*C, "LightGoldenrod3", -139*C, 129*C, 76*C, "LightGoldenrod4", -250*C, 250*C, 210*C, "LightGoldenrodYellow", -211*C, 211*C, 211*C, "LightGray", -144*C, 238*C, 144*C, "LightGreen", -211*C, 211*C, 211*C, "LightGrey", -255*C, 182*C, 193*C, "LightPink", -255*C, 174*C, 185*C, "LightPink1", -238*C, 162*C, 173*C, "LightPink2", -205*C, 140*C, 149*C, "LightPink3", -139*C, 95*C, 101*C, "LightPink4", -255*C, 160*C, 122*C, "LightSalmon", -255*C, 160*C, 122*C, "LightSalmon1", -238*C, 149*C, 114*C, "LightSalmon2", -205*C, 129*C, 98*C, "LightSalmon3", -139*C, 87*C, 66*C, "LightSalmon4", - 32*C, 178*C, 170*C, "LightSeaGreen", -135*C, 206*C, 250*C, "LightSkyBlue", -176*C, 226*C, 255*C, "LightSkyBlue1", -164*C, 211*C, 238*C, "LightSkyBlue2", -141*C, 182*C, 205*C, "LightSkyBlue3", - 96*C, 123*C, 139*C, "LightSkyBlue4", -132*C, 112*C, 255*C, "LightSlateBlue", -119*C, 136*C, 153*C, "LightSlateGray", -119*C, 136*C, 153*C, "LightSlateGrey", -176*C, 196*C, 222*C, "LightSteelBlue", -202*C, 225*C, 255*C, "LightSteelBlue1", -188*C, 210*C, 238*C, "LightSteelBlue2", -162*C, 181*C, 205*C, "LightSteelBlue3", -110*C, 123*C, 139*C, "LightSteelBlue4", -255*C, 255*C, 224*C, "LightYellow", -255*C, 255*C, 224*C, "LightYellow1", -238*C, 238*C, 209*C, "LightYellow2", -205*C, 205*C, 180*C, "LightYellow3", -139*C, 139*C, 122*C, "LightYellow4", - 50*C, 205*C, 50*C, "lime green", - 50*C, 205*C, 50*C, "LimeGreen", -250*C, 240*C, 230*C, "linen", -255*C, 0*C, 255*C, "magenta", -255*C, 0*C, 255*C, "magenta1", -238*C, 0*C, 238*C, "magenta2", -205*C, 0*C, 205*C, "magenta3", -139*C, 0*C, 139*C, "magenta4", -176*C, 48*C, 96*C, "maroon", -255*C, 52*C, 179*C, "maroon1", -238*C, 48*C, 167*C, "maroon2", -205*C, 41*C, 144*C, "maroon3", -139*C, 28*C, 98*C, "maroon4", -102*C, 205*C, 170*C, "medium aquamarine", - 0*C, 0*C, 205*C, "medium blue", -186*C, 85*C, 211*C, "medium orchid", -147*C, 112*C, 219*C, "medium purple", - 60*C, 179*C, 113*C, "medium sea green", -123*C, 104*C, 238*C, "medium slate blue", - 0*C, 250*C, 154*C, "medium spring green", - 72*C, 209*C, 204*C, "medium turquoise", -199*C, 21*C, 133*C, "medium violet red", -102*C, 205*C, 170*C, "MediumAquamarine", - 0*C, 0*C, 205*C, "MediumBlue", -186*C, 85*C, 211*C, "MediumOrchid", -224*C, 102*C, 255*C, "MediumOrchid1", -209*C, 95*C, 238*C, "MediumOrchid2", -180*C, 82*C, 205*C, "MediumOrchid3", -122*C, 55*C, 139*C, "MediumOrchid4", -147*C, 112*C, 219*C, "MediumPurple", -171*C, 130*C, 255*C, "MediumPurple1", -159*C, 121*C, 238*C, "MediumPurple2", -137*C, 104*C, 205*C, "MediumPurple3", - 93*C, 71*C, 139*C, "MediumPurple4", - 60*C, 179*C, 113*C, "MediumSeaGreen", -123*C, 104*C, 238*C, "MediumSlateBlue", - 0*C, 250*C, 154*C, "MediumSpringGreen", - 72*C, 209*C, 204*C, "MediumTurquoise", -199*C, 21*C, 133*C, "MediumVioletRed", - 25*C, 25*C, 112*C, "midnight blue", - 25*C, 25*C, 112*C, "MidnightBlue", -245*C, 255*C, 250*C, "mint cream", -245*C, 255*C, 250*C, "MintCream", -255*C, 228*C, 225*C, "misty rose", -255*C, 228*C, 225*C, "MistyRose", -255*C, 228*C, 225*C, "MistyRose1", -238*C, 213*C, 210*C, "MistyRose2", -205*C, 183*C, 181*C, "MistyRose3", -139*C, 125*C, 123*C, "MistyRose4", -255*C, 228*C, 181*C, "moccasin", -255*C, 222*C, 173*C, "navajo white", -255*C, 222*C, 173*C, "NavajoWhite", -255*C, 222*C, 173*C, "NavajoWhite1", -238*C, 207*C, 161*C, "NavajoWhite2", -205*C, 179*C, 139*C, "NavajoWhite3", -139*C, 121*C, 94*C, "NavajoWhite4", - 0*C, 0*C, 128*C, "navy", - 0*C, 0*C, 128*C, "navy blue", - 0*C, 0*C, 128*C, "NavyBlue", -253*C, 245*C, 230*C, "old lace", -253*C, 245*C, 230*C, "OldLace", -107*C, 142*C, 35*C, "olive drab", -107*C, 142*C, 35*C, "OliveDrab", -192*C, 255*C, 62*C, "OliveDrab1", -179*C, 238*C, 58*C, "OliveDrab2", -154*C, 205*C, 50*C, "OliveDrab3", -105*C, 139*C, 34*C, "OliveDrab4", -255*C, 165*C, 0*C, "orange", -255*C, 69*C, 0*C, "orange red", -255*C, 165*C, 0*C, "orange1", -238*C, 154*C, 0*C, "orange2", -205*C, 133*C, 0*C, "orange3", -139*C, 90*C, 0*C, "orange4", -255*C, 69*C, 0*C, "OrangeRed", -255*C, 69*C, 0*C, "OrangeRed1", -238*C, 64*C, 0*C, "OrangeRed2", -205*C, 55*C, 0*C, "OrangeRed3", -139*C, 37*C, 0*C, "OrangeRed4", -218*C, 112*C, 214*C, "orchid", -255*C, 131*C, 250*C, "orchid1", -238*C, 122*C, 233*C, "orchid2", -205*C, 105*C, 201*C, "orchid3", -139*C, 71*C, 137*C, "orchid4", -238*C, 232*C, 170*C, "pale goldenrod", -152*C, 251*C, 152*C, "pale green", -175*C, 238*C, 238*C, "pale turquoise", -219*C, 112*C, 147*C, "pale violet red", -238*C, 232*C, 170*C, "PaleGoldenrod", -152*C, 251*C, 152*C, "PaleGreen", -154*C, 255*C, 154*C, "PaleGreen1", -144*C, 238*C, 144*C, "PaleGreen2", -124*C, 205*C, 124*C, "PaleGreen3", -84*C, 139*C, 84*C, "PaleGreen4", -175*C, 238*C, 238*C, "PaleTurquoise", -187*C, 255*C, 255*C, "PaleTurquoise1", -174*C, 238*C, 238*C, "PaleTurquoise2", -150*C, 205*C, 205*C, "PaleTurquoise3", -102*C, 139*C, 139*C, "PaleTurquoise4", -219*C, 112*C, 147*C, "PaleVioletRed", -255*C, 130*C, 171*C, "PaleVioletRed1", -238*C, 121*C, 159*C, "PaleVioletRed2", -205*C, 104*C, 137*C, "PaleVioletRed3", -139*C, 71*C, 93*C, "PaleVioletRed4", -255*C, 239*C, 213*C, "papaya whip", -255*C, 239*C, 213*C, "PapayaWhip", -255*C, 218*C, 185*C, "peach puff", -255*C, 218*C, 185*C, "PeachPuff", -255*C, 218*C, 185*C, "PeachPuff1", -238*C, 203*C, 173*C, "PeachPuff2", -205*C, 175*C, 149*C, "PeachPuff3", -139*C, 119*C, 101*C, "PeachPuff4", -205*C, 133*C, 63*C, "peru", -255*C, 192*C, 203*C, "pink", -255*C, 181*C, 197*C, "pink1", -238*C, 169*C, 184*C, "pink2", -205*C, 145*C, 158*C, "pink3", -139*C, 99*C, 108*C, "pink4", -221*C, 160*C, 221*C, "plum", -255*C, 187*C, 255*C, "plum1", -238*C, 174*C, 238*C, "plum2", -205*C, 150*C, 205*C, "plum3", -139*C, 102*C, 139*C, "plum4", -176*C, 224*C, 230*C, "powder blue", -176*C, 224*C, 230*C, "PowderBlue", -160*C, 32*C, 240*C, "purple", -155*C, 48*C, 255*C, "purple1", -145*C, 44*C, 238*C, "purple2", -125*C, 38*C, 205*C, "purple3", - 85*C, 26*C, 139*C, "purple4", -255*C, 0*C, 0*C, "red", -255*C, 0*C, 0*C, "red1", -238*C, 0*C, 0*C, "red2", -205*C, 0*C, 0*C, "red3", -139*C, 0*C, 0*C, "red4", -188*C, 143*C, 143*C, "rosy brown", -188*C, 143*C, 143*C, "RosyBrown", -255*C, 193*C, 193*C, "RosyBrown1", -238*C, 180*C, 180*C, "RosyBrown2", -205*C, 155*C, 155*C, "RosyBrown3", -139*C, 105*C, 105*C, "RosyBrown4", - 65*C, 105*C, 225*C, "royal blue", - 65*C, 105*C, 225*C, "RoyalBlue", - 72*C, 118*C, 255*C, "RoyalBlue1", - 67*C, 110*C, 238*C, "RoyalBlue2", - 58*C, 95*C, 205*C, "RoyalBlue3", - 39*C, 64*C, 139*C, "RoyalBlue4", -139*C, 69*C, 19*C, "saddle brown", -139*C, 69*C, 19*C, "SaddleBrown", -250*C, 128*C, 114*C, "salmon", -255*C, 140*C, 105*C, "salmon1", -238*C, 130*C, 98*C, "salmon2", -205*C, 112*C, 84*C, "salmon3", -139*C, 76*C, 57*C, "salmon4", -244*C, 164*C, 96*C, "sandy brown", -244*C, 164*C, 96*C, "SandyBrown", - 46*C, 139*C, 87*C, "sea green", - 46*C, 139*C, 87*C, "SeaGreen", - 84*C, 255*C, 159*C, "SeaGreen1", - 78*C, 238*C, 148*C, "SeaGreen2", - 67*C, 205*C, 128*C, "SeaGreen3", -46*C, 139*C, 87*C, "SeaGreen4", -255*C, 245*C, 238*C, "seashell", -255*C, 245*C, 238*C, "seashell1", -238*C, 229*C, 222*C, "seashell2", -205*C, 197*C, 191*C, "seashell3", -139*C, 134*C, 130*C, "seashell4", -160*C, 82*C, 45*C, "sienna", -255*C, 130*C, 71*C, "sienna1", -238*C, 121*C, 66*C, "sienna2", -205*C, 104*C, 57*C, "sienna3", -139*C, 71*C, 38*C, "sienna4", -135*C, 206*C, 235*C, "sky blue", -135*C, 206*C, 235*C, "SkyBlue", -135*C, 206*C, 255*C, "SkyBlue1", -126*C, 192*C, 238*C, "SkyBlue2", -108*C, 166*C, 205*C, "SkyBlue3", - 74*C, 112*C, 139*C, "SkyBlue4", -106*C, 90*C, 205*C, "slate blue", -112*C, 128*C, 144*C, "slate gray", -112*C, 128*C, 144*C, "slate grey", -106*C, 90*C, 205*C, "SlateBlue", -131*C, 111*C, 255*C, "SlateBlue1", -122*C, 103*C, 238*C, "SlateBlue2", -105*C, 89*C, 205*C, "SlateBlue3", - 71*C, 60*C, 139*C, "SlateBlue4", -112*C, 128*C, 144*C, "SlateGray", -198*C, 226*C, 255*C, "SlateGray1", -185*C, 211*C, 238*C, "SlateGray2", -159*C, 182*C, 205*C, "SlateGray3", -108*C, 123*C, 139*C, "SlateGray4", -112*C, 128*C, 144*C, "SlateGrey", -255*C, 250*C, 250*C, "snow", -255*C, 250*C, 250*C, "snow1", -238*C, 233*C, 233*C, "snow2", -205*C, 201*C, 201*C, "snow3", -139*C, 137*C, 137*C, "snow4", - 0*C, 255*C, 127*C, "spring green", - 0*C, 255*C, 127*C, "SpringGreen", - 0*C, 255*C, 127*C, "SpringGreen1", - 0*C, 238*C, 118*C, "SpringGreen2", - 0*C, 205*C, 102*C, "SpringGreen3", -0*C, 139*C, 69*C, "SpringGreen4", - 70*C, 130*C, 180*C, "steel blue", - 70*C, 130*C, 180*C, "SteelBlue", - 99*C, 184*C, 255*C, "SteelBlue1", - 92*C, 172*C, 238*C, "SteelBlue2", - 79*C, 148*C, 205*C, "SteelBlue3", - 54*C, 100*C, 139*C, "SteelBlue4", -210*C, 180*C, 140*C, "tan", -255*C, 165*C, 79*C, "tan1", -238*C, 154*C, 73*C, "tan2", -205*C, 133*C, 63*C, "tan3", -139*C, 90*C, 43*C, "tan4", -216*C, 191*C, 216*C, "thistle", -255*C, 225*C, 255*C, "thistle1", -238*C, 210*C, 238*C, "thistle2", -205*C, 181*C, 205*C, "thistle3", -139*C, 123*C, 139*C, "thistle4", -255*C, 99*C, 71*C, "tomato", -255*C, 99*C, 71*C, "tomato1", -238*C, 92*C, 66*C, "tomato2", -205*C, 79*C, 57*C, "tomato3", -139*C, 54*C, 38*C, "tomato4", - 64*C, 224*C, 208*C, "turquoise", - 0*C, 245*C, 255*C, "turquoise1", - 0*C, 229*C, 238*C, "turquoise2", - 0*C, 197*C, 205*C, "turquoise3", - 0*C, 134*C, 139*C, "turquoise4", -238*C, 130*C, 238*C, "violet", -208*C, 32*C, 144*C, "violet red", -208*C, 32*C, 144*C, "VioletRed", -255*C, 62*C, 150*C, "VioletRed1", -238*C, 58*C, 140*C, "VioletRed2", -205*C, 50*C, 120*C, "VioletRed3", -139*C, 34*C, 82*C, "VioletRed4", -245*C, 222*C, 179*C, "wheat", -255*C, 231*C, 186*C, "wheat1", -238*C, 216*C, 174*C, "wheat2", -205*C, 186*C, 150*C, "wheat3", -139*C, 126*C, 102*C, "wheat4", -255*C, 255*C, 255*C, "white", -245*C, 245*C, 245*C, "white smoke", -245*C, 245*C, 245*C, "WhiteSmoke", -255*C, 255*C, 0*C, "yellow", -154*C, 205*C, 50*C, "yellow green", -255*C, 255*C, 0*C, "yellow1", -238*C, 238*C, 0*C, "yellow2", -205*C, 205*C, 0*C, "yellow3", -139*C, 139*C, 0*C, "yellow4", -154*C, 205*C, 50*C, "YellowGreen", + { 240*C, 248*C, 255*C, "alice blue" }, + { 240*C, 248*C, 255*C, "AliceBlue" }, + { 250*C, 235*C, 215*C, "antique white" }, + { 250*C, 235*C, 215*C, "AntiqueWhite" }, + { 255*C, 239*C, 219*C, "AntiqueWhite1" }, + { 238*C, 223*C, 204*C, "AntiqueWhite2" }, + { 205*C, 192*C, 176*C, "AntiqueWhite3" }, + { 139*C, 131*C, 120*C, "AntiqueWhite4" }, + { 127*C, 255*C, 212*C, "aquamarine" }, + { 127*C, 255*C, 212*C, "aquamarine1" }, + { 118*C, 238*C, 198*C, "aquamarine2" }, + { 102*C, 205*C, 170*C, "aquamarine3" }, + { 69*C, 139*C, 116*C, "aquamarine4" }, + { 240*C, 255*C, 255*C, "azure" }, + { 240*C, 255*C, 255*C, "azure1" }, + { 224*C, 238*C, 238*C, "azure2" }, + { 193*C, 205*C, 205*C, "azure3" }, + { 131*C, 139*C, 139*C, "azure4" }, + { 245*C, 245*C, 220*C, "beige" }, + { 255*C, 228*C, 196*C, "bisque" }, + { 255*C, 228*C, 196*C, "bisque1" }, + { 238*C, 213*C, 183*C, "bisque2" }, + { 205*C, 183*C, 158*C, "bisque3" }, + { 139*C, 125*C, 107*C, "bisque4" }, + { 0*C, 0*C, 0*C, "black" }, + { 255*C, 235*C, 205*C, "blanched almond" }, + { 255*C, 235*C, 205*C, "BlanchedAlmond" }, + { 0*C, 0*C, 255*C, "blue" }, + { 138*C, 43*C, 226*C, "blue violet" }, + { 0*C, 0*C, 255*C, "blue1" }, + { 0*C, 0*C, 238*C, "blue2" }, + { 0*C, 0*C, 205*C, "blue3" }, + { 0*C, 0*C, 139*C, "blue4" }, + { 138*C, 43*C, 226*C, "BlueViolet" }, + { 165*C, 42*C, 42*C, "brown" }, + { 255*C, 64*C, 64*C, "brown1" }, + { 238*C, 59*C, 59*C, "brown2" }, + { 205*C, 51*C, 51*C, "brown3" }, + { 139*C, 35*C, 35*C, "brown4" }, + { 222*C, 184*C, 135*C, "burlywood" }, + { 255*C, 211*C, 155*C, "burlywood1" }, + { 238*C, 197*C, 145*C, "burlywood2" }, + { 205*C, 170*C, 125*C, "burlywood3" }, + { 139*C, 115*C, 85*C, "burlywood4" }, + { 95*C, 158*C, 160*C, "cadet blue" }, + { 95*C, 158*C, 160*C, "CadetBlue" }, + { 152*C, 245*C, 255*C, "CadetBlue1" }, + { 142*C, 229*C, 238*C, "CadetBlue2" }, + { 122*C, 197*C, 205*C, "CadetBlue3" }, + { 83*C, 134*C, 139*C, "CadetBlue4" }, + { 127*C, 255*C, 0*C, "chartreuse" }, + { 127*C, 255*C, 0*C, "chartreuse1" }, + { 118*C, 238*C, 0*C, "chartreuse2" }, + { 102*C, 205*C, 0*C, "chartreuse3" }, + { 69*C, 139*C, 0*C, "chartreuse4" }, + { 210*C, 105*C, 30*C, "chocolate" }, + { 255*C, 127*C, 36*C, "chocolate1" }, + { 238*C, 118*C, 33*C, "chocolate2" }, + { 205*C, 102*C, 29*C, "chocolate3" }, + { 139*C, 69*C, 19*C, "chocolate4" }, + { 255*C, 127*C, 80*C, "coral" }, + { 255*C, 114*C, 86*C, "coral1" }, + { 238*C, 106*C, 80*C, "coral2" }, + { 205*C, 91*C, 69*C, "coral3" }, + { 139*C, 62*C, 47*C, "coral4" }, + { 100*C, 149*C, 237*C, "cornflower blue" }, + { 100*C, 149*C, 237*C, "CornflowerBlue" }, + { 255*C, 248*C, 220*C, "cornsilk" }, + { 255*C, 248*C, 220*C, "cornsilk1" }, + { 238*C, 232*C, 205*C, "cornsilk2" }, + { 205*C, 200*C, 177*C, "cornsilk3" }, + { 139*C, 136*C, 120*C, "cornsilk4" }, + { 0*C, 255*C, 255*C, "cyan" }, + { 0*C, 255*C, 255*C, "cyan1" }, + { 0*C, 238*C, 238*C, "cyan2" }, + { 0*C, 205*C, 205*C, "cyan3" }, + { 0*C, 139*C, 139*C, "cyan4" }, + { 0*C, 0*C, 139*C, "dark blue" }, + { 0*C, 139*C, 139*C, "dark cyan" }, + { 184*C, 134*C, 11*C, "dark goldenrod" }, + { 169*C, 169*C, 169*C, "dark gray" }, + { 0*C, 100*C, 0*C, "dark green" }, + { 169*C, 169*C, 169*C, "dark grey" }, + { 189*C, 183*C, 107*C, "dark khaki" }, + { 139*C, 0*C, 139*C, "dark magenta" }, + { 85*C, 107*C, 47*C, "dark olive green" }, + { 255*C, 140*C, 0*C, "dark orange" }, + { 153*C, 50*C, 204*C, "dark orchid" }, + { 139*C, 0*C, 0*C, "dark red" }, + { 233*C, 150*C, 122*C, "dark salmon" }, + { 143*C, 188*C, 143*C, "dark sea green" }, + { 72*C, 61*C, 139*C, "dark slate blue" }, + { 47*C, 79*C, 79*C, "dark slate gray" }, + { 47*C, 79*C, 79*C, "dark slate grey" }, + { 0*C, 206*C, 209*C, "dark turquoise" }, + { 148*C, 0*C, 211*C, "dark violet" }, + { 0*C, 0*C, 139*C, "DarkBlue" }, + { 0*C, 139*C, 139*C, "DarkCyan" }, + { 184*C, 134*C, 11*C, "DarkGoldenrod" }, + { 255*C, 185*C, 15*C, "DarkGoldenrod1" }, + { 238*C, 173*C, 14*C, "DarkGoldenrod2" }, + { 205*C, 149*C, 12*C, "DarkGoldenrod3" }, + { 139*C, 101*C, 8*C, "DarkGoldenrod4" }, + { 169*C, 169*C, 169*C, "DarkGray" }, + { 0*C, 100*C, 0*C, "DarkGreen" }, + { 169*C, 169*C, 169*C, "DarkGrey" }, + { 189*C, 183*C, 107*C, "DarkKhaki" }, + { 139*C, 0*C, 139*C, "DarkMagenta" }, + { 85*C, 107*C, 47*C, "DarkOliveGreen" }, + { 202*C, 255*C, 112*C, "DarkOliveGreen1" }, + { 188*C, 238*C, 104*C, "DarkOliveGreen2" }, + { 162*C, 205*C, 90*C, "DarkOliveGreen3" }, + { 110*C, 139*C, 61*C, "DarkOliveGreen4" }, + { 255*C, 140*C, 0*C, "DarkOrange" }, + { 255*C, 127*C, 0*C, "DarkOrange1" }, + { 238*C, 118*C, 0*C, "DarkOrange2" }, + { 205*C, 102*C, 0*C, "DarkOrange3" }, + { 139*C, 69*C, 0*C, "DarkOrange4" }, + { 153*C, 50*C, 204*C, "DarkOrchid" }, + { 191*C, 62*C, 255*C, "DarkOrchid1" }, + { 178*C, 58*C, 238*C, "DarkOrchid2" }, + { 154*C, 50*C, 205*C, "DarkOrchid3" }, + { 104*C, 34*C, 139*C, "DarkOrchid4" }, + { 139*C, 0*C, 0*C, "DarkRed" }, + { 233*C, 150*C, 122*C, "DarkSalmon" }, + { 143*C, 188*C, 143*C, "DarkSeaGreen" }, + { 193*C, 255*C, 193*C, "DarkSeaGreen1" }, + { 180*C, 238*C, 180*C, "DarkSeaGreen2" }, + { 155*C, 205*C, 155*C, "DarkSeaGreen3" }, + { 105*C, 139*C, 105*C, "DarkSeaGreen4" }, + { 72*C, 61*C, 139*C, "DarkSlateBlue" }, + { 47*C, 79*C, 79*C, "DarkSlateGray" }, + { 151*C, 255*C, 255*C, "DarkSlateGray1" }, + { 141*C, 238*C, 238*C, "DarkSlateGray2" }, + { 121*C, 205*C, 205*C, "DarkSlateGray3" }, + { 82*C, 139*C, 139*C, "DarkSlateGray4" }, + { 47*C, 79*C, 79*C, "DarkSlateGrey" }, + { 0*C, 206*C, 209*C, "DarkTurquoise" }, + { 148*C, 0*C, 211*C, "DarkViolet" }, + { 255*C, 20*C, 147*C, "deep pink" }, + { 0*C, 191*C, 255*C, "deep sky blue" }, + { 255*C, 20*C, 147*C, "DeepPink" }, + { 255*C, 20*C, 147*C, "DeepPink1" }, + { 238*C, 18*C, 137*C, "DeepPink2" }, + { 205*C, 16*C, 118*C, "DeepPink3" }, + { 139*C, 10*C, 80*C, "DeepPink4" }, + { 0*C, 191*C, 255*C, "DeepSkyBlue" }, + { 0*C, 191*C, 255*C, "DeepSkyBlue1" }, + { 0*C, 178*C, 238*C, "DeepSkyBlue2" }, + { 0*C, 154*C, 205*C, "DeepSkyBlue3" }, + { 0*C, 104*C, 139*C, "DeepSkyBlue4" }, + { 105*C, 105*C, 105*C, "dim gray" }, + { 105*C, 105*C, 105*C, "dim grey" }, + { 105*C, 105*C, 105*C, "DimGray" }, + { 105*C, 105*C, 105*C, "DimGrey" }, + { 30*C, 144*C, 255*C, "dodger blue" }, + { 30*C, 144*C, 255*C, "DodgerBlue" }, + { 30*C, 144*C, 255*C, "DodgerBlue1" }, + { 28*C, 134*C, 238*C, "DodgerBlue2" }, + { 24*C, 116*C, 205*C, "DodgerBlue3" }, + { 16*C, 78*C, 139*C, "DodgerBlue4" }, + { 178*C, 34*C, 34*C, "firebrick" }, + { 255*C, 48*C, 48*C, "firebrick1" }, + { 238*C, 44*C, 44*C, "firebrick2" }, + { 205*C, 38*C, 38*C, "firebrick3" }, + { 139*C, 26*C, 26*C, "firebrick4" }, + { 255*C, 250*C, 240*C, "floral white" }, + { 255*C, 250*C, 240*C, "FloralWhite" }, + { 34*C, 139*C, 34*C, "forest green" }, + { 34*C, 139*C, 34*C, "ForestGreen" }, + { 220*C, 220*C, 220*C, "gainsboro" }, + { 248*C, 248*C, 255*C, "ghost white" }, + { 248*C, 248*C, 255*C, "GhostWhite" }, + { 255*C, 215*C, 0*C, "gold" }, + { 255*C, 215*C, 0*C, "gold1" }, + { 238*C, 201*C, 0*C, "gold2" }, + { 205*C, 173*C, 0*C, "gold3" }, + { 139*C, 117*C, 0*C, "gold4" }, + { 218*C, 165*C, 32*C, "goldenrod" }, + { 255*C, 193*C, 37*C, "goldenrod1" }, + { 238*C, 180*C, 34*C, "goldenrod2" }, + { 205*C, 155*C, 29*C, "goldenrod3" }, + { 139*C, 105*C, 20*C, "goldenrod4" }, + { 190*C, 190*C, 190*C, "gray" }, + { 0*C, 0*C, 0*C, "gray0" }, + { 3*C, 3*C, 3*C, "gray1" }, + { 26*C, 26*C, 26*C, "gray10" }, + { 255*C, 255*C, 255*C, "gray100" }, + { 28*C, 28*C, 28*C, "gray11" }, + { 31*C, 31*C, 31*C, "gray12" }, + { 33*C, 33*C, 33*C, "gray13" }, + { 36*C, 36*C, 36*C, "gray14" }, + { 38*C, 38*C, 38*C, "gray15" }, + { 41*C, 41*C, 41*C, "gray16" }, + { 43*C, 43*C, 43*C, "gray17" }, + { 46*C, 46*C, 46*C, "gray18" }, + { 48*C, 48*C, 48*C, "gray19" }, + { 5*C, 5*C, 5*C, "gray2" }, + { 51*C, 51*C, 51*C, "gray20" }, + { 54*C, 54*C, 54*C, "gray21" }, + { 56*C, 56*C, 56*C, "gray22" }, + { 59*C, 59*C, 59*C, "gray23" }, + { 61*C, 61*C, 61*C, "gray24" }, + { 64*C, 64*C, 64*C, "gray25" }, + { 66*C, 66*C, 66*C, "gray26" }, + { 69*C, 69*C, 69*C, "gray27" }, + { 71*C, 71*C, 71*C, "gray28" }, + { 74*C, 74*C, 74*C, "gray29" }, + { 8*C, 8*C, 8*C, "gray3" }, + { 77*C, 77*C, 77*C, "gray30" }, + { 79*C, 79*C, 79*C, "gray31" }, + { 82*C, 82*C, 82*C, "gray32" }, + { 84*C, 84*C, 84*C, "gray33" }, + { 87*C, 87*C, 87*C, "gray34" }, + { 89*C, 89*C, 89*C, "gray35" }, + { 92*C, 92*C, 92*C, "gray36" }, + { 94*C, 94*C, 94*C, "gray37" }, + { 97*C, 97*C, 97*C, "gray38" }, + { 99*C, 99*C, 99*C, "gray39" }, + { 10*C, 10*C, 10*C, "gray4" }, + { 102*C, 102*C, 102*C, "gray40" }, + { 105*C, 105*C, 105*C, "gray41" }, + { 107*C, 107*C, 107*C, "gray42" }, + { 110*C, 110*C, 110*C, "gray43" }, + { 112*C, 112*C, 112*C, "gray44" }, + { 115*C, 115*C, 115*C, "gray45" }, + { 117*C, 117*C, 117*C, "gray46" }, + { 120*C, 120*C, 120*C, "gray47" }, + { 122*C, 122*C, 122*C, "gray48" }, + { 125*C, 125*C, 125*C, "gray49" }, + { 13*C, 13*C, 13*C, "gray5" }, + { 127*C, 127*C, 127*C, "gray50" }, + { 130*C, 130*C, 130*C, "gray51" }, + { 133*C, 133*C, 133*C, "gray52" }, + { 135*C, 135*C, 135*C, "gray53" }, + { 138*C, 138*C, 138*C, "gray54" }, + { 140*C, 140*C, 140*C, "gray55" }, + { 143*C, 143*C, 143*C, "gray56" }, + { 145*C, 145*C, 145*C, "gray57" }, + { 148*C, 148*C, 148*C, "gray58" }, + { 150*C, 150*C, 150*C, "gray59" }, + { 15*C, 15*C, 15*C, "gray6" }, + { 153*C, 153*C, 153*C, "gray60" }, + { 156*C, 156*C, 156*C, "gray61" }, + { 158*C, 158*C, 158*C, "gray62" }, + { 161*C, 161*C, 161*C, "gray63" }, + { 163*C, 163*C, 163*C, "gray64" }, + { 166*C, 166*C, 166*C, "gray65" }, + { 168*C, 168*C, 168*C, "gray66" }, + { 171*C, 171*C, 171*C, "gray67" }, + { 173*C, 173*C, 173*C, "gray68" }, + { 176*C, 176*C, 176*C, "gray69" }, + { 18*C, 18*C, 18*C, "gray7" }, + { 179*C, 179*C, 179*C, "gray70" }, + { 181*C, 181*C, 181*C, "gray71" }, + { 184*C, 184*C, 184*C, "gray72" }, + { 186*C, 186*C, 186*C, "gray73" }, + { 189*C, 189*C, 189*C, "gray74" }, + { 191*C, 191*C, 191*C, "gray75" }, + { 194*C, 194*C, 194*C, "gray76" }, + { 196*C, 196*C, 196*C, "gray77" }, + { 199*C, 199*C, 199*C, "gray78" }, + { 201*C, 201*C, 201*C, "gray79" }, + { 20*C, 20*C, 20*C, "gray8" }, + { 204*C, 204*C, 204*C, "gray80" }, + { 207*C, 207*C, 207*C, "gray81" }, + { 209*C, 209*C, 209*C, "gray82" }, + { 212*C, 212*C, 212*C, "gray83" }, + { 214*C, 214*C, 214*C, "gray84" }, + { 217*C, 217*C, 217*C, "gray85" }, + { 219*C, 219*C, 219*C, "gray86" }, + { 222*C, 222*C, 222*C, "gray87" }, + { 224*C, 224*C, 224*C, "gray88" }, + { 227*C, 227*C, 227*C, "gray89" }, + { 23*C, 23*C, 23*C, "gray9" }, + { 229*C, 229*C, 229*C, "gray90" }, + { 232*C, 232*C, 232*C, "gray91" }, + { 235*C, 235*C, 235*C, "gray92" }, + { 237*C, 237*C, 237*C, "gray93" }, + { 240*C, 240*C, 240*C, "gray94" }, + { 242*C, 242*C, 242*C, "gray95" }, + { 245*C, 245*C, 245*C, "gray96" }, + { 247*C, 247*C, 247*C, "gray97" }, + { 250*C, 250*C, 250*C, "gray98" }, + { 252*C, 252*C, 252*C, "gray99" }, + { 0*C, 255*C, 0*C, "green" }, + { 173*C, 255*C, 47*C, "green yellow" }, + { 0*C, 255*C, 0*C, "green1" }, + { 0*C, 238*C, 0*C, "green2" }, + { 0*C, 205*C, 0*C, "green3" }, + { 0*C, 139*C, 0*C, "green4" }, + { 173*C, 255*C, 47*C, "GreenYellow" }, + { 190*C, 190*C, 190*C, "grey" }, + { 0*C, 0*C, 0*C, "grey0" }, + { 3*C, 3*C, 3*C, "grey1" }, + { 26*C, 26*C, 26*C, "grey10" }, + { 255*C, 255*C, 255*C, "grey100" }, + { 28*C, 28*C, 28*C, "grey11" }, + { 31*C, 31*C, 31*C, "grey12" }, + { 33*C, 33*C, 33*C, "grey13" }, + { 36*C, 36*C, 36*C, "grey14" }, + { 38*C, 38*C, 38*C, "grey15" }, + { 41*C, 41*C, 41*C, "grey16" }, + { 43*C, 43*C, 43*C, "grey17" }, + { 46*C, 46*C, 46*C, "grey18" }, + { 48*C, 48*C, 48*C, "grey19" }, + { 5*C, 5*C, 5*C, "grey2" }, + { 51*C, 51*C, 51*C, "grey20" }, + { 54*C, 54*C, 54*C, "grey21" }, + { 56*C, 56*C, 56*C, "grey22" }, + { 59*C, 59*C, 59*C, "grey23" }, + { 61*C, 61*C, 61*C, "grey24" }, + { 64*C, 64*C, 64*C, "grey25" }, + { 66*C, 66*C, 66*C, "grey26" }, + { 69*C, 69*C, 69*C, "grey27" }, + { 71*C, 71*C, 71*C, "grey28" }, + { 74*C, 74*C, 74*C, "grey29" }, + { 8*C, 8*C, 8*C, "grey3" }, + { 77*C, 77*C, 77*C, "grey30" }, + { 79*C, 79*C, 79*C, "grey31" }, + { 82*C, 82*C, 82*C, "grey32" }, + { 84*C, 84*C, 84*C, "grey33" }, + { 87*C, 87*C, 87*C, "grey34" }, + { 89*C, 89*C, 89*C, "grey35" }, + { 92*C, 92*C, 92*C, "grey36" }, + { 94*C, 94*C, 94*C, "grey37" }, + { 97*C, 97*C, 97*C, "grey38" }, + { 99*C, 99*C, 99*C, "grey39" }, + { 10*C, 10*C, 10*C, "grey4" }, + { 102*C, 102*C, 102*C, "grey40" }, + { 105*C, 105*C, 105*C, "grey41" }, + { 107*C, 107*C, 107*C, "grey42" }, + { 110*C, 110*C, 110*C, "grey43" }, + { 112*C, 112*C, 112*C, "grey44" }, + { 115*C, 115*C, 115*C, "grey45" }, + { 117*C, 117*C, 117*C, "grey46" }, + { 120*C, 120*C, 120*C, "grey47" }, + { 122*C, 122*C, 122*C, "grey48" }, + { 125*C, 125*C, 125*C, "grey49" }, + { 13*C, 13*C, 13*C, "grey5" }, + { 127*C, 127*C, 127*C, "grey50" }, + { 130*C, 130*C, 130*C, "grey51" }, + { 133*C, 133*C, 133*C, "grey52" }, + { 135*C, 135*C, 135*C, "grey53" }, + { 138*C, 138*C, 138*C, "grey54" }, + { 140*C, 140*C, 140*C, "grey55" }, + { 143*C, 143*C, 143*C, "grey56" }, + { 145*C, 145*C, 145*C, "grey57" }, + { 148*C, 148*C, 148*C, "grey58" }, + { 150*C, 150*C, 150*C, "grey59" }, + { 15*C, 15*C, 15*C, "grey6" }, + { 153*C, 153*C, 153*C, "grey60" }, + { 156*C, 156*C, 156*C, "grey61" }, + { 158*C, 158*C, 158*C, "grey62" }, + { 161*C, 161*C, 161*C, "grey63" }, + { 163*C, 163*C, 163*C, "grey64" }, + { 166*C, 166*C, 166*C, "grey65" }, + { 168*C, 168*C, 168*C, "grey66" }, + { 171*C, 171*C, 171*C, "grey67" }, + { 173*C, 173*C, 173*C, "grey68" }, + { 176*C, 176*C, 176*C, "grey69" }, + { 18*C, 18*C, 18*C, "grey7" }, + { 179*C, 179*C, 179*C, "grey70" }, + { 181*C, 181*C, 181*C, "grey71" }, + { 184*C, 184*C, 184*C, "grey72" }, + { 186*C, 186*C, 186*C, "grey73" }, + { 189*C, 189*C, 189*C, "grey74" }, + { 191*C, 191*C, 191*C, "grey75" }, + { 194*C, 194*C, 194*C, "grey76" }, + { 196*C, 196*C, 196*C, "grey77" }, + { 199*C, 199*C, 199*C, "grey78" }, + { 201*C, 201*C, 201*C, "grey79" }, + { 20*C, 20*C, 20*C, "grey8" }, + { 204*C, 204*C, 204*C, "grey80" }, + { 207*C, 207*C, 207*C, "grey81" }, + { 209*C, 209*C, 209*C, "grey82" }, + { 212*C, 212*C, 212*C, "grey83" }, + { 214*C, 214*C, 214*C, "grey84" }, + { 217*C, 217*C, 217*C, "grey85" }, + { 219*C, 219*C, 219*C, "grey86" }, + { 222*C, 222*C, 222*C, "grey87" }, + { 224*C, 224*C, 224*C, "grey88" }, + { 227*C, 227*C, 227*C, "grey89" }, + { 23*C, 23*C, 23*C, "grey9" }, + { 229*C, 229*C, 229*C, "grey90" }, + { 232*C, 232*C, 232*C, "grey91" }, + { 235*C, 235*C, 235*C, "grey92" }, + { 237*C, 237*C, 237*C, "grey93" }, + { 240*C, 240*C, 240*C, "grey94" }, + { 242*C, 242*C, 242*C, "grey95" }, + { 245*C, 245*C, 245*C, "grey96" }, + { 247*C, 247*C, 247*C, "grey97" }, + { 250*C, 250*C, 250*C, "grey98" }, + { 252*C, 252*C, 252*C, "grey99" }, + { 240*C, 255*C, 240*C, "honeydew" }, + { 240*C, 255*C, 240*C, "honeydew1" }, + { 224*C, 238*C, 224*C, "honeydew2" }, + { 193*C, 205*C, 193*C, "honeydew3" }, + { 131*C, 139*C, 131*C, "honeydew4" }, + { 255*C, 105*C, 180*C, "hot pink" }, + { 255*C, 105*C, 180*C, "HotPink" }, + { 255*C, 110*C, 180*C, "HotPink1" }, + { 238*C, 106*C, 167*C, "HotPink2" }, + { 205*C, 96*C, 144*C, "HotPink3" }, + { 139*C, 58*C, 98*C, "HotPink4" }, + { 205*C, 92*C, 92*C, "indian red" }, + { 205*C, 92*C, 92*C, "IndianRed" }, + { 255*C, 106*C, 106*C, "IndianRed1" }, + { 238*C, 99*C, 99*C, "IndianRed2" }, + { 205*C, 85*C, 85*C, "IndianRed3" }, + { 139*C, 58*C, 58*C, "IndianRed4" }, + { 255*C, 255*C, 240*C, "ivory" }, + { 255*C, 255*C, 240*C, "ivory1" }, + { 238*C, 238*C, 224*C, "ivory2" }, + { 205*C, 205*C, 193*C, "ivory3" }, + { 139*C, 139*C, 131*C, "ivory4" }, + { 240*C, 230*C, 140*C, "khaki" }, + { 255*C, 246*C, 143*C, "khaki1" }, + { 238*C, 230*C, 133*C, "khaki2" }, + { 205*C, 198*C, 115*C, "khaki3" }, + { 139*C, 134*C, 78*C, "khaki4" }, + { 230*C, 230*C, 250*C, "lavender" }, + { 255*C, 240*C, 245*C, "lavender blush" }, + { 255*C, 240*C, 245*C, "LavenderBlush" }, + { 255*C, 240*C, 245*C, "LavenderBlush1" }, + { 238*C, 224*C, 229*C, "LavenderBlush2" }, + { 205*C, 193*C, 197*C, "LavenderBlush3" }, + { 139*C, 131*C, 134*C, "LavenderBlush4" }, + { 124*C, 252*C, 0*C, "lawn green" }, + { 124*C, 252*C, 0*C, "LawnGreen" }, + { 255*C, 250*C, 205*C, "lemon chiffon" }, + { 255*C, 250*C, 205*C, "LemonChiffon" }, + { 255*C, 250*C, 205*C, "LemonChiffon1" }, + { 238*C, 233*C, 191*C, "LemonChiffon2" }, + { 205*C, 201*C, 165*C, "LemonChiffon3" }, + { 139*C, 137*C, 112*C, "LemonChiffon4" }, + { 173*C, 216*C, 230*C, "light blue" }, + { 240*C, 128*C, 128*C, "light coral" }, + { 224*C, 255*C, 255*C, "light cyan" }, + { 238*C, 221*C, 130*C, "light goldenrod" }, + { 250*C, 250*C, 210*C, "light goldenrod yellow" }, + { 211*C, 211*C, 211*C, "light gray" }, + { 144*C, 238*C, 144*C, "light green" }, + { 211*C, 211*C, 211*C, "light grey" }, + { 255*C, 182*C, 193*C, "light pink" }, + { 255*C, 160*C, 122*C, "light salmon" }, + { 32*C, 178*C, 170*C, "light sea green" }, + { 135*C, 206*C, 250*C, "light sky blue" }, + { 132*C, 112*C, 255*C, "light slate blue" }, + { 119*C, 136*C, 153*C, "light slate gray" }, + { 119*C, 136*C, 153*C, "light slate grey" }, + { 176*C, 196*C, 222*C, "light steel blue" }, + { 255*C, 255*C, 224*C, "light yellow" }, + { 173*C, 216*C, 230*C, "LightBlue" }, + { 191*C, 239*C, 255*C, "LightBlue1" }, + { 178*C, 223*C, 238*C, "LightBlue2" }, + { 154*C, 192*C, 205*C, "LightBlue3" }, + { 104*C, 131*C, 139*C, "LightBlue4" }, + { 240*C, 128*C, 128*C, "LightCoral" }, + { 224*C, 255*C, 255*C, "LightCyan" }, + { 224*C, 255*C, 255*C, "LightCyan1" }, + { 209*C, 238*C, 238*C, "LightCyan2" }, + { 180*C, 205*C, 205*C, "LightCyan3" }, + { 122*C, 139*C, 139*C, "LightCyan4" }, + { 238*C, 221*C, 130*C, "LightGoldenrod" }, + { 255*C, 236*C, 139*C, "LightGoldenrod1" }, + { 238*C, 220*C, 130*C, "LightGoldenrod2" }, + { 205*C, 190*C, 112*C, "LightGoldenrod3" }, + { 139*C, 129*C, 76*C, "LightGoldenrod4" }, + { 250*C, 250*C, 210*C, "LightGoldenrodYellow" }, + { 211*C, 211*C, 211*C, "LightGray" }, + { 144*C, 238*C, 144*C, "LightGreen" }, + { 211*C, 211*C, 211*C, "LightGrey" }, + { 255*C, 182*C, 193*C, "LightPink" }, + { 255*C, 174*C, 185*C, "LightPink1" }, + { 238*C, 162*C, 173*C, "LightPink2" }, + { 205*C, 140*C, 149*C, "LightPink3" }, + { 139*C, 95*C, 101*C, "LightPink4" }, + { 255*C, 160*C, 122*C, "LightSalmon" }, + { 255*C, 160*C, 122*C, "LightSalmon1" }, + { 238*C, 149*C, 114*C, "LightSalmon2" }, + { 205*C, 129*C, 98*C, "LightSalmon3" }, + { 139*C, 87*C, 66*C, "LightSalmon4" }, + { 32*C, 178*C, 170*C, "LightSeaGreen" }, + { 135*C, 206*C, 250*C, "LightSkyBlue" }, + { 176*C, 226*C, 255*C, "LightSkyBlue1" }, + { 164*C, 211*C, 238*C, "LightSkyBlue2" }, + { 141*C, 182*C, 205*C, "LightSkyBlue3" }, + { 96*C, 123*C, 139*C, "LightSkyBlue4" }, + { 132*C, 112*C, 255*C, "LightSlateBlue" }, + { 119*C, 136*C, 153*C, "LightSlateGray" }, + { 119*C, 136*C, 153*C, "LightSlateGrey" }, + { 176*C, 196*C, 222*C, "LightSteelBlue" }, + { 202*C, 225*C, 255*C, "LightSteelBlue1" }, + { 188*C, 210*C, 238*C, "LightSteelBlue2" }, + { 162*C, 181*C, 205*C, "LightSteelBlue3" }, + { 110*C, 123*C, 139*C, "LightSteelBlue4" }, + { 255*C, 255*C, 224*C, "LightYellow" }, + { 255*C, 255*C, 224*C, "LightYellow1" }, + { 238*C, 238*C, 209*C, "LightYellow2" }, + { 205*C, 205*C, 180*C, "LightYellow3" }, + { 139*C, 139*C, 122*C, "LightYellow4" }, + { 50*C, 205*C, 50*C, "lime green" }, + { 50*C, 205*C, 50*C, "LimeGreen" }, + { 250*C, 240*C, 230*C, "linen" }, + { 255*C, 0*C, 255*C, "magenta" }, + { 255*C, 0*C, 255*C, "magenta1" }, + { 238*C, 0*C, 238*C, "magenta2" }, + { 205*C, 0*C, 205*C, "magenta3" }, + { 139*C, 0*C, 139*C, "magenta4" }, + { 176*C, 48*C, 96*C, "maroon" }, + { 255*C, 52*C, 179*C, "maroon1" }, + { 238*C, 48*C, 167*C, "maroon2" }, + { 205*C, 41*C, 144*C, "maroon3" }, + { 139*C, 28*C, 98*C, "maroon4" }, + { 102*C, 205*C, 170*C, "medium aquamarine" }, + { 0*C, 0*C, 205*C, "medium blue" }, + { 186*C, 85*C, 211*C, "medium orchid" }, + { 147*C, 112*C, 219*C, "medium purple" }, + { 60*C, 179*C, 113*C, "medium sea green" }, + { 123*C, 104*C, 238*C, "medium slate blue" }, + { 0*C, 250*C, 154*C, "medium spring green" }, + { 72*C, 209*C, 204*C, "medium turquoise" }, + { 199*C, 21*C, 133*C, "medium violet red" }, + { 102*C, 205*C, 170*C, "MediumAquamarine" }, + { 0*C, 0*C, 205*C, "MediumBlue" }, + { 186*C, 85*C, 211*C, "MediumOrchid" }, + { 224*C, 102*C, 255*C, "MediumOrchid1" }, + { 209*C, 95*C, 238*C, "MediumOrchid2" }, + { 180*C, 82*C, 205*C, "MediumOrchid3" }, + { 122*C, 55*C, 139*C, "MediumOrchid4" }, + { 147*C, 112*C, 219*C, "MediumPurple" }, + { 171*C, 130*C, 255*C, "MediumPurple1" }, + { 159*C, 121*C, 238*C, "MediumPurple2" }, + { 137*C, 104*C, 205*C, "MediumPurple3" }, + { 93*C, 71*C, 139*C, "MediumPurple4" }, + { 60*C, 179*C, 113*C, "MediumSeaGreen" }, + { 123*C, 104*C, 238*C, "MediumSlateBlue" }, + { 0*C, 250*C, 154*C, "MediumSpringGreen" }, + { 72*C, 209*C, 204*C, "MediumTurquoise" }, + { 199*C, 21*C, 133*C, "MediumVioletRed" }, + { 25*C, 25*C, 112*C, "midnight blue" }, + { 25*C, 25*C, 112*C, "MidnightBlue" }, + { 245*C, 255*C, 250*C, "mint cream" }, + { 245*C, 255*C, 250*C, "MintCream" }, + { 255*C, 228*C, 225*C, "misty rose" }, + { 255*C, 228*C, 225*C, "MistyRose" }, + { 255*C, 228*C, 225*C, "MistyRose1" }, + { 238*C, 213*C, 210*C, "MistyRose2" }, + { 205*C, 183*C, 181*C, "MistyRose3" }, + { 139*C, 125*C, 123*C, "MistyRose4" }, + { 255*C, 228*C, 181*C, "moccasin" }, + { 255*C, 222*C, 173*C, "navajo white" }, + { 255*C, 222*C, 173*C, "NavajoWhite" }, + { 255*C, 222*C, 173*C, "NavajoWhite1" }, + { 238*C, 207*C, 161*C, "NavajoWhite2" }, + { 205*C, 179*C, 139*C, "NavajoWhite3" }, + { 139*C, 121*C, 94*C, "NavajoWhite4" }, + { 0*C, 0*C, 128*C, "navy" }, + { 0*C, 0*C, 128*C, "navy blue" }, + { 0*C, 0*C, 128*C, "NavyBlue" }, + { 253*C, 245*C, 230*C, "old lace" }, + { 253*C, 245*C, 230*C, "OldLace" }, + { 107*C, 142*C, 35*C, "olive drab" }, + { 107*C, 142*C, 35*C, "OliveDrab" }, + { 192*C, 255*C, 62*C, "OliveDrab1" }, + { 179*C, 238*C, 58*C, "OliveDrab2" }, + { 154*C, 205*C, 50*C, "OliveDrab3" }, + { 105*C, 139*C, 34*C, "OliveDrab4" }, + { 255*C, 165*C, 0*C, "orange" }, + { 255*C, 69*C, 0*C, "orange red" }, + { 255*C, 165*C, 0*C, "orange1" }, + { 238*C, 154*C, 0*C, "orange2" }, + { 205*C, 133*C, 0*C, "orange3" }, + { 139*C, 90*C, 0*C, "orange4" }, + { 255*C, 69*C, 0*C, "OrangeRed" }, + { 255*C, 69*C, 0*C, "OrangeRed1" }, + { 238*C, 64*C, 0*C, "OrangeRed2" }, + { 205*C, 55*C, 0*C, "OrangeRed3" }, + { 139*C, 37*C, 0*C, "OrangeRed4" }, + { 218*C, 112*C, 214*C, "orchid" }, + { 255*C, 131*C, 250*C, "orchid1" }, + { 238*C, 122*C, 233*C, "orchid2" }, + { 205*C, 105*C, 201*C, "orchid3" }, + { 139*C, 71*C, 137*C, "orchid4" }, + { 238*C, 232*C, 170*C, "pale goldenrod" }, + { 152*C, 251*C, 152*C, "pale green" }, + { 175*C, 238*C, 238*C, "pale turquoise" }, + { 219*C, 112*C, 147*C, "pale violet red" }, + { 238*C, 232*C, 170*C, "PaleGoldenrod" }, + { 152*C, 251*C, 152*C, "PaleGreen" }, + { 154*C, 255*C, 154*C, "PaleGreen1" }, + { 144*C, 238*C, 144*C, "PaleGreen2" }, + { 124*C, 205*C, 124*C, "PaleGreen3" }, + { 84*C, 139*C, 84*C, "PaleGreen4" }, + { 175*C, 238*C, 238*C, "PaleTurquoise" }, + { 187*C, 255*C, 255*C, "PaleTurquoise1" }, + { 174*C, 238*C, 238*C, "PaleTurquoise2" }, + { 150*C, 205*C, 205*C, "PaleTurquoise3" }, + { 102*C, 139*C, 139*C, "PaleTurquoise4" }, + { 219*C, 112*C, 147*C, "PaleVioletRed" }, + { 255*C, 130*C, 171*C, "PaleVioletRed1" }, + { 238*C, 121*C, 159*C, "PaleVioletRed2" }, + { 205*C, 104*C, 137*C, "PaleVioletRed3" }, + { 139*C, 71*C, 93*C, "PaleVioletRed4" }, + { 255*C, 239*C, 213*C, "papaya whip" }, + { 255*C, 239*C, 213*C, "PapayaWhip" }, + { 255*C, 218*C, 185*C, "peach puff" }, + { 255*C, 218*C, 185*C, "PeachPuff" }, + { 255*C, 218*C, 185*C, "PeachPuff1" }, + { 238*C, 203*C, 173*C, "PeachPuff2" }, + { 205*C, 175*C, 149*C, "PeachPuff3" }, + { 139*C, 119*C, 101*C, "PeachPuff4" }, + { 205*C, 133*C, 63*C, "peru" }, + { 255*C, 192*C, 203*C, "pink" }, + { 255*C, 181*C, 197*C, "pink1" }, + { 238*C, 169*C, 184*C, "pink2" }, + { 205*C, 145*C, 158*C, "pink3" }, + { 139*C, 99*C, 108*C, "pink4" }, + { 221*C, 160*C, 221*C, "plum" }, + { 255*C, 187*C, 255*C, "plum1" }, + { 238*C, 174*C, 238*C, "plum2" }, + { 205*C, 150*C, 205*C, "plum3" }, + { 139*C, 102*C, 139*C, "plum4" }, + { 176*C, 224*C, 230*C, "powder blue" }, + { 176*C, 224*C, 230*C, "PowderBlue" }, + { 160*C, 32*C, 240*C, "purple" }, + { 155*C, 48*C, 255*C, "purple1" }, + { 145*C, 44*C, 238*C, "purple2" }, + { 125*C, 38*C, 205*C, "purple3" }, + { 85*C, 26*C, 139*C, "purple4" }, + { 255*C, 0*C, 0*C, "red" }, + { 255*C, 0*C, 0*C, "red1" }, + { 238*C, 0*C, 0*C, "red2" }, + { 205*C, 0*C, 0*C, "red3" }, + { 139*C, 0*C, 0*C, "red4" }, + { 188*C, 143*C, 143*C, "rosy brown" }, + { 188*C, 143*C, 143*C, "RosyBrown" }, + { 255*C, 193*C, 193*C, "RosyBrown1" }, + { 238*C, 180*C, 180*C, "RosyBrown2" }, + { 205*C, 155*C, 155*C, "RosyBrown3" }, + { 139*C, 105*C, 105*C, "RosyBrown4" }, + { 65*C, 105*C, 225*C, "royal blue" }, + { 65*C, 105*C, 225*C, "RoyalBlue" }, + { 72*C, 118*C, 255*C, "RoyalBlue1" }, + { 67*C, 110*C, 238*C, "RoyalBlue2" }, + { 58*C, 95*C, 205*C, "RoyalBlue3" }, + { 39*C, 64*C, 139*C, "RoyalBlue4" }, + { 139*C, 69*C, 19*C, "saddle brown" }, + { 139*C, 69*C, 19*C, "SaddleBrown" }, + { 250*C, 128*C, 114*C, "salmon" }, + { 255*C, 140*C, 105*C, "salmon1" }, + { 238*C, 130*C, 98*C, "salmon2" }, + { 205*C, 112*C, 84*C, "salmon3" }, + { 139*C, 76*C, 57*C, "salmon4" }, + { 244*C, 164*C, 96*C, "sandy brown" }, + { 244*C, 164*C, 96*C, "SandyBrown" }, + { 46*C, 139*C, 87*C, "sea green" }, + { 46*C, 139*C, 87*C, "SeaGreen" }, + { 84*C, 255*C, 159*C, "SeaGreen1" }, + { 78*C, 238*C, 148*C, "SeaGreen2" }, + { 67*C, 205*C, 128*C, "SeaGreen3" }, + { 46*C, 139*C, 87*C, "SeaGreen4" }, + { 255*C, 245*C, 238*C, "seashell" }, + { 255*C, 245*C, 238*C, "seashell1" }, + { 238*C, 229*C, 222*C, "seashell2" }, + { 205*C, 197*C, 191*C, "seashell3" }, + { 139*C, 134*C, 130*C, "seashell4" }, + { 160*C, 82*C, 45*C, "sienna" }, + { 255*C, 130*C, 71*C, "sienna1" }, + { 238*C, 121*C, 66*C, "sienna2" }, + { 205*C, 104*C, 57*C, "sienna3" }, + { 139*C, 71*C, 38*C, "sienna4" }, + { 135*C, 206*C, 235*C, "sky blue" }, + { 135*C, 206*C, 235*C, "SkyBlue" }, + { 135*C, 206*C, 255*C, "SkyBlue1" }, + { 126*C, 192*C, 238*C, "SkyBlue2" }, + { 108*C, 166*C, 205*C, "SkyBlue3" }, + { 74*C, 112*C, 139*C, "SkyBlue4" }, + { 106*C, 90*C, 205*C, "slate blue" }, + { 112*C, 128*C, 144*C, "slate gray" }, + { 112*C, 128*C, 144*C, "slate grey" }, + { 106*C, 90*C, 205*C, "SlateBlue" }, + { 131*C, 111*C, 255*C, "SlateBlue1" }, + { 122*C, 103*C, 238*C, "SlateBlue2" }, + { 105*C, 89*C, 205*C, "SlateBlue3" }, + { 71*C, 60*C, 139*C, "SlateBlue4" }, + { 112*C, 128*C, 144*C, "SlateGray" }, + { 198*C, 226*C, 255*C, "SlateGray1" }, + { 185*C, 211*C, 238*C, "SlateGray2" }, + { 159*C, 182*C, 205*C, "SlateGray3" }, + { 108*C, 123*C, 139*C, "SlateGray4" }, + { 112*C, 128*C, 144*C, "SlateGrey" }, + { 255*C, 250*C, 250*C, "snow" }, + { 255*C, 250*C, 250*C, "snow1" }, + { 238*C, 233*C, 233*C, "snow2" }, + { 205*C, 201*C, 201*C, "snow3" }, + { 139*C, 137*C, 137*C, "snow4" }, + { 0*C, 255*C, 127*C, "spring green" }, + { 0*C, 255*C, 127*C, "SpringGreen" }, + { 0*C, 255*C, 127*C, "SpringGreen1" }, + { 0*C, 238*C, 118*C, "SpringGreen2" }, + { 0*C, 205*C, 102*C, "SpringGreen3" }, + { 0*C, 139*C, 69*C, "SpringGreen4" }, + { 70*C, 130*C, 180*C, "steel blue" }, + { 70*C, 130*C, 180*C, "SteelBlue" }, + { 99*C, 184*C, 255*C, "SteelBlue1" }, + { 92*C, 172*C, 238*C, "SteelBlue2" }, + { 79*C, 148*C, 205*C, "SteelBlue3" }, + { 54*C, 100*C, 139*C, "SteelBlue4" }, + { 210*C, 180*C, 140*C, "tan" }, + { 255*C, 165*C, 79*C, "tan1" }, + { 238*C, 154*C, 73*C, "tan2" }, + { 205*C, 133*C, 63*C, "tan3" }, + { 139*C, 90*C, 43*C, "tan4" }, + { 216*C, 191*C, 216*C, "thistle" }, + { 255*C, 225*C, 255*C, "thistle1" }, + { 238*C, 210*C, 238*C, "thistle2" }, + { 205*C, 181*C, 205*C, "thistle3" }, + { 139*C, 123*C, 139*C, "thistle4" }, + { 255*C, 99*C, 71*C, "tomato" }, + { 255*C, 99*C, 71*C, "tomato1" }, + { 238*C, 92*C, 66*C, "tomato2" }, + { 205*C, 79*C, 57*C, "tomato3" }, + { 139*C, 54*C, 38*C, "tomato4" }, + { 64*C, 224*C, 208*C, "turquoise" }, + { 0*C, 245*C, 255*C, "turquoise1" }, + { 0*C, 229*C, 238*C, "turquoise2" }, + { 0*C, 197*C, 205*C, "turquoise3" }, + { 0*C, 134*C, 139*C, "turquoise4" }, + { 238*C, 130*C, 238*C, "violet" }, + { 208*C, 32*C, 144*C, "violet red" }, + { 208*C, 32*C, 144*C, "VioletRed" }, + { 255*C, 62*C, 150*C, "VioletRed1" }, + { 238*C, 58*C, 140*C, "VioletRed2" }, + { 205*C, 50*C, 120*C, "VioletRed3" }, + { 139*C, 34*C, 82*C, "VioletRed4" }, + { 245*C, 222*C, 179*C, "wheat" }, + { 255*C, 231*C, 186*C, "wheat1" }, + { 238*C, 216*C, 174*C, "wheat2" }, + { 205*C, 186*C, 150*C, "wheat3" }, + { 139*C, 126*C, 102*C, "wheat4" }, + { 255*C, 255*C, 255*C, "white" }, + { 245*C, 245*C, 245*C, "white smoke" }, + { 245*C, 245*C, 245*C, "WhiteSmoke" }, + { 255*C, 255*C, 0*C, "yellow" }, + { 154*C, 205*C, 50*C, "yellow green" }, + { 255*C, 255*C, 0*C, "yellow1" }, + { 238*C, 238*C, 0*C, "yellow2" }, + { 205*C, 205*C, 0*C, "yellow3" }, + { 139*C, 139*C, 0*C, "yellow4" }, + { 154*C, 205*C, 50*C, "YellowGreen" } }; #undef C diff --git a/programs/Xserver/hw/kdrive/kdrive.c b/programs/Xserver/hw/kdrive/kdrive.c index 5e7694fc5..6427b12d3 100644 --- a/programs/Xserver/hw/kdrive/kdrive.c +++ b/programs/Xserver/hw/kdrive/kdrive.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.10 2000/09/27 20:47:36 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.11 2000/12/08 22:59:37 keithp Exp $ */ #include "kdrive.h" #ifdef PSEUDO8 @@ -30,6 +30,10 @@ #include <mivalidate.h> #include <dixstruct.h> +#ifdef XV +#include "kxv.h" +#endif + CARD8 kdBpp[] = { 1, 4, 8, 16, 24, 32 }; #define NUM_KD_BPP (sizeof (kdBpp) / sizeof (kdBpp[0])) @@ -243,6 +247,7 @@ KdEnableScreen (ScreenPtr pScreen) KdSetRootClip (pScreen, TRUE); if (pScreenPriv->card->cfuncs->dpms) (*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState); + return TRUE; } void @@ -755,6 +760,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) miInitializeBackingStore (pScreen); #endif #endif + + /* * Wrap CloseScreen, the order now is: * KdCloseScreen @@ -811,7 +818,6 @@ KdInitScreen (ScreenInfo *pScreenInfo, char **argv) { KdCardInfo *card = screen->card; - int i; (*card->cfuncs->scrinit) (screen); @@ -927,6 +933,8 @@ KdAddScreen (ScreenInfo *pScreenInfo, AddScreen (KdScreenInit, argc, argv); } +#if 0 /* This function is not used currently */ + int KdDepthToFb (ScreenPtr pScreen, int depth) { @@ -938,12 +946,13 @@ KdDepthToFb (ScreenPtr pScreen, int depth) return fb; } +#endif + void KdInitOutput (ScreenInfo *pScreenInfo, int argc, char **argv) { - int i; KdCardInfo *card; KdScreenInfo *screen; diff --git a/programs/Xserver/hw/kdrive/kdrive.h b/programs/Xserver/hw/kdrive/kdrive.h index 1b06f1499..ca4a8db75 100644 --- a/programs/Xserver/hw/kdrive/kdrive.h +++ b/programs/Xserver/hw/kdrive/kdrive.h @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.11 2000/11/29 08:42:25 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.12 2000/12/08 22:59:37 keithp Exp $ */ #include <stdio.h> #include "X.h" @@ -67,6 +67,7 @@ typedef struct _KdCardAttr { CARD32 io; CARD32 address[KD_MAX_CARD_ADDRESS]; int naddr; + int bus; } KdCardAttr; typedef struct _KdCardInfo { @@ -612,3 +613,6 @@ KdFrameBufferValid (CARD8 *base, int size); int KdFrameBufferSize (CARD8 *base, int max); +/* function prototypes to be imlpemented by the drivers */ +void +InitCard (char *name); diff --git a/programs/Xserver/hw/kdrive/kinput.c b/programs/Xserver/hw/kdrive/kinput.c index e8baf0153..00a757674 100644 --- a/programs/Xserver/hw/kdrive/kinput.c +++ b/programs/Xserver/hw/kdrive/kinput.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.11 2000/12/08 21:40:02 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.12 2001/01/23 06:25:05 keithp Exp $ */ #include "kdrive.h" #include "inputstr.h" @@ -48,8 +48,8 @@ static Bool kdInputEnabled; static Bool kdOffScreen; static unsigned long kdOffScreenTime; static KdMouseMatrix kdMouseMatrix = { - 1, 0, 0, - 0, 1, 0 + { { 1, 0, 0 }, + { 0, 1, 0 } } }; #ifdef TOUCHSCREEN @@ -403,29 +403,29 @@ KdInitAutoRepeats (void) } const KdKeySymModsRec kdKeySymMods[] = { - XK_Control_L, ControlMask, - XK_Control_R, ControlMask, - XK_Shift_L, ShiftMask, - XK_Shift_R, ShiftMask, - XK_Caps_Lock, LockMask, - XK_Shift_Lock, LockMask, - XK_Alt_L, Mod1Mask, - XK_Alt_R, Mod1Mask, - XK_Meta_L, Mod1Mask, - XK_Meta_R, Mod1Mask, - XK_Num_Lock, Mod2Mask, - XK_Super_L, Mod3Mask, - XK_Super_R, Mod3Mask, - XK_Hyper_L, Mod3Mask, - XK_Hyper_R, Mod3Mask, - XK_Mode_switch, Mod4Mask, + { XK_Control_L, ControlMask }, + { XK_Control_R, ControlMask }, + { XK_Shift_L, ShiftMask }, + { XK_Shift_R, ShiftMask }, + { XK_Caps_Lock, LockMask }, + { XK_Shift_Lock, LockMask }, + { XK_Alt_L, Mod1Mask }, + { XK_Alt_R, Mod1Mask }, + { XK_Meta_L, Mod1Mask }, + { XK_Meta_R, Mod1Mask }, + { XK_Num_Lock, Mod2Mask }, + { XK_Super_L, Mod3Mask }, + { XK_Super_R, Mod3Mask }, + { XK_Hyper_L, Mod3Mask }, + { XK_Hyper_R, Mod3Mask }, + { XK_Mode_switch, Mod4Mask }, #ifdef TOUCHSCREEN /* PDA specific hacks */ - XF86XK_Start, ControlMask, - XK_Menu, ShiftMask, - XK_telephone, Mod1Mask, - XF86XK_AudioRecord, Mod2Mask, - XF86XK_Calendar, Mod3Mask, + { XF86XK_Start, ControlMask }, + { XK_Menu, ShiftMask }, + { XK_telephone, Mod1Mask }, + { XF86XK_AudioRecord, Mod2Mask }, + { XF86XK_Calendar, Mod3Mask } #endif }; @@ -787,6 +787,7 @@ int kdEmulationDx, kdEmulationDy; #define EventX(e) ((e)->u.keyButtonPointer.rootX) #define EventY(e) ((e)->u.keyButtonPointer.rootY) +int KdInsideEmulationWindow (xEvent *ev) { if (ev->u.keyButtonPointer.pad1) @@ -829,6 +830,7 @@ KdClassifyInput (xEvent *ev) default: return keyboard; } + return keyboard; } #ifndef NDEBUG diff --git a/programs/Xserver/hw/kdrive/kmap.c b/programs/Xserver/hw/kdrive/kmap.c index e1f3dff52..7238eaa2a 100644 --- a/programs/Xserver/hw/kdrive/kmap.c +++ b/programs/Xserver/hw/kdrive/kmap.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.5 2000/12/08 23:04:56 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.6 2000/12/13 18:06:54 keithp Exp $ */ #include "kdrive.h" @@ -38,6 +38,8 @@ #include <asm/mtrr.h> #endif +#include <sys/ioctl.h> + void * KdMapDevice (CARD32 addr, CARD32 size) { diff --git a/programs/Xserver/hw/kdrive/kmode.c b/programs/Xserver/hw/kdrive/kmode.c index 9841e9848..403a75b6f 100644 --- a/programs/Xserver/hw/kdrive/kmode.c +++ b/programs/Xserver/hw/kdrive/kmode.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.5 2000/05/24 23:57:56 keithp Exp $ * * Copyright 1999 SuSE, Inc. * @@ -41,6 +41,14 @@ const KdMonitorTiming kdMonitorTimings[] = { 36, 108, 216, KdSyncNegative, /* 37.927 */ 1, 42, 46, KdSyncPositive, /* 85.039 */ }, + + + /* Modeline "720x576" 29.000 720 736 800 880 576 577 580 625 */ + { + 720, 576, 52, 32954, /* PAL Video */ + 16, 80, 160, KdSyncPositive, /* 32.954 */ + 1, 45, 49, KdSyncPositive, /* 52.727 */ + }, /* 640x480 modes */ { 640, 480, 85, 36000, /* VESA */ diff --git a/programs/Xserver/hw/kdrive/linux/Imakefile b/programs/Xserver/hw/kdrive/linux/Imakefile index ed7b89e56..477bf9e30 100644 --- a/programs/Xserver/hw/kdrive/linux/Imakefile +++ b/programs/Xserver/hw/kdrive/linux/Imakefile @@ -8,9 +8,9 @@ TSSRCS = ts.c TSOBJS = ts.o #endif -SRCS = keyboard.c linux.c ps2.c bus.c $(TSSRCS) +SRCS = keyboard.c linux.c ps2.c bus.c agp.c $(TSSRCS) -OBJS = keyboard.o linux.o ps2.o bus.o $(TSOBJS) +OBJS = keyboard.o linux.o ps2.o bus.o agp.o $(TSOBJS) INCLUDES = -I. $(KDINCS) diff --git a/programs/Xserver/hw/kdrive/linux/keyboard.c b/programs/Xserver/hw/kdrive/linux/keyboard.c index 3040af987..0ba7a0e92 100644 --- a/programs/Xserver/hw/kdrive/linux/keyboard.c +++ b/programs/Xserver/hw/kdrive/linux/keyboard.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.4 2000/10/10 14:05:48 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.5 2000/12/08 23:04:57 keithp Exp $ * * Copyright © 1999 Keith Packard * @@ -29,6 +29,7 @@ #define XK_PUBLISHING #include <X11/keysym.h> #include <termios.h> +#include <sys/ioctl.h> extern int LinuxConsoleFd; diff --git a/programs/Xserver/hw/kdrive/linux/linux.c b/programs/Xserver/hw/kdrive/linux/linux.c index 2cd54d53b..52f6d86cd 100644 --- a/programs/Xserver/hw/kdrive/linux/linux.c +++ b/programs/Xserver/hw/kdrive/linux/linux.c @@ -28,6 +28,7 @@ #include <linux/vt.h> #include <linux/kd.h> #include <sys/stat.h> +#include <sys/ioctl.h> #include <keysym.h> static int vtno; @@ -174,6 +175,7 @@ LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr) n--; } attr->naddr = n; + attr->bus = bus; ret = TRUE; break; } @@ -181,6 +183,37 @@ LinuxFindPci (CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr *attr) return ret; } +unsigned char * +LinuxGetPciCfg(KdCardAttr *attr) { + char filename[256]; + FILE *f; + unsigned char *cfg; + int r; + + snprintf(filename, 255, "/proc/bus/pci/%02x/%02x.%x", + attr->bus >> 8, (attr->bus & 0xff) >> 3, attr->bus & 7); +/* fprintf(stderr,"Find card on path %s\n",filename); */ + + if (!(f=fopen(filename,"r"))) + return NULL; + + if (!(cfg=xalloc(256))) + { + fclose(f); + return NULL; + } + + if (256 != (r=fread(cfg, 1, 256, f))) + { + fprintf(stderr,"LinuxGetPciCfg: read %d, expected 256\n",r); + free(cfg); + cfg=NULL; + } + fclose(f); +/* fprintf(stderr,"LinuxGetPciCfg: success, returning %p\n",cfg); */ + return cfg; +} + void LinuxSetSwitchMode (int mode) { diff --git a/programs/Xserver/hw/kdrive/linux/ps2.c b/programs/Xserver/hw/kdrive/linux/ps2.c index 9ab1d59ac..70edb1d83 100644 --- a/programs/Xserver/hw/kdrive/linux/ps2.c +++ b/programs/Xserver/hw/kdrive/linux/ps2.c @@ -115,6 +115,7 @@ Ps2Init (void) if (ps2Port >= 0) return ps2Port; } + return -1; } void diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 1cbfe6551..ae33e8903 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,7 @@ XFree86 4.0.99.2 (?? March 2001) + 310. Add XftCache creation to fonts/Type1 (Keith Packard) + 309. Add Xmuu library for non-Xt/Xaw dependent applications (Jim Gettys) + 308. Add i810 and Xv support to kdrive (Pontus Lidman) 307. Fix Radeon CPUToScreen acceleration on Alpha platforms (Jay Estabrook). 306. Fix bug in ServerLayout option handling when there's no ServerFlags section present (David Dawes). @@ -12769,4 +12772,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1647 2001/03/28 14:37:02 alanh Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1649 2001/03/28 20:08:21 alanh Exp $ diff --git a/programs/setxkbmap/Imakefile b/programs/setxkbmap/Imakefile index fedd2010a..f097f86bd 100644 --- a/programs/setxkbmap/Imakefile +++ b/programs/setxkbmap/Imakefile @@ -14,4 +14,6 @@ all:: clean:: RemoveFiles(test.h *.xkm *.xkb) +#if BuildXKBlib ComplexProgramTarget(setxkbmap) +#endif diff --git a/programs/x11perf/Imakefile b/programs/x11perf/Imakefile index fd3aaaf38..4f14d1900 100644 --- a/programs/x11perf/Imakefile +++ b/programs/x11perf/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ -XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.3 2000/11/30 17:07:20 dawes Exp $ +XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.4 2001/01/17 23:45:10 dawes Exp $ #ifndef X11perfcompLib #define X11perfcompLib $(LIBDIR)/x11perfcomp @@ -32,8 +32,8 @@ XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.3 2000/11/30 17:07:20 dawes Ex do_dots.o do_windows.o do_movewin.o do_text.o \ do_blt.o do_arcs.o \ do_tris.o do_complex.o do_traps.o -LOCAL_LIBRARIES = $(XFTLIBS) $(XMULIB) $(XLIB) - DEPLIBS = $(XFTDEPS) $(DEPXMULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XFTLIBS) $(XMUULIB) $(XLIB) + DEPLIBS = $(XFTDEPS) $(DEPXMUULIB) $(DEPXLIB) SYS_LIBRARIES = MathLibrary #ifndef OS2Architecture diff --git a/programs/xauth/Imakefile b/programs/xauth/Imakefile index 3dbed0d25..b28b69208 100644 --- a/programs/xauth/Imakefile +++ b/programs/xauth/Imakefile @@ -3,10 +3,10 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.3 1998/12/20 11:58:12 dawes Exp $ +XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.4 2001/01/17 23:45:14 dawes Exp $ -DEPLIBS = $(DEPXAUTHLIB) $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XAUTHLIB) $(XMULIB) $(XLIB) +DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB) SRCS = xauth.c gethost.c process.c parsedpy.c OBJS = xauth.o gethost.o process.o parsedpy.o CONN_DEFINES = $(CONNECTION_FLAGS) diff --git a/programs/xdm/greeter/Imakefile b/programs/xdm/greeter/Imakefile index 1368550df..1c8e02d46 100644 --- a/programs/xdm/greeter/Imakefile +++ b/programs/xdm/greeter/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.4 2000/06/14 00:16:15 dawes Exp $ +XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.5 2001/01/17 23:45:25 dawes Exp $ #define DoNormalLib NO #define DoSharedLib YES @@ -14,6 +14,10 @@ XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.4 2000/06/14 00:16:15 dawe SOXDMGREETREV = 1.0 #define SoRev SOXDMGREETREV +#if UseXKBInClients +XKB_CLIENT_DEFINES = XkbClientDefines +#endif + #if HasXdmAuth XDMAUTH_DEFINES = -DHASXDMAUTH #endif @@ -75,7 +79,8 @@ PAM_DEFINES = -DUSE_PAM INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE) DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \ - $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) + $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) \ + $(XKB_CLIENT_DEFINES) SHLIBDIR = $(XDMDIR) diff --git a/programs/xftcache/Imakefile b/programs/xftcache/Imakefile index bfa19171e..e5e504ede 100644 --- a/programs/xftcache/Imakefile +++ b/programs/xftcache/Imakefile @@ -9,5 +9,3 @@ OBJS=xftcache.o ComplexProgramTarget(xftcache) LinkBuildBinary(ProgramTargetName(xftcache)) -install:: - $(DESTDIR)$(BINDIR)/xftcache diff --git a/programs/xhost/Imakefile b/programs/xhost/Imakefile index 3c29bf74c..35722a9be 100644 --- a/programs/xhost/Imakefile +++ b/programs/xhost/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xhost/Imakefile,v 1.3 1998/12/20 22:19:00 dawes Exp $ +XCOMM $XFree86: xc/programs/xhost/Imakefile,v 1.4 2001/01/17 23:45:35 dawes Exp $ #if HasSecureRPC RPC_DEFINES = -DSECURE_RPC @@ -13,8 +13,8 @@ RPC_DEFINES = KRB5_DEFINES = Krb5Defines KRB5_INCLUDE = Krb5Includes INCLUDES = $(KRB5_INCLUDE) - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS = xhost.c OBJS = xhost.o DEFINES = $(CONNECTION_FLAGS) $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) diff --git a/programs/xinit/Imakefile b/programs/xinit/Imakefile index e5b8949bf..cc01a6a13 100644 --- a/programs/xinit/Imakefile +++ b/programs/xinit/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.8 2000/12/02 19:06:58 herrb Exp $ +XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.9 2001/01/17 23:45:42 dawes Exp $ #if HasVFork VFORK_DEFINES = -DHAS_VFORK @@ -16,8 +16,8 @@ XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.8 2000/12/02 19:06:58 herrb Exp #endif DEFINES = $(CONNECTION_FLAGS) $(VFORK_DEFINES) $(SIGNAL_DEFINES) \ -DBINDIR=\"$(BINDIR)\" $(OS_DEFS) - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS1 = xinit.c OBJS1 = xinit.o SAMPLECONFIG = xinitrc diff --git a/programs/xinit/xinit.c b/programs/xinit/xinit.c index e87afcdb6..649d9eb87 100644 --- a/programs/xinit/xinit.c +++ b/programs/xinit/xinit.c @@ -21,11 +21,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xinit/xinit.c,v 3.23 2000/11/02 02:51:25 dawes Exp $ */ +/* $XFree86: xc/programs/xinit/xinit.c,v 3.24 2001/01/17 23:45:42 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xos.h> -#include <X11/Xmu/SysUtil.h> #include <stdio.h> #include <ctype.h> diff --git a/programs/xkill/Imakefile b/programs/xkill/Imakefile index c59f1bb07..04e78b4c3 100644 --- a/programs/xkill/Imakefile +++ b/programs/xkill/Imakefile @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.4 91/07/17 00:47:39 gildea Exp $ - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SimpleProgramTarget(xkill) diff --git a/programs/xlsatoms/Imakefile b/programs/xlsatoms/Imakefile index 6aa421bbd..c92bde656 100644 --- a/programs/xlsatoms/Imakefile +++ b/programs/xlsatoms/Imakefile @@ -1,6 +1,6 @@ -XCOMM $XConsortium: Imakefile,v 1.2 91/07/16 23:06:53 gildea Exp $ - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SimpleProgramTarget(xlsatoms) diff --git a/programs/xlsclients/Imakefile b/programs/xlsclients/Imakefile index 2227d3237..1a612d521 100644 --- a/programs/xlsclients/Imakefile +++ b/programs/xlsclients/Imakefile @@ -1,6 +1,6 @@ -XCOMM $XConsortium: Imakefile,v 1.5 91/07/17 16:07:41 gildea Exp $ - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS = xlsclients.c OBJS = xlsclients.o diff --git a/programs/xprop/Imakefile b/programs/xprop/Imakefile index dbebca438..1a6ce89ea 100644 --- a/programs/xprop/Imakefile +++ b/programs/xprop/Imakefile @@ -3,10 +3,10 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ -XCOMM $XFree86$ +XCOMM $XFree86: xc/programs/xprop/Imakefile,v 1.4 2001/01/23 20:22:19 dawes Exp $ - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS = xprop.c dsimple.c OBJS = xprop.o dsimple.o diff --git a/programs/xrdb/Imakefile b/programs/xrdb/Imakefile index 494c658b9..f427591fb 100644 --- a/programs/xrdb/Imakefile +++ b/programs/xrdb/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.2 1997/09/30 04:51:05 hohndel Exp $ +XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.3 2001/01/17 23:46:22 dawes Exp $ #if PatheticCpp CPPDEFS = -DPATHETICCPP @@ -17,7 +17,7 @@ XCOMM Due to ill make parsing the cpp is passed directly in source file #else DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS) #endif - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SimpleProgramTarget(xrdb) diff --git a/programs/xset/Imakefile b/programs/xset/Imakefile index d7dd54a14..353f5949d 100644 --- a/programs/xset/Imakefile +++ b/programs/xset/Imakefile @@ -3,13 +3,13 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xset/Imakefile,v 3.9 2000/08/28 16:35:04 dawes Exp $ +XCOMM $XFree86: xc/programs/xset/Imakefile,v 3.10 2001/01/17 23:46:27 dawes Exp $ DEFINES = ExtensionDefines DPMSDefines \ FontCacheExtensionDefines \ XkbDefines - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS) -LOCAL_LIBRARIES = $(XMULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS) +LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB) #if BuildXF86MiscLibrary DEPXF86LIBS = $(DEPXXF86MISCLIB) diff --git a/programs/xsetroot/Imakefile b/programs/xsetroot/Imakefile index e41c70861..521975c46 100644 --- a/programs/xsetroot/Imakefile +++ b/programs/xsetroot/Imakefile @@ -1,6 +1,6 @@ -XCOMM $XConsortium: Imakefile,v 1.8 91/07/16 23:05:43 gildea Exp $ - DEPLIBS = $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS = xsetroot.c OBJS = xsetroot.o diff --git a/programs/xwd/Imakefile b/programs/xwd/Imakefile index a8ab09a4e..d83c0e43e 100644 --- a/programs/xwd/Imakefile +++ b/programs/xwd/Imakefile @@ -1,6 +1,6 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:11 cpqbld Exp $ - DEPLIBS = XkbClientDepLibs $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = XkbClientLibs $(XMULIB) $(XLIB) + DEPLIBS = XkbClientDepLibs $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = XkbClientLibs $(XMUULIB) $(XLIB) SRCS = xwd.c dsimple.c list.c multiVis.c OBJS = xwd.o dsimple.o list.o multiVis.o DEFINES = XkbClientDefines diff --git a/programs/xwininfo/Imakefile b/programs/xwininfo/Imakefile index 43256cf26..4ad6cea7f 100644 --- a/programs/xwininfo/Imakefile +++ b/programs/xwininfo/Imakefile @@ -1,6 +1,6 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:15 cpqbld Exp $ - DEPLIBS = $(DEPXMULIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMULIB) $(XLIB) + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) SRCS = xwininfo.c dsimple.c OBJS = xwininfo.o dsimple.o |