From 6da3bbdce5c75b4af31c8a97ba0b1c1cf5c17735 Mon Sep 17 00:00:00 2001
From: Brian Barto <bartobrian@gmail.com>
Date: Mon, 18 Apr 2016 12:00:57 -0400
Subject: [PATCH] Restructured the application file a bit.

	modified:   Makefile
	renamed:    src/nms.c -> src/main.c
	copied:     src/nms.h -> src/nms.c
	modified:   src/nms.h
---
 Makefile   |   7 +-
 src/main.c |  13 +++
 src/nms.c  | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/nms.h  | 274 ++--------------------------------------------------
 4 files changed, 293 insertions(+), 278 deletions(-)
 create mode 100644 src/main.c

diff --git a/Makefile b/Makefile
index 6bc92b3..b45f49f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,11 @@ SRC=src
 CC = gcc
 LDLIBS = -lncurses
 
-${BIN}/nms: ${OBJ}/nms.o
-	$(CC) $(LDLIBS) -o $@ $^
+${BIN}/nms: ${OBJ}/nms.o ${OBJ}/main.o
+	$(CC) -o $@ $^ $(LDLIBS)
+
+${OBJ}/main.o: ${SRC}/main.c ${SRC}/nms.h
+	$(CC) -o $@ -c ${SRC}/main.c
 
 ${OBJ}/nms.o: ${SRC}/nms.c ${SRC}/nms.h
 	$(CC) -o $@ -c ${SRC}/nms.c
diff --git a/src/main.c b/src/main.c
new file mode 100644
index 0000000..d21064e
--- /dev/null
+++ b/src/main.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include "nms.h"
+
+int main(void) {
+	// Geting input
+	int c;
+	while ((c = getchar()) != EOF) {
+		nmsprintf("%c", c);
+	}
+	nmsexec();
+
+	return 0;
+}
diff --git a/src/nms.c b/src/nms.c
index d21064e..55dbf77 100644
--- a/src/nms.c
+++ b/src/nms.c
@@ -1,13 +1,272 @@
-#include <stdio.h>
+// Copyright (c) 2016 Brian Barto
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.  See COPYING for more details.
+
 #include "nms.h"
+#include <stdio.h>
+#include <ncurses.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <time.h>
+#include <stdarg.h>
 
