[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.5 and 1.6

version 1.5, 2009/06/03 23:30:40 version 1.6, 2009/06/03 23:37:30
Line 663 
Line 663 
         u_int                    width, xx, i;          u_int                    width, xx, i;
         struct grid_cell         tmp_gc, *tmp_gc2;          struct grid_cell         tmp_gc, *tmp_gc2;
         size_t                   size;          size_t                   size;
           int                      insert = 0;
   
         /* Ignore padding. */          /* Ignore padding. */
         if (gc->flags & GRID_FLAG_PADDING)          if (gc->flags & GRID_FLAG_PADDING)
Line 714 
Line 715 
                 gc = &tmp_gc;                  gc = &tmp_gc;
         }          }
   
           /* If in insert mode, make space for the cells. */
           if (s->mode & MODE_INSERT && s->cx <= screen_size_x(s) - width) {
                   xx = screen_size_x(s) - s->cx - width;
                   grid_move_cells(s->grid, s->cx + width, s->cx, s->cy, xx);
                   insert = 1;
           }
   
         /* Check this will fit on the current line; scroll if not. */          /* Check this will fit on the current line; scroll if not. */
         if (s->cx > screen_size_x(s) - width) {          if (s->cx > screen_size_x(s) - width) {
                 screen_write_carriagereturn(ctx);                  screen_write_carriagereturn(ctx);
Line 747 
Line 755 
         s->cx += width;          s->cx += width;
   
         /* Draw to the screen if necessary. */          /* Draw to the screen if necessary. */
           if (insert)
                   tty_write_cmd(ctx->wp, TTY_INSERTCHARACTER, width);
         if (screen_check_selection(s, s->cx - width, s->cy)) {          if (screen_check_selection(s, s->cx - width, s->cy)) {
                 s->sel.cell.data = gc->data;                  s->sel.cell.data = gc->data;
                 tty_write_cmd(ctx->wp, TTY_CELL, &s->sel.cell, &gu);                  tty_write_cmd(ctx->wp, TTY_CELL, &s->sel.cell, &gu);
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6