diff options
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 114 |
1 files changed, 63 insertions, 51 deletions
diff --git a/src/term.c b/src/term.c index ba2d473bc..aecdadfed 100644 --- a/src/term.c +++ b/src/term.c @@ -6086,6 +6086,8 @@ gui_get_color_cmn(char_u *name) guicolor_T color; }; + /* Only non X11 colors (not present in rgb.txt) and colors in + * color_names[], useful when $VIMRUNTIME is not found,. */ static struct rgbcolor_table_S rgb_table[] = { {(char_u *)"black", RGB(0x00, 0x00, 0x00)}, {(char_u *)"blue", RGB(0x00, 0x00, 0xFF)}, @@ -6100,26 +6102,8 @@ gui_get_color_cmn(char_u *name) {(char_u *)"darkred", RGB(0x8B, 0x00, 0x00)}, {(char_u *)"darkyellow", RGB(0x8B, 0x8B, 0x00)}, /* No X11 */ {(char_u *)"gray", RGB(0xBE, 0xBE, 0xBE)}, - {(char_u *)"gray10", RGB(0x1A, 0x1A, 0x1A)}, - {(char_u *)"gray20", RGB(0x33, 0x33, 0x33)}, - {(char_u *)"gray30", RGB(0x4D, 0x4D, 0x4D)}, - {(char_u *)"gray40", RGB(0x66, 0x66, 0x66)}, - {(char_u *)"gray50", RGB(0x7F, 0x7F, 0x7F)}, - {(char_u *)"gray60", RGB(0x99, 0x99, 0x99)}, - {(char_u *)"gray70", RGB(0xB3, 0xB3, 0xB3)}, - {(char_u *)"gray80", RGB(0xCC, 0xCC, 0xCC)}, - {(char_u *)"gray90", RGB(0xE5, 0xE5, 0xE5)}, {(char_u *)"green", RGB(0x00, 0xFF, 0x00)}, {(char_u *)"grey", RGB(0xBE, 0xBE, 0xBE)}, - {(char_u *)"grey10", RGB(0x1A, 0x1A, 0x1A)}, - {(char_u *)"grey20", RGB(0x33, 0x33, 0x33)}, - {(char_u *)"grey30", RGB(0x4D, 0x4D, 0x4D)}, - {(char_u *)"grey40", RGB(0x66, 0x66, 0x66)}, - {(char_u *)"grey50", RGB(0x7F, 0x7F, 0x7F)}, - {(char_u *)"grey60", RGB(0x99, 0x99, 0x99)}, - {(char_u *)"grey70", RGB(0xB3, 0xB3, 0xB3)}, - {(char_u *)"grey80", RGB(0xCC, 0xCC, 0xCC)}, - {(char_u *)"grey90", RGB(0xE5, 0xE5, 0xE5)}, {(char_u *)"lightblue", RGB(0xAD, 0xD8, 0xE6)}, {(char_u *)"lightcyan", RGB(0xE0, 0xFF, 0xFF)}, {(char_u *)"lightgray", RGB(0xD3, 0xD3, 0xD3)}, @@ -6129,16 +6113,13 @@ gui_get_color_cmn(char_u *name) {(char_u *)"lightred", RGB(0xFF, 0x8B, 0x8B)}, /* No X11 */ {(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xE0)}, {(char_u *)"magenta", RGB(0xFF, 0x00, 0xFF)}, - {(char_u *)"orange", RGB(0xFF, 0xA5, 0x00)}, - {(char_u *)"purple", RGB(0xA0, 0x20, 0xF0)}, {(char_u *)"red", RGB(0xFF, 0x00, 0x00)}, - {(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)}, - {(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)}, - {(char_u *)"violet", RGB(0xEE, 0x82, 0xEE)}, {(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)}, {(char_u *)"yellow", RGB(0xFF, 0xFF, 0x00)}, }; + static struct rgbcolor_table_S *colornames_table; + static int size = 0; if (name[0] == '#' && STRLEN(name) == 7) { @@ -6159,44 +6140,75 @@ gui_get_color_cmn(char_u *name) /* * Last attempt. Look in the file "$VIM/rgb.txt". */ + if (size == 0) + { + int counting; - fname = expand_env_save((char_u *)"$VIMRUNTIME/rgb.txt"); - if (fname == NULL) - return INVALCOLOR; + /* colornames_table not yet initialized */ + fname = expand_env_save((char_u *)"$VIMRUNTIME/rgb.txt"); + if (fname == NULL) + return INVALCOLOR; - fd = fopen((char *)fname, "rt"); - vim_free(fname); - if (fd == NULL) - { - if (p_verbose > 1) - verb_msg((char_u *)_("Cannot open $VIMRUNTIME/rgb.txt")); - return INVALCOLOR; - } + fd = fopen((char *)fname, "rt"); + vim_free(fname); + if (fd == NULL) + { + if (p_verbose > 1) + verb_msg((char_u *)_("Cannot open $VIMRUNTIME/rgb.txt")); + return INVALCOLOR; + } - while (!feof(fd)) - { - size_t len; - int pos; + for (counting = 1; counting >= 0; --counting) + { + if (!counting) + { + colornames_table = (struct rgbcolor_table_S *)alloc( + (unsigned)(sizeof(struct rgbcolor_table_S) * size)); + if (colornames_table == NULL) + { + fclose(fd); + return INVALCOLOR; + } + rewind(fd); + } + size = 0; - ignoredp = fgets(line, LINE_LEN, fd); - len = strlen(line); + while (!feof(fd)) + { + size_t len; + int pos; - if (len <= 1 || line[len - 1] != '\n') - continue; + ignoredp = fgets(line, LINE_LEN, fd); + len = strlen(line); - line[len - 1] = '\0'; + if (len <= 1 || line[len - 1] != '\n') + continue; - i = sscanf(line, "%d %d %d %n", &r, &g, &b, &pos); - if (i != 3) - continue; + line[len - 1] = '\0'; - if (STRICMP(line + pos, name) == 0) - { - fclose(fd); - return (guicolor_T)RGB(r, g, b); + i = sscanf(line, "%d %d %d %n", &r, &g, &b, &pos); + if (i != 3) + continue; + + if (!counting) + { + char_u *s = vim_strsave((char_u *)line + pos); + + if (s == NULL) + return INVALCOLOR; + colornames_table[size].color_name = s; + colornames_table[size].color = (guicolor_T)RGB(r, g, b); + } + size++; + } } + fclose(fd); } - fclose(fd); + + for (i = 0; i < size; i++) + if (STRICMP(name, colornames_table[i].color_name) == 0) + return colornames_table[i].color; + return INVALCOLOR; } #endif |