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

Fix to properly wrap wide characters.

pull/1/head
Micah Cowan 2011-03-24 17:03:29 +00:00
parent 164c2cbcb0
commit a9eb5e12ec
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
screen-write.c
View File

@ -1,4 +1,4 @@
/* $Id: screen-write.c,v 1.94 2011-03-19 23:30:37 tcunha Exp $ */
/* $Id: screen-write.c,v 1.95 2011-03-24 17:03:29 micahcowan Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1012,8 +1012,10 @@ screen_write_cell(struct screen_write_ctx *ctx,
* If this is a wide character and there is no room on the screen, for
* the entire character, don't print it.
*/
if (width > 1 && (width > screen_size_x(s) ||
(s->cx != screen_size_x(s) && s->cx > screen_size_x(s) - width)))
if (!(s->mode & MODE_WRAP)
&& (width > 1 && (width > screen_size_x(s) ||
(s->cx != screen_size_x(s)
&& s->cx > screen_size_x(s) - width))))
return;
/*
@ -1045,8 +1047,8 @@ screen_write_cell(struct screen_write_ctx *ctx,
}
/* Sanity checks. */
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - 1)
|| s->cy > screen_size_y(s) - 1)
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
|| s->cy > screen_size_y(s) - width)
return;
/* Handle overwriting of UTF-8 characters. */

16
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.205 2011-03-19 23:32:01 tcunha Exp $ */
/* $Id: tty.c,v 1.206 2011-03-24 17:03:29 micahcowan Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -892,11 +892,19 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen;
u_int cx;
u_int width;
const struct grid_cell *gc = ctx->cell;
const struct grid_utf8 *gu = ctx->utf8;
if (gc->flags & GRID_FLAG_UTF8)
width = gu->width;
else
width = 1;
tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
/* Is the cursor in the very last position? */
if (ctx->ocx > wp->sx - ctx->last_width) {
if (ctx->ocx > wp->sx - width) {
if (wp->xoff != 0 || wp->sx != tty->sx) {
/*
* The pane doesn't fill the entire line, the linefeed
@ -906,10 +914,10 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
} else if (tty->cx < tty->sx) {
/*
* The cursor isn't in the last position already, so
* move as far left as possinble and redraw the last
* move as far left as possible and redraw the last
* cell to move into the last position.
*/
cx = screen_size_x(s) - ctx->last_width;
cx = screen_size_x(s) - width;
tty_cursor_pane(tty, ctx, cx, ctx->ocy);
tty_cell(tty, &ctx->last_cell, &ctx->last_utf8);
}