===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** src/usr.bin/tmux/status.c	2012/03/17 18:24:07	1.90
--- src/usr.bin/tmux/status.c	2012/04/23 22:23:14	1.91
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.90 2012/03/17 18:24:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.91 2012/04/23 22:23:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 160,170 ****
  	struct winlink	       *wl;
  	struct screen		old_status, window_list;
  	struct grid_cell	stdgc, lgc, rgc, gc;
  	time_t			t;
! 	char		       *left, *right;
  	u_int			offset, needed;
  	u_int			wlstart, wlwidth, wlavailable, wloffset, wlsize;
! 	size_t			llen, rlen;
  	int			larrow, rarrow, utf8flag;
  
  	/* No status line? */
--- 160,171 ----
  	struct winlink	       *wl;
  	struct screen		old_status, window_list;
  	struct grid_cell	stdgc, lgc, rgc, gc;
+ 	struct options	       *oo;
  	time_t			t;
! 	char		       *left, *right, *sep;
  	u_int			offset, needed;
  	u_int			wlstart, wlwidth, wlavailable, wloffset, wlsize;
! 	size_t			llen, rlen, seplen;
  	int			larrow, rarrow, utf8flag;
  
  	/* No status line? */
***************
*** 230,236 ****
  
  		if (wl == s->curw)
  			wloffset = wlwidth;
! 		wlwidth += wl->status_width + 1;
  	}
  
  	/* Create a new screen for the window list. */
--- 231,241 ----
  
  		if (wl == s->curw)
  			wloffset = wlwidth;
! 
! 		oo = &wl->window->options;
! 		sep = options_get_string(oo, "window-status-separator");
! 		seplen = screen_write_strlen(utf8flag, "%s", sep);
! 		wlwidth += wl->status_width + seplen;
  	}
  
  	/* Create a new screen for the window list. */
***************
*** 241,247 ****
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		screen_write_cnputs(&ctx,
  		    -1, &wl->status_cell, utf8flag, "%s", wl->status_text);
! 		screen_write_putc(&ctx, &stdgc, ' ');
  	}
  	screen_write_stop(&ctx);
  
--- 246,255 ----
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		screen_write_cnputs(&ctx,
  		    -1, &wl->status_cell, utf8flag, "%s", wl->status_text);
! 
! 		oo = &wl->window->options;
! 		sep = options_get_string(oo, "window-status-separator");
! 		screen_write_nputs(&ctx, -1, &stdgc, utf8flag, "%s", sep);
  	}
  	screen_write_stop(&ctx);