===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-more.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/Attic/window-more.c	2009/06/01 22:58:49	1.1
--- src/usr.bin/tmux/Attic/window-more.c	2009/06/24 23:00:31	1.2
***************
*** 1,4 ****
! /* $OpenBSD: window-more.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-more.c,v 1.2 2009/06/24 23:00:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 175,181 ****
--- 175,183 ----
  	struct grid_cell		 gc;
  	char   				*msg, hdr[32];
  	size_t	 			 size;
+  	int				 utf8flag;
  
+ 	utf8flag = options_get_number(&wp->window->options, "utf8");
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  
  	if (py == 0) {
***************
*** 193,200 ****
  	screen_write_cursormove(ctx, 0, py);
  	if (data->top + py  < ARRAY_LENGTH(&data->list)) {
  		msg = ARRAY_ITEM(&data->list, data->top + py);
! 		screen_write_puts(
! 		    ctx, &gc, "%.*s", (int) (screen_size_x(s) - size), msg);
  	}
  	while (s->cx < screen_size_x(s) - size)
  		screen_write_putc(ctx, &gc, ' ');
--- 195,202 ----
  	screen_write_cursormove(ctx, 0, py);
  	if (data->top + py  < ARRAY_LENGTH(&data->list)) {
  		msg = ARRAY_ITEM(&data->list, data->top + py);
! 		screen_write_nputs(
! 		    ctx, screen_size_x(s) - 1 - size, &gc, utf8flag, "%s", msg);
  	}
  	while (s->cx < screen_size_x(s) - size)
  		screen_write_putc(ctx, &gc, ' ');