Split internal status-colour into status-fg/status-bg options and lose workarounds in set-option stuff.

This commit is contained in:
Nicholas Marriott
2008-06-23 22:12:29 +00:00
parent e704d6aee2
commit b69f4a3312
6 changed files with 70 additions and 121 deletions

View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.40 2008-06-23 21:54:48 nicm Exp $ */
/* $Id: status.c,v 1.41 2008-06-23 22:12:29 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -48,7 +48,8 @@ status_redraw(struct client *c)
if (clock_gettime(CLOCK_REALTIME, &c->status_timer) != 0)
fatal("clock_gettime failed");
colr = options_get_number(&s->options, "status-colour");
colr = options_get_number(&s->options, "status-bg") +
(options_get_number(&s->options, "status-fg") << 4);
yy = c->sy - 1;
if (yy == 0)