Changeset 1241 for toilet/trunk/src/mono9.cTweet

Timestamp:

Oct 26, 2006, 3:07:58 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Make stdin input line-aware so that we don't have to wait until EOF to display stuff.
• Reorganise stuff and fix memory leaks.

File:

• toilet/trunk/src/mono9.c (copied) (copied from toilet/trunk/src/render.c) (3 diffs)

toilet/trunk/src/mono9.c

@@ -27 +27 @@
 #include "render.h"
 
-static int feed_tiny(context_t *, uint32_t);
-static int end_tiny(context_t *);
-
 static int feed_big(context_t *, uint32_t);
+static int flush_big(context_t *);
 static int end_big(context_t *);
-
-int init_tiny(context_t *cx)
-{
-    cx->ew = 16;
-    cx->eh = 2;
-    cx->x = cx->y = 0;
-    cx->w = cx->h = 0;
-    cx->cv = cucul_create_canvas(cx->ew, cx->eh);
-
-    cx->feed = feed_tiny;
-    cx->end = end_tiny;
-
-    return 0;
-}
-
-static int feed_tiny(context_t *cx, uint32_t ch)
-{
-    switch(ch)
-    {
-        case (uint32_t)'\r':
-            return 0;
-        case (uint32_t)'\n':
-            cx->x = 0;
-            cx->y++;
-            return 0;
-        case (uint32_t)'\t':
-            cx->x = (cx->x & ~7) + 8;
-            return 0;
-    }
-
-    /* Check whether we reached the end of the screen */
-    if(cx->x && cx->x + 1 > cx->term_width)
-    {
-        cx->x = 0;
-        cx->y++;
-    }
-
-    /* Check whether the current canvas is large enough */
-    if(cx->x + 1 > cx->w)
-    {
-        cx->w = cx->x + 1 < cx->term_width ? cx->x + 1 : cx->term_width;
-        if(cx->w > cx->ew)
-            cx->ew = cx->ew + cx->ew / 2;
-    }
-
-    if(cx->y + 1 > cx->h)
-    {
-        cx->h = cx->y + 1;
-        if(cx->h > cx->eh)
-            cx->eh = cx->eh + cx->eh / 2;
-    }
-
-    cucul_set_canvas_size(cx->cv, cx->ew, cx->eh);
-
-    cucul_putchar(cx->cv, cx->x, cx->y, ch);
-    cx->x++;
-
-    return 0;
-}
-
-static int end_tiny(context_t *cx)
-{
-    cucul_set_canvas_size(cx->cv, cx->w, cx->h);
-
-    return 0;
-}
 
 int init_big(context_t *cx)
@@ -115 +47 @@
 
     cx->feed = feed_big;
+    cx->flush = flush_big;
     cx->end = end_big;
 
@@ -180 +113 @@
 }
 
+static int flush_big(context_t *cx)
+{
+    cx->torender = cx->cv;
+    cucul_set_canvas_size(cx->torender, cx->w, cx->h);
+
+    cx->x = cx->y = 0;
+    cx->w = cx->h = 0;
+    cx->cv = cucul_create_canvas(1, 1);
+
+    return 0;
+}
+
 static int end_big(context_t *cx)
 {
     cucul_free_canvas(cx->onechar);
+    cucul_free_canvas(cx->cv);
     free(cx->buf);
     cucul_free_font(cx->f);