console library works now

1 files changed, 15 insertions, 7 deletions

diff --git a/src/console.c b/src/console.c
index dba8c85..8d0cebb 100644
--- a/src/console.c
+++ b/src/console.c
@@ -37,10 +37,15 @@ consoleLineSet_t init_consolelineset(consoleLine_t* lines, int count) {
 	lineSet.count = count;
 	return lineSet;
 }
+void set_cache(consoleLineSet_t lines) {
+	lineCache = lines;
+}
 void clear_screen() {
-	printf("\033[2J");
+	/* clear screen, move cursor to the top */
+	printf("\033[2J\033[0;0H");
 }
 void draw_screen() {
+	clear_screen();
 	int linesDrawn = 0;
 	struct winsize win;
 	ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -48,13 +53,13 @@ void draw_screen() {
 	int height = (int)(win.ws_row);
 	int i = scroll;
 	int e = 0;
-	while (i - scroll + e < height) {
+	while (i - scroll + e < height && i - scroll < lineCache.count) {
 		char c = lineCache.lines[i].color;
 		if (i == selected) {
-			printf("%s%s", c == CBLACK ? BLKB : c == CRED ? REDB : c == CGREEN ? GRNB : WHTB, BLK);
+			printf("%s%s", BLK, c == CBLACK ? BLKB : c == CRED ? REDB : c == CGREEN ? GRNB : WHTB);
 		}
 		else {
-			printf("%s%s", BLKB, c == CBLACK ? BLK : c == CRED ? RED : c == CGREEN ? GRN : WHT);
+			printf("%s%s", c == CBLACK ? BLK : c == CRED ? RED : c == CGREEN ? GRN : WHT, BLKB);
 		}
 		printf("%s\n", lineCache.lines[i].content);
 		if (lineCache.lines[i].isExpanded) {
@@ -63,10 +68,10 @@ void draw_screen() {
 		}
 		i++;
 	}
-	printf("%s\n", RESET);
+	printf("%s", RESET);
 }
 void move_selection(int amount) {
-	selected = (selected + amount) % lineCache.count;
+	selected = (((selected + amount) % lineCache.count) + lineCache.count) % lineCache.count;
 	struct winsize win;
 	ioctl(fileno(stdout), TIOCGWINSZ, &win);
 	int height = (int)(win.ws_row);
@@ -79,7 +84,10 @@ void move_selection(int amount) {
 }
 void interact_selected() {
 	if (lineCache.lines[selected].onInteract == NULL) {
-		lineCache.lines[selected].isExpanded = !lineCache.lines[selected].isExpanded; } else { lineCache.lines[selected].onInteract();
+		lineCache.lines[selected].isExpanded = !lineCache.lines[selected].isExpanded; 
+	}
+	else {
+		lineCache.lines[selected].onInteract();
 	}
 	clear_screen();
 	draw_screen();