===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -c -r1.138 -r1.139
*** src/usr.bin/tmux/screen-write.c	2018/07/31 11:49:26	1.138
--- src/usr.bin/tmux/screen-write.c	2018/10/18 08:38:01	1.139
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.138 2018/07/31 11:49:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.139 2018/10/18 08:38:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 54,65 ****
  	TAILQ_HEAD(, screen_write_collect_item) items;
  };
  
  /* Initialize writing with a window. */
  void
  screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
      struct screen *s)
  {
! 	char	tmp[16];
  	u_int	y;
  
  	memset(ctx, 0, sizeof *ctx);
--- 54,100 ----
  	TAILQ_HEAD(, screen_write_collect_item) items;
  };
  
+ static void
+ screen_write_offset_timer(__unused int fd, __unused short events, void *data)
+ {
+ 	struct window	*w = data;
+ 
+ 	tty_update_window_offset(w);
+ }
+ 
+ /* Set cursor position. */
+ static void
+ screen_write_set_cursor(struct screen_write_ctx *ctx, int cx, int cy)
+ {
+ 	struct window_pane	*wp = ctx->wp;
+ 	struct window		*w;
+ 	struct screen		*s = ctx->s;
+ 	struct timeval		 tv = { .tv_usec = 10000 };
+ 
+ 	if (cx != -1 && (u_int)cx == s->cx && cy != -1 && (u_int)cy == s->cy)
+ 		return;
+ 
+ 	if (cx != -1)
+ 		s->cx = cx;
+ 	if (cy != -1)
+ 		s->cy = cy;
+ 
+ 	if (wp == NULL)
+ 		return;
+ 	w = wp->window;
+ 
+ 	if (!event_initialized(&w->offset_timer))
+ 		evtimer_set(&w->offset_timer, screen_write_offset_timer, w);
+ 	if (!evtimer_pending(&w->offset_timer, NULL))
+ 		evtimer_add(&w->offset_timer, &tv);
+ }
+ 
  /* Initialize writing with a window. */
  void
  screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
      struct screen *s)
  {
! 	char	tmp[32];
  	u_int	y;
  
  	memset(ctx, 0, sizeof *ctx);
***************
*** 78,85 ****
  	ctx->scrolled = 0;
  	ctx->bg = 8;
  
! 	if (wp != NULL)
! 		snprintf(tmp, sizeof tmp, "pane %%%u", wp->id);
  	log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),
  	    screen_size_y(ctx->s), wp == NULL ? "no pane" : tmp);
  }
--- 113,122 ----
  	ctx->scrolled = 0;
  	ctx->bg = 8;
  
! 	if (wp != NULL) {
! 		snprintf(tmp, sizeof tmp, "pane %%%u (at %u,%u)", wp->id,
! 		    wp->xoff, wp->yoff);
! 	}
  	log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),
  	    screen_size_y(ctx->s), wp == NULL ? "no pane" : tmp);
  }
***************
*** 603,627 ****
  screen_write_cursorup(struct screen_write_ctx *ctx, u_int ny)
  {
  	struct screen	*s = ctx->s;
  
  	if (ny == 0)
  		ny = 1;
  
! 	if (s->cy < s->rupper) {
  		/* Above region. */
! 		if (ny > s->cy)
! 			ny = s->cy;
  	} else {
  		/* Below region. */
! 		if (ny > s->cy - s->rupper)
! 			ny = s->cy - s->rupper;
  	}
! 	if (s->cx == screen_size_x(s))
! 	    s->cx--;
! 	if (ny == 0)
! 		return;
  
! 	s->cy -= ny;
  }
  
  /* Cursor down by ny. */
--- 640,665 ----
  screen_write_cursorup(struct screen_write_ctx *ctx, u_int ny)
  {
  	struct screen	*s = ctx->s;
+ 	u_int		 cx = s->cx, cy = s->cy;
  
  	if (ny == 0)
  		ny = 1;
  
! 	if (cy < s->rupper) {
  		/* Above region. */
! 		if (ny > cy)
! 			ny = cy;
  	} else {
  		/* Below region. */
! 		if (ny > cy - s->rupper)
! 			ny = cy - s->rupper;
  	}
! 	if (cx == screen_size_x(s))
! 		cx--;
  
! 	cy -= ny;
! 
! 	screen_write_set_cursor(ctx, cx, cy);
  }
  
  /* Cursor down by ny. */
