add font stuff

Author: MESYETI

Makefile

@@ -1,15 +1,22 @@
-SRC   = $(wildcard source/*.c)
-DEPS  = $(wildcard source/*.h)
-OBJ   = $(addsuffix .o,$(subst source/,bin/,$(basename ${SRC})))
-LIBS  = -lSDL2 -lSDL2_ttf
-FLAGS = -std=c99 -Wall -Wextra -Werror -pedantic -g -I./lib
+SRC      = $(wildcard source/*.c)
+DEPS     = $(wildcard source/*.h)
+OBJ      = $(addsuffix .o,$(subst source/,bin/,$(basename $(SRC))))
+LIBS     = -lSDL3
+FLAGS    = -std=c99 -Wall -Wextra -pedantic -g -I./lib
+EMBEDDED = $(addsuffix .h,$(subst assets/,source/assets/,$(basename $(wildcard assets/*))))
 
-compile: ./bin $(OBJ) $(SRC) $(DEPS)
+compile: $(EMBEDDED) ./bin $(OBJ) $(SRC) $(DEPS)
 	$(CC) $(OBJ) $(LIBS) -o yterm
 
 ./bin:
 	mkdir -p bin
 
+source/assets/%.h: assets/%.bmp ./source/assets
+	xxd -i $< > $@
+
+./source/assets:
+	mkdir -p source/assets
+
 bin/%.o: source/%.c $(DEPS)
 	$(CC) -c $< $(FLAGS) -o $@
 

TODO.md

@@ -0,0 +1,2 @@
+# TODO
+- Add line wrapping

assets/basil_8x8.bmp

@@ -0,0 +1 @@
+Subproject commit f0569113c93ad095470c54bf34a17b36646bbbb5

assets/default_7x16.bmp

@@ -15,18 +15,17 @@ void App_Init(App* app, char** env) {
 
 	// init video
 	app->video = Video_Init();
-	SDL_StartTextInput();
-	Video_OpenFont(&app->video, "./font.ttf");
+	SDL_StartTextInput(app->video.window);
+
+	// init colourscheme and font
+	LoadConfig(&app->colours, &app->video);
 
 	// init tabs
 	app->tabs       = NULL;
 	app->tabAmount  = 0;
 	app->currentTab = 0;
 	App_AddTab(app);
 
-	// init colourscheme
-	LoadConfig(&app->colours);
-
 	// init screen
 	app->screen = TextScreen_New(
 		app->video.windowSize.x / app->video.charWidth,
@@ -87,28 +86,28 @@ void App_Update(App* app) {
 
 	while (SDL_PollEvent(&e)) {
 		switch (e.type) {
-			case SDL_QUIT: {
+			case SDL_EVENT_QUIT: {
 				app->running = false;
 				continue;
 			}
-			case SDL_KEYDOWN:
-			case SDL_TEXTINPUT: {
-				if (e.type == SDL_KEYDOWN) {
-					const uint8_t* keys = SDL_GetKeyboardState(NULL);
+			case SDL_EVENT_KEY_DOWN:
+			case SDL_EVENT_TEXT_INPUT: {
+				if (e.type == SDL_EVENT_KEY_DOWN) {
+					const bool* keys = SDL_GetKeyboardState(NULL);
 
 					if (!ShiftPressed(keys) || !keys[SDL_SCANCODE_LCTRL]) {
 						goto doInput;
 					}
 
 					if (
-						(e.key.keysym.scancode == SDL_SCANCODE_LCTRL) ||
-						(e.key.keysym.scancode == SDL_SCANCODE_LSHIFT) ||
-						(e.key.keysym.scancode == SDL_SCANCODE_RSHIFT)
+						(e.key.scancode == SDL_SCANCODE_LCTRL) ||
+						(e.key.scancode == SDL_SCANCODE_LSHIFT) ||
+						(e.key.scancode == SDL_SCANCODE_RSHIFT)
 					) {
 						goto doInput;
 					}
 
-					switch (e.key.keysym.scancode) {
+					switch (e.key.scancode) {
 						case SDL_SCANCODE_T: {
 							App_AddTab(app);
 							app->currentTab = app->tabAmount - 1;
@@ -141,28 +140,24 @@ void App_Update(App* app) {
 				HandleInputEvent(&e, App_CurrentTab(app));
 				break;
 			}
-			case SDL_WINDOWEVENT: {
-				switch (e.window.event) {
-					case SDL_WINDOWEVENT_RESIZED: {
-						app->video.windowSize.x = e.window.data1;
-						app->video.windowSize.y = e.window.data2;
-					
-						Vec2 newSize = {
-							e.window.data1 / app->video.charWidth,
-							e.window.data2 / app->video.charHeight
-						};
-						TextScreen_Resize(&app->screen, newSize);
-
-						Vec2 newTabSize = App_GetUsableArea(app);
-						
-						for (size_t i = 0; i < app->tabAmount; ++ i) {
-							TextScreen_Resize(&app->tabs[i].buffer, newTabSize);
-						}
-						
-						SetTerminalSize(App_CurrentTab(app));
-						break;
-					}
+			case SDL_EVENT_WINDOW_RESIZED: {
+				app->video.windowSize.x = e.window.data1;
+				app->video.windowSize.y = e.window.data2;
+			
+				Vec2 newSize = {
+					e.window.data1 / app->video.charWidth,
+					e.window.data2 / app->video.charHeight
+				};
+				TextScreen_Resize(&app->screen, newSize);
+
+				Vec2 newTabSize = App_GetUsableArea(app);
+				
+				for (size_t i = 0; i < app->tabAmount; ++ i) {
+					TextScreen_Resize(&app->tabs[i].buffer, newTabSize);
 				}
+				
+				SetTerminalSize(App_CurrentTab(app));
+				break;
 			}
 		}
 	}

assets/trinity_12x18.bmp

@@ -0,0 +1,51 @@
+#include "util.h"
+#include "assets.h"
+#include "config.h"
+
+// assets
+#include "assets/basil_8x8.h"
+#include "assets/default_7x16.h"
+#include "assets/trinity_12x18.h"
+
+typedef struct {
+	const char*    fileName;
+	const uint8_t* contents;
+	size_t         size;
+} Asset;
+
+void WriteAssets(void) {
+	Asset assets[] = {
+		{
+			.fileName = "fonts/basil_8x8.bmp",
+			.contents = assets_basil_8x8_bmp,
+			.size     = assets_basil_8x8_bmp_len
+		},
+		{
+			.fileName = "fonts/default_7x16.bmp",
+			.contents = assets_default_7x16_bmp,
+			.size     = assets_default_7x16_bmp_len
+		},
+		{
+			.fileName = "fonts/trinity_12x18.bmp",
+			.contents = assets_trinity_12x18_bmp,
+			.size     = assets_trinity_12x18_bmp_len
+		}
+	};
+
+	for (size_t i = 0; i < ARRAY_LEN(assets); ++ i) {
+		Asset* asset = &assets[i];
+
+		char assetPath[2048];
+		strcpy(assetPath, GetConfigPath());
+		strcat(assetPath, asset->fileName);
+
+		FILE* file = fopen(assetPath, "wb");
+
+		if (file == NULL) {
+			FATAL("Failed to open file '%s': %s\n", assetPath, strerror(errno));
+		}
+
+		fwrite(asset->contents, 1, asset->size, file);
+		fclose(file);
+	}
+}

font.ttf

@@ -0,0 +1,6 @@
+#ifndef YTERM_ASSETS_H
+#define YTERM_ASSETS_H
+
+void WriteAssets(void);
+
+#endif