-int main(void) {
-	// Geting input
-	int c;
-	while ((c = getchar()) != EOF) {
-		nmsprintf("%c", c);
+#define SPACE      32
+#define NEWLINE    10
+#define TAB        9
+
+// Window position structure, linked list. Keeps track of every
+// character's position on the terminal, as well as other attributes.
+struct winpos {
+	char source;
+	char mask;
+	int row;
+	int col;
+	int s1_time;
+	int s2_time;
+	struct winpos *next;
+};
+
+// Globals
+static char *display = NULL;
+
+// Function prototypes (internal)
+char getMaskChar(void);
+
+/*
+ * void nmsprintf(const char *format, ...)
+ *
+ * DESCR:
+ * Used to load characters in to the display queue that will later
+ * be rendered on tothe screen via nmsexec(). It is a wrapper for 
+ * sprintf(), and the parameters that it accepts are the same.
+ *
+ * PARAMS:
+ * const char *format - printf-style format string
+ */
+void nmsprintf(const char *format, ...) {
+	char nmsprintBuffer[10000];
+
+	va_list argp;
+	va_start(argp, format);
+	vsprintf(nmsprintBuffer, format, argp);
+	va_end(argp);
+
+	if (display == NULL) {
+		display = malloc(strlen(nmsprintBuffer) + 1);
+		strcpy(display, nmsprintBuffer);
+	} else {
+		display = realloc(display, strlen(display) + strlen(nmsprintBuffer) + 1);
+		strcat(display, nmsprintBuffer);
 	}
-	nmsexec();
-
-	return 0;
+}
+
+
+/*
+ * void nmsexec(void)
+ *
+ * DESCR:
+ * Displays the characters stored in the display queue.
+ *
+ */
+void nmsexec(void) {
+	struct winpos *list_pointer = NULL;
+	struct winpos *start;                   // Always points to start of list
+	struct winpos *temp;                    // Used for free()ing the list
+	int termSizeRows, termSizeCols;
+	int c, n, x = 0, y = 0;
+	int r_time, r_time_l, r_time_s;
+	int ms, ls;
+	bool first = true;
+
+	// Start and initialize curses mode
+	initscr();
+	cbreak();
+	noecho();
+	scrollok(stdscr, true);
+
+	// Setting up and starting colors if terminal supports them
+	if (has_colors()) {
+		start_color();
+		init_pair(1, COLOR_BLUE, COLOR_BLACK);
+	}
+
+	// Get terminal window size
+	getmaxyx(stdscr, termSizeRows, termSizeCols);
+
+	// Seed my random number generator with the current time
+	srand(time(NULL));
+
+	// Geting input
+	n = 0;
+	while ((c = display[n++]) != '\0') {
+		if (c == NEWLINE) {
+			++y;
+			x = 0;
+		} else if (c == TAB && x + 4 <= termSizeCols) {
+			x += 4;
+		} else if (isspace(c)) {
+			if (++x > termSizeCols) {
+				++y;
+				x = 0;
+			}
+		} else {
+			if (first) {
+				list_pointer = malloc(sizeof(struct winpos));
+				start = list_pointer;
+				first = false;
+			} else {
+				list_pointer->next = malloc(sizeof(struct winpos));
+				list_pointer = list_pointer->next;
+			}
+
+			r_time = rand() % 50;
+			r_time_s = r_time * .25;
+			r_time_l = r_time * .75;
+			r_time *= 100;
+			r_time_s *= 100;
+			r_time_l *= 100;
+
+			list_pointer->source = c;
+			list_pointer->mask = getMaskChar();
+			list_pointer->row = y;
+			list_pointer->col = x;
+			list_pointer->s1_time = r_time > 1000 ? r_time_l : r_time;
+			list_pointer->s2_time = r_time > 1000 ? r_time_s : 0;
+			list_pointer->next = NULL;
+
+			if (++x > termSizeCols) {
+				++y;
+				x = 0;
+			}
+		}
+	}
+
+	// Freeing the display character array
+	free(display);
+
+	// Initially display the characters in the terminal with a 'type effect'.
+	ms = 5;             // miliseconds, used for usleep()
+	list_pointer = start;
+	while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
+		mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
+		refresh();
+		list_pointer->mask = getMaskChar();
+		list_pointer = list_pointer->next;
+		usleep(ms * 1000);
+	}
+
+	// TODO: pause with getchar() - something about the input stream being redirected
+	// to a file is causing getchar() to immediately return here.
+	sleep(1);
+
+	// Jumble loop
+	ms = 35;           // miliseconds, used for usleep()
+	ls = 2;            // loop seconds, number of seconds to loop
+	x = 0;
+	while (x < (ls * 1000) / ms) {
+		list_pointer = start;
+		while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
+			mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
+			refresh();
+			list_pointer->mask = getMaskChar();
+			list_pointer = list_pointer->next;
+		}
+		usleep(ms * 1000);
+		++x;
+	}
+
+
+	// Reveal loop
+	ms = 100;                     // miliseconds to sleep (must always evenly divisible by 5)
+	int s1_remask_time = 500;     // time, in milliseconds, we change the mask for stage 1
+	bool loop = true;
+	while (loop) {
+		loop = false;
+		list_pointer = start;
+		while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
+			if (list_pointer->s1_time > 0) {
+				loop = true;
+				list_pointer->s1_time -= ms;
+				if (list_pointer->s1_time % s1_remask_time == 0) {
+					list_pointer->mask = getMaskChar();
+				}
+			} else if (list_pointer->s2_time > 0) {
+				loop = true;
+				list_pointer->s2_time -= ms;
+				list_pointer->mask = getMaskChar();
+			} else {
+				list_pointer->mask = list_pointer->source;
+				attron(A_BOLD);
+				if (has_colors())
+					attron(COLOR_PAIR(1));
+			}
+			mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
+			refresh();
+			list_pointer = list_pointer->next;
+
+			attroff(A_BOLD);
+			if (has_colors())
+				attroff(COLOR_PAIR(1));
+		}
+		usleep(ms * 1000);
+	}
+
+	// Printing remaining characters from list if we stopped short due to 
+	// a terminal row limitation. i.e. the number of textual rows in the input
+	// stream were greater than the number of rows in the terminal.
+	int prevRow;
+	if (list_pointer != NULL) {
+		attron(A_BOLD);
+		if (has_colors())
+			attron(COLOR_PAIR(1));
+		prevRow = list_pointer->row;
+		scroll(stdscr);
+		while (list_pointer != NULL) {
+			while (list_pointer->row > prevRow) {
+				scroll(stdscr);
+				++prevRow;
+			}
+			mvaddch(termSizeRows -1, list_pointer->col, list_pointer->source);
+			refresh();
+			//mvaddch(0, 0, list_pointer->source);
+			list_pointer = list_pointer->next;
+		}
+		attroff(A_BOLD);
+		if (has_colors())
+			attroff(COLOR_PAIR(1));
+	}
+
+	// End curses mode
+	endwin();
+
+	// Freeing the list. 
+	list_pointer = start;
+	while (list_pointer != NULL) {
+		temp = list_pointer;
+		list_pointer = list_pointer->next;
+		free(temp);
+	}
+}
+
+/*
+ * void getMaskChar(void)
+ *
+ * DESCR:
+ * Returns a random character from the maskChars string. Used for generating
+ * a corresponding 'mask' character for each character in the display queue.
+ *
+ */
+char getMaskChar(void) {
+	char *maskChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	                  "abcdefghijklmnopqrstuvwxyz"
+	                  "1234567890"
+	                  "!@#$%^&*()-_=+{}[]:;|\\\"'<>,.?/";
+
+	return maskChars[rand() % strlen(maskChars)];
 }
