circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 283:

Browse Source 
Fix grid_expand_line so it actually works when the required size is bigger than
2 * the current size.
This commit is contained in:
Tiago Cunha 2009-08-21 21:10:37 +00:00
parent 4b883524d8
commit a004fc3592
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grid.c
View File

@ -1,4 +1,4 @@
/* $Id: grid.c,v 1.31 2009-08-21 21:09:13 tcunha Exp $ */ /* $Id: grid.c,v 1.32 2009-08-21 21:10:37 tcunha Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -189,19 +189,22 @@ grid_scroll_line(struct grid *gd)
/* Expand line to fit to cell. */ /* Expand line to fit to cell. */
void void
grid_expand_line(struct grid *gd, u_int py, u_int sx) grid_expand_line(struct grid *gd, u_int py, u_int wantx)
{ {
struct grid_line *gl; struct grid_line *gl;
u_int xx; u_int xx, sx;
gl = &gd->linedata[py]; gl = &gd->linedata[py];
if (sx <= gl->cellsize) if (wantx <= gl->cellsize)
return; return;
if (gl->cellsize > gd->sx / 2) if (gl->cellsize > gd->sx / 2)
sx = gd->sx; sx = gd->sx;
else else {
sx = 1 + gl->cellsize * 2; sx = gl->cellsize + 1;
while (sx < wantx)
sx *= 2;
}
gl->celldata = xrealloc(gl->celldata, sx, sizeof *gl->celldata); gl->celldata = xrealloc(gl->celldata, sx, sizeof *gl->celldata);
for (xx = gl->cellsize; xx < sx; xx++) for (xx = gl->cellsize; xx < sx; xx++)
grid_put_cell(gd, xx, py, &grid_default_cell); grid_put_cell(gd, xx, py, &grid_default_cell);