greg/no-more-secrets-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make module for character set to allow easy substitution with different set.

Browse Source 
modified:   Makefile
	new file:   src/nmscharset.c
	new file:   src/nmscharset.h
	modified:   src/nmseffect.c
This commit is contained in:
Brian Barto 2017-01-19 12:08:20 -05:00
parent 8a09f36cee
commit 272e780adf
4 changed files with 81 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -17,20 +17,20 @@ CFLAGS ?= -Wextra -Wall
.PHONY: all install uninstall clean .PHONY: all install uninstall clean
nms: $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) nms: $(OBJ)/nmscharset.o $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN)
$(CC) $(CFLAGS) -o $(BIN)/$@ $^ $(CC) $(CFLAGS) -o $(BIN)/$@ $^
sneakers: $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN) sneakers: $(OBJ)/nmscharset.o $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN)
$(CC) $(CFLAGS) -o $(BIN)/$@ $^ $(CC) $(CFLAGS) -o $(BIN)/$@ $^
all: nms sneakers all: nms sneakers
all-ncurses: nms-ncurses sneakers-ncurses all-ncurses: nms-ncurses sneakers-ncurses
nms-ncurses: $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) nms-ncurses: $(OBJ)/nmscharset.o $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN)
$(CC) $(CFLAGS) -o $(BIN)/nms $^ -lncurses $(CC) $(CFLAGS) -o $(BIN)/nms $^ -lncurses
sneakers-ncurses: $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN) sneakers-ncurses: $(OBJ)/nmscharset.o $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN)
$(CC) $(CFLAGS) -o $(BIN)/sneakers $^ -lncurses $(CC) $(CFLAGS) -o $(BIN)/sneakers $^ -lncurses
$(OBJ)/%.o: $(SRC)/%.c | $(OBJ) $(OBJ)/%.o: $(SRC)/%.c | $(OBJ)

53
src/nmscharset.c Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2017 Brian Barto
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the MIT License. See LICENSE for more details.
*/
#include <stdlib.h>
#define MASK_CHAR_COUNT 218 // Total characters in charTable[] array.
// Character table representing the character set know as CP437 used by
// the original IBM PC - https://en.wikipedia.org/wiki/Code_page_437
static char *charTable[] = {
"!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", "~",
".", "/", ":", ";", "<", "=", ">", "?", "[", "\\", "]", "_", "{", "}",
"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
"N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
"n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
"\xc3\x87", "\xc3\xbc", "\xc3\xa9", "\xc3\xa2", "\xc3\xa4", "\xc3\xa0",
"\xc3\xa5", "\xc3\xa7", "\xc3\xaa", "\xc3\xab", "\xc3\xa8", "\xc3\xaf",
"\xc3\xae", "\xc3\xac", "\xc3\x84", "\xc3\x85", "\xc3\x89", "\xc3\xa6",
"\xc3\x86", "\xc3\xb4", "\xc3\xb6", "\xc3\xb2", "\xc3\xbb", "\xc3\xb9",
"\xc3\xbf", "\xc3\x96", "\xc3\x9c", "\xc2\xa2", "\xc2\xa3", "\xc2\xa5",
"\xc6\x92", "\xc3\xa1", "\xc3\xad", "\xc3\xb3", "\xc3\xba", "\xc3\xb1",
"\xc3\x91", "\xc2\xaa", "\xc2\xba", "\xc2\xbf", "\xc2\xac", "\xc2\xbd",
"\xc2\xbc", "\xc2\xa1", "\xc2\xab", "\xc2\xbb", "\xce\xb1", "\xc3\x9f",
"\xce\x93", "\xcf\x80", "\xce\xa3", "\xcf\x83", "\xc2\xb5", "\xcf\x84",
"\xce\xa6", "\xce\x98", "\xce\xa9", "\xce\xb4", "\xcf\x86", "\xce\xb5",
"\xc2\xb1", "\xc3\xb7", "\xc2\xb0", "\xc2\xb7", "\xc2\xb2", "\xc2\xb6",
"\xe2\x8c\x90", "\xe2\x82\xa7", "\xe2\x96\x91", "\xe2\x96\x92",
"\xe2\x96\x93", "\xe2\x94\x82", "\xe2\x94\xa4", "\xe2\x95\xa1",
"\xe2\x95\xa2", "\xe2\x95\x96", "\xe2\x95\x95", "\xe2\x95\xa3",
"\xe2\x95\x91", "\xe2\x95\x97", "\xe2\x95\x9d", "\xe2\x95\x9c",
"\xe2\x95\x9b", "\xe2\x94\x90", "\xe2\x94\x94", "\xe2\x94\xb4",
"\xe2\x94\xac", "\xe2\x94\x9c", "\xe2\x94\x80", "\xe2\x94\xbc",
"\xe2\x95\x9e", "\xe2\x95\x9f", "\xe2\x95\x9a", "\xe2\x95\x94",
"\xe2\x95\xa9", "\xe2\x95\xa6", "\xe2\x95\xa0", "\xe2\x95\x90",
"\xe2\x95\xac", "\xe2\x95\xa7", "\xe2\x95\xa8", "\xe2\x95\xa4",
"\xe2\x95\xa7", "\xe2\x95\x99", "\xe2\x95\x98", "\xe2\x95\x92",
"\xe2\x95\x93", "\xe2\x95\xab", "\xe2\x95\xaa", "\xe2\x94\x98",
"\xe2\x94\x8c", "\xe2\x96\x88", "\xe2\x96\x84", "\xe2\x96\x8c",
"\xe2\x96\x90", "\xe2\x96\x80", "\xe2\x88\x9e", "\xe2\x88\xa9",
"\xe2\x89\xa1", "\xe2\x89\xa5", "\xe2\x89\xa4", "\xe2\x8c\xa0",
"\xe2\x8c\xa1", "\xe2\x89\x88", "\xe2\x88\x99", "\xe2\x88\x9a",
"\xe2\x81\xbf", "\xe2\x96\xa0"
};
char *nmscharset_get_random(void) {
return charTable[rand() % MASK_CHAR_COUNT];
}

