circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-10-04 19:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-03-06 10:01:21 +00:00
commit 69257bc0aa
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
screen-write.c
View File

@ -1151,7 +1151,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
struct grid_cell tmp_gc, now_gc; struct grid_cell tmp_gc, now_gc;
struct tty_ctx ttyctx; struct tty_ctx ttyctx;
u_int sx = screen_size_x(s), sy = screen_size_y(s); u_int sx = screen_size_x(s), sy = screen_size_y(s);
u_int width = gc->data.width, xx, last; u_int width = gc->data.width, xx, last, cx, cy;
int selected, skip = 1; int selected, skip = 1;
/* Ignore padding cells. */ /* Ignore padding cells. */
@ -1163,10 +1163,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
if (width == 0) { if (width == 0) {
screen_write_collect_flush(ctx, 0); screen_write_collect_flush(ctx, 0);
if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) { if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {
cx = s->cx; cy = s->cy;
screen_write_cursormove(ctx, xx, s->cy); screen_write_cursormove(ctx, xx, s->cy);
screen_write_initctx(ctx, &ttyctx); screen_write_initctx(ctx, &ttyctx);
ttyctx.cell = gc; ttyctx.cell = gc;
tty_write(tty_cmd_cell, &ttyctx); tty_write(tty_cmd_cell, &ttyctx);
s->cx = cx; s->cy = cy;
} }
return; return;
} }

17
tty.c
View File

@ -709,7 +709,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
for (i = 0; i < sx; i++) { for (i = 0; i < sx; i++) {
grid_view_get_cell(s->grid, i, py, &gc); grid_view_get_cell(s->grid, i, py, &gc);
if (len != 0 && if (len != 0 &&
(gc.attr & GRID_ATTR_CHARSET || (((~tty->flags & TTY_UTF8) &&
(gc.data.size != 1 ||
*gc.data.data >= 0x7f ||
gc.data.width != 1)) ||
(gc.attr & GRID_ATTR_CHARSET) ||
gc.flags != last.flags || gc.flags != last.flags ||
gc.attr != last.attr || gc.attr != last.attr ||
gc.fg != last.fg || gc.fg != last.fg ||
@ -726,10 +730,19 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
screen_select_cell(s, &last, &gc); screen_select_cell(s, &last, &gc);
else else
memcpy(&last, &gc, sizeof last); memcpy(&last, &gc, sizeof last);
if (gc.attr & GRID_ATTR_CHARSET) { if (((~tty->flags & TTY_UTF8) &&
(gc.data.size != 1 ||
*gc.data.data >= 0x7f ||
gc.data.width != 1)) ||
(gc.attr & GRID_ATTR_CHARSET)) {
tty_attributes(tty, &last, wp); tty_attributes(tty, &last, wp);
if (~tty->flags & TTY_UTF8) {
for (j = 0; j < gc.data.width; j++)
tty_putc(tty, '_');
} else {
for (j = 0; j < gc.data.size; j++) for (j = 0; j < gc.data.size; j++)
tty_putc(tty, gc.data.data[j]); tty_putc(tty, gc.data.data[j]);
}
} else { } else {
memcpy(buf + len, gc.data.data, gc.data.size); memcpy(buf + len, gc.data.data, gc.data.size);
len += gc.data.size; len += gc.data.size;