[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.58 and 1.59

version 1.58, 2010/01/27 20:26:42 version 1.59, 2010/03/22 19:18:46
Line 35 
Line 35 
             struct client *, time_t, int, struct grid_cell *, size_t *);              struct client *, time_t, int, struct grid_cell *, size_t *);
 char   *status_job(struct client *, char **);  char   *status_job(struct client *, char **);
 void    status_job_callback(struct job *);  void    status_job_callback(struct job *);
 size_t  status_width(struct client *, struct winlink *, time_t);  
 char   *status_print(  char   *status_print(
             struct client *, struct winlink *, time_t, struct grid_cell *);              struct client *, struct winlink *, time_t, struct grid_cell *);
 void    status_replace1(struct client *,  void    status_replace1(struct client *,
Line 557 
Line 556 
                 job->data = buf;                  job->data = buf;
         else          else
                 job->data = xstrdup(line);                  job->data = xstrdup(line);
 }  
   
 /* Calculate winlink status line entry width. */  
 size_t  
 status_width(struct client *c, struct winlink *wl, time_t t)  
 {  
         struct options  *oo = &wl->window->options;  
         struct session  *s = c->session;  
         const char      *fmt;  
         char            *text;  
         size_t           size;  
         int              utf8flag;  
   
         utf8flag = options_get_number(&s->options, "status-utf8");  
   
         fmt = options_get_string(&wl->window->options, "window-status-format");  
         if (wl == s->curw)  
                 fmt = options_get_string(oo, "window-status-current-format");  
   
         text = status_replace(c, wl, fmt, t, 1);  
         size = screen_write_cstrlen(utf8flag, "%s", text);  
         xfree(text);  
   
         return (size);  
 }  }
   
 /* Return winlink status line entry and adjust gc as necessary. */  /* Return winlink status line entry and adjust gc as necessary. */
Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59