[BACK]Return to grid.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/grid.c between version 1.50 and 1.51

version 1.50, 2016/01/19 15:59:12 version 1.51, 2016/01/29 11:13:56
Line 37 
Line 37 
   
 /* Default grid cell data. */  /* Default grid cell data. */
 const struct grid_cell grid_default_cell = {  const struct grid_cell grid_default_cell = {
         0, 0, 8, 8, { { ' ' }, 0, 1, 1 }          0, 0, { .fg = 8 }, { .bg = 8 }, { { ' ' }, 0, 1, 1 }
 };  };
 const struct grid_cell_entry grid_default_entry = {  const struct grid_cell_entry grid_default_entry = {
         0, { .data = { 0, 8, 8, ' ' } }          0, { .data = { 0, 8, 8, ' ' } }
Line 284 
Line 284 
         struct grid_line        *gl;          struct grid_line        *gl;
         struct grid_cell_entry  *gce;          struct grid_cell_entry  *gce;
         struct grid_cell        *gcp;          struct grid_cell        *gcp;
           int                      extended;
   
         if (grid_check_y(gd, py) != 0)          if (grid_check_y(gd, py) != 0)
                 return;                  return;
Line 293 
Line 294 
         gl = &gd->linedata[py];          gl = &gd->linedata[py];
         gce = &gl->celldata[px];          gce = &gl->celldata[px];
   
         if ((gce->flags & GRID_FLAG_EXTENDED) || gc->data.size != 1 ||          extended = (gce->flags & GRID_FLAG_EXTENDED);
             gc->data.width != 1) {          if (!extended && (gc->data.size != 1 || gc->data.width != 1))
                   extended = 1;
           if (!extended && (gc->flags & (GRID_FLAG_FGRGB|GRID_FLAG_BGRGB)))
                   extended = 1;
           if (extended) {
                 if (~gce->flags & GRID_FLAG_EXTENDED) {                  if (~gce->flags & GRID_FLAG_EXTENDED) {
                         gl->extddata = xreallocarray(gl->extddata,                          gl->extddata = xreallocarray(gl->extddata,
                             gl->extdsize + 1, sizeof *gl->extddata);                              gl->extdsize + 1, sizeof *gl->extddata);

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51