***************
*** 629,653 ****
  screen_write_cursordown(struct screen_write_ctx *ctx, u_int ny)
  {
  	struct screen	*s = ctx->s;
  
  	if (ny == 0)
  		ny = 1;
  
! 	if (s->cy > s->rlower) {
  		/* Below region. */
! 		if (ny > screen_size_y(s) - 1 - s->cy)
! 			ny = screen_size_y(s) - 1 - s->cy;
  	} else {
  		/* Above region. */
! 		if (ny > s->rlower - s->cy)
! 			ny = s->rlower - s->cy;
  	}
! 	if (s->cx == screen_size_x(s))
! 	    s->cx--;
! 	if (ny == 0)
  		return;
  
! 	s->cy += ny;
  }
  
  /* Cursor right by nx. */
--- 667,694 ----
  screen_write_cursordown(struct screen_write_ctx *ctx, u_int ny)
  {
  	struct screen	*s = ctx->s;
+ 	u_int		 cx = s->cx, cy = s->cy;
  
  	if (ny == 0)
  		ny = 1;
  
! 	if (cy > s->rlower) {
  		/* Below region. */
! 		if (ny > screen_size_y(s) - 1 - cy)
! 			ny = screen_size_y(s) - 1 - cy;
  	} else {
  		/* Above region. */
! 		if (ny > s->rlower - cy)
! 			ny = s->rlower - cy;
  	}
! 	if (cx == screen_size_x(s))
! 	    cx--;
! 	else if (ny == 0)
  		return;
  
! 	cy += ny;
! 
! 	screen_write_set_cursor(ctx, cx, cy);
  }
  
  /* Cursor right by nx. */
***************
*** 655,670 ****
  screen_write_cursorright(struct screen_write_ctx *ctx, u_int nx)
  {
  	struct screen	*s = ctx->s;
  
  	if (nx == 0)
  		nx = 1;
  
! 	if (nx > screen_size_x(s) - 1 - s->cx)
! 		nx = screen_size_x(s) - 1 - s->cx;
  	if (nx == 0)
  		return;
  
! 	s->cx += nx;
  }
  
  /* Cursor left by nx. */
--- 696,714 ----
  screen_write_cursorright(struct screen_write_ctx *ctx, u_int nx)
  {
  	struct screen	*s = ctx->s;
+ 	u_int		 cx = s->cx, cy = s->cy;
  
  	if (nx == 0)
  		nx = 1;
  
! 	if (nx > screen_size_x(s) - 1 - cx)
! 		nx = screen_size_x(s) - 1 - cx;
  	if (nx == 0)
  		return;
  
! 	cx += nx;
! 
! 	screen_write_set_cursor(ctx, cx, cy);
  }
  
  /* Cursor left by nx. */
***************
*** 672,687 ****
  screen_write_cursorleft(struct screen_write_ctx *ctx, u_int nx)
  {
  	struct screen	*s = ctx->s;
  
  	if (nx == 0)
  		nx = 1;
  
! 	if (nx > s->cx)
! 		nx = s->cx;
  	if (nx == 0)
  		return;
  
! 	s->cx -= nx;
  }
  
  /* Backspace; cursor left unless at start of wrapped line when can move up. */
--- 716,734 ----
  screen_write_cursorleft(struct screen_write_ctx *ctx, u_int nx)
  {
  	struct screen	*s = ctx->s;
+ 	u_int		 cx = s->cx, cy = s->cy;
  
  	if (nx == 0)
  		nx = 1;
  
! 	if (nx > cx)
! 		nx = cx;
  	if (nx == 0)
  		return;
  
! 	cx -= nx;
! 
! 	screen_write_set_cursor(ctx, cx, cy);
  }
  
  /* Backspace; cursor left unless at start of wrapped line when can move up. */
