Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-05 21:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

xterm fix wasn't quite right...

Browse Source
This commit is contained in:
Timothy Stack 2018-11-17 07:45:18 -08:00
parent 8b5b8743b1
commit 2c5bfc830e
1 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/view_curses.cc
View File

@ -697,17 +697,21 @@ void view_colors::init(void)
inline attr_t attr_for_colors(int &pair_base, short fg, short bg)
{
int pair = ++pair_base;
if (lnav_config.lc_ui_default_colors) {
if (fg == COLOR_WHITE) {
fg = -1;
}
if (bg == COLOR_BLACK) {
bg = -1;
if (COLOR_PAIRS <= 64) {
return view_colors::ansi_color_pair(fg, bg);
} else {
if (lnav_config.lc_ui_default_colors) {
if (fg == COLOR_WHITE) {
fg = -1;
}
if (bg == COLOR_BLACK) {
bg = -1;
}
}
}
int pair = ++pair_base;
init_pair(pair, fg, bg);
return COLOR_PAIR(pair);
@ -720,58 +724,58 @@ void view_colors::init_roles(int color_pair_base)
/* Setup the mappings from roles to actual colors. */
this->vc_role_colors[VCR_TEXT] =
ansi_color_pair(COLOR_WHITE, COLOR_BLACK);
attr_for_colors(color_pair_base, COLOR_WHITE, COLOR_BLACK);
if (lnav_config.lc_ui_dim_text) {
this->vc_role_colors[VCR_TEXT] |= A_DIM;
}
this->vc_role_colors[VCR_SEARCH] = A_REVERSE;
this->vc_role_colors[VCR_OK] = ansi_color_pair(COLOR_GREEN, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_ERROR] = ansi_color_pair(COLOR_RED, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_WARNING] = ansi_color_pair(COLOR_YELLOW, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_OK] = attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_ERROR] = attr_for_colors(color_pair_base, COLOR_RED, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_WARNING] = attr_for_colors(color_pair_base, COLOR_YELLOW, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_ALT_ROW] = this->vc_role_colors[VCR_TEXT] | A_BOLD;
this->vc_role_colors[VCR_HIDDEN] = ansi_color_pair(COLOR_YELLOW, COLOR_BLACK);
this->vc_role_colors[VCR_ADJUSTED_TIME] = ansi_color_pair(COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_SKEWED_TIME] = ansi_color_pair(COLOR_YELLOW, COLOR_BLACK) | A_UNDERLINE;
this->vc_role_colors[VCR_OFFSET_TIME] = ansi_color_pair(COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_HIDDEN] = attr_for_colors(color_pair_base, COLOR_YELLOW, COLOR_BLACK);
this->vc_role_colors[VCR_ADJUSTED_TIME] = attr_for_colors(color_pair_base, COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_SKEWED_TIME] = attr_for_colors(color_pair_base, COLOR_YELLOW, COLOR_BLACK) | A_UNDERLINE;
this->vc_role_colors[VCR_OFFSET_TIME] = attr_for_colors(color_pair_base, COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_STATUS] =
ansi_color_pair(COLOR_BLACK, COLOR_WHITE);
attr_for_colors(color_pair_base, COLOR_BLACK, COLOR_WHITE);
this->vc_role_colors[VCR_WARN_STATUS] =
ansi_color_pair(COLOR_YELLOW, COLOR_WHITE) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_YELLOW, COLOR_WHITE) | A_BOLD;
this->vc_role_colors[VCR_ALERT_STATUS] =
ansi_color_pair(COLOR_RED, COLOR_WHITE) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_RED, COLOR_WHITE) | A_BOLD;
this->vc_role_colors[VCR_ACTIVE_STATUS] =
ansi_color_pair(COLOR_GREEN, COLOR_WHITE);
attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_WHITE);
this->vc_role_colors[VCR_ACTIVE_STATUS2] =
ansi_color_pair(COLOR_GREEN, COLOR_WHITE) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_WHITE) | A_BOLD;
this->vc_role_colors[VCR_BOLD_STATUS] =
ansi_color_pair(COLOR_BLACK, COLOR_WHITE) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_BLACK, COLOR_WHITE) | A_BOLD;
this->vc_role_colors[VCR_VIEW_STATUS] =
ansi_color_pair(COLOR_WHITE, COLOR_BLUE) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_WHITE, COLOR_BLUE) | A_BOLD;
rgb_color::from_str(string_fragment("White"), fg, err);
rgb_color::from_str(string_fragment("Grey37"), bg, err);
this->vc_role_colors[VCR_INACTIVE_STATUS] = ensure_color_pair(fg, bg);
this->vc_role_colors[VCR_POPUP] =
ansi_color_pair(COLOR_WHITE, COLOR_CYAN) | A_BOLD;
attr_for_colors(color_pair_base, COLOR_WHITE, COLOR_CYAN) | A_BOLD;
this->vc_role_colors[VCR_KEYWORD] = ansi_color_pair(COLOR_BLUE, COLOR_BLACK);
this->vc_role_colors[VCR_STRING] = ansi_color_pair(COLOR_GREEN, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_COMMENT] = ansi_color_pair(COLOR_GREEN, COLOR_BLACK);
this->vc_role_colors[VCR_VARIABLE] = ansi_color_pair(COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_SYMBOL] = ansi_color_pair(COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_RE_SPECIAL] = ansi_color_pair(COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_RE_REPEAT] = ansi_color_pair(COLOR_YELLOW, COLOR_BLACK);
this->vc_role_colors[VCR_FILE] = ansi_color_pair(COLOR_BLUE, COLOR_BLACK);
this->vc_role_colors[VCR_KEYWORD] = attr_for_colors(color_pair_base, COLOR_BLUE, COLOR_BLACK);
this->vc_role_colors[VCR_STRING] = attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_BLACK) | A_BOLD;
this->vc_role_colors[VCR_COMMENT] = attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_BLACK);
this->vc_role_colors[VCR_VARIABLE] = attr_for_colors(color_pair_base, COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_SYMBOL] = attr_for_colors(color_pair_base, COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_RE_SPECIAL] = attr_for_colors(color_pair_base, COLOR_CYAN, COLOR_BLACK);
this->vc_role_colors[VCR_RE_REPEAT] = attr_for_colors(color_pair_base, COLOR_YELLOW, COLOR_BLACK);
this->vc_role_colors[VCR_FILE] = attr_for_colors(color_pair_base, COLOR_BLUE, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_DELETE] = ansi_color_pair(COLOR_RED, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_ADD] = ansi_color_pair(COLOR_GREEN, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_SECTION] = ansi_color_pair(COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_DELETE] = attr_for_colors(color_pair_base, COLOR_RED, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_ADD] = attr_for_colors(color_pair_base, COLOR_GREEN, COLOR_BLACK);
this->vc_role_colors[VCR_DIFF_SECTION] = attr_for_colors(color_pair_base, COLOR_MAGENTA, COLOR_BLACK);
this->vc_role_colors[VCR_LOW_THRESHOLD] = ansi_color_pair(COLOR_BLACK, COLOR_GREEN);
this->vc_role_colors[VCR_MED_THRESHOLD] = ansi_color_pair(COLOR_BLACK, COLOR_YELLOW);
this->vc_role_colors[VCR_HIGH_THRESHOLD] = ansi_color_pair(COLOR_BLACK, COLOR_RED);
this->vc_role_colors[VCR_LOW_THRESHOLD] = attr_for_colors(color_pair_base, COLOR_BLACK, COLOR_GREEN);
this->vc_role_colors[VCR_MED_THRESHOLD] = attr_for_colors(color_pair_base, COLOR_BLACK, COLOR_YELLOW);
this->vc_role_colors[VCR_HIGH_THRESHOLD] = attr_for_colors(color_pair_base, COLOR_BLACK, COLOR_RED);
this->vc_color_pair_end = color_pair_base + 1;
}