summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2014-12-01 22:22:14 +0000
committernicm <nicm@openbsd.org>2014-12-01 22:22:14 +0000
commita876f2470c0e9a7d6cfcbf53be0fc9a225c42d52 (patch)
tree3fe1cfb844c9eecf55cbaa56f214657139c63b3b
parentA couple of minor changes to the "Terminal Special Files" section to (diff)
downloadwireguard-openbsd-a876f2470c0e9a7d6cfcbf53be0fc9a225c42d52.tar.xz
wireguard-openbsd-a876f2470c0e9a7d6cfcbf53be0fc9a225c42d52.zip
Another fix for insertion from Balazs Kezes. On insertion, size the line
just enough for the inserted characters.
-rw-r--r--usr.bin/tmux/grid-view.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/tmux/grid-view.c b/usr.bin/tmux/grid-view.c
index a44a0b65e09..9068a12a338 100644
--- a/usr.bin/tmux/grid-view.c
+++ b/usr.bin/tmux/grid-view.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grid-view.c,v 1.19 2014/11/12 22:59:45 nicm Exp $ */
+/* $OpenBSD: grid-view.c,v 1.20 2014/12/01 22:22:14 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -184,9 +184,10 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx)
px = grid_view_x(gd, px);
py = grid_view_y(gd, py);
- sx = grid_view_x(gd, gd->linedata[py].cellsize);
- if (sx < px + nx)
- sx = px + nx;
+ if (gd->linedata[py].cellsize + nx < gd->sx)
+ sx = grid_view_x(gd, gd->linedata[py].cellsize + nx);
+ else
+ sx = grid_view_x(gd, gd->sx);
if (px == sx - 1)
grid_clear(gd, px, py, 1, 1);