diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-11-19 09:22:03 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-11-19 09:22:03 +0000 |
| commit | 3e8efcc555a2767ff0abc121cb3232d7e84c3873 (patch) | |
| tree | d655f7fdb10952e417cd79e2f907e5e9d75ea0c5 /grid-view.c | |
| parent | bd803e82e96512473036461ec3832c569768e535 (diff) | |
| parent | e0929262db947f984964f979a23215c0de75ceb2 (diff) | |
| download | rtmux-3e8efcc555a2767ff0abc121cb3232d7e84c3873.tar.gz rtmux-3e8efcc555a2767ff0abc121cb3232d7e84c3873.tar.bz2 rtmux-3e8efcc555a2767ff0abc121cb3232d7e84c3873.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'grid-view.c')
| -rw-r--r-- | grid-view.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/grid-view.c b/grid-view.c index badabd56..a34c5a08 100644 --- a/grid-view.c +++ b/grid-view.c @@ -184,7 +184,9 @@ 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->sx); + sx = grid_view_x(gd, gd->linedata[py].cellsize); + if (sx < px + nx) + sx = px + nx; if (px == sx - 1) grid_clear(gd, px, py, 1, 1); @@ -201,7 +203,9 @@ grid_view_delete_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->sx); + sx = grid_view_x(gd, gd->linedata[py].cellsize); + if (sx < px + nx) + sx = px + nx; grid_move_cells(gd, px, px + nx, py, sx - px - nx); grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1); |