mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tui: Combine multiple attribute changes.

Browse Source 
Use the terminfo set_attribute capability to set multiple attributes in one
control sequence, if it is available.
This commit is contained in:
Jonathan de Boyne Pollard
2017-06-05 22:12:53 +01:00
parent 239b0aaf2e
commit 054b03e07a
1 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/nvim/tui/tui.c
View File

@@ -360,19 +360,43 @@ static void update_attrs(UI *ui, HlAttrs attrs)
} }
data->print_attrs = attrs; data->print_attrs = attrs;
if (!data->default_attr) {
data->default_attr = true;
unibi_out(ui, unibi_exit_attribute_mode);
}
UGrid *grid = &data->grid; UGrid *grid = &data->grid;
int fg = attrs.foreground != -1 ? attrs.foreground : grid->fg; int fg = attrs.foreground != -1 ? attrs.foreground : grid->fg;
int bg = attrs.background != -1 ? attrs.background : grid->bg; int bg = attrs.background != -1 ? attrs.background : grid->bg;
data->default_attr = fg == -1 && bg == -1 if (unibi_get_str(data->ut, unibi_set_attributes)) {
&& !attrs.bold && !attrs.italic && !attrs.underline && !attrs.undercurl if (attrs.bold || attrs.reverse || attrs.underline || attrs.undercurl) {
&& !attrs.reverse; data->params[0].i = 0; // standout
data->params[1].i = attrs.underline || attrs.undercurl;
data->params[2].i = attrs.reverse;
data->params[3].i = 0; // blink
data->params[4].i = 0; // dim
data->params[5].i = attrs.bold;
data->params[6].i = 0; // blank
data->params[7].i = 0; // protect
data->params[8].i = 0; // alternate character set
unibi_out(ui, unibi_set_attributes);
} else if (!data->default_attr) {
unibi_out(ui, unibi_exit_attribute_mode);
}
} else {
if (!data->default_attr) {
unibi_out(ui, unibi_exit_attribute_mode);
}
if (attrs.bold) {
unibi_out(ui, unibi_enter_bold_mode);
}
if (attrs.underline || attrs.undercurl) {
unibi_out(ui, unibi_enter_underline_mode);
}
if (attrs.reverse) {
unibi_out(ui, unibi_enter_reverse_mode);
}
}
if (attrs.italic) {
unibi_out(ui, unibi_enter_italics_mode);
}
if (ui->rgb) { if (ui->rgb) {
if (fg != -1) { if (fg != -1) {
data->params[0].i = (fg >> 16) & 0xff; // red data->params[0].i = (fg >> 16) & 0xff; // red
@@ -399,18 +423,9 @@ static void update_attrs(UI *ui, HlAttrs attrs)
} }
} }
if (attrs.bold) { data->default_attr = fg == -1 && bg == -1
unibi_out(ui, unibi_enter_bold_mode); && !attrs.bold && !attrs.italic && !attrs.underline && !attrs.undercurl
} && !attrs.reverse;
if (attrs.italic) {
unibi_out(ui, unibi_enter_italics_mode);
}
if (attrs.underline || attrs.undercurl) {
unibi_out(ui, unibi_enter_underline_mode);
}
if (attrs.reverse) {
unibi_out(ui, unibi_enter_reverse_mode);
}
} }
static void final_column_wrap(UI *ui) static void final_column_wrap(UI *ui)