=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v retrieving revision 1.22 retrieving revision 1.23 diff -c -r1.22 -r1.23 *** src/usr.bin/tmux/status.c 2009/07/30 20:41:48 1.22 --- src/usr.bin/tmux/status.c 2009/08/05 16:26:38 1.23 *************** *** 1,4 **** ! /* $OpenBSD: status.c,v 1.22 2009/07/30 20:41:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: status.c,v 1.23 2009/08/05 16:26:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 64,71 **** if (gettimeofday(&c->status_timer, NULL) != 0) fatal("gettimeofday"); memcpy(&stdgc, &grid_default_cell, sizeof gc); ! stdgc.bg = options_get_number(&s->options, "status-fg"); ! stdgc.fg = options_get_number(&s->options, "status-bg"); stdgc.attr |= options_get_number(&s->options, "status-attr"); yy = c->tty.sy - 1; --- 64,71 ---- if (gettimeofday(&c->status_timer, NULL) != 0) fatal("gettimeofday"); memcpy(&stdgc, &grid_default_cell, sizeof gc); ! stdgc.fg = options_get_number(&s->options, "status-fg"); ! stdgc.bg = options_get_number(&s->options, "status-bg"); stdgc.attr |= options_get_number(&s->options, "status-attr"); yy = c->tty.sy - 1; *************** *** 563,570 **** len = c->tty.sx; memcpy(&gc, &grid_default_cell, sizeof gc); ! gc.bg = options_get_number(&s->options, "message-fg"); ! gc.fg = options_get_number(&s->options, "message-bg"); gc.attr |= options_get_number(&s->options, "message-attr"); screen_write_start(&ctx, NULL, &c->status); --- 563,570 ---- len = c->tty.sx; memcpy(&gc, &grid_default_cell, sizeof gc); ! gc.fg = options_get_number(&s->options, "message-fg"); ! gc.bg = options_get_number(&s->options, "message-bg"); gc.attr |= options_get_number(&s->options, "message-attr"); screen_write_start(&ctx, NULL, &c->status); *************** *** 662,669 **** len = c->tty.sx; memcpy(&gc, &grid_default_cell, sizeof gc); ! gc.bg = options_get_number(&s->options, "message-fg"); ! gc.fg = options_get_number(&s->options, "message-bg"); gc.attr |= options_get_number(&s->options, "message-attr"); screen_write_start(&ctx, NULL, &c->status); --- 662,669 ---- len = c->tty.sx; memcpy(&gc, &grid_default_cell, sizeof gc); ! gc.fg = options_get_number(&s->options, "message-fg"); ! gc.bg = options_get_number(&s->options, "message-bg"); gc.attr |= options_get_number(&s->options, "message-attr"); screen_write_start(&ctx, NULL, &c->status);