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

Diff for /src/usr.bin/tmux/screen-write.c between version 1.107 and 1.108

version 1.107, 2017/02/08 15:41:41 version 1.108, 2017/02/08 15:49:29
Line 51 
Line 51 
 screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,  screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
     struct screen *s)      struct screen *s)
 {  {
         u_int            size;          u_int   size;
         char             tmp[16];          char    tmp[16];
         const char      *cp = tmp;  
   
         ctx->wp = wp;          ctx->wp = wp;
         if (wp != NULL && s == NULL)          if (wp != NULL && s == NULL)
Line 71 
Line 70 
   
         ctx->cells = ctx->written = ctx->skipped = 0;          ctx->cells = ctx->written = ctx->skipped = 0;
   
         if (wp == NULL)          if (wp != NULL)
                 cp = "no pane";  
         else  
                 snprintf(tmp, sizeof tmp, "pane %%%u", wp->id);                  snprintf(tmp, sizeof tmp, "pane %%%u", wp->id);
         log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),          log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),
             screen_size_y(ctx->s), cp);              screen_size_y(ctx->s), wp == NULL ? "no pane" : tmp);
 }  }
   
 /* Finish writing. */  /* Finish writing. */
Line 773 
Line 770 
         struct tty_ctx           ttyctx;          struct tty_ctx           ttyctx;
         u_int                    sx = screen_size_x(s);          u_int                    sx = screen_size_x(s);
   
         screen_write_initctx(ctx, &ttyctx);  
         ttyctx.bg = bg;  
   
         gl = &s->grid->linedata[s->grid->hsize + s->cy];          gl = &s->grid->linedata[s->grid->hsize + s->cy];
         if (gl->cellsize == 0 && bg == 8)          if (gl->cellsize == 0 && bg == 8)
                 return;                  return;
   
           screen_write_initctx(ctx, &ttyctx);
           ttyctx.bg = bg;
   
         screen_dirty_clear(s, 0, s->cy, sx - 1, s->cy);          screen_dirty_clear(s, 0, s->cy, sx - 1, s->cy);
         grid_view_clear(s->grid, 0, s->cy, sx, 1, bg);          grid_view_clear(s->grid, 0, s->cy, sx, 1, bg);
   
Line 795 
Line 792 
         struct tty_ctx           ttyctx;          struct tty_ctx           ttyctx;
         u_int                    sx = screen_size_x(s);          u_int                    sx = screen_size_x(s);
   
         screen_write_initctx(ctx, &ttyctx);  
         ttyctx.bg = bg;  
   
         gl = &s->grid->linedata[s->grid->hsize + s->cy];          gl = &s->grid->linedata[s->grid->hsize + s->cy];
         if (s->cx > sx - 1 || (s->cx >= gl->cellsize && bg == 8))          if (s->cx > sx - 1 || (s->cx >= gl->cellsize && bg == 8))
                 return;                  return;
   
           screen_write_initctx(ctx, &ttyctx);
           ttyctx.bg = bg;
   
         screen_dirty_clear(s, s->cx, s->cy, sx - 1, s->cy);          screen_dirty_clear(s, s->cx, s->cy, sx - 1, s->cy);
         grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1, bg);          grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1, bg);

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.108