From 0ec1ce005c98f4fa1813cf47e4bcc11d8cd4b523 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 11 Sep 2009 14:13:52 +0000 Subject: Sync OpenBSD patchset 322: Permit options such as status-bg to be configured using the entire 256 colour palette by setting "colour0" to "colour255". --- window-scroll.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'window-scroll.c') diff --git a/window-scroll.c b/window-scroll.c index 188ee9a3..549b684a 100644 --- a/window-scroll.c +++ b/window-scroll.c @@ -1,4 +1,4 @@ -/* $Id: window-scroll.c,v 1.40 2009-08-16 19:26:49 tcunha Exp $ */ +/* $Id: window-scroll.c,v 1.41 2009-09-11 14:13:52 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -192,6 +192,7 @@ window_scroll_write_line( { struct window_scroll_mode_data *data = wp->modedata; struct screen *s = &data->screen; + struct options *oo = &wp->window->options; struct grid_cell gc; char hdr[32]; size_t size; @@ -200,9 +201,9 @@ window_scroll_write_line( memcpy(&gc, &grid_default_cell, sizeof gc); size = xsnprintf(hdr, sizeof hdr, "[%u,%u/%u]", data->ox, data->oy, screen_hsize(&wp->base)); - gc.fg = options_get_number(&wp->window->options, "mode-fg"); - gc.bg = options_get_number(&wp->window->options, "mode-bg"); - gc.attr |= options_get_number(&wp->window->options, "mode-attr"); + colour_set_fg(&gc, options_get_number(oo, "mode-fg")); + colour_set_bg(&gc, options_get_number(oo, "mode-bg")); + gc.attr |= options_get_number(oo, "mode-attr"); screen_write_cursormove(ctx, screen_size_x(s) - size, 0); screen_write_puts(ctx, &gc, "%s", hdr); memcpy(&gc, &grid_default_cell, sizeof gc); -- cgit