1 files changed, 51 insertions, 9 deletions

diff --git a/tui/widget/list/scrolllist.ha b/tui/widget/list/scrolllist.ha
index ab1e7bc..95fa4e0 100644
--- a/tui/widget/list/scrolllist.ha
+++ b/tui/widget/list/scrolllist.ha
@@ -5,6 +5,13 @@ use unix::tty;
 use memio;
 use strings;
 use fmt;
+use strconv;
+
+export def DEFAULTSTYLE = liststyle {
+	style = void,
+	normal = widget::color::DEFAULTFG,
+	marked = widget::color::BLUEBG,
+};
 
 export type scrolllist = struct {
 	widget: widget::widget,
@@ -12,13 +19,22 @@ export type scrolllist = struct {
 	frame: frame,
 	cursor: int,
 	marked: []int,
+	style: *liststyle,
+};
+
+export type liststyle = struct {
+	style: (void | *widget::style),
+	normal: widget::color,
+	marked: widget::color,
+	//normal: (void | widget::color),
+	//marked: (void | widget::color),
 };
 
 // Return an instance of list. out is the tty file, pos the starting position,
 // sz is the size of the widget (if void is used, the maximum possible
 // size is used), items is the slice of items of the list.
 export fn newscrolllist(state: *tui::tui, pos: widget::coords, sz: widget::widgetsize,
-style: (*widget::style | void), items: str...) (scrolllist | tty::error) = {
+style: *liststyle, items: str...) (scrolllist | tty::error) = {
 	const tsz = tty::winsize(state.out)?;
 
 	let end = match (sz) {
@@ -42,7 +58,7 @@ style: (*widget::style | void), items: str...) (scrolllist | tty::error) = {
 			finish = &finishscrolllist,
 			pos = pos,
 			sz = sz,
-			style = style,
+			style = style.style,
 			damage = widget::damageall,
 			...
 		},
@@ -53,6 +69,7 @@ style: (*widget::style | void), items: str...) (scrolllist | tty::error) = {
 		},
 		cursor = 0,
 		marked = [],
+		style = style,
 	};
 };
 
@@ -153,22 +170,47 @@ fn stylesscrolllist(widget: *widget::widget, txt: str, idx: size) str = {
 	const idx = idx: int + list.frame.start;
 	let st = memio::dynamic();
 	defer io::close(&st)!;
+
+	const normalst = colorordefault(list.style.normal, widget::color::DEFAULTFG);
+	const markst = colorordefault(list.style.marked, widget::color::BLUEBG);
+
+	//memio::concat(&st, widget::color_to_str(normalst))!;
+	const normalsts = widget::color_to_str(normalst);
+	defer free(normalsts);
+	memio::concat(&st, normalsts)!;
 	if (idx == list.cursor) {
 		memio::concat(&st, "\x1B[7m")!;
 	};
 	if (ismarked(*list, idx) is size) {
-		memio::concat(&st, "\x1B[44m")!;
+		const s = widget::color_to_str(markst);
+		defer free(s);
+		memio::concat(&st, s)!;
 	};
 	memio::concat(&st, txt)!;
-	if (idx == list.cursor) {
-		memio::concat(&st, "\x1B[27m")!;
-	};
-	if (ismarked(*list, idx) is size) {
-		memio::concat(&st, "\x1B[49m")!;
-	};
+	memio::concat(&st, "\x1B[0m")!;
+	//if (idx == list.cursor) {
+	//	memio::concat(&st, "\x1B[27m")!;
+	//} else if (ismarked(*list, idx) is size) {
+	//};
+	//if (idx == list.cursor) {
+	//	memio::concat(&st, "\x1B[27m")!;
+	//};
+	//if (ismarked(*list, idx) is size) {
+	//	memio::concat(&st, "\x1B[49m")!;
+	//};
 	return strings::dup(memio::string(&st)!);
 };
 
+fn colorordefault(col: (void | widget::color), d: widget::color) widget::color = {
+	const c = match (col) {
+	case let c: widget::color =>
+		yield c;
+	case void =>
+		yield d;
+	};
+	return c;
+};
+
 fn ismarked(li: scrolllist, j: int) (size | void) = {
 	for (let i = 0z; i < len(li.marked); i += 1) {
 		const idx = li.marked[i];