version 1.56, 2009/10/21 13:42:44 |
version 1.57, 2009/10/21 16:52:30 |
|
|
{ |
{ |
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, sx; |
|
|
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? */ |
* Should the cursor be in the last cursor position ready for a natural |
if (ctx->ocx > wp->sx - ctx->last_width) { |
* wrap? If so - and it isn't - move to and rewrite the last cell. |
if (wp->xoff != 0 || wp->sx != tty->sx) { |
*/ |
/* |
if (!(tty->term->flags & TERM_EARLYWRAP) && |
* The pane doesn't fill the entire line, the linefeed |
ctx->ocx + wp->xoff > tty->sx - ctx->last_width) { |
* will already have happened, so just move the cursor. |
if (tty->cx < tty->sx) { |
*/ |
|
tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1); |
|
} 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 |
|
* cell to move into the last position. |
|
*/ |
cx = screen_size_x(s) - ctx->last_width; |
cx = screen_size_x(s) - ctx->last_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); |