Changeset 1241 for toilet/trunk/src/term.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/term.c (copied) (copied from toilet/trunk/src/render.c) (3 diffs)

toilet/trunk/src/term.c

@@ -28 +28 @@
 
 static int feed_tiny(context_t *, uint32_t);
+static int flush_tiny(context_t *);
 static int end_tiny(context_t *);
-
-static int feed_big(context_t *, uint32_t);
-static int end_big(context_t *);
 
 int init_tiny(context_t *cx)
@@ -42 +40 @@
 
     cx->feed = feed_tiny;
+    cx->flush = flush_tiny;
     cx->end = end_tiny;
 
@@ -92 +91 @@
 }
 
-static int end_tiny(context_t *cx)
+static int flush_tiny(context_t *cx)
 {
-    cucul_set_canvas_size(cx->cv, cx->w, cx->h);
+    cx->torender = cx->cv;
+    cucul_set_canvas_size(cx->torender, cx->w, cx->h);
+
+    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);
 
     return 0;
 }
 
-int init_big(context_t *cx)
+static int end_tiny(context_t *cx)
 {
-    char const * const * fonts;
-
-    fonts = cucul_get_font_list();
-    cx->f = cucul_load_font(fonts[0], 0);
-    cx->buf = malloc(4 * cucul_get_font_width(cx->f)
-                       * cucul_get_font_height(cx->f));
-    cx->onechar = cucul_create_canvas(1, 1);
-    cucul_set_color(cx->onechar, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
-
-    cx->x = cx->y = 0;
-    cx->w = cx->h = 0;
-    cx->cv = cucul_create_canvas(1, 1);
-
-    cx->feed = feed_big;
-    cx->end = end_big;
+    cucul_free_canvas(cx->cv);
 
     return 0;
 }
 
-static int feed_big(context_t *cx, uint32_t ch)
-{
-    unsigned int w = cucul_get_font_width(cx->f);
-    unsigned int h = cucul_get_font_height(cx->f);
-    unsigned int x, y;
-
-    switch(ch)
-    {
-        case (uint32_t)'\r':
-            return 0;
-        case (uint32_t)'\n':
-            cx->x = 0;
-            cx->y += h;
-            return 0;
-        case (uint32_t)'\t':
-            cx->x = (((cx->x / w) & ~7) + 8) * w;
-            return 0;
-    }
-
-    /* Check whether we reached the end of the screen */
-    if(cx->x && cx->x + w > cx->term_width)
-    {
-        cx->x = 0;
-        cx->y += h;
-    }
-
-    /* Check whether the current canvas is large enough */
-    if(cx->x + w > cx->w)
-        cx->w = cx->x + w < cx->term_width ? cx->x + w : cx->term_width;
-
-    if(cx->y + h > cx->h)
-        cx->h = cx->y + h;
-
-    cucul_set_canvas_size(cx->cv, cx->w, cx->h);
-
-    /* Render our char */
-    cucul_putchar(cx->onechar, 0, 0, ch);
-    cucul_render_canvas(cx->onechar, cx->f, cx->buf, w, h, 4 * w);
-
-    for(y = 0; y < h; y++)
-       for(x = 0; x < w; x++)
-    {
-        unsigned char c = cx->buf[4 * (x + y * w) + 2];
-
-        if(c >= 0xa0)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "█");
-        else if(c >= 0x80)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "▓");
-        else if(c >= 0x40)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "▒");
-        else if(c >= 0x20)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "░");
-    }
-
-    /* Advance cursor */
-    cx->x += w;
-
-    return 0;
-}
-
-static int end_big(context_t *cx)
-{
-    cucul_free_canvas(cx->onechar);
-    free(cx->buf);
-    cucul_free_font(cx->f);
-
-    return 0;
-}
-