Changes in emu/ser.c [0edef06:c5b6c90] in buchla-emu

File:

• emu/ser.c (modified) (9 diffs)

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
@@ -58 +60 @@
 static SDL_Window *win;
 static SDL_Renderer *ren;
-static SDL_atomic_t frame;
 
 static TTF_Font *fon;
@@ -69 +70 @@
 static int32_t bel = 0;
 
-static void scroll(void)
-{
-        memmove(mem, mem + 1, (CON_H - 1) * (CON_W + 1));
-        memset(mem + (CON_H - 1), ' ', CON_W);
-}
-
-static void forw(void)
-{
-        if (cur_x < CON_W - 1) {
-                ++cur_x;
-                return;
-        }
-
-        if (cur_y == CON_H - 1) {
-                cur_x = 0;
-                scroll();
-                return;
-        }
-
-        cur_x = 0;
-        ++cur_y;
-}
-
-static void back(void)
-{
-        if (cur_x > 0) {
-                --cur_x;
-                return;
-        }
-
-        if (cur_y == 0) {
-                return;
-        }
-
-        cur_x = CON_W - 1;
-        --cur_y;
-}
-
-static void down(void)
-{
-        if (cur_y < CON_H - 1) {
-                ++cur_y;
-                return;
-        }
-
-        scroll();
-}
-
-static void echo(uint8_t c)
-{
-        if (c < 32) {
-                switch (c) {
-                case '\r':
-                        cur_x = 0;
-                        break;
-
-                case '\n':
-                        down();
-                        break;
-
-                case '\b':
-                        back();
-                        break;
-
-                case '\a':
-                        bel = BEL_CYC;
-                        break;
-
-                default:
-                        echo('^');
-                        echo((uint8_t)(c + '@'));
-                        return;
-                }
-        }
-        else {
-                mem[cur_y][cur_x] = c;
-                forw();
-        }
-
-        SDL_AtomicAdd(&frame, 1);
-}
-
-static void out(int32_t un, uint8_t c)
-{
-        if (SDL_LockMutex(cpu_mutex) < 0) {
-                fail("SDL_LockMutex() failed: %s", SDL_GetError());
-        }
-
-        state[un].rdr = c;
-        state[un].rdr_ok = true;
-        state[un].irq_r = true;
-
-        if (SDL_UnlockMutex(cpu_mutex) < 0) {
-                fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
-        }
-}
-
-void ser_sdl(void)
-{
-        ver3("ser_sdl()");
-
-        static int32_t last = 0;
-        int32_t now = SDL_AtomicGet(&frame);
-
-        if (last == now) {
-                ver3("no update");
-                return;
-        }
-
-        last = now;
-
+static void update(void)
+{
         if (SDL_FillRect(sur, NULL, bel == 0 ? CON_BGR : CON_BEL) < 0) {
                 fail("SDL_FillRect() failed: %s", SDL_GetError());
@@ -194 +86 @@
 
         for (int32_t y = 0; y < CON_H; ++y) {
-                char line[CON_W + 1];
-
-                if (SDL_LockMutex(cpu_mutex) < 0) {
-                        fail("SDL_LockMutex() failed: %s", SDL_GetError());
-                }
-
-                memcpy(line, mem[y], CON_W + 1);
-
-                if (SDL_UnlockMutex(cpu_mutex) < 0) {
-                        fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
-                }
-
-                SDL_Surface *lin = TTF_RenderText_Blended(fon, line, CON_FGR);
+                SDL_Surface *lin = TTF_RenderText_Blended(fon, (char *)mem[y], CON_FGR);
 
                 if (lin == NULL) {
@@ -238 +118 @@
 }
 
+static void scroll(void)
+{
+        memmove(mem, mem + 1, (CON_H - 1) * (CON_W + 1));
+        memset(mem + (CON_H - 1), ' ', CON_W);
+}
+
+static void forw(void)
+{
+        if (cur_x < CON_W - 1) {
+                ++cur_x;
+                return;
+        }
+
+        if (cur_y == CON_H - 1) {
+                cur_x = 0;
+                scroll();
+                return;
+        }
+
+        cur_x = 0;
+        ++cur_y;
+}
+
+static void back(void)
+{
+        if (cur_x > 0) {
+                --cur_x;
+                return;
+        }
+
+        if (cur_y == 0) {
+                return;
+        }
+
+        cur_x = CON_W - 1;
+        --cur_y;
+}
+
+static void down(void)
+{
+        if (cur_y < CON_H - 1) {
+                ++cur_y;
+                return;
+        }
+
+        scroll();
+}
+
+static void echo(uint8_t c)
+{
+        if (c < 32) {
+                switch (c) {
+                case '\r':
+                        cur_x = 0;
+                        break;
+
+                case '\n':
+                        down();
+                        break;
+
+                case '\b':
+                        back();
+                        break;
+
+                case '\a':
+                        bel = BEL_CYC;
+                        break;
+
+                default:
+                        echo('^');
+                        echo((uint8_t)(c + '@'));
+                        return;
+                }
+        }
+        else {
+                mem[cur_y][cur_x] = c;
+                forw();
+        }
+
+        update();
+}
+
+static void out(int32_t un, uint8_t c)
+{
+        state[un].rdr = c;
+        state[un].rdr_ok = true;
+        state[un].irq_r = true;
+}
+
 void ser_key(SDL_KeyboardEvent *ev)
 {
@@ -283 +252 @@
         }
 
-        SDL_AtomicSet(&frame, 1);
-
-        SDL_RWops *ops = SDL_RWFromFile(font, "rb");
+        SDL_RWops *ops = SDL_RWFromFile(CON_FONT, "rb");
 
         if (ops == NULL) {
-                fail("error while opening font file %s: %s", font, SDL_GetError());
+                fail("error while opening font file " CON_FONT ": %s", SDL_GetError());
         }
 
@@ -294 +261 @@
 
         if (fon == NULL) {
-                fail("error while loading font file %s: %s", font, TTF_GetError());
+                fail("error while loading font file " CON_FONT ": %s", TTF_GetError());
         }
 
@@ -319 +286 @@
                 mem[y][CON_W] = 0;
         }
+
+        update();
 }
 
@@ -340 +309 @@
 
                 if (bel == BEL_CYC - 1 || bel == 0) {
-                        SDL_AtomicAdd(&frame, 1);
+                        update();
                 }
         }