diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2014-01-07 20:48:25 +0000 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2014-01-07 20:48:25 +0000 |
| commit | 115e8fbfe3af0e0556a58b34b2a52c79536628e0 (patch) | |
| tree | ae48b10e2791f87d936fb09f8d4dd61b82a8eaeb /src/render.c | |
| parent | a7fc324e125fbbdd062172bbf37777c9b8d1d97b (diff) | |
Initial work for new SC processor
Diffstat (limited to 'src/render.c')
| -rw-r--r-- | src/render.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/render.c b/src/render.c index 813344d..6ea1afa 100644 --- a/src/render.c +++ b/src/render.c @@ -35,7 +35,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdk.h> -#include "storycode.h" +#include "sc_parse.h" #include "presentation.h" #include "frame.h" #include "render.h" @@ -277,16 +277,6 @@ static void run_render_sc(cairo_t *cr, struct frame *fr, const char *sc) } - -static void do_background(cairo_t *cr, struct frame *fr) -{ - if ( fr->style != NULL ) { - run_render_sc(cr, fr, fr->style->sc_prologue); - } - run_render_sc(cr, fr, fr->sc); -} - - /* Render Level 1 Storycode (no subframes) */ static int render_sc(cairo_t *cr, struct frame *fr, ImageStore *is, enum is_size isz, struct slide_constants *scc, @@ -332,12 +322,13 @@ static int render_frame(cairo_t *cr, struct frame *fr, ImageStore *is, { int i; - do_background(cr, fr); - /* Render all subframes */ for ( i=0; i<fr->num_children; i++ ) { struct frame *ch = fr->children[i]; +#if 0 +/* Frame geometry calculation */ + double mtot; if ( ch->style != NULL ) { @@ -385,7 +376,7 @@ static int render_frame(cairo_t *cr, struct frame *fr, ImageStore *is, break; } - +#endif ch->x = ch->lop.x + fr->lop.pad_l + ch->lop.margin_l; ch->y = ch->lop.y + fr->lop.pad_t + ch->lop.margin_t; cairo_save(cr); |