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

Diff for /src/usr.bin/tmux/status.c between version 1.181 and 1.182

version 1.181, 2018/08/29 09:50:32 version 1.182, 2018/10/18 08:38:01
Line 214 
Line 214 
                 return (-1);                  return (-1);
         if (s->statusat != 1)          if (s->statusat != 1)
                 return (s->statusat);                  return (s->statusat);
         return (c->tty.sy - status_line_size(s));          return (c->tty.sy - status_line_size(c));
 }  }
   
 /*  /* Get size of status line for client's session. 0 means off. */
  * Get size of status line for session. 0 means off. Note that status line may  
  * be forced off for an individual client if it is too small (the  
  * CLIENT_STATUSOFF flag is set for this).  
  */  
 u_int  u_int
 status_line_size(struct session *s)  status_line_size(struct client *c)
 {  {
           struct session  *s = c->session;
   
           if (c->flags & CLIENT_STATUSOFF)
                   return (0);
         if (s->statusat == -1)          if (s->statusat == -1)
                 return (0);                  return (0);
         return (1);          return (1);
Line 324 
Line 324 
         }          }
   
         /* No status line? */          /* No status line? */
         lines = status_line_size(s);          lines = status_line_size(c);
         if (c->tty.sy == 0 || lines == 0)          if (c->tty.sy == 0 || lines == 0)
                 return (1);                  return (1);
         left = right = NULL;          left = right = NULL;
Line 663 
Line 663 
                 return (0);                  return (0);
         memcpy(&old_status, &c->status.status, sizeof old_status);          memcpy(&old_status, &c->status.status, sizeof old_status);
   
         lines = status_line_size(c->session);          lines = status_line_size(c);
         if (lines <= 1) {          if (lines <= 1) {
                 lines = 1;                  lines = 1;
                 screen_init(&c->status.status, c->tty.sx, 1, 0);                  screen_init(&c->status.status, c->tty.sx, 1, 0);
Line 819 
Line 819 
                 return (0);                  return (0);
         memcpy(&old_status, &c->status.status, sizeof old_status);          memcpy(&old_status, &c->status.status, sizeof old_status);
   
         lines = status_line_size(c->session);          lines = status_line_size(c);
         if (lines <= 1) {          if (lines <= 1) {
                 lines = 1;                  lines = 1;
                 screen_init(&c->status.status, c->tty.sx, 1, 0);                  screen_init(&c->status.status, c->tty.sx, 1, 0);
Legend:
Removed from v.1.181  
changed lines
  Added in v.1.182