 @@ -1,14 +1,14 @@
-/* $NetBSD: testpat.c,v 1.1 2021/01/02 03:21:39 nat Exp $ */
+/* $NetBSD: testpat.c,v 1.2 2021/01/02 12:10:17 jmcneill Exp $ */
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -56,48 +56,48 @@ int main(int argc, char *argv[]) {
 	};
 	float coord_x, circle_int;
 	float a_axis, b_axis;
 	if (!(initscr())) {
 		printf("\nUnknown terminal type.");
 		printf("\n");
 		return EXIT_FAILURE;
+	}
 	if (argc > 2) {
 		endwin();
 		errx(EINVAL, "usage: testpat [title]");
+	}
 	if (argc == 2 && strlen(argv[1]) < (size_t)COLS)
 		snprintf(title, sizeof(title), "%s", argv[1]);
 	else if (argc == 2 && (int)strlen(argv[1]) > COLS) {
 		endwin();
 		errx(EINVAL, "title string must be less than display columns");
+	}
 	colourOK = has_colors();
 	if (COLS < 13 || LINES < 13) {
 		endwin();
 		printf("\nTerminal size must be at least 72x25.");
 		printf("\n");
 		return EXIT_FAILURE;
+	}
 	if (colourOK) {
 		start_color();
 	    	init_pair( 0, COLOR_WHITE, COLOR_BLACK );
 	    	init_pair( 1, COLOR_WHITE, COLOR_RED );
 	    	init_pair( 2, COLOR_WHITE, COLOR_GREEN );
 	    	init_pair( 3, COLOR_WHITE, COLOR_YELLOW );
 	    	init_pair( 4, COLOR_WHITE, COLOR_BLUE );
 	    	init_pair( 5, COLOR_WHITE, COLOR_MAGENTA );
 	    	init_pair( 6, COLOR_WHITE, COLOR_CYAN );
 	    	init_pair( 7, COLOR_BLACK, COLOR_WHITE );
 		attrset(COLOR_PAIR(0));
+	}
 	x_limit = (COLS - 1) / 2;
 @@ -182,56 +182,56 @@ int main(int argc, char *argv[]) {
+	}
 	mvaddch(0, 0, 108 | A_ALTCHARSET);
 	mvaddch(0, x_limit, 107 | A_ALTCHARSET);
 	mvaddch(y_limit, 0, 109 | A_ALTCHARSET);
 	mvaddch(y_limit, x_limit, 106 | A_ALTCHARSET);
 	/* Draw a white circle. */
 	for (i = 1; i < y_limit; i++) {
 		for (col = circle_pos[i][0]; col <= circle_pos[i][1]; col++) {
 			mvaddch(i, col, 32 | A_REVERSE);
+		}
+	}
 	/* Add title segment. */
 	for (i = roundf(1 * grid_unit); i < roundf(2 * grid_unit); i++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 		for (col = roundf((4 * grid_unit * 2) +
 		    circle_pos[y_limit /2][0]); col <= roundf((9 * grid_unit
 		    * 2) + circle_pos[y_limit /2][0]); col++)
 			mvaddch(i, col, ' ');
+	}
 	i = roundf(1.4 * grid_unit);
 	col = y_limit - (strlen(title) / 2) + circle_pos[y_limit / 2][0];
 		mvprintw(i, col, "%s", title);
 	/* Add black segments at top. */
 	for (line = roundf(2 * grid_unit); line < 4 * grid_unit; line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 		for (col = 0; col <= roundf((3.5 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos <= circle_pos[line][1])
 					mvaddch(line, xpos, ' ');
+		}
 		for (col = roundf((9.5 * grid_unit * 2)); col <
 		    roundf((13 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos <= circle_pos[line][1])
 					mvaddch(line, xpos, ' ');
+		}
+	}
 	/* Add black and white squares close to top. */
 	int gap = (circle_pos[(int)(5 * grid_unit)][1] -
 	    circle_pos[(int)(5 * grid_unit)][0]) / 13;
 	for (i = roundf(3 * grid_unit); i < roundf(4 * grid_unit); i++) {
 @@ -253,27 +253,27 @@ int main(int argc, char *argv[]) {
 				if (col >= circle_pos[i][0] &&
 				    col <= circle_pos[i][1])
 					mvaddch(i, col, ' ');
+			}
+		}
+	}
 	/* Add colour bars. */
 	for (i = 0; i < numcolours; i++) {
 		colour = colour_list[i];
 		if (colourOK)
 	    		attrset(COLOR_PAIR(colour));
 		if (i == 0)
 			spacing_start = 0;
 		else
 			spacing_start = (spacing * i) + spacing_residual;
 		if (i == numcolours - 1)
 			spacing_end = circle_pos[y_limit / 2][1];
 		else
 			spacing_end = (spacing * (i + 1)) + spacing_residual;
 	    	for (line = roundf(4 * grid_unit); line < (y_limit / 2);
 		    line++) {
 			for (col = spacing_start; col < spacing_end; col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 @@ -283,85 +283,85 @@ int main(int argc, char *argv[]) {
+			}
+	    	}
+	}
 	/* Add black segment under centre line. */
 	for (line = y_limit / 2; line < (9.5 * grid_unit); line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 		for (col = circle_pos[line][0]; col <= circle_pos[line][1];
 		    col++)
 			mvaddch(line, col, ' ');
 		for (col = roundf((1.5 * grid_unit * 2)); col <
 		    roundf((4.3 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, 120 | A_ALTCHARSET);
+		}
 		for (col = roundf((4.3 * grid_unit * 2)); col <
 		    roundf((7.6 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, '|');
+		}
 		for (col = roundf((7.6 * grid_unit * 2)); col <
 		    roundf((11.5 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, 97 | A_ALTCHARSET);
+		}
+	}
 	/* Add black segment close to bottom. */
 	for (line = roundf(9.5 * grid_unit); line <= (10.5 * grid_unit);
 	    line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 		for (col = roundf((0 * grid_unit * 2)); col <
 		    roundf((4 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, ' ');
+		}
 		for (col = roundf((4 * grid_unit * 2)); col <
 		    roundf((6.5 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, 97 | A_ALTCHARSET);
+		}
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_WHITE));
 		for (col = roundf((6.5 * grid_unit * 2)); col <
 		    roundf((9 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, 97 | A_ALTCHARSET);
+		}
 		for (col = roundf((9 * grid_unit * 2)); col <
 		    roundf((13 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, ' ');
+		}
+	}
 	/* Add name segment close to bottom. */
 	for (line = roundf(10.5 * grid_unit); line < (12 * grid_unit);
 	    line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 @@ -396,38 +396,38 @@ int main(int argc, char *argv[]) {
 	/* Add yellow segment at bottom. */
 	for (line = 12 * grid_unit; line < y_limit; line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_YELLOW));
 		for (col = circle_pos[line][0]; col <= circle_pos[line][1];
 		    col++)
 			mvaddch(line, col, ' ');
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_RED));
 		for (col = roundf((6 * grid_unit * 2)); col <
 		    roundf((7 * grid_unit * 2)); col++) {
 				xpos = col + circle_pos[y_limit / 2][0];
 				if (xpos >= circle_pos[line][0] &&
 				    xpos < circle_pos[line][1])
 					mvaddch(line, xpos, ' ');
+		}
+	}
 	if (colourOK)
     		attrset(COLOR_PAIR(COLOR_BLACK));
 	for (line = 6 * grid_unit; line <= (7 * grid_unit) + 1; line++) {
 		if (colourOK)
     			attrset(COLOR_PAIR(COLOR_BLACK));
 		col = x_limit / 2;
 		if (line != a_axis) {
 			mvaddch(line, col - 1, ' ');
 			mvaddch(line, col, 120 | A_ALTCHARSET);
 			mvaddch(line, col + 1, ' ');
+		}
+	}
 	line = y_limit / 2;