Permit options such as status-bg to be configured using the entire 256 colour

palette by setting "colour0" to "colour255".

1 files changed, 5 insertions, 6 deletions

diff --git a/screen-redraw.c b/screen-redraw.c
index ce26c47d..d22591f0 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -240,7 +240,7 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 	struct session		*s = c->session;
 	struct grid_cell	 gc;
 	u_int			 idx, px, py, i, j;
-	u_char			 colour;
+	int			 colour;
 	char			 buf[16], *ptr;
 	size_t			 len;
 
@@ -256,7 +256,7 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 	if (wp->sx < len * 6 || wp->sy < 5) {
 		tty_cursor(tty, px - len / 2, py, wp->xoff, wp->yoff);
 		memcpy(&gc, &grid_default_cell, sizeof gc);
-		gc.fg = colour;
+		colour_set_fg(&gc, colour);
 		tty_attributes(tty, &gc);
 		tty_puts(tty, buf);
 		return;
@@ -266,7 +266,7 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 	py -= 2;
 
 	memcpy(&gc, &grid_default_cell, sizeof gc);
-	gc.bg = colour;
+	colour_set_bg(&gc, colour);
 	tty_attributes(tty, &gc);
 	for (ptr = buf; *ptr != '\0'; ptr++) {
 		if (*ptr < '0' || *ptr > '9')
@@ -276,9 +276,8 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 		for (j = 0; j < 5; j++) {
 			for (i = px; i < px + 5; i++) {
 				tty_cursor(tty, i, py + j, wp->xoff, wp->yoff);
-				if (!clock_table[idx][j][i - px])
-					continue;
-				tty_putc(tty, ' ');
+				if (clock_table[idx][j][i - px])
+					tty_putc(tty, ' ');
 			}
 		}
 		px += 6;