diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt index 283d22dd29..5bf38e75e0 100644 --- a/runtime/doc/gui_mac.txt +++ b/runtime/doc/gui_mac.txt @@ -402,32 +402,23 @@ top of the screen, you can set |MMNonNativeFullScreenShowMenu| to `NO` and ============================================================================== 5. Special colors *macvim-colors* -The colors in MacVim are defined in two dictionaries inside the "Resources" -folder of the application bundle (MacVim.app/Contents/Resources). It is -possible to add more colors by modifying these files. Color names are case -insensitive when accessed from Vim, but in the dictionary they must be -lowercase. +MacVim mostly uses standard Vim colors. See |gui-colors| and |v:colornames| +for how to set and override them. *SystemColors.plist* -There are only a few system colors that can be accessed from Vim. These -colors are defined in the dictionary "SystemColors.plist". This dictionary -stores (key, value) pairs where the key is the name of the color and the -value is an NSColor selector name. - -The most useful system colors are: > - MacSelectedTextBackgroundColor - MacSecondarySelectedColor -The former is the "Highlight Color" which can be changed in the "Appearance" -section of the System Settings. The latter is the selection color used by -a Cocoa application when it is not in focus. - - *Colors.plist* -Apart from the system colors, it is also possible to use the standard X11 -color names (see https://en.wikipedia.org/wiki/X11_color_names) which usually -come in a file called "rgb.txt". MacVim does not have such a file, instead it -keeps these colors in a dictionary called "Colors.plist". The key in this -dictionary is the name of the color and the value is an RGB value on the form -#rrggbb stored as an integer. +There are a few additional system colors that can be used in the |:hi| +command. These colors are defined in the dictionary "SystemColors.plist" in +the MacVim.app bundle. These color values correspond to NSColor selectors in +macOS. The available color names are: + +KEY VALUE ~ +MacSecondarySelectedControlColor Selection color when app is not in + focus. +MacSelectedTextBackgroundColor "Highlight Color" which can be changed + in the "Appearance" section of System + Settings. +MacTextBackgroundColor Normal text background color. +MacTextColor Normal text color. *macvim-colorscheme* MacVim ships with a custom color scheme that is used instead of the default diff --git a/runtime/doc/tags b/runtime/doc/tags index bd3897039e..2ab8d00933 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4124,7 +4124,6 @@ CmdwinEnter autocmd.txt /*CmdwinEnter* CmdwinLeave autocmd.txt /*CmdwinLeave* ColorScheme autocmd.txt /*ColorScheme* ColorSchemePre autocmd.txt /*ColorSchemePre* -Colors.plist gui_mac.txt /*Colors.plist* Command-line cmdline.txt /*Command-line* Command-line-mode cmdline.txt /*Command-line-mode* CompleteChanged autocmd.txt /*CompleteChanged* diff --git a/src/MacVim/Colors.plist b/src/MacVim/Colors.plist deleted file mode 100644 index 281be216ae..0000000000 --- a/src/MacVim/Colors.plist +++ /dev/null @@ -1,1329 +0,0 @@ - - - - - - aliceblue - 0xf0f8ff - antiquewhite - 0xfaebd7 - antiquewhite1 - 0xffefdb - antiquewhite2 - 0xeedfcc - antiquewhite3 - 0xcdc0b0 - antiquewhite4 - 0x8b8378 - aquamarine - 0x7fffd4 - aquamarine1 - 0x7fffd4 - aquamarine2 - 0x76eec6 - aquamarine3 - 0x66cdaa - aquamarine4 - 0x458b74 - azure - 0xf0ffff - azure1 - 0xf0ffff - azure2 - 0xe0eeee - azure3 - 0xc1cdcd - azure4 - 0x838b8b - beige - 0xf5f5dc - bisque - 0xffe4c4 - bisque1 - 0xffe4c4 - bisque2 - 0xeed5b7 - bisque3 - 0xcdb79e - bisque4 - 0x8b7d6b - black - 0x000000 - blanchedalmond - 0xffebcd - blue - 0x0000ff - blue1 - 0x0000ff - blue2 - 0x0000ee - blue3 - 0x0000cd - blue4 - 0x00008b - blueviolet - 0x8a2be2 - brown - 0xa52a2a - brown1 - 0xff4040 - brown2 - 0xee3b3b - brown3 - 0xcd3333 - brown4 - 0x8b2323 - burlywood - 0xdeb887 - burlywood1 - 0xffd39b - burlywood2 - 0xeec591 - burlywood3 - 0xcdaa7d - burlywood4 - 0x8b7355 - cadetblue - 0x5f9ea0 - cadetblue1 - 0x98f5ff - cadetblue2 - 0x8ee5ee - cadetblue3 - 0x7ac5cd - cadetblue4 - 0x53868b - chartreuse - 0x7fff00 - chartreuse1 - 0x7fff00 - chartreuse2 - 0x76ee00 - chartreuse3 - 0x66cd00 - chartreuse4 - 0x458b00 - chocolate - 0xd2691e - chocolate1 - 0xff7f24 - chocolate2 - 0xee7621 - chocolate3 - 0xcd661d - chocolate4 - 0x8b4513 - coral - 0xff7f50 - coral1 - 0xff7256 - coral2 - 0xee6a50 - coral3 - 0xcd5b45 - coral4 - 0x8b3e2f - cornflowerblue - 0x6495ed - cornsilk - 0xfff8dc - cornsilk1 - 0xfff8dc - cornsilk2 - 0xeee8cd - cornsilk3 - 0xcdc8b1 - cornsilk4 - 0x8b8878 - cyan - 0x00ffff - cyan1 - 0x00ffff - cyan2 - 0x00eeee - cyan3 - 0x00cdcd - cyan4 - 0x008b8b - darkblue - 0x00008b - darkcyan - 0x008b8b - darkgoldenrod - 0xb8860b - darkgoldenrod1 - 0xffb90f - darkgoldenrod2 - 0xeead0e - darkgoldenrod3 - 0xcd950c - darkgoldenrod4 - 0x8b6508 - darkgray - 0xa9a9a9 - darkgreen - 0x006400 - darkgrey - 0xa9a9a9 - darkkhaki - 0xbdb76b - darkmagenta - 0x8b008b - darkolivegreen - 0x556b2f - darkolivegreen1 - 0xcaff70 - darkolivegreen2 - 0xbcee68 - darkolivegreen3 - 0xa2cd5a - darkolivegreen4 - 0x6e8b3d - darkorange - 0xff8c00 - darkorange1 - 0xff7f00 - darkorange2 - 0xee7600 - darkorange3 - 0xcd6600 - darkorange4 - 0x8b4500 - darkorchid - 0x9932cc - darkorchid1 - 0xbf3eff - darkorchid2 - 0xb23aee - darkorchid3 - 0x9a32cd - darkorchid4 - 0x68228b - darkred - 0x8b0000 - darksalmon - 0xe9967a - darkseagreen - 0x8fbc8f - darkseagreen1 - 0xc1ffc1 - darkseagreen2 - 0xb4eeb4 - darkseagreen3 - 0x9bcd9b - darkseagreen4 - 0x698b69 - darkslateblue - 0x483d8b - darkslategray - 0x2f4f4f - darkslategray1 - 0x97ffff - darkslategray2 - 0x8deeee - darkslategray3 - 0x79cdcd - darkslategray4 - 0x528b8b - darkslategrey - 0x2f4f4f - darkturquoise - 0x00ced1 - darkviolet - 0x9400d3 - darkyellow - 0x8b8b00 - deeppink - 0xff1493 - deeppink1 - 0xff1493 - deeppink2 - 0xee1289 - deeppink3 - 0xcd1076 - deeppink4 - 0x8b0a50 - deepskyblue - 0x00bfff - deepskyblue1 - 0x00bfff - deepskyblue2 - 0x00b2ee - deepskyblue3 - 0x009acd - deepskyblue4 - 0x00688b - dimgray - 0x696969 - dimgrey - 0x696969 - dodgerblue - 0x1e90ff - dodgerblue1 - 0x1e90ff - dodgerblue2 - 0x1c86ee - dodgerblue3 - 0x1874cd - dodgerblue4 - 0x104e8b - firebrick - 0xb22222 - firebrick1 - 0xff3030 - firebrick2 - 0xee2c2c - firebrick3 - 0xcd2626 - firebrick4 - 0x8b1a1a - floralwhite - 0xfffaf0 - forestgreen - 0x228b22 - gainsboro - 0xdcdcdc - ghostwhite - 0xf8f8ff - gold - 0xffd700 - gold1 - 0xffd700 - gold2 - 0xeec900 - gold3 - 0xcdad00 - gold4 - 0x8b7500 - goldenrod - 0xdaa520 - goldenrod1 - 0xffc125 - goldenrod2 - 0xeeb422 - goldenrod3 - 0xcd9b1d - goldenrod4 - 0x8b6914 - gray - 0xbebebe - gray0 - 0x000000 - gray1 - 0x030303 - gray10 - 0x1a1a1a - gray100 - 0xffffff - gray11 - 0x1c1c1c - gray12 - 0x1f1f1f - gray13 - 0x212121 - gray14 - 0x242424 - gray15 - 0x262626 - gray16 - 0x292929 - gray17 - 0x2b2b2b - gray18 - 0x2e2e2e - gray19 - 0x303030 - gray2 - 0x050505 - gray20 - 0x333333 - gray21 - 0x363636 - gray22 - 0x383838 - gray23 - 0x3b3b3b - gray24 - 0x3d3d3d - gray25 - 0x404040 - gray26 - 0x424242 - gray27 - 0x454545 - gray28 - 0x474747 - gray29 - 0x4a4a4a - gray3 - 0x080808 - gray30 - 0x4d4d4d - gray31 - 0x4f4f4f - gray32 - 0x525252 - gray33 - 0x545454 - gray34 - 0x575757 - gray35 - 0x595959 - gray36 - 0x5c5c5c - gray37 - 0x5e5e5e - gray38 - 0x616161 - gray39 - 0x636363 - gray4 - 0x0a0a0a - gray40 - 0x666666 - gray41 - 0x696969 - gray42 - 0x6b6b6b - gray43 - 0x6e6e6e - gray44 - 0x707070 - gray45 - 0x737373 - gray46 - 0x757575 - gray47 - 0x787878 - gray48 - 0x7a7a7a - gray49 - 0x7d7d7d - gray5 - 0x0d0d0d - gray50 - 0x7f7f7f - gray51 - 0x828282 - gray52 - 0x858585 - gray53 - 0x878787 - gray54 - 0x8a8a8a - gray55 - 0x8c8c8c - gray56 - 0x8f8f8f - gray57 - 0x919191 - gray58 - 0x949494 - gray59 - 0x969696 - gray6 - 0x0f0f0f - gray60 - 0x999999 - gray61 - 0x9c9c9c - gray62 - 0x9e9e9e - gray63 - 0xa1a1a1 - gray64 - 0xa3a3a3 - gray65 - 0xa6a6a6 - gray66 - 0xa8a8a8 - gray67 - 0xababab - gray68 - 0xadadad - gray69 - 0xb0b0b0 - gray7 - 0x121212 - gray70 - 0xb3b3b3 - gray71 - 0xb5b5b5 - gray72 - 0xb8b8b8 - gray73 - 0xbababa - gray74 - 0xbdbdbd - gray75 - 0xbfbfbf - gray76 - 0xc2c2c2 - gray77 - 0xc4c4c4 - gray78 - 0xc7c7c7 - gray79 - 0xc9c9c9 - gray8 - 0x141414 - gray80 - 0xcccccc - gray81 - 0xcfcfcf - gray82 - 0xd1d1d1 - gray83 - 0xd4d4d4 - gray84 - 0xd6d6d6 - gray85 - 0xd9d9d9 - gray86 - 0xdbdbdb - gray87 - 0xdedede - gray88 - 0xe0e0e0 - gray89 - 0xe3e3e3 - gray9 - 0x171717 - gray90 - 0xe5e5e5 - gray91 - 0xe8e8e8 - gray92 - 0xebebeb - gray93 - 0xededed - gray94 - 0xf0f0f0 - gray95 - 0xf2f2f2 - gray96 - 0xf5f5f5 - gray97 - 0xf7f7f7 - gray98 - 0xfafafa - gray99 - 0xfcfcfc - green - 0x00ff00 - green1 - 0x00ff00 - green2 - 0x00ee00 - green3 - 0x00cd00 - green4 - 0x008b00 - greenyellow - 0xadff2f - grey - 0xbebebe - grey0 - 0x000000 - grey1 - 0x030303 - grey10 - 0x1a1a1a - grey100 - 0xffffff - grey11 - 0x1c1c1c - grey12 - 0x1f1f1f - grey13 - 0x212121 - grey14 - 0x242424 - grey15 - 0x262626 - grey16 - 0x292929 - grey17 - 0x2b2b2b - grey18 - 0x2e2e2e - grey19 - 0x303030 - grey2 - 0x050505 - grey20 - 0x333333 - grey21 - 0x363636 - grey22 - 0x383838 - grey23 - 0x3b3b3b - grey24 - 0x3d3d3d - grey25 - 0x404040 - grey26 - 0x424242 - grey27 - 0x454545 - grey28 - 0x474747 - grey29 - 0x4a4a4a - grey3 - 0x080808 - grey30 - 0x4d4d4d - grey31 - 0x4f4f4f - grey32 - 0x525252 - grey33 - 0x545454 - grey34 - 0x575757 - grey35 - 0x595959 - grey36 - 0x5c5c5c - grey37 - 0x5e5e5e - grey38 - 0x616161 - grey39 - 0x636363 - grey4 - 0x0a0a0a - grey40 - 0x666666 - grey41 - 0x696969 - grey42 - 0x6b6b6b - grey43 - 0x6e6e6e - grey44 - 0x707070 - grey45 - 0x737373 - grey46 - 0x757575 - grey47 - 0x787878 - grey48 - 0x7a7a7a - grey49 - 0x7d7d7d - grey5 - 0x0d0d0d - grey50 - 0x7f7f7f - grey51 - 0x828282 - grey52 - 0x858585 - grey53 - 0x878787 - grey54 - 0x8a8a8a - grey55 - 0x8c8c8c - grey56 - 0x8f8f8f - grey57 - 0x919191 - grey58 - 0x949494 - grey59 - 0x969696 - grey6 - 0x0f0f0f - grey60 - 0x999999 - grey61 - 0x9c9c9c - grey62 - 0x9e9e9e - grey63 - 0xa1a1a1 - grey64 - 0xa3a3a3 - grey65 - 0xa6a6a6 - grey66 - 0xa8a8a8 - grey67 - 0xababab - grey68 - 0xadadad - grey69 - 0xb0b0b0 - grey7 - 0x121212 - grey70 - 0xb3b3b3 - grey71 - 0xb5b5b5 - grey72 - 0xb8b8b8 - grey73 - 0xbababa - grey74 - 0xbdbdbd - grey75 - 0xbfbfbf - grey76 - 0xc2c2c2 - grey77 - 0xc4c4c4 - grey78 - 0xc7c7c7 - grey79 - 0xc9c9c9 - grey8 - 0x141414 - grey80 - 0xcccccc - grey81 - 0xcfcfcf - grey82 - 0xd1d1d1 - grey83 - 0xd4d4d4 - grey84 - 0xd6d6d6 - grey85 - 0xd9d9d9 - grey86 - 0xdbdbdb - grey87 - 0xdedede - grey88 - 0xe0e0e0 - grey89 - 0xe3e3e3 - grey9 - 0x171717 - grey90 - 0xe5e5e5 - grey91 - 0xe8e8e8 - grey92 - 0xebebeb - grey93 - 0xededed - grey94 - 0xf0f0f0 - grey95 - 0xf2f2f2 - grey96 - 0xf5f5f5 - grey97 - 0xf7f7f7 - grey98 - 0xfafafa - grey99 - 0xfcfcfc - honeydew - 0xf0fff0 - honeydew1 - 0xf0fff0 - honeydew2 - 0xe0eee0 - honeydew3 - 0xc1cdc1 - honeydew4 - 0x838b83 - hotpink - 0xff69b4 - hotpink1 - 0xff6eb4 - hotpink2 - 0xee6aa7 - hotpink3 - 0xcd6090 - hotpink4 - 0x8b3a62 - indianred - 0xcd5c5c - indianred1 - 0xff6a6a - indianred2 - 0xee6363 - indianred3 - 0xcd5555 - indianred4 - 0x8b3a3a - ivory - 0xfffff0 - ivory1 - 0xfffff0 - ivory2 - 0xeeeee0 - ivory3 - 0xcdcdc1 - ivory4 - 0x8b8b83 - khaki - 0xf0e68c - khaki1 - 0xfff68f - khaki2 - 0xeee685 - khaki3 - 0xcdc673 - khaki4 - 0x8b864e - lavender - 0xe6e6fa - lavenderblush - 0xfff0f5 - lavenderblush1 - 0xfff0f5 - lavenderblush2 - 0xeee0e5 - lavenderblush3 - 0xcdc1c5 - lavenderblush4 - 0x8b8386 - lawngreen - 0x7cfc00 - lemonchiffon - 0xfffacd - lemonchiffon1 - 0xfffacd - lemonchiffon2 - 0xeee9bf - lemonchiffon3 - 0xcdc9a5 - lemonchiffon4 - 0x8b8970 - lightblue - 0xadd8e6 - lightblue1 - 0xbfefff - lightblue2 - 0xb2dfee - lightblue3 - 0x9ac0cd - lightblue4 - 0x68838b - lightcoral - 0xf08080 - lightcyan - 0xe0ffff - lightcyan1 - 0xe0ffff - lightcyan2 - 0xd1eeee - lightcyan3 - 0xb4cdcd - lightcyan4 - 0x7a8b8b - lightgoldenrod - 0xeedd82 - lightgoldenrod1 - 0xffec8b - lightgoldenrod2 - 0xeedc82 - lightgoldenrod3 - 0xcdbe70 - lightgoldenrod4 - 0x8b814c - lightgoldenrodyellow - 0xfafad2 - lightgray - 0xd3d3d3 - lightgreen - 0x90ee90 - lightgrey - 0xd3d3d3 - lightmagenta - 0xff8bff - lightpink - 0xffb6c1 - lightpink1 - 0xffaeb9 - lightpink2 - 0xeea2ad - lightpink3 - 0xcd8c95 - lightpink4 - 0x8b5f65 - lightred - 0xff8b8b - lightsalmon - 0xffa07a - lightsalmon1 - 0xffa07a - lightsalmon2 - 0xee9572 - lightsalmon3 - 0xcd8162 - lightsalmon4 - 0x8b5742 - lightseagreen - 0x20b2aa - lightskyblue - 0x87cefa - lightskyblue1 - 0xb0e2ff - lightskyblue2 - 0xa4d3ee - lightskyblue3 - 0x8db6cd - lightskyblue4 - 0x607b8b - lightslateblue - 0x8470ff - lightslategray - 0x778899 - lightslategrey - 0x778899 - lightsteelblue - 0xb0c4de - lightsteelblue1 - 0xcae1ff - lightsteelblue2 - 0xbcd2ee - lightsteelblue3 - 0xa2b5cd - lightsteelblue4 - 0x6e7b8b - lightyellow - 0xffffe0 - lightyellow1 - 0xffffe0 - lightyellow2 - 0xeeeed1 - lightyellow3 - 0xcdcdb4 - lightyellow4 - 0x8b8b7a - limegreen - 0x32cd32 - linen - 0xfaf0e6 - magenta - 0xff00ff - magenta1 - 0xff00ff - magenta2 - 0xee00ee - magenta3 - 0xcd00cd - magenta4 - 0x8b008b - maroon - 0xb03060 - maroon1 - 0xff34b3 - maroon2 - 0xee30a7 - maroon3 - 0xcd2990 - maroon4 - 0x8b1c62 - mediumaquamarine - 0x66cdaa - mediumblue - 0x0000cd - mediumorchid - 0xba55d3 - mediumorchid1 - 0xe066ff - mediumorchid2 - 0xd15fee - mediumorchid3 - 0xb452cd - mediumorchid4 - 0x7a378b - mediumpurple - 0x9370db - mediumpurple1 - 0xab82ff - mediumpurple2 - 0x9f79ee - mediumpurple3 - 0x8968cd - mediumpurple4 - 0x5d478b - mediumseagreen - 0x3cb371 - mediumslateblue - 0x7b68ee - mediumspringgreen - 0x00fa9a - mediumturquoise - 0x48d1cc - mediumvioletred - 0xc71585 - midnightblue - 0x191970 - mintcream - 0xf5fffa - mistyrose - 0xffe4e1 - mistyrose1 - 0xffe4e1 - mistyrose2 - 0xeed5d2 - mistyrose3 - 0xcdb7b5 - mistyrose4 - 0x8b7d7b - moccasin - 0xffe4b5 - navajowhite - 0xffdead - navajowhite1 - 0xffdead - navajowhite2 - 0xeecfa1 - navajowhite3 - 0xcdb38b - navajowhite4 - 0x8b795e - navy - 0x000080 - navyblue - 0x000080 - oldlace - 0xfdf5e6 - olivedrab - 0x6b8e23 - olivedrab1 - 0xc0ff3e - olivedrab2 - 0xb3ee3a - olivedrab3 - 0x9acd32 - olivedrab4 - 0x698b22 - orange - 0xffa500 - orange1 - 0xffa500 - orange2 - 0xee9a00 - orange3 - 0xcd8500 - orange4 - 0x8b5a00 - orangered - 0xff4500 - orangered1 - 0xff4500 - orangered2 - 0xee4000 - orangered3 - 0xcd3700 - orangered4 - 0x8b2500 - orchid - 0xda70d6 - orchid1 - 0xff83fa - orchid2 - 0xee7ae9 - orchid3 - 0xcd69c9 - orchid4 - 0x8b4789 - palegoldenrod - 0xeee8aa - palegreen - 0x98fb98 - palegreen1 - 0x9aff9a - palegreen2 - 0x90ee90 - palegreen3 - 0x7ccd7c - palegreen4 - 0x548b54 - paleturquoise - 0xafeeee - paleturquoise1 - 0xbbffff - paleturquoise2 - 0xaeeeee - paleturquoise3 - 0x96cdcd - paleturquoise4 - 0x668b8b - palevioletred - 0xdb7093 - palevioletred1 - 0xff82ab - palevioletred2 - 0xee799f - palevioletred3 - 0xcd6889 - palevioletred4 - 0x8b475d - papayawhip - 0xffefd5 - peachpuff - 0xffdab9 - peachpuff1 - 0xffdab9 - peachpuff2 - 0xeecbad - peachpuff3 - 0xcdaf95 - peachpuff4 - 0x8b7765 - peru - 0xcd853f - pink - 0xffc0cb - pink1 - 0xffb5c5 - pink2 - 0xeea9b8 - pink3 - 0xcd919e - pink4 - 0x8b636c - plum - 0xdda0dd - plum1 - 0xffbbff - plum2 - 0xeeaeee - plum3 - 0xcd96cd - plum4 - 0x8b668b - powderblue - 0xb0e0e6 - purple - 0xa020f0 - purple1 - 0x9b30ff - purple2 - 0x912cee - purple3 - 0x7d26cd - purple4 - 0x551a8b - red - 0xff0000 - red1 - 0xff0000 - red2 - 0xee0000 - red3 - 0xcd0000 - red4 - 0x8b0000 - rosybrown - 0xbc8f8f - rosybrown1 - 0xffc1c1 - rosybrown2 - 0xeeb4b4 - rosybrown3 - 0xcd9b9b - rosybrown4 - 0x8b6969 - royalblue - 0x4169e1 - royalblue1 - 0x4876ff - royalblue2 - 0x436eee - royalblue3 - 0x3a5fcd - royalblue4 - 0x27408b - saddlebrown - 0x8b4513 - salmon - 0xfa8072 - salmon1 - 0xff8c69 - salmon2 - 0xee8262 - salmon3 - 0xcd7054 - salmon4 - 0x8b4c39 - sandybrown - 0xf4a460 - seagreen - 0x2e8b57 - seagreen1 - 0x54ff9f - seagreen2 - 0x4eee94 - seagreen3 - 0x43cd80 - seagreen4 - 0x2e8b57 - seashell - 0xfff5ee - seashell1 - 0xfff5ee - seashell2 - 0xeee5de - seashell3 - 0xcdc5bf - seashell4 - 0x8b8682 - sienna - 0xa0522d - sienna1 - 0xff8247 - sienna2 - 0xee7942 - sienna3 - 0xcd6839 - sienna4 - 0x8b4726 - skyblue - 0x87ceeb - skyblue1 - 0x87ceff - skyblue2 - 0x7ec0ee - skyblue3 - 0x6ca6cd - skyblue4 - 0x4a708b - slateblue - 0x6a5acd - slateblue1 - 0x836fff - slateblue2 - 0x7a67ee - slateblue3 - 0x6959cd - slateblue4 - 0x473c8b - slategray - 0x708090 - slategray1 - 0xc6e2ff - slategray2 - 0xb9d3ee - slategray3 - 0x9fb6cd - slategray4 - 0x6c7b8b - slategrey - 0x708090 - snow - 0xfffafa - snow1 - 0xfffafa - snow2 - 0xeee9e9 - snow3 - 0xcdc9c9 - snow4 - 0x8b8989 - springgreen - 0x00ff7f - springgreen1 - 0x00ff7f - springgreen2 - 0x00ee76 - springgreen3 - 0x00cd66 - springgreen4 - 0x008b45 - steelblue - 0x4682b4 - steelblue1 - 0x63b8ff - steelblue2 - 0x5cacee - steelblue3 - 0x4f94cd - steelblue4 - 0x36648b - tan - 0xd2b48c - tan1 - 0xffa54f - tan2 - 0xee9a49 - tan3 - 0xcd853f - tan4 - 0x8b5a2b - thistle - 0xd8bfd8 - thistle1 - 0xffe1ff - thistle2 - 0xeed2ee - thistle3 - 0xcdb5cd - thistle4 - 0x8b7b8b - tomato - 0xff6347 - tomato1 - 0xff6347 - tomato2 - 0xee5c42 - tomato3 - 0xcd4f39 - tomato4 - 0x8b3626 - turquoise - 0x40e0d0 - turquoise1 - 0x00f5ff - turquoise2 - 0x00e5ee - turquoise3 - 0x00c5cd - turquoise4 - 0x00868b - violet - 0xee82ee - violetred - 0xd02090 - violetred1 - 0xff3e96 - violetred2 - 0xee3a8c - violetred3 - 0xcd3278 - violetred4 - 0x8b2252 - wheat - 0xf5deb3 - wheat1 - 0xffe7ba - wheat2 - 0xeed8ae - wheat3 - 0xcdba96 - wheat4 - 0x8b7e66 - white - 0xffffff - whitesmoke - 0xf5f5f5 - yellow - 0xffff00 - yellow1 - 0xffff00 - yellow2 - 0xeeee00 - yellow3 - 0xcdcd00 - yellow4 - 0x8b8b00 - yellowgreen - 0x9acd32 - - diff --git a/src/MacVim/MMBackend.h b/src/MacVim/MMBackend.h index 93c3cdb997..0ed690bd25 100644 --- a/src/MacVim/MMBackend.h +++ b/src/MacVim/MMBackend.h @@ -22,7 +22,6 @@ NSConnection *vimServerConnection; id appProxy; unsigned long identifier; - NSDictionary *colorDict; NSDictionary *sysColorDict; NSDictionary *actionDict; BOOL tabBarVisible; diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m index 9d8c6b7a70..b443d8bec3 100644 --- a/src/MacVim/MMBackend.m +++ b/src/MacVim/MMBackend.m @@ -229,11 +229,8 @@ - (id)init serverReplyDict = [[NSMutableDictionary alloc] init]; NSBundle *mainBundle = [NSBundle mainBundle]; - NSString *path = [mainBundle pathForResource:@"Colors" ofType:@"plist"]; - if (path) - colorDict = [[NSDictionary dictionaryWithContentsOfFile:path] retain]; - path = [mainBundle pathForResource:@"SystemColors" ofType:@"plist"]; + NSString *path = [mainBundle pathForResource:@"SystemColors" ofType:@"plist"]; if (path) sysColorDict = [[NSDictionary dictionaryWithContentsOfFile:path] retain]; @@ -242,7 +239,7 @@ - (id)init if (path) actionDict = [[NSDictionary dictionaryWithContentsOfFile:path] retain]; - if (!(colorDict && sysColorDict && actionDict)) { + if (!(sysColorDict && actionDict)) { ASLogNotice(@"Failed to load dictionaries.%@", MMSymlinkWarningString); } @@ -270,7 +267,6 @@ - (void)dealloc [appProxy release]; appProxy = nil; [actionDict release]; actionDict = nil; [sysColorDict release]; sysColorDict = nil; - [colorDict release]; colorDict = nil; [vimServerConnection release]; vimServerConnection = nil; #ifdef FEAT_BEVAL [lastToolTip release]; lastToolTip = nil; @@ -1139,25 +1135,9 @@ - (int)lookupColorWithKey:(NSString *)key componentsJoinedByString:@""]; if (stripKey && [stripKey length] > 0) { - // First of all try to lookup key in the color dictionary; note that - // all keys in this dictionary are lowercase with no whitespace. - id obj = [colorDict objectForKey:stripKey]; - if (obj) return [obj intValue]; - - // The key was not in the dictionary; is it perhaps of the form - // #rrggbb? - if ([stripKey length] > 1 && [stripKey characterAtIndex:0] == '#') { - NSScanner *scanner = [NSScanner scannerWithString:stripKey]; - [scanner setScanLocation:1]; - unsigned hex = 0; - if ([scanner scanHexInt:&hex]) { - return (int)hex; - } - } - - // As a last resort, check if it is one of the system defined colors. - // The keys in this dictionary are also lowercase with no whitespace. - obj = [sysColorDict objectForKey:stripKey]; + // Check if it is one of the system defined colors. The keys in this + // dictionary are also lowercase with no whitespace. + id obj = [sysColorDict objectForKey:stripKey]; if (obj) { NSColor *col = [NSColor performSelector:NSSelectorFromString(obj)]; if (col) { @@ -1171,7 +1151,6 @@ - (int)lookupColorWithKey:(NSString *)key } } - ASLogNotice(@"No color with key %@ found.", stripKey); return INVALCOLOR; } diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 74818701b0..e6eaa210e2 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */; }; 0395A8AA0D72D88B00881434 /* General.png in Resources */ = {isa = PBXBuildFile; fileRef = 0395A8A90D72D88B00881434 /* General.png */; }; 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; }; - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; }; 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */; }; 1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; }; 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D14749E0C5673AE0038FA2B /* MMAppController.m */; }; @@ -172,7 +171,6 @@ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTypesetter.h; sourceTree = ""; }; 1D09AB400C6A4D520045497E /* MMTypesetter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTypesetter.m; sourceTree = ""; }; - 1D0E051B0BA5F83800B6049E /* Colors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Colors.plist; sourceTree = ""; }; 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMTextViewHelper.h; sourceTree = ""; }; 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMTextViewHelper.m; sourceTree = ""; }; 1D1474950C56703C0038FA2B /* MacVim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacVim.h; sourceTree = ""; }; @@ -669,7 +667,6 @@ 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */, 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */, 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */, - 1D0E051B0BA5F83800B6049E /* Colors.plist */, 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 528DA6691426D4EB003380F1 /* macvim-askpass */, @@ -1048,7 +1045,6 @@ buildActionMask = 2147483647; files = ( 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */, 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */, 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */, 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */, diff --git a/src/MacVim/MacVim_xcode8.xcodeproj/project.pbxproj b/src/MacVim/MacVim_xcode8.xcodeproj/project.pbxproj index 671fa705a7..d12e701707 100644 --- a/src/MacVim/MacVim_xcode8.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim_xcode8.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */; }; 0395A8AA0D72D88B00881434 /* General.png in Resources */ = {isa = PBXBuildFile; fileRef = 0395A8A90D72D88B00881434 /* General.png */; }; 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; }; - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; }; 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */; }; 1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; }; 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D14749E0C5673AE0038FA2B /* MMAppController.m */; }; @@ -173,7 +172,6 @@ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTypesetter.h; sourceTree = ""; }; 1D09AB400C6A4D520045497E /* MMTypesetter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTypesetter.m; sourceTree = ""; }; - 1D0E051B0BA5F83800B6049E /* Colors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Colors.plist; sourceTree = ""; }; 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMTextViewHelper.h; sourceTree = ""; }; 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMTextViewHelper.m; sourceTree = ""; }; 1D1474950C56703C0038FA2B /* MacVim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacVim.h; sourceTree = ""; }; @@ -670,7 +668,6 @@ 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */, 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */, 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */, - 1D0E051B0BA5F83800B6049E /* Colors.plist */, 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 528DA6691426D4EB003380F1 /* macvim-askpass */, @@ -1049,7 +1046,6 @@ buildActionMask = 2147483647; files = ( 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */, 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */, 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */, 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */, diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m index d1d04514f5..8ca89a23c8 100644 --- a/src/MacVim/gui_macvim.m +++ b/src/MacVim/gui_macvim.m @@ -1860,20 +1860,20 @@ guicolor_T gui_mch_get_color(char_u *name) { + guicolor_T color = gui_get_color_cmn(name); + if (color != INVALCOLOR) + return color; + if (![MMBackend sharedInstance]) return INVALCOLOR; char_u *u8name = CONVERT_TO_UTF8(name); NSString *key = [NSString stringWithUTF8String:(char*)u8name]; - guicolor_T color = [[MMBackend sharedInstance] lookupColorWithKey:key]; + color = [[MMBackend sharedInstance] lookupColorWithKey:key]; CONVERT_TO_UTF8_FREE(u8name); - - if (color != INVALCOLOR) - return color; - - return gui_get_color_cmn(name); + return color; }