nausea

commit 031ee001c1f0f3d3ba50ee1a5901a282efabb5c3
parent fb49d8fbc236a178b586673926f4db08166fc60e
Author: sin <sin@2f30.org>
Date:   Thu, 21 Nov 2013 17:15:44 +0000

Factor out color initialization to a separate function

Diffstat:
M
spectrum.c
 | 
33
++++++++++++++++++++-------------

1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/spectrum.c b/spectrum.c
@@ -243,6 +243,22 @@ draw(struct frame *fr)
 	refresh();
 }
 
+static int
+initcolors(void)
+{
+	unsigned i;
+	struct color_range *cr;
+
+	if (has_colors() == FALSE)
+		return -1;
+	start_color();
+	for (i = 0; i < LEN(color_ranges); i++) {
+		cr = &color_ranges[i];
+		init_pair(cr->pair, cr->fg, cr->bg);
+	}
+	return 0;
+}
+
 static void
 usage(void)
 {
@@ -255,9 +271,7 @@ int
 main(int argc, char *argv[])
 {
 	int c;
-	unsigned i;
 	struct frame fr;
-	struct color_range *cr;
 
 	argv0 = argv[0];
 	while (--argc > 0 && (*++argv)[0] == '-')
@@ -293,17 +307,10 @@ main(int argc, char *argv[])
 	curs_set(FALSE); /* hide cursor */
 	timeout(msec);
 
-	if (colors) {
-		if (has_colors() == FALSE) {
-			endwin();
-			done(&fr);
-			errx(1, "terminal does not support colors");
-		}
-		start_color();
-		for (i = 0; i < LEN(color_ranges); i++) {
-			cr = &color_ranges[i];
-			init_pair(cr->pair, cr->fg, cr->bg);
-		}
+	if (colors && initcolors() < 0) {
+		endwin();
+		done(&fr);
+		errx(1, "your terminal does not support colors");
 	}
 
 	while (!die) {