~talya/kyuubey

antique QBASIC editor reimplementation ·
👀
 c
👀
 ruby
r/o

Hello, VGA. 8371eb7f parent c5401cb8

authored by Yuki Izumi

authored by Yuki Izumi <yuki@kivikakk.ee> 10 years ago

Hello, VGA.

renderer.c | 6 +++---
sfont.c | 19 +++++++------------
sfont.h | 7 ++++++-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/renderer.c b/renderer.c
index d0563ff..d15e81a 100644
--- a/renderer.c
+++ b/renderer.c
@@ -15,8 +15,8 @@ int renderer_init(void) {
"vga",
SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED,
- 80 * 8,
- 25 * 14,
+ 80 * FONT_WIDTH,
+ 25 * FONT_HEIGHT,
0);
if (!window) {
@@ -36,7 +36,7 @@ int renderer_init(void) {
return 1;
}
- sfont = read_ega_sdlfont("cp437.ega");
+ sfont = read_raw_sdlfont("cp437.vga");
text_init();
text_refresh();
diff --git a/sfont.c b/sfont.c
index a5ee5a9..7755545 100644
--- a/sfont.c
+++ b/sfont.c
@@ -1,11 +1,6 @@
#include "sfont.h"
#include "renderer.h"
-/* FONT_WIDTH is relatively more involved to change as `egachar' is defined in
- * terms of `unsigned char'. */
-#define FONT_WIDTH 8
-#define FONT_HEIGHT 14
-
/* adorable CGA: https://en.wikipedia.org/wiki/Color_Graphics_Adapter#Color_palette */
static int colors[16] = {
0x000000,
@@ -28,22 +23,22 @@ static int colors[16] = {
typedef struct {
unsigned char bitmap[FONT_HEIGHT];
-} egachar;
+} rawchar;
typedef struct {
- egachar charset[256];
-} egafont;
+ rawchar charset[256];
+} rawfont;
-sdlfont *read_ega_sdlfont(const char *filename) {
- egafont font;
+sdlfont *read_raw_sdlfont(const char *filename) {
+ rawfont font;
FILE *f = fopen(filename, "r");
- fread(&font, sizeof(egafont), 1, f);
+ fread(&font, sizeof(rawfont), 1, f);
fclose(f);
sdlfont *sfont = malloc(sizeof(*sfont));
for (int i = 0; i < 256; ++i) {
- egachar c = font.charset[i];
+ rawchar c = font.charset[i];
SDL_Texture *t = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, FONT_WIDTH, FONT_HEIGHT);
SDL_SetTextureBlendMode(t, SDL_BLENDMODE_BLEND);
SDL_SetRenderTarget(renderer, t);
diff --git a/sfont.h b/sfont.h
index 4e0193b..a9874e7 100644
--- a/sfont.h
+++ b/sfont.h
@@ -4,11 +4,16 @@
#include <SDL2/SDL.h>
#include <SDL2/SDL_render.h>
+/* FONT_WIDTH is relatively more involved to change as `rawchar' is defined in
+ * terms of `unsigned char'. */
+#define FONT_WIDTH 8
+#define FONT_HEIGHT 16
+
typedef struct {
SDL_Texture *charset[256];
} sdlfont;
-sdlfont *read_ega_sdlfont(const char *filename);
+sdlfont *read_raw_sdlfont(const char *filename);
void render_sfont(sdlfont *sfont, unsigned short pair, int x, int y);
void free_sdlfont(sdlfont *sfont);