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: Coding style changes only

Browse Source 
Per warnings about house style from automated tools.
This commit is contained in:
Jonathan de Boyne Pollard
2017-05-23 15:38:51 +01:00
parent e826ec0b0e
commit d077a161ee
1 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,7 +415,7 @@ static bool cheap_to_print(UI *ui, int row, int col, int next)
--next;
if (attrs_differ(cell->attrs, data->print_attrs)) {
if (data->default_attr) {
return false;
return false;
}
}
if (strlen(cell->data) > 1) {
@@ -439,8 +439,9 @@ static void cursor_goto(UI *ui, int row, int col)
{
TUIData *data = ui->data;
UGrid *grid = &data->grid;
if (row == grid->row && col == grid->col)
if (row == grid->row && col == grid->col) {
return;
}
if (0 == row && 0 == col) {
unibi_out(ui, unibi_cursor_home);
ugrid_goto(&data->grid, row, col);
@@ -456,34 +457,37 @@ static void cursor_goto(UI *ui, int row, int col)
ugrid_goto(&data->grid, grid->row, 0);
} else if (col > grid->col) {
int n = col - grid->col;
if (n <= (row == grid->row ? 4 : 2) && cheap_to_print(ui, grid->row, grid->col, n)) {
UGRID_FOREACH_CELL(grid, grid->row, grid->row,
grid->col, col - 1, {
print_cell(ui, cell);
++grid->col;
});
if (n <= (row == grid->row ? 4 : 2)
&& cheap_to_print(ui, grid->row, grid->col, n)) {
UGRID_FOREACH_CELL(grid, grid->row, grid->row,
grid->col, col - 1, {
print_cell(ui, cell);
++grid->col;
});
}
}
if (row == grid->row) {
if (col < grid->col) {
int n = grid->col - col;
if (n <= 4) { // This might be just BS, so it is considered really cheap.
while (n--)
unibi_out(ui, unibi_cursor_left);
while (n--) {
unibi_out(ui, unibi_cursor_left);
}
} else {
data->params[0].i = n;
unibi_out(ui, unibi_parm_left_cursor);
data->params[0].i = n;
unibi_out(ui, unibi_parm_left_cursor);
}
ugrid_goto(&data->grid, row, col);
return;
} else if (col > grid->col) {
int n = col - grid->col;
if (n <= 2) {
while (n--)
unibi_out(ui, unibi_cursor_right);
while (n--) {
unibi_out(ui, unibi_cursor_right);
}
} else {
data->params[0].i = n;
unibi_out(ui, unibi_parm_right_cursor);
data->params[0].i = n;
unibi_out(ui, unibi_parm_right_cursor);
}
ugrid_goto(&data->grid, row, col);
return;
@@ -493,22 +497,24 @@ static void cursor_goto(UI *ui, int row, int col)
if (row > grid->row) {
int n = row - grid->row;
if (n <= 4) { // This might be just LF, so it is considered really cheap.
while (n--)
unibi_out(ui, unibi_cursor_down);
while (n--) {
unibi_out(ui, unibi_cursor_down);
}
} else {
data->params[0].i = n;
unibi_out(ui, unibi_parm_down_cursor);
data->params[0].i = n;
unibi_out(ui, unibi_parm_down_cursor);
}
ugrid_goto(&data->grid, row, col);
return;
} else if (row < grid->row) {
int n = grid->row - row;
if (n <= 2) {
while (n--)
unibi_out(ui, unibi_cursor_up);
while (n--) {
unibi_out(ui, unibi_cursor_up);
}
} else {
data->params[0].i = n;
unibi_out(ui, unibi_parm_up_cursor);
data->params[0].i = n;
unibi_out(ui, unibi_parm_up_cursor);
}
ugrid_goto(&data->grid, row, col);
return;
@@ -1235,7 +1241,8 @@ static void fix_terminfo(TUIData *data)
unibi_set_if_empty(ut, unibi_set_left_margin_parm, "\x1b[%i%p1%ds");
unibi_set_if_empty(ut, unibi_set_right_margin_parm, "\x1b[%i;%p2%ds");
}
if (data->term == kTermXTerm || data->term == kTermRxvt || data->term == kTermPuTTY) {
if (data->term == kTermXTerm || data->term == kTermRxvt
|| data->term == kTermPuTTY) {
unibi_set_if_empty(ut, unibi_change_scroll_region, "\x1b[%i%p1%d;%p2%dr");
unibi_set_if_empty(ut, unibi_clear_screen, "\x1b[H\x1b[2J");
unibi_set_bool(ut, unibi_back_color_erase, true);
@@ -1282,7 +1289,8 @@ static void fix_terminfo(TUIData *data)
"\x1b[8;%p1%d;%p2%dt");
}
if (data->term == kTermXTerm || data->term == kTermRxvt || data->term == kTermPuTTY) {
if (data->term == kTermXTerm || data->term == kTermRxvt
|| data->term == kTermPuTTY) {
data->unibi_ext.reset_scroll_region = (int)unibi_add_ext_str(ut, NULL,
"\x1b[r");
}