diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-27 11:33:22 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-27 11:33:22 +0000 |
| commit | 55ba15894d6cfa42867db856cd82331450ae5248 (patch) | |
| tree | 0105f467e3c172f2891c49c2b85455d34f188195 /usr.bin | |
| parent | 03c7d1193db9d2be84b3bda312af139ce6fa0b2e (diff) | |
Draw UTF-8 characters under the selection correctly.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/screen-write.c | 24 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 9 |
2 files changed, 19 insertions, 14 deletions
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c index 02a523d3d25..44e3d230743 100644 --- a/usr.bin/tmux/screen-write.c +++ b/usr.bin/tmux/screen-write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen-write.c,v 1.17 2009/07/22 20:53:38 nicm Exp $ */ +/* $OpenBSD: screen-write.c,v 1.18 2009/07/27 11:33:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -723,7 +723,7 @@ screen_write_cell( struct tty_ctx ttyctx; struct grid_utf8 gu, *tmp_gu; u_int width, xx, i; - struct grid_cell tmp_gc, *tmp_gc2; + struct grid_cell tmp_gc, tmp_gc2, *tmp_gcp; int insert = 0; /* Ignore padding. */ @@ -743,11 +743,11 @@ screen_write_cell( if (width == 0) { if (s->cx == 0) return; - tmp_gc2 = grid_view_get_cell(gd, s->cx - 1, s->cy); - if (!(tmp_gc2->flags & GRID_FLAG_UTF8)) { - tmp_gc2->flags |= GRID_FLAG_UTF8; + tmp_gcp = grid_view_get_cell(gd, s->cx - 1, s->cy); + if (!(tmp_gcp->flags & GRID_FLAG_UTF8)) { + tmp_gcp->flags |= GRID_FLAG_UTF8; memset(&gu.data, 0xff, sizeof gu.data); - *gu.data = tmp_gc2->data; + *gu.data = tmp_gcp->data; gu.width = 1; grid_view_set_utf8(gd, s->cx - 1, s->cy, &gu); } @@ -799,9 +799,9 @@ screen_write_cell( * already ensured there is enough room. */ for (xx = s->cx + 1; xx < s->cx + width; xx++) { - tmp_gc2 = grid_view_get_cell(gd, xx, s->cy); - if (tmp_gc2 != NULL) - tmp_gc2->flags |= GRID_FLAG_PADDING; + tmp_gcp = grid_view_get_cell(gd, xx, s->cy); + if (tmp_gcp != NULL) + tmp_gcp->flags |= GRID_FLAG_PADDING; } /* Set the cell. */ @@ -820,8 +820,10 @@ screen_write_cell( } ttyctx.utf8 = &gu; if (screen_check_selection(s, s->cx - width, s->cy)) { - s->sel.cell.data = gc->data; - ttyctx.cell = &s->sel.cell; + memcpy(&tmp_gc2, &s->sel.cell, sizeof tmp_gc2); + tmp_gc2.data = gc->data; + tmp_gc2.flags = gc->flags; + ttyctx.cell = &tmp_gc2; tty_write(tty_cmd_cell, &ttyctx); } else { ttyctx.cell = gc; diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index 7a05fe6afc7..e7678a89e70 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.15 2009/07/22 20:56:58 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.16 2009/07/27 11:33:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -480,6 +480,7 @@ void tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy) { const struct grid_cell *gc; + struct grid_cell tmpgc; const struct grid_utf8 *gu; u_int i, sx; @@ -498,8 +499,10 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy) gu = grid_view_peek_utf8(s->grid, i, py); if (screen_check_selection(s, i, py)) { - s->sel.cell.data = gc->data; - tty_cell(tty, &s->sel.cell, gu); + memcpy(&tmpgc, &s->sel.cell, sizeof tmpgc); + tmpgc.data = gc->data; + tmpgc.flags = gc->flags; + tty_cell(tty, &tmpgc, gu); } else tty_cell(tty, gc, gu); } |