[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.109 and 1.110

version 1.109, 2017/02/08 16:45:18 version 1.110, 2017/02/08 17:31:09
Line 839 
Line 839 
         if (rupper >= rlower)   /* cannot be one line */          if (rupper >= rlower)   /* cannot be one line */
                 return;                  return;
   
           screen_write_collect_flush(ctx);
   
         /* Cursor moves to top-left. */          /* Cursor moves to top-left. */
         s->cx = 0;          s->cx = 0;
         s->cy = 0;          s->cy = 0;
Line 854 
Line 856 
         struct screen           *s = ctx->s;          struct screen           *s = ctx->s;
         struct grid             *gd = s->grid;          struct grid             *gd = s->grid;
         struct grid_line        *gl;          struct grid_line        *gl;
         struct tty_ctx           ttyctx;  
   
         gl = &gd->linedata[gd->hsize + s->cy];          gl = &gd->linedata[gd->hsize + s->cy];
         if (wrapped)          if (wrapped)
Line 864 
Line 865 
   
         if (s->cy == s->rlower) {          if (s->cy == s->rlower) {
                 grid_view_scroll_region_up(gd, s->rupper, s->rlower);                  grid_view_scroll_region_up(gd, s->rupper, s->rlower);
   
                 screen_write_collect_scroll(ctx);                  screen_write_collect_scroll(ctx);
                 screen_write_initctx(ctx, &ttyctx);                  ctx->scrolled++;
                 tty_write(tty_cmd_linefeed, &ttyctx);  
         } else if (s->cy < screen_size_y(s) - 1)          } else if (s->cy < screen_size_y(s) - 1)
                 s->cy++;                  s->cy++;
 }  }
   
   /* Scroll up. */
   void
   screen_write_scrollup(struct screen_write_ctx *ctx, u_int lines)
   {
           struct screen   *s = ctx->s;
           struct grid     *gd = s->grid;
           u_int            i;
   
           if (lines == 0)
                   lines = 1;
           else if (lines > s->rlower - s->rupper + 1)
                   lines = s->rlower - s->rupper + 1;
   
           for (i = 0; i < lines; i++) {
                   grid_view_scroll_region_up(gd, s->rupper, s->rlower);
                   screen_write_collect_scroll(ctx);
           }
           ctx->scrolled += lines;
   }
   
 /* Carriage return (cursor to start of line). */  /* Carriage return (cursor to start of line). */
 void  void
 screen_write_carriagereturn(struct screen_write_ctx *ctx)  screen_write_carriagereturn(struct screen_write_ctx *ctx)
Line 1008 
Line 1027 
         struct screen_write_collect_item        *ci, *tmp;          struct screen_write_collect_item        *ci, *tmp;
         u_int                                    y, cx, cy;          u_int                                    y, cx, cy;
         struct tty_ctx                           ttyctx;          struct tty_ctx                           ttyctx;
   
           if (ctx->scrolled != 0) {
                   log_debug("%s: scrolled %u (region %u-%u)", __func__,
                       ctx->scrolled, s->rupper, s->rlower);
                   if (ctx->scrolled > s->rlower - s->rupper + 1)
                           ctx->scrolled = s->rlower - s->rupper + 1;
   
                   screen_write_initctx(ctx, &ttyctx);
                   ttyctx.num = ctx->scrolled;
                   tty_write(tty_cmd_scrollup, &ttyctx);
           }
           ctx->scrolled = 0;
   
         cx = s->cx; cy = s->cy;          cx = s->cx; cy = s->cy;
         for (y = 0; y < screen_size_y(s); y++) {          for (y = 0; y < screen_size_y(s); y++) {
Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110