diff options
| -rw-r--r-- | input.c | 12 | ||||
| -rw-r--r-- | tmux.h | 8 | ||||
| -rw-r--r-- | window.c | 18 |
3 files changed, 26 insertions, 12 deletions
@@ -1255,8 +1255,12 @@ input_csi_dispatch(struct input_ctx *ictx) case 1005: screen_write_utf8mousemode(&ictx->ctx, 0); break; + case 47: + case 1047: + window_pane_alternate_off(wp, &ictx->cell, 0); + break; case 1049: - window_pane_alternate_off(wp, &ictx->cell); + window_pane_alternate_off(wp, &ictx->cell, 1); break; case 2004: screen_write_bracketpaste(&ictx->ctx, 0); @@ -1310,8 +1314,12 @@ input_csi_dispatch(struct input_ctx *ictx) case 1005: screen_write_utf8mousemode(&ictx->ctx, 1); break; + case 47: + case 1047: + window_pane_alternate_on(wp, &ictx->cell, 0); + break; case 1049: - window_pane_alternate_on(wp, &ictx->cell); + window_pane_alternate_on(wp, &ictx->cell, 1); break; case 2004: screen_write_bracketpaste(&ictx->ctx, 1); @@ -2145,10 +2145,10 @@ int window_pane_spawn(struct window_pane *, const char *, const char *, const char *, struct environ *, struct termios *, char **); void window_pane_resize(struct window_pane *, u_int, u_int); -void window_pane_alternate_on( - struct window_pane *, struct grid_cell *); -void window_pane_alternate_off( - struct window_pane *, struct grid_cell *); +void window_pane_alternate_on(struct window_pane *, + struct grid_cell *, int); +void window_pane_alternate_off(struct window_pane *, + struct grid_cell *, int); int window_pane_set_mode( struct window_pane *, const struct window_mode *); void window_pane_reset_mode(struct window_pane *); @@ -867,7 +867,8 @@ window_pane_resize(struct window_pane *wp, u_int sx, u_int sy) * history is not updated */ void -window_pane_alternate_on(struct window_pane *wp, struct grid_cell *gc) +window_pane_alternate_on(struct window_pane *wp, struct grid_cell *gc, + int cursor) { struct screen *s = &wp->base; u_int sx, sy; @@ -881,8 +882,10 @@ window_pane_alternate_on(struct window_pane *wp, struct grid_cell *gc) wp->saved_grid = grid_create(sx, sy, 0); grid_duplicate_lines(wp->saved_grid, 0, s->grid, screen_hsize(s), sy); - wp->saved_cx = s->cx; - wp->saved_cy = s->cy; + if (cursor) { + wp->saved_cx = s->cx; + wp->saved_cy = s->cy; + } memcpy(&wp->saved_cell, gc, sizeof wp->saved_cell); grid_view_clear(s->grid, 0, 0, sx, sy); @@ -894,7 +897,8 @@ window_pane_alternate_on(struct window_pane *wp, struct grid_cell *gc) /* Exit alternate screen mode and restore the copied grid. */ void -window_pane_alternate_off(struct window_pane *wp, struct grid_cell *gc) +window_pane_alternate_off(struct window_pane *wp, struct grid_cell *gc, + int cursor) { struct screen *s = &wp->base; u_int sx, sy; @@ -915,10 +919,12 @@ window_pane_alternate_off(struct window_pane *wp, struct grid_cell *gc) /* Restore the grid, cursor position and cell. */ grid_duplicate_lines(s->grid, screen_hsize(s), wp->saved_grid, 0, sy); - s->cx = wp->saved_cx; + if (cursor) + s->cx = wp->saved_cx; if (s->cx > screen_size_x(s) - 1) s->cx = screen_size_x(s) - 1; - s->cy = wp->saved_cy; + if (cursor) + s->cy = wp->saved_cy; if (s->cy > screen_size_y(s) - 1) s->cy = screen_size_y(s) - 1; memcpy(gc, &wp->saved_cell, sizeof *gc); |