Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | further reduction of color table to 147 entries! |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | rfe-3503317 |
Files: | files | file ages | folders |
SHA1: |
7f343b6e6abbe0930e798b85b672f1a8 |
User & Date: | jan.nijtmans 2012-03-16 22:36:44 |
Context
2012-03-17
| ||
00:18 | implementation complete, todo: more testing check-in: 190211c6 user: jan.nijtmans tags: rfe-3503317 | |
2012-03-16
| ||
22:36 | further reduction of color table to 147 entries! check-in: 7f343b6e user: jan.nijtmans tags: rfe-3503317 | |
2012-03-15
| ||
20:45 | workaround for _strtoi64 determination on win64 (autoconf-2.13 issue) check-in: 11cf61f5 user: jan.nijtmans tags: core-8-4-branch | |
2012-03-13
| ||
15:05 | make sure that "burly wood" is not a valid color check-in: 3a32cd8c user: jan.nijtmans tags: rfe-3503317 | |
Changes
Changes to generic/tkColor.c.
︙ | ︙ | |||
855 856 857 858 859 860 861 862 863 864 865 866 | buf[7] = *(--spec); buf[6] = *(--spec); buf[5] = buf[8] = *(--spec); buf[3] = *(--spec); buf[2] = *(--spec); buf[1] = buf[4] = *(--spec); spec = buf; } } return XParseColor(display, map, spec, colorPtr); } #endif /* __WIN32__ */ | > > | 855 856 857 858 859 860 861 862 863 864 865 866 867 868 | buf[7] = *(--spec); buf[6] = *(--spec); buf[5] = buf[8] = *(--spec); buf[3] = *(--spec); buf[2] = *(--spec); buf[1] = buf[4] = *(--spec); spec = buf; } else { spec -= 10; } } return XParseColor(display, map, spec, colorPtr); } #endif /* __WIN32__ */ |
Changes to win/configure.
︙ | ︙ | |||
1748 1749 1750 1751 1752 1753 1754 1755 | #------------------------------------------- # Check for _strtoi64 #------------------------------------------- echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 | > | | | > | | 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 | #------------------------------------------- # Check for _strtoi64 #------------------------------------------- if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 echo "configure:1758: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF #line 1764 "configure" #include "confdefs.h" #include <stdlib.h> int main() { _strtoi64(0,0,0) ; return 0; } EOF if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* tcl_have_strtoi64=no fi rm -f conftest* fi echo "$ac_t""$tcl_have_strtoi64" 1>&6 if test $tcl_have_strtoi64 = no; then cat >> confdefs.h <<\EOF #define NO_STRTOI64 1 EOF fi fi #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols # option. This macro depends on C flags, and should be called # after SC_CONFIG_CFLAGS macro is called. #-------------------------------------------------------------------- echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 echo "configure:1800: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" tcl_ok=$enableval else tcl_ok=no fi |
︙ | ︙ | |||
1851 1852 1853 1854 1855 1856 1857 | #-------------------------------------------------------------------- # Embed the manifest if we can determine how #-------------------------------------------------------------------- echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 | | | | 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 | #-------------------------------------------------------------------- # Embed the manifest if we can determine how #-------------------------------------------------------------------- echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 echo "configure:1861: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" embed_ok=$enableval else embed_ok=yes fi VC_MANIFEST_EMBED_DLL= VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <<EOF #line 1878 "configure" #include "confdefs.h" #if defined(_MSC_VER) && _MSC_VER >= 1400 print("manifest needed") #endif EOF |
︙ | ︙ | |||
1905 1906 1907 1908 1909 1910 1911 | #-------------------------------------------------------------------- # Locate and source the tclConfig.sh file. #-------------------------------------------------------------------- echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 | | | 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 | #-------------------------------------------------------------------- # Locate and source the tclConfig.sh file. #-------------------------------------------------------------------- echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 echo "configure:1915: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win elif test -d ../../tcl8.4/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4/win else TCL_BIN_DIR_DEFAULT=../../tcl/win |
︙ | ︙ | |||
1933 1934 1935 1936 1937 1938 1939 | if test ! -f $TCL_BIN_DIR/tclConfig.sh; then { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } fi echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 | | | 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 | if test ! -f $TCL_BIN_DIR/tclConfig.sh; then { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } fi echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 . $TCL_BIN_DIR/tclConfig.sh else echo "$ac_t""file not found" 1>&6 fi |
︙ | ︙ | |||
1986 1987 1988 1989 1990 1991 1992 | echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 | | | | 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 | echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 echo "configure:1996: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 echo "configure:2003: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else search_path=`echo ${PATH} | sed -e 's/:/ /g'` for dir in $search_path ; do |
︙ | ︙ |
Changes to win/configure.in.
︙ | ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H") AC_SUBST(MAN2TCLFLAGS) #------------------------------------------- # Check for _strtoi64 #------------------------------------------- AC_CACHE_CHECK([availability of _strtoi64], tcl_have_strtoi64, [ AC_TRY_LINK([#include <stdlib.h>], [_strtoi64(0,0,0)], tcl_have_strtoi64=yes, tcl_have_strtoi64=no)]) if test $tcl_have_strtoi64 = no; then AC_DEFINE(NO_STRTOI64, 1, [Is _strtoi64 function available?]) fi #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols # option. This macro depends on C flags, and should be called # after SC_CONFIG_CFLAGS macro is called. #-------------------------------------------------------------------- | > > | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H") AC_SUBST(MAN2TCLFLAGS) #------------------------------------------- # Check for _strtoi64 #------------------------------------------- if test "${MACHINE}" = "X86" ; then AC_CACHE_CHECK([availability of _strtoi64], tcl_have_strtoi64, [ AC_TRY_LINK([#include <stdlib.h>], [_strtoi64(0,0,0)], tcl_have_strtoi64=yes, tcl_have_strtoi64=no)]) if test $tcl_have_strtoi64 = no; then AC_DEFINE(NO_STRTOI64, 1, [Is _strtoi64 function available?]) fi fi #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols # option. This macro depends on C flags, and should be called # after SC_CONFIG_CFLAGS macro is called. #-------------------------------------------------------------------- |
︙ | ︙ |
Changes to xlib/xcolors.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* * xcolors.c -- * * This file contains the routines used to map from X color names to RGB * and pixel values. * * Copyright (c) 1996 by Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < | > > > > > | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | > | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < | | | | | | | | | | | < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < | | | | | | | | | < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < | < < < < > | < < < < < > | | < > > > > < < < < < < < < < < < < < < < < < < < < < < < | < < < < | < < < < < > | > | > > > > | < < < < | < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < > > | | < < < < < > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | /* * xcolors.c -- * * This file contains the routines used to map from X color names to RGB * and pixel values. * * Copyright (c) 1996 by Sun Microsystems, Inc. * Copyright (c) 2012 by Jan Nijtmans * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" /* * Special array for the colors gray9-gray100 (and grey9-grey100, which are * identical). (TODO: to be removed, because the values can be calculated) */ static const char graymap[] = "\377\377\377\374\374\374\372\372\372\367\367\367" "\365\365\365\362\362\362\360\360\360\355\355\355\353\353\353\350\350\350" "\345\345\345\343\343\343\340\340\340\336\336\336\333\333\333\331\331\331" "\326\326\326\324\324\324\321\321\321\317\317\317\314\314\314\311\311\311" "\307\307\307\304\304\304\302\302\302\277\277\277\275\275\275\272\272\272" "\270\270\270\265\265\265\263\263\263\260\260\260\255\255\255\253\253\253" "\250\250\250\246\246\246\243\243\243\241\241\241\236\236\236\234\234\234" "\231\231\231\226\226\226\224\224\224\221\221\221\217\217\217\214\214\214" "\212\212\212\207\207\207\205\205\205\202\202\202\177\177\177\175\175\175" "\172\172\172\170\170\170\165\165\165\163\163\163\160\160\160\156\156\156" "\153\153\153\151\151\151\146\146\146\143\143\143\141\141\141\136\136\136" "\134\134\134\131\131\131\127\127\127\124\124\124\122\122\122\117\117\117" "\115\115\115\112\112\112\107\107\107\105\105\105\102\102\102\100\100\100" "\075\075\075\073\073\073\070\070\070\066\066\066\063\063\063\060\060\060" "\056\056\056\053\053\053\051\051\051\046\046\046\044\044\044\041\041\041" "\037\037\037\034\034\034\032\032\032\027\027\027"; /* * Index array. For each of the characters 'a'-'y', this table gives the first color * starting with that character in the xColors table. */ static int az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99, 102, 107, 118, 118, 121, 134, 138, 138, 140, 143, 143, 145}; /* * Define an array that defines the mapping from color names to RGB values. * Note that this array must be kept sorted alphabetically so that the * binary search used in XParseColor will succeed. * * Each color definition consists of exactly 32 characters, and starts with * the color name, but without its first character (that character can be * reproduced from the az index array). The last byte holds the number * of additional color variants. For example "azure1" up to "azure4" are * handled by the same table entry as "azure". From the last byte backwards, * each group of 3 bytes contain the rgb values of the main color and * the available variants. * * The colors gray and grey have more than 8 variants. gray1 up to gray8 * are handled by this table, above that is handled especially. */ typedef char elem[32]; static const elem xColors[] = { /* Colors starting with 'a' */ "liceBlue\0 \360\370\377\0", "ntiqueWhite\0 \213\203\170\315\300\260\356\337\314\377\357\333\372\353\327\4", "quamarine\0 \105\213\164\146\315\252\166\356\306\177\377\324\177\377\324\4", "zure\0 \203\213\213\301\315\315\340\356\356\360\377\377\360\377\377\4", /* Colors starting with 'b' */ "eige\0 \365\365\334\0", "isque\0 \213\175\153\315\267\236\356\325\267\377\344\304\377\344\304\4", "lack\0 \000\000\000\0", "lanchedAlmond\0 \377\353\315\0", "lue\0 \000\000\213\000\000\315\000\000\356\000\000\377\000\000\377\4", "lueViolet\0 \212\053\342\0", "rown\0 \213\043\043\315\063\063\356\073\073\377\100\100\245\052\052\4", "urlywood\0 \213\163\125\315\252\175\356\305\221\377\323\233\336\270\207\4", /* Colors starting with 'c' */ "adetBlue\0 \123\206\213\172\305\315\216\345\356\230\365\377\137\236\240\4", "hartreuse\0 \105\213\000\146\315\000\166\356\000\177\377\000\177\377\000\4", "hocolate\0 \213\105\023\315\146\035\356\166\041\377\177\044\322\151\036\4", "oral\0 \213\076\057\315\133\105\356\152\120\377\162\126\377\177\120\4", "ornflowerBlue\0 \144\225\355\0", "ornsilk\0 \213\210\170\315\310\261\356\350\315\377\370\334\377\370\334\4", "yan\0 \000\213\213\000\315\315\000\356\356\000\377\377\000\377\377\4", /* Colors starting with 'd' */ "arkBlue\0 \000\000\213\0", "arkCyan\0 \000\213\213\0", "arkGoldenrod\0 \213\145\010\315\225\014\356\255\016\377\271\017\270\206\013\4", "arkGray\0 \251\251\251\0", "arkGreen\0 \000\144\000\0", "arkGrey\0 \251\251\251\0", "arkKhaki\0 \275\267\153\0", "arkMagenta\0 \213\000\213\0", "arkOliveGreen\0 \156\213\075\242\315\132\274\356\150\312\377\160\125\153\057\4", "arkOrange\0 \213\105\000\315\146\000\356\166\000\377\177\000\377\214\000\4", "arkOrchid\0 \150\042\213\232\062\315\262\072\356\277\076\377\231\062\314\4", "arkRed\0 \213\000\000\0", "arkSalmon\0 \351\226\172\0", "arkSeaGreen\0 \151\213\151\233\315\233\264\356\264\301\377\301\217\274\217\4", "arkSlateBlue\0 \110\075\213\0", "arkSlateGray\0 \122\213\213\171\315\315\215\356\356\227\377\377\057\117\117\4", "arkSlateGrey\0 \057\117\117\0", "arkTurquoise\0 \000\316\321\0", "arkViolet\0 \224\000\323\0", "eepPink\0 \213\012\120\315\020\166\356\022\211\377\024\223\377\024\223\4", "eepSkyBlue\0 \000\150\213\000\232\315\000\262\356\000\277\377\000\277\377\4", "imGray\0 \151\151\151\0", "imGrey\0 \151\151\151\0", "odgerBlue\0 \020\116\213\030\164\315\034\206\356\036\220\377\036\220\377\4", /* Colors starting with 'e' */ /* Colors starting with 'f' */ "irebrick\0 \213\032\032\315\046\046\356\054\054\377\060\060\262\042\042\4", "loralWhite\0 \377\372\360\0", "orestGreen\0 \042\213\042\0", /* Colors starting with 'g' */ "ainsboro\0 \334\334\334\0", "hostWhite\0 \370\370\377\0", "old\0 \213\165\000\315\255\000\356\311\000\377\327\000\377\327\000\4", "oldenrod\0 \213\151\024\315\233\035\356\264\042\377\301\045\332\245\040\4", "ray\0\024\024\024\022\022\022\017\017\017\015\015\015\012\012\012" "\010\010\010\005\005\005\003\003\003\276\276\276\10", "ray0\0 \000\000\000\0", "reen\0 \000\213\000\000\315\000\000\356\000\000\377\000\000\377\000\4", "reenYellow\0 \255\377\057\0", "rey\0\024\024\024\022\022\022\017\017\017\015\015\015\012\012\012" "\010\010\010\005\005\005\003\003\003\276\276\276\10", "rey0\0 \000\000\000\0", /* Colors starting with 'h' */ "oneydew\0 \203\213\203\301\315\301\340\356\340\360\377\360\360\377\360\4", "otPink\0 \213\072\142\315\140\220\356\152\247\377\156\264\377\151\264\4", /* Colors starting with 'i' */ "ndianRed\0 \213\072\072\315\125\125\356\143\143\377\152\152\315\134\134\4", "vory\0 \213\213\203\315\315\301\356\356\340\377\377\360\377\377\360\4", /* Colors starting with 'j' */ /* Colors starting with 'k' */ "haki\0 \213\206\116\315\306\163\356\346\205\377\366\217\360\346\214\4", /* Colors starting with 'l' */ "avender\0 \346\346\372\0", "avenderBlush\0 \213\203\206\315\301\305\356\340\345\377\360\365\377\360\365\4", "awnGreen\0 \174\374\000\0", "emonChiffon\0 \213\211\160\315\311\245\356\351\277\377\372\315\377\372\315\4", "ightBlue\0 \150\203\213\232\300\315\262\337\356\277\357\377\255\330\346\4", "ightCoral\0 \360\200\200\0", "ightCyan\0 \172\213\213\264\315\315\321\356\356\340\377\377\340\377\377\4", "ightGoldenrod\0 \213\201\114\315\276\160\356\334\202\377\354\213\356\335\202\4", "ightGoldenrodYellow\0 \372\372\322\0", "ightGray\0 \323\323\323\0", "ightGreen\0 \220\356\220\0", "ightGrey\0 \323\323\323\0", "ightPink\0 \213\137\145\315\214\225\356\242\255\377\256\271\377\266\301\4", "ightSalmon\0 \213\127\102\315\201\142\356\225\162\377\240\172\377\240\172\4", "ightSeaGreen\0 \040\262\252\0", "ightSkyBlue\0 \140\173\213\215\266\315\244\323\356\260\342\377\207\316\372\4", "ightSlateBlue\0 \204\160\377\0", "ightSlateGray\0 \167\210\231\0", "ightSlateGrey\0 \167\210\231\0", "ightSteelBlue\0 \156\173\213\242\265\315\274\322\356\312\341\377\260\304\336\4", "ightYellow\0 \213\213\172\315\315\264\356\356\321\377\377\340\377\377\340\4", "imeGreen\0 \062\315\062\0", "inen\0 \372\360\346\0", /* Colors starting with 'm' */ "agenta\0 \213\000\213\315\000\315\356\000\356\377\000\377\377\000\377\4", "aroon\0 \213\034\142\315\051\220\356\060\247\377\064\263\260\060\140\4", "ediumAquamarine\0 \146\315\252\0", "ediumBlue\0 \000\000\315\0", "ediumOrchid\0 \172\067\213\264\122\315\321\137\356\340\146\377\272\125\323\4", "ediumPurple\0 \135\107\213\211\150\315\237\171\356\253\202\377\223\160\333\4", "ediumSeaGreen\0 \074\263\161\0", "ediumSlateBlue\0 \173\150\356\0", "ediumSpringGreen\0 \000\372\232\0", "ediumTurquoise\0 \110\321\314\0", "ediumVioletRed\0 \307\025\205\0", "idnightBlue\0 \031\031\160\0", "intCream\0 \365\377\372\0", "istyRose\0 \213\175\173\315\267\265\356\325\322\377\344\341\377\344\341\4", "occasin\0 \377\344\265\0", /* Colors starting with 'n' */ "avajoWhite\0 \213\171\136\315\263\213\356\317\241\377\336\255\377\336\255\4", "avy\0 \000\000\200\0", "avyBlue\0 \000\000\200\0", /* Colors starting with 'o' */ "ldLace\0 \375\365\346\0", "liveDrab\0 \151\213\042\232\315\062\263\356\072\300\377\076\153\216\043\4", "range\0 \213\132\000\315\205\000\356\232\000\377\245\000\377\245\000\4", "rangeRed\0 \213\045\000\315\067\000\356\100\000\377\105\000\377\105\000\4", "rchid\0 \213\107\211\315\151\311\356\172\351\377\203\372\332\160\326\4", /* Colors starting with 'p' */ "aleGoldenrod\0 \356\350\252\0", "aleGreen\0 \124\213\124\174\315\174\220\356\220\232\377\232\230\373\230\4", "aleTurquoise\0 \146\213\213\226\315\315\256\356\356\273\377\377\257\356\356\4", "aleVioletRed\0 \213\107\135\315\150\211\356\171\237\377\202\253\333\160\223\4", "apayaWhip\0 \377\357\325\0", "eachPuff\0 \213\167\145\315\257\225\356\313\255\377\332\271\377\332\271\4", "eru\0 \315\205\077\0", "ink\0 \213\143\154\315\221\236\356\251\270\377\265\305\377\300\313\4", "lum\0 \213\146\213\315\226\315\356\256\356\377\273\377\335\240\335\4", "owderBlue\0 \260\340\346\0", "urple\0 \125\032\213\175\046\315\221\054\356\233\060\377\240\040\360\4", /* Colors starting with 'q' */ /* Colors starting with 'r' */ "ed\0 \213\000\000\315\000\000\356\000\000\377\000\000\377\000\000\4", "osyBrown\0 \213\151\151\315\233\233\356\264\264\377\301\301\274\217\217\4", "oyalBlue\0 \047\100\213\072\137\315\103\156\356\110\166\377\101\151\341\4", /* Colors starting with 's' */ "addleBrown\0 \213\105\023\0", "almon\0 \213\114\071\315\160\124\356\202\142\377\214\151\372\200\162\4", "andyBrown\0 \364\244\140\0", "eaGreen\0 \056\213\127\103\315\200\116\356\224\124\377\237\056\213\127\4", "eashell\0 \213\206\202\315\305\277\356\345\336\377\365\356\377\365\356\4", "ienna\0 \213\107\046\315\150\071\356\171\102\377\202\107\240\122\055\4", "kyBlue\0 \112\160\213\154\246\315\176\300\356\207\316\377\207\316\353\4", "lateBlue\0 \107\074\213\151\131\315\172\147\356\203\157\377\152\132\315\4", "lateGray\0 \154\173\213\237\266\315\271\323\356\306\342\377\160\200\220\4", "lateGrey\0 \160\200\220\0", "now\0 \213\211\211\315\311\311\356\351\351\377\372\372\377\372\372\4", "pringGreen\0 \000\213\105\000\315\146\000\356\166\000\377\177\000\377\177\4", "teelBlue\0 \066\144\213\117\224\315\134\254\356\143\270\377\106\202\264\4", /* Colors starting with 't' */ "an\0 \213\132\053\315\205\077\356\232\111\377\245\117\322\264\214\4", "histle\0 \213\173\213\315\265\315\356\322\356\377\341\377\330\277\330\4", "omato\0 \213\066\046\315\117\071\356\134\102\377\143\107\377\143\107\4", "urquoise\0 \000\206\213\000\305\315\000\345\356\000\365\377\100\340\320\4", /* Colors starting with 'u' */ /* Colors starting with 'v' */ "iolet\0 \356\202\356\0", "ioletRed\0 \213\042\122\315\062\170\356\072\214\377\076\226\320\040\220\4", /* Colors starting with 'w' */ "heat\0 \213\176\146\315\272\226\356\330\256\377\347\272\365\336\263\4", "hite\0 \377\377\377\0", "hiteSmoke\0 \365\365\365\0", /* Colors starting with 'x' */ /* Colors starting with 'y' */ "ellow\0 \213\213\000\315\315\000\356\356\000\377\377\000\377\377\000\4", "ellowGreen\0 \232\315\062\0" }; /* *---------------------------------------------------------------------- * * XParseColor -- * |
︙ | ︙ | |||
757 758 759 760 761 762 763 764 765 766 767 768 769 770 | /* Strings are equal, but difference in spacings only. We should still * report not-equal, so "burly wood" is not a valid color */ r = 1; } return r; } Status XParseColor( Display *display, Colormap map, const char *spec, XColor *colorPtr) { | > > > > | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 | /* Strings are equal, but difference in spacings only. We should still * report not-equal, so "burly wood" is not a valid color */ r = 1; } return r; } #define RED(p) ((unsigned char)(p)[28]) #define GREEN(p) ((unsigned char)(p)[29]) #define BLUE(p) ((unsigned char)(p)[30]) Status XParseColor( Display *display, Colormap map, const char *spec, XColor *colorPtr) { |
︙ | ︙ | |||
793 794 795 796 797 798 799 800 801 802 803 804 | colorPtr->green = (unsigned short) (value >> 16); colorPtr->blue = (unsigned short) value; break; default: return 0; } } else { /* * Perform a binary search on the sorted array of colors. * size = current size of search range * p = pointer to current element being considered. */ | > > > | > > > | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 | colorPtr->green = (unsigned short) (value >> 16); colorPtr->blue = (unsigned short) value; break; default: return 0; } } else { int size; const elem *p; /* * Perform a binary search on the sorted array of colors. * size = current size of search range * p = pointer to current element being considered. */ int r = (spec[0] - 'A') & 0xdf; if (r > (sizeof(az)/sizeof(az[0] - 1))) { return 0; } size = az[r + 1] - az[r]; p = &xColors[(az[r + 1] + az[r]) >> 1]; r = colorcmp(spec + 1, *p); while (r != 0) { if (r < 0) { size = (size >> 1); p -= ((size + 1) >> 1); } else { --size; size = (size >> 1); p += ((size + 2) >> 1); } if (!size) { return 0; } r = colorcmp(spec + 1, *p); } colorPtr->red = ((RED(*p) << 8) | RED(*p)); colorPtr->green = ((GREEN(*p) << 8) | GREEN(*p)); colorPtr->blue = ((BLUE(*p) << 8) | BLUE(*p)); } colorPtr->pixel = TkpGetPixel(colorPtr); colorPtr->flags = DoRed|DoGreen|DoBlue; colorPtr->pad = 0; return 1; } #if 0 int main() { XColor color; char buf[32]; int charindex; int i, result; int repeat = 1; while (repeat--) { buf[0] = 'a'; charindex = 1; for (i = 0; i < sizeof(xColors)/sizeof(xColors[0]); ++i) { while (i >= az[charindex]) { ++charindex; ++(buf[0]); } strcpy(buf + 1, xColors[i]); result = XParseColor(0, 0, buf, &color); if (!result) { break; } printf("color %d: %s %d %d %d %d\n", i, buf, result, color.red >> 8, color.green >> 8, color.blue >> 8); } } if (!result) { printf("NOT OK: %s\n", buf); } else { printf("OK\n"); } } #endif /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |