Changeset 1243 for toilet/trunk/src/render.cTweet

Timestamp:

Oct 26, 2006, 3:30:14 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Make filters line-feed aware.

File:

• toilet/trunk/src/render.c (modified) (4 diffs)

toilet/trunk/src/render.c

@@ -29 +29 @@
 #include "render.h"
 #include "filter.h"
+
+static int render_flush(context_t *);
 
 int render_init(context_t *cx)
@@ -67 +69 @@
 
         if(ch == '\n')
-            render_line(cx);
+            render_flush(cx);
     }
 
@@ -92 +94 @@
     }
 
-    render_line(cx);
-
-    return 0;
-}
-
-int render_line(context_t *cx)
-{
-    cucul_buffer_t *buffer;
-
-    /* Flush current line */
-    cx->flush(cx);
-
-    /* Apply optional effects to our string */
-    filter_do(cx);
-
-    /* Output line */
-    buffer = cucul_export_canvas(cx->torender, cx->export);
-    fwrite(cucul_get_buffer_data(buffer),
-           cucul_get_buffer_size(buffer), 1, stdout);
-    cucul_free_buffer(buffer);
-    cucul_free_canvas(cx->torender);
+    render_flush(cx);
 
     return 0;
@@ -125 +107 @@
 }
 
+/* XXX: Following functions are local */
+
+static int render_flush(context_t *cx)
+{
+    cucul_buffer_t *buffer;
+
+    /* Flush current line */
+    cx->flush(cx);
+
+    /* Apply optional effects to our string */
+    filter_do(cx);
+
+    cx->lines += cucul_get_canvas_height(cx->torender);
+
+    /* Output line */
+    buffer = cucul_export_canvas(cx->torender, cx->export);
+    fwrite(cucul_get_buffer_data(buffer),
+           cucul_get_buffer_size(buffer), 1, stdout);
+    cucul_free_buffer(buffer);
+    cucul_free_canvas(cx->torender);
+
+    return 0;
+}
+