===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-redraw.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/screen-redraw.c	2013/03/25 11:41:49	1.24
--- src/usr.bin/tmux/screen-redraw.c	2014/01/28 23:07:09	1.25
***************
*** 1,4 ****
! /* $OpenBSD: screen-redraw.c,v 1.24 2013/03/25 11:41:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: screen-redraw.c,v 1.25 2014/01/28 23:07:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 224,230 ****
  	struct window_pane	*wp;
  	struct grid_cell	 active_gc, other_gc;
  	u_int		 	 i, j, type, top;
! 	int		 	 status, spos, fg, bg;
  
  	/* Suspended clients should not be updated. */
  	if (c->flags & CLIENT_SUSPENDED)
--- 224,230 ----
  	struct window_pane	*wp;
  	struct grid_cell	 active_gc, other_gc;
  	u_int		 	 i, j, type, top;
! 	int		 	 status, spos;
  
  	/* Suspended clients should not be updated. */
  	if (c->flags & CLIENT_SUSPENDED)
***************
*** 251,267 ****
  	}
  
  	/* Set up pane border attributes. */
! 	memcpy(&other_gc, &grid_marker_cell, sizeof other_gc);
! 	memcpy(&active_gc, &grid_marker_cell, sizeof active_gc);
! 	active_gc.attr = other_gc.attr = GRID_ATTR_CHARSET;
! 	fg = options_get_number(oo, "pane-border-fg");
! 	colour_set_fg(&other_gc, fg);
! 	bg = options_get_number(oo, "pane-border-bg");
! 	colour_set_bg(&other_gc, bg);
! 	fg = options_get_number(oo, "pane-active-border-fg");
! 	colour_set_fg(&active_gc, fg);
! 	bg = options_get_number(oo, "pane-active-border-bg");
! 	colour_set_bg(&active_gc, bg);
  
  	/* Draw background and borders. */
  	for (j = 0; j < tty->sy - status; j++) {
--- 251,259 ----
  	}
  
  	/* Set up pane border attributes. */
! 	style_apply(&other_gc, oo, "pane-border-style");
! 	style_apply(&active_gc, oo, "pane-active-border-style");
! 	active_gc.attr = other_gc.attr = GRID_ATTR_CHARSET; /* nuke existing */
  
  	/* Draw background and borders. */
  	for (j = 0; j < tty->sy - status; j++) {
***************
*** 368,374 ****
  	px -= len * 3;
  	py -= 2;
  
! 	memcpy(&gc, &grid_marker_cell, sizeof gc);
  	if (w->active == wp)
  		colour_set_bg(&gc, active_colour);
  	else
--- 360,366 ----
  	px -= len * 3;
  	py -= 2;
  
! 	memcpy(&gc, &grid_default_cell, sizeof gc);
  	if (w->active == wp)
  		colour_set_bg(&gc, active_colour);
  	else
***************
*** 395,401 ****
  	tty_cursor(tty, xoff + wp->sx - len, yoff);
  
  draw_text:
! 	memcpy(&gc, &grid_marker_cell, sizeof gc);
  	if (w->active == wp)
  		colour_set_fg(&gc, active_colour);
  	else
--- 387,393 ----
  	tty_cursor(tty, xoff + wp->sx - len, yoff);
  
  draw_text:
! 	memcpy(&gc, &grid_default_cell, sizeof gc);
  	if (w->active == wp)
  		colour_set_fg(&gc, active_colour);
  	else