[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.47 and 1.48

version 1.47, 2011/03/07 23:46:27 version 1.48, 2011/03/26 19:07:33
Line 1012 
Line 1012 
          * If this is a wide character and there is no room on the screen, for           * If this is a wide character and there is no room on the screen, for
          * the entire character, don't print it.           * the entire character, don't print it.
          */           */
         if (width > 1 && (width > screen_size_x(s) ||          if (!(s->mode & MODE_WRAP)
             (s->cx != screen_size_x(s) && s->cx > screen_size_x(s) - width)))              && (width > 1 && (width > screen_size_x(s) ||
                   (s->cx != screen_size_x(s)
                    && s->cx > screen_size_x(s) - width))))
                 return;                  return;
   
         /*          /*
Line 1045 
Line 1047 
         }          }
   
         /* Sanity checks. */          /* Sanity checks. */
         if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - 1)          if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
             || s->cy > screen_size_y(s) - 1)              || s->cy > screen_size_y(s) - width)
                 return;                  return;
   
         /* Handle overwriting of UTF-8 characters. */          /* Handle overwriting of UTF-8 characters. */
Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48