mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement DECAWM (SM/RM 7) using existing MODE_WRAP flag.

Browse Source
This commit is contained in:
Nicholas Marriott
2013-03-22 10:36:53 +00:00
parent 22a2949bd2
commit ad5df9bc2f
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
input.c
View File

@@ -1248,6 +1248,9 @@ input_csi_dispatch(struct input_ctx *ictx)
screen_write_cursormove(&ictx->ctx, 0, 0); screen_write_cursormove(&ictx->ctx, 0, 0);
screen_write_clearscreen(&ictx->ctx); screen_write_clearscreen(&ictx->ctx);
break; break;
case 7: /* DECAWM */
screen_write_mode_clear(&ictx->ctx, MODE_WRAP);
break;
case 25: /* TCEM */ case 25: /* TCEM */
screen_write_mode_clear(&ictx->ctx, MODE_CURSOR); screen_write_mode_clear(&ictx->ctx, MODE_CURSOR);
break; break;
@@ -1305,6 +1308,9 @@ input_csi_dispatch(struct input_ctx *ictx)
screen_write_cursormove(&ictx->ctx, 0, 0); screen_write_cursormove(&ictx->ctx, 0, 0);
screen_write_clearscreen(&ictx->ctx); screen_write_clearscreen(&ictx->ctx);
break; break;
case 7: /* DECAWM */
screen_write_mode_set(&ictx->ctx, MODE_WRAP);
break;
case 25: /* TCEM */ case 25: /* TCEM */
screen_write_mode_set(&ictx->ctx, MODE_CURSOR); screen_write_mode_set(&ictx->ctx, MODE_CURSOR);
break; break;

21
screen-write.c
View File

@@ -979,10 +979,10 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid *gd = s->grid; struct grid *gd = s->grid;
struct tty_ctx ttyctx; struct tty_ctx ttyctx;
u_int width, xx; u_int width, xx, last;
struct grid_cell tmp_gc, *tmp_gcp; struct grid_cell tmp_gc, *tmp_gcp;
struct utf8_data ud; struct utf8_data ud;
int insert = 0; int insert;
/* Ignore padding. */ /* Ignore padding. */
if (gc->flags & GRID_FLAG_PADDING) if (gc->flags & GRID_FLAG_PADDING)
@@ -1020,7 +1020,8 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
xx = screen_size_x(s) - s->cx - width; xx = screen_size_x(s) - s->cx - width;
grid_move_cells(s->grid, s->cx + width, s->cx, s->cy, xx); grid_move_cells(s->grid, s->cx + width, s->cx, s->cy, xx);
insert = 1; insert = 1;
} } else
insert = 0;
/* Check this will fit on the current line and wrap if not. */ /* Check this will fit on the current line and wrap if not. */
if ((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) { if ((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) {
@@ -1028,9 +1029,8 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
s->cx = 0; /* carriage return */ s->cx = 0; /* carriage return */
} }
/* Sanity checks. */ /* Sanity check cursor position. */
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) if (s->cx > screen_size_x(s) - width || s->cy > screen_size_y(s) - 1)
|| s->cy > screen_size_y(s) - 1)
return; return;
/* Handle overwriting of UTF-8 characters. */ /* Handle overwriting of UTF-8 characters. */
@@ -1049,8 +1049,15 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
/* Set the cell. */ /* Set the cell. */
grid_view_set_cell(gd, s->cx, s->cy, gc); grid_view_set_cell(gd, s->cx, s->cy, gc);
/* Move the cursor. */ /*
* Move the cursor. If not wrapping, stick at the last character and
* replace it.
*/
last = !!(s->mode & MODE_WRAP);
if (s->cx <= screen_size_x(s) - last - width)
s->cx += width; s->cx += width;
else
s->cx = screen_size_x(s) - last;
/* Draw to the screen if necessary. */ /* Draw to the screen if necessary. */
if (insert) { if (insert) {