Changeset 0edef06 in buchla-emu

Timestamp:

08/06/2017 08:20:22 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

3523847

Parents:

59ea67d

Message:

Configurable font file.

Files:

• .gitignore (modified) (1 diff)
• emu/all.h (modified) (1 diff)
• emu/main.c (modified) (3 diffs)
• emu/ser.c (modified) (3 diffs)

.gitignore

@@ -4 +4 @@
 midas.elf
 
+build/*
 buchla
 buchla.exe

emu/all.h

@@ -63 +63 @@
 extern const char *bios;
 extern const char *disk;
+extern const char *font;
 
 extern SDL_atomic_t run;

emu/main.c

@@ -41 +41 @@
 const char *bios = "bios.abs";
 const char *disk = "buchla.disk";
+const char *font = "ttf/vera-sans-mono.ttf";
 
 SDL_atomic_t run;
@@ -46 +47 @@
 static void usage(FILE *fh)
 {
-        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios] [-d disk]\n");
+        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios] [-d disk] [-f font]\n");
         fprintf(fh, "where comp is one of: ");
 
@@ -83 +84 @@
 
                         disk = argv[i];
+                        continue;
+                }
+
+                if (strcmp(argv[i], "-f") == 0) {
+                        if (++i == argc) {
+                                usage(stderr);
+                                fprintf(stderr, "missing argument to -f\n");
+                                exit(1);
+                        }
+
+                        font = argv[i];
                         continue;
                 }

emu/ser.c

@@ -37 +37 @@
 #define CON_FGR ((SDL_Color){ .r = 255, .b = 255, .g = 255, .a = 255 })
 
-#define CON_FONT "ttf/vera-sans-mono.ttf"
-
 #define REG_IER_ISR 0
 #define REG_CFR_SR  1
@@ -287 +285 @@
         SDL_AtomicSet(&frame, 1);
 
-        SDL_RWops *ops = SDL_RWFromFile(CON_FONT, "rb");
+        SDL_RWops *ops = SDL_RWFromFile(font, "rb");
 
         if (ops == NULL) {
-                fail("error while opening font file " CON_FONT ": %s", SDL_GetError());
+                fail("error while opening font file %s: %s", font, SDL_GetError());
         }
 
@@ -296 +294 @@
 
         if (fon == NULL) {
-                fail("error while loading font file " CON_FONT ": %s", TTF_GetError());
+                fail("error while loading font file %s: %s", font, TTF_GetError());
         }