[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.129 and 1.130

version 1.129, 2023/06/30 21:55:08 version 1.130, 2023/07/13 06:03:48
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, 1, 1 }, 0, 0, 8, 8, 0, 0          { { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 8, 0
 };  };
   
 /*  /*
Line 45 
Line 45 
  * appears in the grid - because of this, they are always extended cells.   * appears in the grid - because of this, they are always extended cells.
  */   */
 static const struct grid_cell grid_padding_cell = {  static const struct grid_cell grid_padding_cell = {
         { { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 0, 0          { { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 8, 0
 };  };
   
 /* Cleared grid cell data. */  /* Cleared grid cell data. */
 static const struct grid_cell grid_cleared_cell = {  static const struct grid_cell grid_cleared_cell = {
         { { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0          { { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 8, 0
 };  };
 static const struct grid_cell_entry grid_cleared_entry = {  static const struct grid_cell_entry grid_cleared_entry = {
         { .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED          { .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
Line 528 
Line 528 
         gc->bg = gce->data.bg;          gc->bg = gce->data.bg;
         if (gce->flags & GRID_FLAG_BG256)          if (gce->flags & GRID_FLAG_BG256)
                 gc->bg |= COLOUR_FLAG_256;                  gc->bg |= COLOUR_FLAG_256;
         gc->us = 0;          gc->us = 8;
         utf8_set(&gc->data, gce->data.data);          utf8_set(&gc->data, gce->data.data);
         gc->link = 0;          gc->link = 0;
 }  }
Line 956 
Line 956 
         for (i = 0; i < nitems(attrs); i++) {          for (i = 0; i < nitems(attrs); i++) {
                 if (((~attr & attrs[i].mask) &&                  if (((~attr & attrs[i].mask) &&
                     (lastattr & attrs[i].mask)) ||                      (lastattr & attrs[i].mask)) ||
                     (lastgc->us != 0 && gc->us == 0)) {                      (lastgc->us != 8 && gc->us == 8)) {
                         s[n++] = 0;                          s[n++] = 0;
                         lastattr &= GRID_ATTR_CHARSET;                          lastattr &= GRID_ATTR_CHARSET;
                         break;                          break;
Legend:
Removed from v.1.129  
changed lines
  Added in v.1.130