diff --git a/src/nms.h b/src/nms.h
index d0b6066..bff7aa6 100644
--- a/src/nms.h
+++ b/src/nms.h
@@ -1,273 +1,13 @@
-// Copyright (c) 2016 Brian Barto
-//
-// This program is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3 of the License, or (at your option)
-// any later version.  See COPYING for more details.
+#ifndef NMS_H
+#define NMS_H 1
 
-#include <stdio.h>
-#include <ncurses.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdbool.h>
-#include <time.h>
-#include <stdarg.h>
-
-#define SPACE      32
-#define NEWLINE    10
-#define TAB        9
-
-// Window position structure, linked list. Keeps track of every
-// character's position on the terminal, as well as other attributes.
-struct winpos {
-	char source;
-	char mask;
-	int row;
-	int col;
-	int s1_time;
-	int s2_time;
-	struct winpos *next;
-};
-
-// Globals
-static char *display = NULL;
 
 // Function prototypes
+
+// Load characters in to the display queue
 void nmsprintf(const char *, ...);
+
+// Display the characters stored in the display queue
 void nmsexec(void);
-char getMaskChar(void);
 
-/*
- * void nmsprintf(const char *format, ...)
- *
- * DESCR:
- * Used to load characters in to the display queue that will later
- * be rendered on tothe screen via nmsexec(). It is a wrapper for 
- * sprintf(), and the parameters that it accepts are the same.
- *
- * PARAMS:
- * const char *format - printf-style format string
- */
-void nmsprintf(const char *format, ...) {
-	char nmsprintBuffer[10000];
-
-	va_list argp;
-	va_start(argp, format);
-	vsprintf(nmsprintBuffer, format, argp);
-	va_end(argp);
-
-	if (display == NULL) {
-		display = malloc(strlen(nmsprintBuffer) + 1);
-		strcpy(display, nmsprintBuffer);
-	} else {
-		display = realloc(display, strlen(display) + strlen(nmsprintBuffer) + 1);
-		strcat(display, nmsprintBuffer);
-	}
-}
-
-
-/*
- * void nmsexec(void)
- *
- * DESCR:
- * Displays the characters stored in the display queue.
- *
- */
-void nmsexec(void) {
-	struct winpos *list_pointer = NULL;
-	struct winpos *start;                   // Always points to start of list
-	struct winpos *temp;                    // Used for free()ing the list
-	int termSizeRows, termSizeCols;
-	int c, n, x = 0, y = 0;
-	int r_time, r_time_l, r_time_s;
-	int ms, ls;
-	bool first = true;
-
-	// Start and initialize curses mode
-	initscr();
-	cbreak();
-	noecho();
-	scrollok(stdscr, true);
-
-	// Setting up and starting colors if terminal supports them
-	if (has_colors()) {
-		start_color();
-		init_pair(1, COLOR_BLUE, COLOR_BLACK);
-	}
-
-	// Get terminal window size
-	getmaxyx(stdscr, termSizeRows, termSizeCols);
-
-	// Seed my random number generator with the current time
-	srand(time(NULL));
-
-	// Geting input
-	n = 0;
-	while ((c = display[n++]) != '\0') {
-		if (c == NEWLINE) {
-			++y;
-			x = 0;
-		} else if (c == TAB && x + 4 <= termSizeCols) {
-			x += 4;
-		} else if (isspace(c)) {
-			if (++x > termSizeCols) {
-				++y;
-				x = 0;
-			}
-		} else {
-			if (first) {
-				list_pointer = malloc(sizeof(struct winpos));
-				start = list_pointer;
-				first = false;
-			} else {
-				list_pointer->next = malloc(sizeof(struct winpos));
-				list_pointer = list_pointer->next;
-			}
-
-			r_time = rand() % 50;
-			r_time_s = r_time * .25;
-			r_time_l = r_time * .75;
-			r_time *= 100;
-			r_time_s *= 100;
-			r_time_l *= 100;
-
-			list_pointer->source = c;
-			list_pointer->mask = getMaskChar();
-			list_pointer->row = y;
-			list_pointer->col = x;
-			list_pointer->s1_time = r_time > 1000 ? r_time_l : r_time;
-			list_pointer->s2_time = r_time > 1000 ? r_time_s : 0;
-			list_pointer->next = NULL;
-
-			if (++x > termSizeCols) {
-				++y;
-				x = 0;
-			}
-		}
-	}
-
-	// Freeing the display character array
-	free(display);
-
-	// Initially display the characters in the terminal with a 'type effect'.
-	ms = 5;             // miliseconds, used for usleep()
-	list_pointer = start;
-	while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
-		mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
-		refresh();
-		list_pointer->mask = getMaskChar();
-		list_pointer = list_pointer->next;
-		usleep(ms * 1000);
-	}
-
-	// TODO: pause with getchar() - something about the input stream being redirected
-	// to a file is causing getchar() to immediately return here.
-	sleep(1);
-
-	// Jumble loop
-	ms = 35;           // miliseconds, used for usleep()
-	ls = 2;            // loop seconds, number of seconds to loop
-	x = 0;
-	while (x < (ls * 1000) / ms) {
-		list_pointer = start;
-		while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
-			mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
-			refresh();
-			list_pointer->mask = getMaskChar();
-			list_pointer = list_pointer->next;
-		}
-		usleep(ms * 1000);
-		++x;
-	}
-
-
-	// Reveal loop
-	ms = 100;                     // miliseconds to sleep (must always evenly divisible by 5)
-	int s1_remask_time = 500;     // time, in milliseconds, we change the mask for stage 1
-	bool loop = true;
-	while (loop) {
-		loop = false;
-		list_pointer = start;
-		while (list_pointer != NULL && list_pointer->row <= termSizeRows) {
-			if (list_pointer->s1_time > 0) {
-				loop = true;
-				list_pointer->s1_time -= ms;
-				if (list_pointer->s1_time % s1_remask_time == 0) {
-					list_pointer->mask = getMaskChar();
-				}
-			} else if (list_pointer->s2_time > 0) {
-				loop = true;
-				list_pointer->s2_time -= ms;
-				list_pointer->mask = getMaskChar();
-			} else {
-				list_pointer->mask = list_pointer->source;
-				attron(A_BOLD);
-				if (has_colors())
-					attron(COLOR_PAIR(1));
-			}
-			mvaddch(list_pointer->row, list_pointer->col, list_pointer->mask);
-			refresh();
-			list_pointer = list_pointer->next;
-
-			attroff(A_BOLD);
-			if (has_colors())
-				attroff(COLOR_PAIR(1));
-		}
-		usleep(ms * 1000);
-	}
-
-	// Printing remaining characters from list if we stopped short due to 
-	// a terminal row limitation. i.e. the number of textual rows in the input
-	// stream were greater than the number of rows in the terminal.
-	int prevRow;
-	if (list_pointer != NULL) {
-		attron(A_BOLD);
-		if (has_colors())
-			attron(COLOR_PAIR(1));
-		prevRow = list_pointer->row;
-		scroll(stdscr);
-		while (list_pointer != NULL) {
-			while (list_pointer->row > prevRow) {
-				scroll(stdscr);
-				++prevRow;
-			}
-			mvaddch(termSizeRows -1, list_pointer->col, list_pointer->source);
-			refresh();
-			//mvaddch(0, 0, list_pointer->source);
-			list_pointer = list_pointer->next;
-		}
-		attroff(A_BOLD);
-		if (has_colors())
-			attroff(COLOR_PAIR(1));
-	}
-
-	// End curses mode
-	endwin();
-
-	// Freeing the list. 
-	list_pointer = start;
-	while (list_pointer != NULL) {
-		temp = list_pointer;
-		list_pointer = list_pointer->next;
-		free(temp);
-	}
-}
-
-/*
- * void getMaskChar(void)
- *
- * DESCR:
- * Returns a random character from the maskChars string. Used for generating
- * a corresponding 'mask' character for each character in the display queue.
- *
- */
-char getMaskChar(void) {
-	char *maskChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	                  "abcdefghijklmnopqrstuvwxyz"
-	                  "1234567890"
-	                  "!@#$%^&*()-_=+{}[]:;|\\\"'<>,.?/";
-
-	return maskChars[rand() % strlen(maskChars)];
-}
+#endif