14
src/nmscharset.h Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright (c) 2017 Brian Barto
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the MIT License. See LICENSE for more details.
*/
#ifndef NMSCHARSET_H
#define NMSCHARSET_H 1
// Function prototypes
char *nmscharset_get_random(void);
#endif

59
src/nmseffect.c
View File

@ -17,13 +17,13 @@
#include <wchar.h> #include <wchar.h>
#include "nmseffect.h" #include "nmseffect.h"
#include "nmstermio.h" #include "nmstermio.h"
#include "nmscharset.h"
// Program settings // Program settings
#define TYPE_EFFECT_SPEED 4 // miliseconds per char #define TYPE_EFFECT_SPEED 4 // miliseconds per char
#define JUMBLE_SECONDS 2 // number of seconds for jumble effect #define JUMBLE_SECONDS 2 // number of seconds for jumble effect
#define JUMBLE_LOOP_SPEED 35 // miliseconds between each jumble #define JUMBLE_LOOP_SPEED 35 // miliseconds between each jumble
#define REVEAL_LOOP_SPEED 50 // miliseconds between each reveal loop #define REVEAL_LOOP_SPEED 50 // miliseconds between each reveal loop
#define MASK_CHAR_COUNT 218 // Total characters in maskCharTable[] array.
// Character attribute structure, linked list. Keeps track of every // Character attribute structure, linked list. Keeps track of every
// character's attributes required for rendering and decryption effect. // character's attributes required for rendering and decryption effect.
@ -46,45 +46,6 @@ static int colorOn = 1; // Terminal color flag
static int inputPositionX = -1; // X coordinate for input position static int inputPositionX = -1; // X coordinate for input position
static int inputPositionY = -1; // Y coordinate for input position static int inputPositionY = -1; // Y coordinate for input position
// Character table representing the character set know as CP437 used by
// the original IBM PC - https://en.wikipedia.org/wiki/Code_page_437
static char *maskCharTable[] = {
"!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", "~",
".", "/", ":", ";", "<", "=", ">", "?", "[", "\\", "]", "_", "{", "}",
"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
"N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
"n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
"\xc3\x87", "\xc3\xbc", "\xc3\xa9", "\xc3\xa2", "\xc3\xa4", "\xc3\xa0",
"\xc3\xa5", "\xc3\xa7", "\xc3\xaa", "\xc3\xab", "\xc3\xa8", "\xc3\xaf",
"\xc3\xae", "\xc3\xac", "\xc3\x84", "\xc3\x85", "\xc3\x89", "\xc3\xa6",
"\xc3\x86", "\xc3\xb4", "\xc3\xb6", "\xc3\xb2", "\xc3\xbb", "\xc3\xb9",
"\xc3\xbf", "\xc3\x96", "\xc3\x9c", "\xc2\xa2", "\xc2\xa3", "\xc2\xa5",
"\xc6\x92", "\xc3\xa1", "\xc3\xad", "\xc3\xb3", "\xc3\xba", "\xc3\xb1",
"\xc3\x91", "\xc2\xaa", "\xc2\xba", "\xc2\xbf", "\xc2\xac", "\xc2\xbd",
"\xc2\xbc", "\xc2\xa1", "\xc2\xab", "\xc2\xbb", "\xce\xb1", "\xc3\x9f",
"\xce\x93", "\xcf\x80", "\xce\xa3", "\xcf\x83", "\xc2\xb5", "\xcf\x84",
"\xce\xa6", "\xce\x98", "\xce\xa9", "\xce\xb4", "\xcf\x86", "\xce\xb5",
"\xc2\xb1", "\xc3\xb7", "\xc2\xb0", "\xc2\xb7", "\xc2\xb2", "\xc2\xb6",
"\xe2\x8c\x90", "\xe2\x82\xa7", "\xe2\x96\x91", "\xe2\x96\x92",
"\xe2\x96\x93", "\xe2\x94\x82", "\xe2\x94\xa4", "\xe2\x95\xa1",
"\xe2\x95\xa2", "\xe2\x95\x96", "\xe2\x95\x95", "\xe2\x95\xa3",
"\xe2\x95\x91", "\xe2\x95\x97", "\xe2\x95\x9d", "\xe2\x95\x9c",
"\xe2\x95\x9b", "\xe2\x94\x90", "\xe2\x94\x94", "\xe2\x94\xb4",
"\xe2\x94\xac", "\xe2\x94\x9c", "\xe2\x94\x80", "\xe2\x94\xbc",
"\xe2\x95\x9e", "\xe2\x95\x9f", "\xe2\x95\x9a", "\xe2\x95\x94",
"\xe2\x95\xa9", "\xe2\x95\xa6", "\xe2\x95\xa0", "\xe2\x95\x90",
"\xe2\x95\xac", "\xe2\x95\xa7", "\xe2\x95\xa8", "\xe2\x95\xa4",
"\xe2\x95\xa7", "\xe2\x95\x99", "\xe2\x95\x98", "\xe2\x95\x92",
"\xe2\x95\x93", "\xe2\x95\xab", "\xe2\x95\xaa", "\xe2\x94\x98",
"\xe2\x94\x8c", "\xe2\x96\x88", "\xe2\x96\x84", "\xe2\x96\x8c",
"\xe2\x96\x90", "\xe2\x96\x80", "\xe2\x88\x9e", "\xe2\x88\xa9",
"\xe2\x89\xa1", "\xe2\x89\xa5", "\xe2\x89\xa4", "\xe2\x8c\xa0",
"\xe2\x8c\xa1", "\xe2\x89\x88", "\xe2\x88\x99", "\xe2\x88\x9a",
"\xe2\x81\xbf", "\xe2\x96\xa0"
};
/* /*
* nmseffect_exec() - This function is passed a pointer to a character string * nmseffect_exec() - This function is passed a pointer to a character string
* and displays the contents of the string in a way that mimicks the * and displays the contents of the string in a way that mimicks the
@ -114,6 +75,9 @@ char nmseffect_exec(char *string) {
// Needed for UTF-8 support // Needed for UTF-8 support
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
// Seed my random number generator with the current time
srand(time(NULL));
// Initialize terminal // Initialize terminal
nmstermio_init_terminal(); nmstermio_init_terminal();
@ -130,9 +94,6 @@ char nmseffect_exec(char *string) {
maxRows = nmstermio_get_rows(); maxRows = nmstermio_get_rows();
maxCols = nmstermio_get_cols(); maxCols = nmstermio_get_cols();
// Seed my random number generator with the current time
srand(time(NULL));
// Assign current row/col positions // Assign current row/col positions
curRow = origRow; curRow = origRow;
curCol = origCol; curCol = origCol;
@ -173,7 +134,7 @@ char nmseffect_exec(char *string) {
list_pointer->is_space = 0; list_pointer->is_space = 0;
// Set initial mask chharacter // Set initial mask chharacter
list_pointer->mask = maskCharTable[rand() % MASK_CHAR_COUNT]; list_pointer->mask = nmscharset_get_random();
// Set reveal time // Set reveal time
list_pointer->time = rand() % 5000; list_pointer->time = rand() % 5000;
@ -209,7 +170,7 @@ char nmseffect_exec(char *string) {
// print mask character // print mask character
nmstermio_print_string(list_pointer->mask); nmstermio_print_string(list_pointer->mask);
if (list_pointer->width == 2) { if (list_pointer->width == 2) {
nmstermio_print_string(maskCharTable[rand() % MASK_CHAR_COUNT]); nmstermio_print_string(nmscharset_get_random());
} }
// flush output and sleep // flush output and sleep
@ -243,9 +204,9 @@ char nmseffect_exec(char *string) {
} }
// print new mask character // print new mask character
nmstermio_print_string(maskCharTable[rand() % MASK_CHAR_COUNT]); nmstermio_print_string(nmscharset_get_random());
if (list_pointer->width == 2) { if (list_pointer->width == 2) {
nmstermio_print_string(maskCharTable[rand() % MASK_CHAR_COUNT]); nmstermio_print_string(nmscharset_get_random());
} }
} }
@ -277,11 +238,11 @@ char nmseffect_exec(char *string) {
// Change the mask randomly // Change the mask randomly
if (list_pointer->time < 500) { if (list_pointer->time < 500) {
if (rand() % 3 == 0) { if (rand() % 3 == 0) {
list_pointer->mask = maskCharTable[rand() % MASK_CHAR_COUNT]; list_pointer->mask = nmscharset_get_random();
} }
} else { } else {
if (rand() % 10 == 0) { if (rand() % 10 == 0) {
list_pointer->mask = maskCharTable[rand() % MASK_CHAR_COUNT]; list_pointer->mask = nmscharset_get_random();
} }
} }