***************
*** 690,706 ****
  {
  	struct screen		*s = ctx->s;
  	struct grid_line	*gl;
  
! 	if (s->cx == 0) {
! 		if (s->cy == 0)
  			return;
! 		gl = grid_get_line(s->grid, s->grid->hsize + s->cy - 1);
  		if (gl->flags & GRID_LINE_WRAPPED) {
! 			s->cy--;
! 			s->cx = screen_size_x(s) - 1;
  		}
  	} else
! 		s->cx--;
  }
  
  /* VT100 alignment test. */
--- 737,756 ----
  {
  	struct screen		*s = ctx->s;
  	struct grid_line	*gl;
+ 	u_int			 cx = s->cx, cy = s->cy;
  
! 	if (cx == 0) {
! 		if (cy == 0)
  			return;
! 		gl = grid_get_line(s->grid, s->grid->hsize + cy - 1);
  		if (gl->flags & GRID_LINE_WRAPPED) {
! 			cy--;
! 			cx = screen_size_x(s) - 1;
  		}
  	} else
! 		cx--;
! 
! 	screen_write_set_cursor(ctx, cx, cy);
  }
  
  /* VT100 alignment test. */
***************
*** 712,719 ****
  	struct grid_cell       	 gc;
  	u_int			 xx, yy;
  
- 	screen_write_initctx(ctx, &ttyctx);
- 
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  	utf8_set(&gc.data, 'E');
  
--- 762,767 ----
***************
*** 722,729 ****
  			grid_view_set_cell(s->grid, xx, yy, &gc);
  	}
  
! 	s->cx = 0;
! 	s->cy = 0;
  
  	s->rupper = 0;
  	s->rlower = screen_size_y(s) - 1;
--- 770,776 ----
  			grid_view_set_cell(s->grid, xx, yy, &gc);
  	}
  
! 	screen_write_set_cursor(ctx, 0, 0);
  
  	s->rupper = 0;
  	s->rlower = screen_size_y(s) - 1;
***************
*** 988,995 ****
  	if (py > screen_size_y(s) - 1)
  		py = screen_size_y(s) - 1;
  
! 	s->cx = px;
! 	s->cy = py;
  }
  
  /* Reverse index (up with scroll). */
--- 1035,1041 ----
  	if (py > screen_size_y(s) - 1)
  		py = screen_size_y(s) - 1;
  
! 	screen_write_set_cursor(ctx, px, py);
  }
  
  /* Reverse index (up with scroll). */
***************
*** 1005,1011 ****
  	if (s->cy == s->rupper)
  		grid_view_scroll_region_down(s->grid, s->rupper, s->rlower, bg);
  	else if (s->cy > 0)
! 		s->cy--;
  
  	screen_write_collect_flush(ctx, 0);
  	tty_write(tty_cmd_reverseindex, &ttyctx);
--- 1051,1057 ----
  	if (s->cy == s->rupper)
  		grid_view_scroll_region_down(s->grid, s->rupper, s->rlower, bg);
  	else if (s->cy > 0)
! 		screen_write_set_cursor(ctx, -1, s->cy - 1);
  
  	screen_write_collect_flush(ctx, 0);
  	tty_write(tty_cmd_reverseindex, &ttyctx);
***************
*** 1028,1035 ****
  	screen_write_collect_flush(ctx, 0);
  
  	/* Cursor moves to top-left. */
! 	s->cx = 0;
! 	s->cy = 0;
  
  	s->rupper = rupper;
  	s->rlower = rlower;
--- 1074,1080 ----
  	screen_write_collect_flush(ctx, 0);
  
  	/* Cursor moves to top-left. */
! 	screen_write_set_cursor(ctx, 0, 0);
  
  	s->rupper = rupper;
  	s->rlower = rlower;
***************
*** 1062,1068 ****
  		screen_write_collect_scroll(ctx);
  		ctx->scrolled++;
  	} else if (s->cy < screen_size_y(s) - 1)
