remove lookup_color function

Author: leematos

src/proto/syntax.pro

@@ -25,7 +25,6 @@ void ex_syntime(exarg_T *eap);
 char_u *get_syntime_arg(expand_T *xp, int idx);
 void init_highlight(int both, int reset);
 int load_colors(char_u *name);
-int lookup_color(int idx, int foreground, int *boldp);
 void do_highlight(char_u *line, int forceit, int init);
 void free_highlight(void);
 void restore_cterm_colors(void);

src/syntax.c

@@ -371,95 +371,6 @@ static char *(color_names[28]) = {
  * 14, 15, 16, 17,
  * 18, 19, 20, 21, 22,
  * 23, 24, 25, 26, 27 */
-static int color_numbers_16[28] = {0, 1, 2, 3,
- 4, 5, 6, 6,
- 7, 7, 7, 7,
- 8, 8,
- 9, 9, 10, 10,
- 11, 11, 12, 12, 13,
- 13, 14, 14, 15, -1};
-/* for xterm with 88 colors... */
-static int color_numbers_88[28] = {0, 4, 2, 6,
- 1, 5, 32, 72,
- 84, 84, 7, 7,
- 82, 82,
- 12, 43, 10, 61,
- 14, 63, 9, 74, 13,
- 75, 11, 78, 15, -1};
-/* for xterm with 256 colors... */
-static int color_numbers_256[28] = {0, 4, 2, 6,
- 1, 5, 130, 130,
- 248, 248, 7, 7,
- 242, 242,
- 12, 81, 10, 121,
- 14, 159, 9, 224, 13,
- 225, 11, 229, 15, -1};
-/* for terminals with less than 16 colors... */
-static int color_numbers_8[28] = {0, 4, 2, 6,
- 1, 5, 3, 3,
- 7, 7, 7, 7,
- 0 + 8, 0 + 8,
- 4 + 8, 4 + 8, 2 + 8, 2 + 8,
- 6 + 8, 6 + 8, 1 + 8, 1 + 8, 5 + 8,
- 5 + 8, 3 + 8, 3 + 8, 7 + 8, -1};
-
-/*
- * Lookup the "cterm" value to be used for color with index "idx" in
- * color_names[].
- * "boldp" will be set to TRUE or FALSE for a foreground color when using 8
- * colors, otherwise it will be unchanged.
- */
-int lookup_color(int idx, int foreground, int *boldp)
-{
- int color = color_numbers_16[idx];
- char_u *p;
-
- /* Use the _16 table to check if it's a valid color name. */
- if (color < 0)
- return -1;
-
- if (t_colors == 8)
- {
- /* t_Co is 8: use the 8 colors table */
-#if defined(__QNXNTO__)
- color = color_numbers_8_qansi[idx];
-#else
- color = color_numbers_8[idx];
-#endif
- if (foreground)
- {
- /* set/reset bold attribute to get light foreground
- * colors (on some terminals, e.g. "linux") */
- if (color & 8)
- *boldp = TRUE;
- else
- *boldp = FALSE;
- }
- color &= 7; /* truncate to 8 colors */
- }
- else if (t_colors == 16 || t_colors == 88 || t_colors >= 256)
- {
- /*
- * Guess: if the termcap entry ends in 'm', it is
- * probably an xterm-like terminal. Use the changed
- * order for colors.
- */
- if (*T_CAF != NUL)
- p = T_CAF;
- else
- p = T_CSF;
- if (*p != NUL && (t_colors > 256 || *(p + STRLEN(p) - 1) == 'm'))
- {
- if (t_colors == 88)
- color = color_numbers_88[idx];
- else if (t_colors >= 256)
- color = color_numbers_256[idx];
- else
- color = color_numbers_8[idx];
- }
- }
- return color;
-}
 
 /*
  * Handle the ":highlight .." command.
@@ -901,7 +812,7 @@ void do_highlight(
  break;
  }
 
- color = lookup_color(i, key[5] == 'F', &bold);
+ color = 0;
 
  /* set/reset bold attribute to get light foreground
  * colors (on some terminals, e.g. "linux") */

src/terminal.c

@@ -2137,89 +2137,6 @@ may_toggle_cursor(term_T *term)
 static int
 color2index(VTermColor *color, int fg, int *boldp)
 {
- int red = color->red;
- int blue = color->blue;
- int green = color->green;
-
- if (color->ansi_index != VTERM_ANSI_INDEX_NONE)
- {
- // The first 16 colors and default: use the ANSI index.
- switch (color->ansi_index)
- {
- case 0:
- return 0;
- case 1:
- return lookup_color(0, fg, boldp) + 1; /* black */
- case 2:
- return lookup_color(4, fg, boldp) + 1; /* dark red */
- case 3:
- return lookup_color(2, fg, boldp) + 1; /* dark green */
- case 4:
- return lookup_color(6, fg, boldp) + 1; /* brown */
- case 5:
- return lookup_color(1, fg, boldp) + 1; /* dark blue */
- case 6:
- return lookup_color(5, fg, boldp) + 1; /* dark magenta */
- case 7:
- return lookup_color(3, fg, boldp) + 1; /* dark cyan */
- case 8:
- return lookup_color(8, fg, boldp) + 1; /* light grey */
- case 9:
- return lookup_color(12, fg, boldp) + 1; /* dark grey */
- case 10:
- return lookup_color(20, fg, boldp) + 1; /* red */
- case 11:
- return lookup_color(16, fg, boldp) + 1; /* green */
- case 12:
- return lookup_color(24, fg, boldp) + 1; /* yellow */
- case 13:
- return lookup_color(14, fg, boldp) + 1; /* blue */
- case 14:
- return lookup_color(22, fg, boldp) + 1; /* magenta */
- case 15:
- return lookup_color(18, fg, boldp) + 1; /* cyan */
- case 16:
- return lookup_color(26, fg, boldp) + 1; /* white */
- }
- }
-
- if (t_colors >= 256)
- {
- if (red == blue && red == green)
- {
- /* 24-color greyscale plus white and black */
- static int cutoff[23] = {
- 0x0D, 0x17, 0x21, 0x2B, 0x35, 0x3F, 0x49, 0x53, 0x5D, 0x67,
- 0x71, 0x7B, 0x85, 0x8F, 0x99, 0xA3, 0xAD, 0xB7, 0xC1, 0xCB,
- 0xD5, 0xDF, 0xE9};
- int i;
-
- if (red < 5)
- return 17; /* 00/00/00 */
- if (red > 245) /* ff/ff/ff */
- return 232;
- for (i = 0; i < 23; ++i)
- if (red < cutoff[i])
- return i + 233;
- return 256;
- }
- {
- static int cutoff[5] = {0x2F, 0x73, 0x9B, 0xC3, 0xEB};
- int ri, gi, bi;
-
- /* 216-color cube */
- for (ri = 0; ri < 5; ++ri)
- if (red < cutoff[ri])
- break;
- for (gi = 0; gi < 5; ++gi)
- if (green < cutoff[gi])
- break;
- for (bi = 0; bi < 5; ++bi)
- if (blue < cutoff[bi])
- break;
- return 17 + ri * 36 + gi * 6 + bi;
- }
- }
  return 0;
 }