===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/tmux/status.c	2010/01/27 20:26:42	1.58
--- src/usr.bin/tmux/status.c	2010/03/22 19:18:46	1.59
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.58 2010/01/27 20:26:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.59 2010/03/22 19:18:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 35,41 ****
  	    struct client *, time_t, int, struct grid_cell *, size_t *);
  char   *status_job(struct client *, char **);
  void	status_job_callback(struct job *);
- size_t	status_width(struct client *, struct winlink *, time_t);
  char   *status_print(
  	    struct client *, struct winlink *, time_t, struct grid_cell *);
  void	status_replace1(struct client *,
--- 35,40 ----
***************
*** 557,586 ****
  		job->data = buf;
  	else
  		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. */
--- 556,561 ----