circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up new UTF-8 code and make it more generic.

Browse Source
This commit is contained in:
nicm
2020-05-25 18:19:29 +00:00
parent dc893405e1
commit 49ec074271
4 changed files with 154 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
grid.c
View File

@ -114,7 +114,7 @@ grid_extended_cell(struct grid_line *gl, struct grid_cell_entry *gce,
gl->flags |= GRID_LINE_EXTENDED;
gee = &gl->extddata[gce->offset];
gee->data = utf8_map_big(&gc->data);
utf8_from_data(&gc->data, &gee->data);
gee->attr = gc->attr;
gee->flags = flags;
gee->fg = gc->fg;
@ -496,7 +496,7 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
gc->fg = gee->fg;
gc->bg = gee->bg;
gc->us = gee->us;
utf8_get_big(gee->data, &gc->data);
utf8_to_data(gee->data, &gc->data);
}
return;
}
@ -570,7 +570,7 @@ grid_set_cells(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc,
gce = &gl->celldata[px + i];
if (grid_need_extended_cell(gce, gc)) {
gee = grid_extended_cell(gl, gce, gc);
gee->data = utf8_set_big(s[i], 1);
gee->data = utf8_build_one(s[i], 1);
} else
grid_store_cell(gce, gc, s[i]);
}