circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix to properly wrap wide characters, from Micah Cowan.

Browse Source
This commit is contained in:
Nicholas Marriott 2011-03-26 19:07:33 +00:00
parent 54456d5602
commit d74e5bffba
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
screen-write.c
View File

@ -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 * If this is a wide character and there is no room on the screen, for
* the entire character, don't print it. * the entire character, don't print it.
*/ */
if (width > 1 && (width > screen_size_x(s) || if (!(s->mode & MODE_WRAP)
(s->cx != screen_size_x(s) && s->cx > screen_size_x(s) - width))) && (width > 1 && (width > screen_size_x(s) ||
(s->cx != screen_size_x(s)
&& s->cx > screen_size_x(s) - width))))
return; return;
/* /*
@ -1045,8 +1047,8 @@ screen_write_cell(struct screen_write_ctx *ctx,
} }
/* Sanity checks. */ /* Sanity checks. */
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - 1) if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
|| s->cy > screen_size_y(s) - 1) || s->cy > screen_size_y(s) - width)
return; return;
/* Handle overwriting of UTF-8 characters. */ /* Handle overwriting of UTF-8 characters. */

14
tty.c
View File

@ -892,11 +892,19 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen; struct screen *s = wp->screen;
u_int cx; 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); tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
/* Is the cursor in the very last position? */ /* 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) { if (wp->xoff != 0 || wp->sx != tty->sx) {
/* /*
* The pane doesn't fill the entire line, the linefeed * 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) { } else if (tty->cx < tty->sx) {
/* /*
* The cursor isn't in the last position already, so * 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. * 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_cursor_pane(tty, ctx, cx, ctx->ocy);
tty_cell(tty, &ctx->last_cell, &ctx->last_utf8); tty_cell(tty, &ctx->last_cell, &ctx->last_utf8);
} }