! 		s->cy++;
  }
  
  /* Scroll up. */
--- 1107,1113 ----
  		screen_write_collect_scroll(ctx);
  		ctx->scrolled++;
  	} else if (s->cy < screen_size_y(s) - 1)
! 		screen_write_set_cursor(ctx, -1, s->cy + 1);
  }
  
  /* Scroll up. */
***************
*** 1094,1102 ****
  void
  screen_write_carriagereturn(struct screen_write_ctx *ctx)
  {
! 	struct screen	*s = ctx->s;
! 
! 	s->cx = 0;
  }
  
  /* Clear to end of screen from cursor. */
--- 1139,1145 ----
  void
  screen_write_carriagereturn(struct screen_write_ctx *ctx)
  {
! 	screen_write_set_cursor(ctx, 0, -1);
  }
  
  /* Clear to end of screen from cursor. */
***************
*** 1300,1313 ****
  			grid_view_set_cell(s->grid, xx, s->cy,
  			    &grid_default_cell);
  		}
! 		if (gc.data.width > 1)
  			grid_view_set_cell(s->grid, xx, s->cy,
  			    &grid_default_cell);
  	}
  
  	memcpy(&gc, &ci->gc, sizeof gc);
  	grid_view_set_cells(s->grid, s->cx, s->cy, &gc, ci->data, ci->used);
! 	s->cx += ci->used;
  
  	for (xx = s->cx; xx < screen_size_x(s); xx++) {
  		grid_view_get_cell(s->grid, xx, s->cy, &gc);
--- 1343,1357 ----
  			grid_view_set_cell(s->grid, xx, s->cy,
  			    &grid_default_cell);
  		}
! 		if (gc.data.width > 1) {
  			grid_view_set_cell(s->grid, xx, s->cy,
  			    &grid_default_cell);
+ 		}
  	}
  
  	memcpy(&gc, &ci->gc, sizeof gc);
  	grid_view_set_cells(s->grid, s->cx, s->cy, &gc, ci->data, ci->used);
! 	screen_write_set_cursor(ctx, s->cx + ci->used, -1);
  
  	for (xx = s->cx; xx < screen_size_x(s); xx++) {
  		grid_view_get_cell(s->grid, xx, s->cy, &gc);
***************
*** 1361,1367 ****
  		log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
  		ci->wrapped = 1;
  		screen_write_linefeed(ctx, 1, 8);
! 		s->cx = 0;
  	}
  
  	if (ci->used == 0)
--- 1405,1411 ----
  		log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
  		ci->wrapped = 1;
  		screen_write_linefeed(ctx, 1, 8);
! 		screen_write_set_cursor(ctx, 0, -1);
  	}
  
  	if (ci->used == 0)
***************
*** 1423,1429 ****
  	if ((s->mode & MODE_WRAP) && s->cx > sx - width) {
  		log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
  		screen_write_linefeed(ctx, 1, 8);
! 		s->cx = 0;
  		screen_write_collect_flush(ctx, 1);
  	}
  
--- 1467,1473 ----
  	if ((s->mode & MODE_WRAP) && s->cx > sx - width) {
  		log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
  		screen_write_linefeed(ctx, 1, 8);
! 		screen_write_set_cursor(ctx, 0, -1);
  		screen_write_collect_flush(ctx, 1);
  	}
  
***************
*** 1496,1504 ****
  	 */
  	last = !(s->mode & MODE_WRAP);
  	if (s->cx <= sx - last - width)
! 		s->cx += width;
  	else
! 		s->cx = sx - last;
  
  	/* Create space for character in insert mode. */
  	if (s->mode & MODE_INSERT) {
--- 1540,1548 ----
  	 */
  	last = !(s->mode & MODE_WRAP);
  	if (s->cx <= sx - last - width)
! 		screen_write_set_cursor(ctx, s->cx + width, -1);
  	else
! 		screen_write_set_cursor(ctx,  sx - last, -1);
  
  	/* Create space for character in insert mode. */
  	if (s->mode & MODE_INSERT) {