From 3ffd4e783c17bcd90820da297b9a2c3c7766df95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sat, 12 Mar 2016 16:54:18 +0100
Subject: ui/view: general code cleanup

---
 view.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'view.c')

diff --git a/view.c b/view.c
index e64d0b3..086fc6b 100644
--- a/view.c
+++ b/view.c
@@ -191,7 +191,7 @@ static void view_syntax_color(View *view) {
 			for (bool token_next = false; line; line = line->next, col = 0) {
 				for (; col < line->width; col++) {
 					if (pos < token_end) {
-						line->cells[col].attr = token_style;
+						line->cells[col].style = token_style;
 						pos += line->cells[col].len;
 					} else {
 						token_next = true;
@@ -354,7 +354,7 @@ static bool view_addch(View *view, Cell *cell) {
 			cell->len = w == 0 ? 1 : 0;
 			int t = w == 0 ? SYNTAX_SYMBOL_TAB : SYNTAX_SYMBOL_TAB_FILL;
 			strncpy(cell->data, view->symbols[t]->symbol, sizeof(cell->data)-1);
-			cell->attr = view->symbols[t]->style;
+			cell->style = view->symbols[t]->style;
 			view->line->cells[view->col] = *cell;
 			view->line->len += cell->len;
 			view->line->width += cell->width;
@@ -373,7 +373,7 @@ static bool view_addch(View *view, Cell *cell) {
 		}
 
 		strncpy(cell->data, view->symbols[SYNTAX_SYMBOL_EOL]->symbol, sizeof(cell->data)-1);
-		cell->attr = view->symbols[SYNTAX_SYMBOL_EOL]->style;
+		cell->style = view->symbols[SYNTAX_SYMBOL_EOL]->style;
 
 		view->line->cells[view->col] = *cell;
 		view->line->len += cell->len;
@@ -393,13 +393,13 @@ static bool view_addch(View *view, Cell *cell) {
 				.data = { '^', ch == 127 ? '?' : ch + 64, '\0' },
 				.len = 1,
 				.width = 2,
-				.attr = cell->attr,
+				.style = cell->style,
 			};
 		}
 
 		if (ch == ' ') {
 			strncpy(cell->data, view->symbols[SYNTAX_SYMBOL_SPACE]->symbol, sizeof(cell->data)-1);
-			cell->attr = view->symbols[SYNTAX_SYMBOL_SPACE]->style;
+			cell->style = view->symbols[SYNTAX_SYMBOL_SPACE]->style;
 
 		}
 
@@ -650,7 +650,7 @@ void view_update(View *view) {
 
 				/* This screen line contains the cell we want to highlight */
 				if (line_cols >= view->colorcolumn) {
-					l->cells[(view->colorcolumn - 1) % view->width].attr = UI_STYLE_COLOR_COLUMN;
+					l->cells[(view->colorcolumn - 1) % view->width].style = UI_STYLE_COLOR_COLUMN;
 					line_cc_set = true;
 				}
 			}
@@ -661,7 +661,7 @@ void view_update(View *view) {
 
 	for (Line *l = view->lastline->next; l; l = l->next) {
 		strncpy(l->cells[0].data, view->symbols[SYNTAX_SYMBOL_EOF]->symbol, sizeof(l->cells[0].data));
-		l->cells[0].attr = view->symbols[SYNTAX_SYMBOL_EOF]->style;
+		l->cells[0].style = view->symbols[SYNTAX_SYMBOL_EOF]->style;
 		for (int x = 1; x < view->width; x++)
 			l->cells[x] = cell_blank;
 		l->width = 1;
-- 
cgit v1.2.3