mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #9056 from bfredl/tui_repr
TUI code simplification and dead code elimination
This commit is contained in:
Björn Linse
GitHub
commit
64a8a8fd22
@ -574,7 +574,7 @@ static void print_cell(UI *ui, UCell *ptr)
|
||||
// Printing the next character finally advances the cursor.
|
||||
final_column_wrap(ui);
|
||||
}
|
||||
update_attrs(ui, ptr->attrs);
|
||||
update_attrs(ui, kv_A(data->attrs, ptr->attr));
|
||||
out(ui, ptr->data, strlen(ptr->data));
|
||||
grid->col++;
|
||||
if (data->immediate_wrap_after_last_column) {
|
||||
@ -590,7 +590,8 @@ static bool cheap_to_print(UI *ui, int row, int col, int next)
|
||||
UCell *cell = grid->cells[row] + col;
|
||||
while (next) {
|
||||
next--;
|
||||
if (attrs_differ(cell->attrs, data->print_attrs, ui->rgb)) {
|
||||
if (attrs_differ(kv_A(data->attrs, cell->attr),
|
||||
data->print_attrs, ui->rgb)) {
|
||||
if (data->default_attr) {
|
||||
return false;
|
||||
}
|
||||
@ -764,43 +765,31 @@ static void clear_region(UI *ui, int top, int bot, int left, int right,
|
||||
cursor_goto(ui, data->row, data->col);
|
||||
}
|
||||
|
||||
static bool can_use_scroll(UI * ui)
|
||||
static void set_scroll_region(UI *ui, int top, int bot, int left, int right)
|
||||
{
|
||||
TUIData *data = ui->data;
|
||||
UGrid *grid = &data->grid;
|
||||
|
||||
return data->scroll_region_is_full_screen
|
||||
|| (data->can_change_scroll_region
|
||||
&& ((grid->left == 0 && grid->right == ui->width - 1)
|
||||
|| data->can_set_lr_margin
|
||||
|| data->can_set_left_right_margin));
|
||||
}
|
||||
|
||||
static void set_scroll_region(UI *ui)
|
||||
{
|
||||
TUIData *data = ui->data;
|
||||
UGrid *grid = &data->grid;
|
||||
|
||||
UNIBI_SET_NUM_VAR(data->params[0], grid->top);
|
||||
UNIBI_SET_NUM_VAR(data->params[1], grid->bot);
|
||||
UNIBI_SET_NUM_VAR(data->params[0], top);
|
||||
UNIBI_SET_NUM_VAR(data->params[1], bot);
|
||||
unibi_out(ui, unibi_change_scroll_region);
|
||||
if (grid->left != 0 || grid->right != ui->width - 1) {
|
||||
if (left != 0 || right != ui->width - 1) {
|
||||
unibi_out_ext(ui, data->unibi_ext.enable_lr_margin);
|
||||
if (data->can_set_lr_margin) {
|
||||
UNIBI_SET_NUM_VAR(data->params[0], grid->left);
|
||||
UNIBI_SET_NUM_VAR(data->params[1], grid->right);
|
||||
UNIBI_SET_NUM_VAR(data->params[0], left);
|
||||
UNIBI_SET_NUM_VAR(data->params[1], right);
|
||||
unibi_out(ui, unibi_set_lr_margin);
|
||||
} else {
|
||||
UNIBI_SET_NUM_VAR(data->params[0], grid->left);
|
||||
UNIBI_SET_NUM_VAR(data->params[0], left);
|
||||
unibi_out(ui, unibi_set_left_margin_parm);
|
||||
UNIBI_SET_NUM_VAR(data->params[0], grid->right);
|
||||
UNIBI_SET_NUM_VAR(data->params[0], right);
|
||||
unibi_out(ui, unibi_set_right_margin_parm);
|
||||
}
|
||||
}
|
||||
unibi_goto(ui, grid->row, grid->col);
|
||||
}
|
||||
|
||||
static void reset_scroll_region(UI *ui)
|
||||
static void reset_scroll_region(UI *ui, bool fullwidth)
|
||||
{
|
||||
TUIData *data = ui->data;
|
||||
UGrid *grid = &data->grid;
|
||||
@ -812,7 +801,7 @@ static void reset_scroll_region(UI *ui)
|
||||
UNIBI_SET_NUM_VAR(data->params[1], ui->height - 1);
|
||||
unibi_out(ui, unibi_change_scroll_region);
|
||||
}
|
||||
if (grid->left != 0 || grid->right != ui->width - 1) {
|
||||
if (!fullwidth) {
|
||||
if (data->can_set_lr_margin) {
|
||||
UNIBI_SET_NUM_VAR(data->params[0], 0);
|
||||
UNIBI_SET_NUM_VAR(data->params[1], ui->width - 1);
|
||||
@ -849,7 +838,7 @@ static void tui_grid_resize(UI *ui, Integer g, Integer width, Integer height)
|
||||
unibi_out_ext(ui, data->unibi_ext.resize_screen);
|
||||
// DECSLPP does not reset the scroll region.
|
||||
if (data->scroll_region_is_full_screen) {
|
||||
reset_scroll_region(ui);
|
||||
reset_scroll_region(ui, ui->width == grid->width);
|
||||
}
|
||||
} else { // Already handled the SIGWINCH signal; avoid double-resize.
|
||||
got_winch = false;
|
||||
@ -1007,28 +996,35 @@ static void tui_mode_change(UI *ui, String mode, Integer mode_idx)
|
||||
data->showing_mode = (ModeShape)mode_idx;
|
||||
}
|
||||
|
||||
static void tui_grid_scroll(UI *ui, Integer g, Integer top, Integer bot,
|
||||
Integer left, Integer right,
|
||||
static void tui_grid_scroll(UI *ui, Integer g, Integer startrow, Integer endrow,
|
||||
Integer startcol, Integer endcol,
|
||||
Integer rows, Integer cols)
|
||||
{
|
||||
TUIData *data = ui->data;
|
||||
UGrid *grid = &data->grid;
|
||||
ugrid_set_scroll_region(&data->grid, (int)top, (int)bot-1,
|
||||
(int)left, (int)right-1);
|
||||
int top = (int)startrow, bot = (int)endrow-1;
|
||||
int left = (int)startcol, right = (int)endcol-1;
|
||||
|
||||
data->scroll_region_is_full_screen =
|
||||
left == 0 && right == ui->width
|
||||
&& top == 0 && bot == ui->height;
|
||||
bool fullwidth = left == 0 && right == ui->width-1;
|
||||
data->scroll_region_is_full_screen = fullwidth
|
||||
&& top == 0 && bot == ui->height-1;
|
||||
|
||||
int clear_top, clear_bot;
|
||||
ugrid_scroll(grid, (int)rows, &clear_top, &clear_bot);
|
||||
ugrid_scroll(grid, top, bot, left, right, (int)rows,
|
||||
&clear_top, &clear_bot);
|
||||
|
||||
if (can_use_scroll(ui)) {
|
||||
bool can_scroll = data->scroll_region_is_full_screen
|
||||
|| (data->can_change_scroll_region
|
||||
&& ((left == 0 && right == ui->width - 1)
|
||||
|| data->can_set_lr_margin
|
||||
|| data->can_set_left_right_margin));
|
||||
|
||||
if (can_scroll) {
|
||||
// Change terminal scroll region and move cursor to the top
|
||||
if (!data->scroll_region_is_full_screen) {
|
||||
set_scroll_region(ui);
|
||||
set_scroll_region(ui, top, bot, left, right);
|
||||
}
|
||||
cursor_goto(ui, grid->top, grid->left);
|
||||
cursor_goto(ui, top, left);
|
||||
// also set default color attributes or some terminals can become funny
|
||||
update_attrs(ui, data->clear_attrs);
|
||||
|
||||
@ -1050,19 +1046,19 @@ static void tui_grid_scroll(UI *ui, Integer g, Integer top, Integer bot,
|
||||
|
||||
// Restore terminal scroll region and cursor
|
||||
if (!data->scroll_region_is_full_screen) {
|
||||
reset_scroll_region(ui);
|
||||
reset_scroll_region(ui, fullwidth);
|
||||
}
|
||||
cursor_goto(ui, data->row, data->col);
|
||||
|
||||
if (!(data->bce || no_bg(ui, data->clear_attrs))) {
|
||||
// Scrolling will leave wrong background in the cleared area on non-BCE
|
||||
// terminals. Update the cleared area.
|
||||
clear_region(ui, clear_top, clear_bot, grid->left, grid->right,
|
||||
clear_region(ui, clear_top, clear_bot, left, right,
|
||||
data->clear_attrs);
|
||||
}
|
||||
} else {
|
||||
// Mark the entire scroll region as invalid for redrawing later
|
||||
invalidate(ui, grid->top, grid->bot, grid->left, grid->right);
|
||||
invalidate(ui, top, bot, left, right);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1221,7 +1217,8 @@ static void tui_raw_line(UI *ui, Integer g, Integer linerow, Integer startcol,
|
||||
UGrid *grid = &data->grid;
|
||||
for (Integer c = startcol; c < endcol; c++) {
|
||||
memcpy(grid->cells[linerow][c].data, chunk[c-startcol], sizeof(schar_T));
|
||||
grid->cells[linerow][c].attrs = kv_A(data->attrs, attrs[c-startcol]);
|
||||
assert((size_t)attrs[c-startcol] < kv_size(data->attrs));
|
||||
grid->cells[linerow][c].attr = attrs[c-startcol];
|
||||
}
|
||||
UGRID_FOREACH_CELL(grid, (int)linerow, (int)linerow, (int)startcol,
|
||||
(int)endcol-1, {
|
||||
@ -1232,7 +1229,7 @@ static void tui_raw_line(UI *ui, Integer g, Integer linerow, Integer startcol,
|
||||
if (clearcol > endcol) {
|
||||
HlAttrs cl_attrs = kv_A(data->attrs, (size_t)clearattr);
|
||||
ugrid_clear_chunk(grid, (int)linerow, (int)endcol, (int)clearcol,
|
||||
cl_attrs);
|
||||
(sattr_T)clearattr);
|
||||
clear_region(ui, (int)linerow, (int)linerow, (int)endcol, (int)clearcol-1,
|
||||
cl_attrs);
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
void ugrid_init(UGrid *grid)
|
||||
{
|
||||
grid->attrs = HLATTRS_INIT;
|
||||
grid->cells = NULL;
|
||||
}
|
||||
|
||||
@ -33,10 +32,6 @@ void ugrid_resize(UGrid *grid, int width, int height)
|
||||
grid->cells[i] = xcalloc((size_t)width, sizeof(UCell));
|
||||
}
|
||||
|
||||
grid->top = 0;
|
||||
grid->bot = height - 1;
|
||||
grid->left = 0;
|
||||
grid->right = width - 1;
|
||||
grid->row = grid->col = 0;
|
||||
grid->width = width;
|
||||
grid->height = height;
|
||||
@ -44,13 +39,12 @@ void ugrid_resize(UGrid *grid, int width, int height)
|
||||
|
||||
void ugrid_clear(UGrid *grid)
|
||||
{
|
||||
clear_region(grid, 0, grid->height-1, 0, grid->width-1,
|
||||
HLATTRS_INIT);
|
||||
clear_region(grid, 0, grid->height-1, 0, grid->width-1, 0);
|
||||
}
|
||||
|
||||
void ugrid_clear_chunk(UGrid *grid, int row, int col, int endcol, HlAttrs attrs)
|
||||
void ugrid_clear_chunk(UGrid *grid, int row, int col, int endcol, sattr_T attr)
|
||||
{
|
||||
clear_region(grid, row, row, col, endcol-1, attrs);
|
||||
clear_region(grid, row, row, col, endcol-1, attr);
|
||||
}
|
||||
|
||||
void ugrid_goto(UGrid *grid, int row, int col)
|
||||
@ -59,25 +53,18 @@ void ugrid_goto(UGrid *grid, int row, int col)
|
||||
grid->col = col;
|
||||
}
|
||||
|
||||
void ugrid_set_scroll_region(UGrid *grid, int top, int bot, int left, int right)
|
||||
{
|
||||
grid->top = top;
|
||||
grid->bot = bot;
|
||||
grid->left = left;
|
||||
grid->right = right;
|
||||
}
|
||||
|
||||
void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
|
||||
void ugrid_scroll(UGrid *grid, int top, int bot, int left, int right,
|
||||
int count, int *clear_top, int *clear_bot)
|
||||
{
|
||||
// Compute start/stop/step for the loop below
|
||||
int start, stop, step;
|
||||
if (count > 0) {
|
||||
start = grid->top;
|
||||
stop = grid->bot - count + 1;
|
||||
start = top;
|
||||
stop = bot - count + 1;
|
||||
step = 1;
|
||||
} else {
|
||||
start = grid->bot;
|
||||
stop = grid->top - count - 1;
|
||||
start = bot;
|
||||
stop = top - count - 1;
|
||||
step = -1;
|
||||
}
|
||||
|
||||
@ -85,10 +72,10 @@ void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
|
||||
|
||||
// Copy cell data
|
||||
for (i = start; i != stop; i += step) {
|
||||
UCell *target_row = grid->cells[i] + grid->left;
|
||||
UCell *source_row = grid->cells[i + count] + grid->left;
|
||||
UCell *target_row = grid->cells[i] + left;
|
||||
UCell *source_row = grid->cells[i + count] + left;
|
||||
memcpy(target_row, source_row,
|
||||
sizeof(UCell) * (size_t)(grid->right - grid->left + 1));
|
||||
sizeof(UCell) * (size_t)(right - left + 1));
|
||||
}
|
||||
|
||||
// clear cells in the emptied region,
|
||||
@ -99,32 +86,16 @@ void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
|
||||
*clear_bot = stop;
|
||||
*clear_top = stop + count + 1;
|
||||
}
|
||||
clear_region(grid, *clear_top, *clear_bot, grid->left, grid->right,
|
||||
HLATTRS_INIT);
|
||||
}
|
||||
|
||||
UCell *ugrid_put(UGrid *grid, uint8_t *text, size_t size)
|
||||
{
|
||||
UCell *cell = grid->cells[grid->row] + grid->col;
|
||||
cell->data[size] = 0;
|
||||
cell->attrs = grid->attrs;
|
||||
assert(size <= CELLBYTES);
|
||||
|
||||
if (text) {
|
||||
memcpy(cell->data, text, size);
|
||||
}
|
||||
|
||||
grid->col += 1;
|
||||
return cell;
|
||||
clear_region(grid, *clear_top, *clear_bot, left, right, 0);
|
||||
}
|
||||
|
||||
static void clear_region(UGrid *grid, int top, int bot, int left, int right,
|
||||
HlAttrs attrs)
|
||||
sattr_T attr)
|
||||
{
|
||||
UGRID_FOREACH_CELL(grid, top, bot, left, right, {
|
||||
cell->data[0] = ' ';
|
||||
cell->data[1] = 0;
|
||||
cell->attrs = attrs;
|
||||
cell->attr = attr;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -11,14 +11,12 @@ typedef struct ugrid UGrid;
|
||||
|
||||
struct ucell {
|
||||
char data[CELLBYTES + 1];
|
||||
HlAttrs attrs;
|
||||
sattr_T attr;
|
||||
};
|
||||
|
||||
struct ugrid {
|
||||
int top, bot, left, right;
|
||||
int row, col;
|
||||
int width, height;
|
||||
HlAttrs attrs;
|
||||
UCell **cells;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user