Refactor frontend code

window.[ch] now contains a somewhat generic editor window which is
then enhanced in vis.[ch] with a statusbar.

1 files changed, 6 insertions, 6 deletions

diff --git a/colors.c b/colors.c
index d1a0357..4a447f6 100644
--- a/colors.c
+++ b/colors.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <curses.h>
 
-#include "editor.h"
+#include "vis.h"
 #include "util.h"
 
 #ifdef NCURSES_VERSION
@@ -30,7 +30,7 @@ static unsigned int color_hash(short fg, short bg)
 	return fg * (COLORS + 2) + bg;
 }
 
-short editor_color_get(short fg, short bg)
+short vis_color_get(short fg, short bg)
 {
 	if (fg >= COLORS)
 		fg = default_fg;
@@ -68,10 +68,10 @@ short editor_color_get(short fg, short bg)
 	return color_pair >= 0 ? color_pair : -color_pair;
 }
 
-short editor_color_reserve(short fg, short bg)
+short vis_color_reserve(short fg, short bg)
 {
 	if (!color2palette)
-		editor_init();
+		vis_init();
 	if (!color2palette || fg >= COLORS || bg >= COLORS)
 		return 0;
 	if (!has_default_colors && fg == -1)
@@ -89,7 +89,7 @@ short editor_color_reserve(short fg, short bg)
 	return color_pair >= 0 ? color_pair : -color_pair;
 }
 
-void editor_init(void)
+void vis_init(void)
 {
 	if (color2palette)
 		return;
@@ -102,5 +102,5 @@ void editor_init(void)
 	color_pairs_max = MIN(COLOR_PAIRS, MAX_COLOR_PAIRS);
 	if (COLORS)
 		color2palette = calloc((COLORS + 2) * (COLORS + 2), sizeof(short));
-	editor_color_reserve(COLOR_WHITE, COLOR_BLACK);
+	vis_color_reserve(COLOR_WHITE, COLOR_BLACK);
 }