Seperated animation functions from drawing functions for easier extendability

makefile

@@ -2,7 +2,7 @@ NAME = ly
 CC = gcc
 FLAGS = -std=c99 -pedantic -g
 FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter
-#FLAGS+= -DDEBUG
+FLAGS+= -DDEBUG
 FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\"
 LINK = -lpam -lxcb
 VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp
@@ -36,6 +36,7 @@ SRCS += $(SRCD)/draw.c
 SRCS += $(SRCD)/inputs.c
 SRCS += $(SRCD)/login.c
 SRCS += $(SRCD)/utils.c
+SRCS += $(SRCD)/animations.c
 SRCS += $(SUBD)/argoat/src/argoat.c
 SRCS += $(SUBD)/configator/src/configator.c
 SRCS += $(SUBD)/dragonfail/src/dragonfail.c

src/animations.c

@@ -0,0 +1,406 @@
+#include "dragonfail.h"
+#include "termbox.h"
+
+#include "inputs.h"
+#include "utils.h"
+#include "config.h"
+#include "draw.h"
+#include "animations.h"
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+	#include <sys/kbio.h>
+#else // linux
+	#include <linux/kd.h>
+#endif
+
+#define DOOM_STEPS 13
+
+static void doom_free(struct term_buf* buf);
+static void matrix_free(struct term_buf* buf);
+
+
+
+// Adapted from cmatrix
+static void matrix_init(struct term_buf* buf)
+{
+	buf->init_width = buf->width;
+	buf->init_height = buf->height;
+	buf->astate = malloc(sizeof(struct matrix_state));
+    // cast state to matrix_state pointer
+	struct matrix_state* s = (struct matrix_state*)buf->astate;
+
+	if (s == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	uint16_t len = buf->height + 1;
+	s->grid = malloc(sizeof(struct matrix_dot*) * len);
+
+	if (s->grid == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	len = (buf->height + 1) * buf->width;
+	(s->grid)[0] = malloc(sizeof(struct matrix_dot) * len);
+
+	if ((s->grid)[0] == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	for (int i = 1; i <= buf->height; ++i)
+	{
+		s->grid[i] = s->grid[i - 1] + buf->width;
+
+		if (s->grid[i] == NULL)
+		{
+			dgn_throw(DGN_ALLOC);
+		}
+	}
+
+	s->length = malloc(buf->width * sizeof(int));
+
+	if (s->length == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	s->spaces = malloc(buf->width * sizeof(int));
+
+	if (s->spaces == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	s->updates = malloc(buf->width * sizeof(int));
+
+	if (s->updates == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	// Initialize grid
+	for (int i = 0; i <= buf->height; ++i)
+	{
+		for (int j = 0; j <= buf->width - 1; j += 2)
+		{
+			s->grid[i][j].val = -1;
+		}
+	}
+
+	for (int j = 0; j < buf->width; j += 2)
+	{
+		s->spaces[j] = (int) rand() % buf->height + 1;
+		s->length[j] = (int) rand() % (buf->height - 3) + 3;
+		s->grid[1][j].val = ' ';
+		s->updates[j] = (int) rand() % 3 + 1;
+	}
+}
+
+static void matrix_free(struct term_buf* buf)
+{
+    // casting state to matrix_state pointer
+	free(((struct matrix_state*)buf->astate)->grid[0]);
+	free(((struct matrix_state*)buf->astate)->grid);
+	free(((struct matrix_state*)buf->astate)->length);
+	free(((struct matrix_state*)buf->astate)->spaces);
+	free(((struct matrix_state*)buf->astate)->updates);
+	free(buf->astate);
+}
+
+// Adapted from cmatrix
+static void matrix(struct term_buf* buf)
+{
+	static int frame = 3;
+	const int frame_delay = 8;
+	static int count = 0;
+	bool first_col;
+	struct matrix_state* s = ((struct matrix_state*)buf->astate);
+
+	// Allowed codepoints
+	const int randmin = 33;
+	const int randnum = 123 - randmin;
+	// Chars change mid-scroll
+	const bool changes = true;
+
+	if ((buf->width != buf->init_width) || (buf->height != buf->init_height))
+	{
+		return;
+	}
+
+	count += 1;
+	if (count > frame_delay) {
+		frame += 1;
+		if (frame > 4) frame = 1;
+		count = 0;
+
+		for (int j = 0; j < buf->width; j += 2)
+		{
+			int tail;
+			if (frame > s->updates[j])
+			{
+				if (s->grid[0][j].val == -1 && s->grid[1][j].val == ' ')
+				{
+					if (s->spaces[j] > 0)
+					{
+						s->spaces[j]--;
+					} else {
+						s->length[j] = (int) rand() % (buf->height - 3) + 3;
+						s->grid[0][j].val = (int) rand() % randnum + randmin;
+						s->spaces[j] = (int) rand() % buf->height + 1;
+					}
+				}
+
+				int i = 0, seg_len = 0;
+				first_col = 1;
+				while (i <= buf->height)
+				{
+					// Skip over spaces
+					while (i <= buf->height
+							&& (s->grid[i][j].val == ' ' || s->grid[i][j].val == -1))
+					{
+						i++;
+					}
+
+					if (i > buf->height) break;
+
+					// Find the head of this col
+					tail = i;
+					seg_len = 0;
+					while (i <= buf->height
+							&& (s->grid[i][j].val != ' ' && s->grid[i][j].val != -1))
+					{
+						s->grid[i][j].is_head = false;
+						if (changes)
+						{
+							if (rand() % 8 == 0)
+								s->grid[i][j].val = (int) rand() % randnum + randmin;
+						}
+						i++;
+						seg_len++;
+					}
+
+					// Head's down offscreen
+					if (i > buf->height)
+					{
+						s->grid[tail][j].val = ' ';
+						continue;
+					}
+
+					s->grid[i][j].val = (int) rand() % randnum + randmin;
+					s->grid[i][j].is_head = true;
+
+					if (seg_len > s->length[j] || !first_col) {
+						s->grid[tail][j].val = ' ';
+						s->grid[0][j].val = -1;
+					}
+					first_col = 0;
+					i++;
+				}
+			}
+		}
+	}
+
+	uint32_t blank;
+	utf8_char_to_unicode(&blank, " ");
+
+	for (int j = 0; j < buf->width; j += 2) {
+		for (int i = 1; i <= buf->height; ++i)
+		{
+			uint32_t c;
+			int fg = TB_GREEN;
+			int bg = TB_DEFAULT;
+
+			if (s->grid[i][j].val == -1 || s->grid[i][j].val == ' ')
+			{
+				tb_change_cell(j, i - 1, blank, fg, bg);
+				continue;
+			}
+
+			char tmp[2];
+			tmp[0] = s->grid[i][j].val;
+			tmp[1] = '\0';
+			if(utf8_char_to_unicode(&c, tmp))
+			{
+				if (s->grid[i][j].is_head)
+				{
+					fg = TB_WHITE | TB_BOLD;
+				}
+				tb_change_cell(j, i - 1, c, fg, bg);
+			}
+		}
+	}
+}
+
+// doom functions 
+static void doom_init(struct term_buf* buf)
+{
+	buf->init_width = buf->width;
+	buf->init_height = buf->height;
+	buf->astate = malloc(sizeof(struct doom_state));
+
+	if (buf->astate == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	uint16_t tmp_len = buf->width * buf->height;
+    // cast state to doom_state pointer
+    struct doom_state* d = (struct doom_state*)buf->astate;
+	d->buf = malloc(tmp_len);
+	tmp_len -= buf->width;
+
+	if (((struct doom_state*)buf->astate)->buf == NULL)
+	{
+		dgn_throw(DGN_ALLOC);
+	}
+
+	memset(d->buf, 0, tmp_len);
+	memset(d->buf + tmp_len, DOOM_STEPS - 1, buf->width);
+}
+
+static void doom_free(struct term_buf* buf)
+{
+    // cast state to doom_state pointer
+	free(((struct doom_state*)buf->astate)->buf);
+	free(buf->astate);
+}
+
+static void doom(struct term_buf* term_buf)
+{
+	static struct tb_cell fire[DOOM_STEPS] =
+	{
+		{' ', 9, 0}, // default
+		{0x2591, 2, 0}, // red
+		{0x2592, 2, 0}, // red
+		{0x2593, 2, 0}, // red
+		{0x2588, 2, 0}, // red
+		{0x2591, 4, 2}, // yellow
+		{0x2592, 4, 2}, // yellow
+		{0x2593, 4, 2}, // yellow
+		{0x2588, 4, 2}, // yellow
+		{0x2591, 8, 4}, // white
+		{0x2592, 8, 4}, // white
+		{0x2593, 8, 4}, // white
+		{0x2588, 8, 4}, // white
+	};
+
+	uint16_t src;
+	uint16_t random;
+	uint16_t dst;
+
+	uint16_t w = term_buf->init_width;
+	uint8_t* tmp = ((struct doom_state*)term_buf->astate)->buf;
+
+	if ((term_buf->width != term_buf->init_width) || (term_buf->height != term_buf->init_height))
+	{
+		return;
+	}
+
+	struct tb_cell* buf = tb_cell_buffer();
+
+	for (uint16_t x = 0; x < w; ++x)
+	{
+		for (uint16_t y = 1; y < term_buf->init_height; ++y)
+		{
+			src = y * w + x;
+			random = ((rand() % 7) & 3);
+			dst = src - random + 1;
+
+			if (w > dst)
+			{
+				dst = 0;
+			}
+			else
+			{
+				dst -= w;
+			}
+
+			tmp[dst] = tmp[src] - (random & 1);
+
+			if (tmp[dst] > 12)
+			{
+				tmp[dst] = 0;
+			}
+
+			buf[dst] = fire[tmp[dst]];
+			buf[src] = fire[tmp[src]];
+		}
+	}
+}
+
+
+
+void animate_free(struct term_buf* buf)
+{
+	if (config.animate)
+	{
+		switch (config.animation)
+		{
+			case 0:
+				doom_free(buf);
+				break;
+			case 1:
+				matrix_free(buf);
+				break;
+		}
+	}
+}
+
+void animate(struct term_buf* buf)
+{
+	buf->width = tb_width();
+	buf->height = tb_height();
+
+	if (config.animate)
+	{
+		switch(config.animation)
+		{
+			case 0:
+			{
+				doom(buf);
+				break;
+			}
+			case 1:
+			{
+				matrix(buf);
+				break;
+			}
+		}
+	}
+}
+
+void animate_init(struct term_buf* buf)
+{
+	if (config.animate)
+	{
+		switch(config.animation)
+		{
+			case 0:
+			{
+				doom_init(buf);
+				break;
+			}
+			case 1:
+			{
+				matrix_init(buf);
+				break;
+			}
+		}
+	}
+}
+
+
+

src/animations.h

@@ -0,0 +1,35 @@
+#ifndef H_LY_ANIMATIONS
+#define H_LY_ANIMATIONS
+
+#include "termbox.h"
+#include "inputs.h"
+#include "draw.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+
+struct matrix_dot
+{
+	int val;
+	bool is_head;
+};
+
+struct matrix_state
+{
+	struct matrix_dot** grid;
+	int* length;
+	int* spaces;
+	int* updates;
+};
+
+struct doom_state
+{
+	uint8_t* buf;
+};
+
+void animate_init(struct term_buf*);
+void animate_free(struct term_buf*);
+void animate(struct term_buf*);
+
+#endif

src/draw.c

@@ -22,8 +22,6 @@
 	#include <linux/kd.h>
 #endif
 
-#define DOOM_STEPS 13
-
 void draw_init(struct term_buf* buf)
 {
 	buf->width = tb_width();
@@ -69,24 +67,6 @@ void draw_init(struct term_buf* buf)
 #endif
 }
 
-static void doom_free(struct term_buf* buf);
-static void matrix_free(struct term_buf* buf);
-
-void draw_free(struct term_buf* buf)
-{
-	if (config.animate)
-	{
-		switch (config.animation)
-		{
-			case 0:
-				doom_free(buf);
-				break;
-			case 1:
-				matrix_free(buf);
-				break;
-		}
-	}
-}
 
 void draw_box(struct term_buf* buf)
 {
@@ -488,353 +468,6 @@ void position_input(
 	password->visible_len = len;
 }
 
-static void doom_init(struct term_buf* buf)
-{
-	buf->init_width = buf->width;
-	buf->init_height = buf->height;
-	buf->astate.doom = malloc(sizeof(struct doom_state));
-
-	if (buf->astate.doom == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	uint16_t tmp_len = buf->width * buf->height;
-	buf->astate.doom->buf = malloc(tmp_len);
-	tmp_len -= buf->width;
-
-	if (buf->astate.doom->buf == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	memset(buf->astate.doom->buf, 0, tmp_len);
-	memset(buf->astate.doom->buf + tmp_len, DOOM_STEPS - 1, buf->width);
-}
-
-static void doom_free(struct term_buf* buf)
-{
-	free(buf->astate.doom->buf);
-	free(buf->astate.doom);
-}
-
-// Adapted from cmatrix
-static void matrix_init(struct term_buf* buf)
-{
-	buf->init_width = buf->width;
-	buf->init_height = buf->height;
-	buf->astate.matrix = malloc(sizeof(struct matrix_state));
-	struct matrix_state* s = buf->astate.matrix;
-
-	if (s == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	uint16_t len = buf->height + 1;
-	s->grid = malloc(sizeof(struct matrix_dot*) * len);
-
-	if (s->grid == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	len = (buf->height + 1) * buf->width;
-	(s->grid)[0] = malloc(sizeof(struct matrix_dot) * len);
-
-	if ((s->grid)[0] == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	for (int i = 1; i <= buf->height; ++i)
-	{
-		s->grid[i] = s->grid[i - 1] + buf->width;
-
-		if (s->grid[i] == NULL)
-		{
-			dgn_throw(DGN_ALLOC);
-		}
-	}
-
-	s->length = malloc(buf->width * sizeof(int));
-
-	if (s->length == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	s->spaces = malloc(buf->width * sizeof(int));
-
-	if (s->spaces == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	s->updates = malloc(buf->width * sizeof(int));
-
-	if (s->updates == NULL)
-	{
-		dgn_throw(DGN_ALLOC);
-	}
-
-	// Initialize grid
-	for (int i = 0; i <= buf->height; ++i)
-	{
-		for (int j = 0; j <= buf->width - 1; j += 2)
-		{
-			s->grid[i][j].val = -1;
-		}
-	}
-
-	for (int j = 0; j < buf->width; j += 2)
-	{
-		s->spaces[j] = (int) rand() % buf->height + 1;
-		s->length[j] = (int) rand() % (buf->height - 3) + 3;
-		s->grid[1][j].val = ' ';
-		s->updates[j] = (int) rand() % 3 + 1;
-	}
-}
-
-static void matrix_free(struct term_buf* buf)
-{
-	free(buf->astate.matrix->grid[0]);
-	free(buf->astate.matrix->grid);
-	free(buf->astate.matrix->length);
-	free(buf->astate.matrix->spaces);
-	free(buf->astate.matrix->updates);
-	free(buf->astate.matrix);
-}
-
-void animate_init(struct term_buf* buf)
-{
-	if (config.animate)
-	{
-		switch(config.animation)
-		{
-			case 0:
-			{
-				doom_init(buf);
-				break;
-			}
-			case 1:
-			{
-				matrix_init(buf);
-				break;
-			}
-		}
-	}
-}
-
-static void doom(struct term_buf* term_buf)
-{
-	static struct tb_cell fire[DOOM_STEPS] =
-	{
-		{' ', 9, 0}, // default
-		{0x2591, 2, 0}, // red
-		{0x2592, 2, 0}, // red
-		{0x2593, 2, 0}, // red
-		{0x2588, 2, 0}, // red
-		{0x2591, 4, 2}, // yellow
-		{0x2592, 4, 2}, // yellow
-		{0x2593, 4, 2}, // yellow
-		{0x2588, 4, 2}, // yellow
-		{0x2591, 8, 4}, // white
-		{0x2592, 8, 4}, // white
-		{0x2593, 8, 4}, // white
-		{0x2588, 8, 4}, // white
-	};
-
-	uint16_t src;
-	uint16_t random;
-	uint16_t dst;
-
-	uint16_t w = term_buf->init_width;
-	uint8_t* tmp = term_buf->astate.doom->buf;
-
-	if ((term_buf->width != term_buf->init_width) || (term_buf->height != term_buf->init_height))
-	{
-		return;
-	}
-
-	struct tb_cell* buf = tb_cell_buffer();
-
-	for (uint16_t x = 0; x < w; ++x)
-	{
-		for (uint16_t y = 1; y < term_buf->init_height; ++y)
-		{
-			src = y * w + x;
-			random = ((rand() % 7) & 3);
-			dst = src - random + 1;
-
-			if (w > dst)
-			{
-				dst = 0;
-			}
-			else
-			{
-				dst -= w;
-			}
-
-			tmp[dst] = tmp[src] - (random & 1);
-
-			if (tmp[dst] > 12)
-			{
-				tmp[dst] = 0;
-			}
-
-			buf[dst] = fire[tmp[dst]];
-			buf[src] = fire[tmp[src]];
-		}
-	}
-}
-
-// Adapted from cmatrix
-static void matrix(struct term_buf* buf)
-{
-	static int frame = 3;
-	const int frame_delay = 8;
-	static int count = 0;
-	bool first_col;
-	struct matrix_state* s = buf->astate.matrix;
-
-	// Allowed codepoints
-	const int randmin = 33;
-	const int randnum = 123 - randmin;
-	// Chars change mid-scroll
-	const bool changes = true;
-
-	if ((buf->width != buf->init_width) || (buf->height != buf->init_height))
-	{
-		return;
-	}
-
-	count += 1;
-	if (count > frame_delay) {
-		frame += 1;
-		if (frame > 4) frame = 1;
-		count = 0;
-
-		for (int j = 0; j < buf->width; j += 2)
-		{
-			int tail;
-			if (frame > s->updates[j])
-			{
-				if (s->grid[0][j].val == -1 && s->grid[1][j].val == ' ')
-				{
-					if (s->spaces[j] > 0)
-					{
-						s->spaces[j]--;
-					} else {
-						s->length[j] = (int) rand() % (buf->height - 3) + 3;
-						s->grid[0][j].val = (int) rand() % randnum + randmin;
-						s->spaces[j] = (int) rand() % buf->height + 1;
-					}
-				}
-
-				int i = 0, seg_len = 0;
-				first_col = 1;
-				while (i <= buf->height)
-				{
-					// Skip over spaces
-					while (i <= buf->height
-							&& (s->grid[i][j].val == ' ' || s->grid[i][j].val == -1))
-					{
-						i++;
-					}
-
-					if (i > buf->height) break;
-
-					// Find the head of this col
-					tail = i;
-					seg_len = 0;
-					while (i <= buf->height
-							&& (s->grid[i][j].val != ' ' && s->grid[i][j].val != -1))
-					{
-						s->grid[i][j].is_head = false;
-						if (changes)
-						{
-							if (rand() % 8 == 0)
-								s->grid[i][j].val = (int) rand() % randnum + randmin;
-						}
-						i++;
-						seg_len++;
-					}
-
-					// Head's down offscreen
-					if (i > buf->height)
-					{
-						s->grid[tail][j].val = ' ';
-						continue;
-					}
-
-					s->grid[i][j].val = (int) rand() % randnum + randmin;
-					s->grid[i][j].is_head = true;
-
-					if (seg_len > s->length[j] || !first_col) {
-						s->grid[tail][j].val = ' ';
-						s->grid[0][j].val = -1;
-					}
-					first_col = 0;
-					i++;
-				}
-			}
-		}
-	}
-
-	uint32_t blank;
-	utf8_char_to_unicode(&blank, " ");
-
-	for (int j = 0; j < buf->width; j += 2) {
-		for (int i = 1; i <= buf->height; ++i)
-		{
-			uint32_t c;
-			int fg = TB_GREEN;
-			int bg = TB_DEFAULT;
-
-			if (s->grid[i][j].val == -1 || s->grid[i][j].val == ' ')
-			{
-				tb_change_cell(j, i - 1, blank, fg, bg);
-				continue;
-			}
-
-			char tmp[2];
-			tmp[0] = s->grid[i][j].val;
-			tmp[1] = '\0';
-			if(utf8_char_to_unicode(&c, tmp))
-			{
-				if (s->grid[i][j].is_head)
-				{
-					fg = TB_WHITE | TB_BOLD;
-				}
-				tb_change_cell(j, i - 1, c, fg, bg);
-			}
-		}
-	}
-}
-
-void animate(struct term_buf* buf)
-{
-	buf->width = tb_width();
-	buf->height = tb_height();
-
-	if (config.animate)
-	{
-		switch(config.animation)
-		{
-			case 0:
-			{
-				doom(buf);
-				break;
-			}
-			case 1:
-			{
-				matrix(buf);
-				break;
-			}
-		}
-	}
-}
 
 bool cascade(struct term_buf* term_buf, uint8_t* fails)
 {

src/draw.h

@@ -19,31 +19,6 @@ struct box
 	uint32_t right;
 };
 
-struct matrix_dot
-{
-	int val;
-	bool is_head;
-};
-
-struct matrix_state
-{
-	struct matrix_dot** grid;
-	int* length;
-	int* spaces;
-	int* updates;
-};
-
-struct doom_state
-{
-	uint8_t* buf;
-};
-
-union anim_state
-{
-	struct doom_state* doom;
-	struct matrix_state* matrix;
-};
-
 struct term_buf
 {
 	uint16_t width;
@@ -59,9 +34,12 @@ struct term_buf
 	uint16_t box_width;
 	uint16_t box_height;
 
-	union anim_state astate;
+    // void pointer allows not
+    // explicitly declaring animations
+    void* astate;
 };
 
+
 void draw_init(struct term_buf* buf);
 void draw_free(struct term_buf* buf);
 void draw_box(struct term_buf* buf);
@@ -82,8 +60,7 @@ void position_input(
 	struct text* login,
 	struct text* password);
 
-void animate_init(struct term_buf* buf);
+
-void animate(struct term_buf* buf);
 bool cascade(struct term_buf* buf, uint8_t* fails);
 
 #endif

src/main.c

@@ -4,6 +4,7 @@
 #include "termbox.h"
 
 #include "draw.h"
+#include "animations.h"
 #include "inputs.h"
 #include "login.h"
 #include "utils.h"
@@ -314,7 +315,7 @@ int main(int argc, char** argv)
 	free_hostname();
 
 	// unload config
-	draw_free(&buf);
+	animate_free(&buf);
 	lang_free();
 
 	if (shutdown)