From dd89bbc721e72d49167bd1dab750c14129b836e6 Mon Sep 17 00:00:00 2001 From: Brian Barto Date: Fri, 8 Apr 2016 15:34:07 -0400 Subject: [PATCH] Added getMaskChar function. Also swapped out some explicit null pointers with NULL modified: src/nms.c --- src/nms.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/nms.c b/src/nms.c index 45932f3..4ddb50c 100644 --- a/src/nms.c +++ b/src/nms.c @@ -1,9 +1,11 @@ #include #include +#include #include #include #include #include +#include #define SPACE 32 #define NEWLINE 10 @@ -11,10 +13,12 @@ int getTermSizeRows(void); int getTermSizeCols(void); void clearTermWindow(int, int); +char getMaskChar(void); int main(void) { struct winpos { char source; + char mask; int row; int col; struct winpos *next; @@ -25,6 +29,9 @@ int main(void) { int termSizeRows = getTermSizeRows(); int termSizeCols = getTermSizeCols(); + // Seed my random number generator with the current time + srand(time(NULL)); + // Geting input int c, x = 1, y = 1; bool first = true; @@ -45,9 +52,10 @@ int main(void) { } list_pointer->source = c; + list_pointer->mask = getMaskChar(); list_pointer->row = y; list_pointer->col = x; - list_pointer->next = (struct winpos *) 0; + list_pointer->next = NULL; ++x; } @@ -57,16 +65,15 @@ int main(void) { // Printing the list list_pointer = start; - while (list_pointer != (struct winpos *) 0) { - printf("row: %i, ", list_pointer->row); - printf("col: %i, ", list_pointer->col); - printf("char: %c\n", list_pointer->source); + while (list_pointer != NULL) { + printf("\033[%i;%iH%c", list_pointer->row, list_pointer->col, list_pointer->mask); list_pointer = list_pointer->next; } + printf("\n"); // Freeing the list. list_pointer = start; - while (list_pointer != (struct winpos *) 0) { + while (list_pointer != NULL) { temp = list_pointer; list_pointer = list_pointer->next; free(temp); @@ -103,3 +110,11 @@ void clearTermWindow(int pRows, int pCols) { // Position cursor at the top printf("\033[%i;%iH", 1, 1); } + +char getMaskChar(void) { + char *maskChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "1234567890"; + + return maskChars[rand() % strlen(maskChars)]; +}