circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-11-12 16:02:37 +00:00
parent 849d06c0df 86e648d906
commit 3c6cdf0115
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mode-tree.c
View File

@ -582,10 +582,10 @@ mode_tree_draw(struct mode_tree_data *mtd)
} }
if (i != mtd->current) { if (i != mtd->current) {
screen_write_nputs(&ctx, w, &gc0, "%s", text); screen_write_cnputs(&ctx, w, &gc0, "%s", text);
screen_write_clearendofline(&ctx, 8); screen_write_clearendofline(&ctx, 8);
} else { } else {
screen_write_nputs(&ctx, w, &gc, "%s", text); screen_write_cnputs(&ctx, w, &gc, "%s", text);
screen_write_clearendofline(&ctx, gc.bg); screen_write_clearendofline(&ctx, gc.bg);
} }
free(text); free(text);

5
screen-write.c
View File

@ -350,7 +350,6 @@ screen_write_cnputs(struct screen_write_ctx *ctx, ssize_t maxlen,
ptr = last + 1; ptr = last + 1;
continue; continue;
} }
if (*ptr > 0x7f && utf8_open(ud, *ptr) == UTF8_MORE) { if (*ptr > 0x7f && utf8_open(ud, *ptr) == UTF8_MORE) {
ptr++; ptr++;
@ -376,7 +375,9 @@ screen_write_cnputs(struct screen_write_ctx *ctx, ssize_t maxlen,
if (maxlen > 0 && size + 1 > (size_t)maxlen) if (maxlen > 0 && size + 1 > (size_t)maxlen)
break; break;
if (*ptr > 0x1f && *ptr < 0x7f) { if (*ptr == '\001')
gc.attr ^= GRID_ATTR_CHARSET;
else if (*ptr > 0x1f && *ptr < 0x7f) {
size++; size++;
screen_write_putc(ctx, &gc, *ptr); screen_write_putc(ctx, &gc, *ptr);
} }