From 432e445204bc8e9f3d4e71c36d271ed0b51f1d44 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 20 Oct 2014 21:38:11 +0200 Subject: Update tests --- tests/render_test.c | 54 ++++++++++++++++++++++++------------------------ tests/render_test_sc1.c | 55 ++++++++++++++++++++++++------------------------- 2 files changed, 54 insertions(+), 55 deletions(-) (limited to 'tests') diff --git a/tests/render_test.c b/tests/render_test.c index 7d43123..456a6e1 100644 --- a/tests/render_test.c +++ b/tests/render_test.c @@ -50,17 +50,33 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) { gint w, h; cairo_surface_t *surface; - struct slide *s = data; + SCBlock *scblocks = data; + struct frame top; w = gtk_widget_get_allocated_width(da); h = gtk_widget_get_allocated_height(da); - /* Overall background */ - cairo_rectangle(cr, 0.0, 0.0, w, h); - cairo_set_source_rgb(cr, 0.9, 0.9, 0.9); - cairo_fill(cr); - - surface = render_slide(s, w, h, w, h, NULL, ISZ_EDITOR, 1); + top.pad_l = 20.0; + top.pad_r = 20.0; + top.pad_t = 20.0; + top.pad_b = 20.0; + top.w = w; + top.h = h; + top.grad = GRAD_NONE; + top.bgcol[0] = 1.0; + top.bgcol[1] = 1.0; + top.bgcol[2] = 0.6; + top.bgcol[3] = 1.0; + + top.lines = NULL; + top.n_lines = 0; + top.children = NULL; + top.num_children = 0; + top.max_children = 0; + top.boxes = NULL; + + surface = render_sc(scblocks, w, h, w, h, &top, NULL, NULL, + ISZ_EDITOR, 1); cairo_rectangle(cr, 0.0, 0.0, w, h); cairo_set_source_surface(cr, surface, 0.0, 0.0); cairo_fill(cr); @@ -74,32 +90,16 @@ int main(int argc, char *argv[]) { GtkWidget *window; GtkWidget *drawingarea; - struct frame *fr; - struct slide s; - struct presentation p; + SCBlock *scblocks; gtk_init(&argc, &argv); - fr = frame_new(); - if ( fr == NULL ) return 1; - fr->scblocks = sc_parse(sc); - if ( fr->scblocks == NULL ) { + scblocks = sc_parse(sc); + if ( scblocks == NULL ) { fprintf(stderr, "SC parse failed.\n"); return 1; } - fr->pad_l = 20.0; - fr->pad_r = 20.0; - fr->pad_t = 20.0; - fr->pad_b = 20.0; - - s.top = fr; - s.parent = &p; - s.scblocks = fr->scblocks; - - p.stylesheet = NULL; - p.scblocks = fr->scblocks; - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); drawingarea = gtk_drawing_area_new(); @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) NULL); g_signal_connect(G_OBJECT(drawingarea), "draw", - G_CALLBACK(draw_sig), &s); + G_CALLBACK(draw_sig), scblocks); gtk_widget_show_all(window); gtk_main(); diff --git a/tests/render_test_sc1.c b/tests/render_test_sc1.c index 7db7970..df36b26 100644 --- a/tests/render_test_sc1.c +++ b/tests/render_test_sc1.c @@ -48,17 +48,33 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) { gint w, h; cairo_surface_t *surface; - struct slide *s = data; + SCBlock *scblocks = data; + struct frame top; w = gtk_widget_get_allocated_width(da); h = gtk_widget_get_allocated_height(da); - /* Overall background */ - cairo_rectangle(cr, 0.0, 0.0, w, h); - cairo_set_source_rgb(cr, 0.9, 0.9, 0.9); - cairo_fill(cr); - - surface = render_slide(s, w, h, w, h, NULL, ISZ_EDITOR, 1); + top.pad_l = 20.0; + top.pad_r = 20.0; + top.pad_t = 20.0; + top.pad_b = 20.0; + top.w = w; + top.h = h; + top.grad = GRAD_NONE; + top.bgcol[0] = 1.0; + top.bgcol[1] = 1.0; + top.bgcol[2] = 0.6; + top.bgcol[3] = 1.0; + + top.lines = NULL; + top.n_lines = 0; + top.children = NULL; + top.num_children = 0; + top.max_children = 0; + top.boxes = NULL; + + surface = render_sc(scblocks, w, h, w, h, &top, NULL, NULL, + ISZ_EDITOR, 1); cairo_rectangle(cr, 0.0, 0.0, w, h); cairo_set_source_surface(cr, surface, 0.0, 0.0); cairo_fill(cr); @@ -72,32 +88,15 @@ int main(int argc, char *argv[]) { GtkWidget *window; GtkWidget *drawingarea; - struct frame *fr; - struct slide s; - struct presentation p; + SCBlock *scblocks; gtk_init(&argc, &argv); - fr = frame_new(); - if ( fr == NULL ) return 1; - fr->scblocks = sc_parse(sc); - if ( fr->scblocks == NULL ) { + scblocks = sc_parse(sc); + if ( scblocks == NULL ) { fprintf(stderr, "SC parse failed.\n"); return 1; } - - fr->pad_l = 20.0; - fr->pad_r = 20.0; - fr->pad_t = 20.0; - fr->pad_b = 20.0; - - s.top = fr; - s.parent = &p; - s.scblocks = fr->scblocks; - - p.scblocks = fr->scblocks; - p.stylesheet = NULL; - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); drawingarea = gtk_drawing_area_new(); @@ -108,7 +107,7 @@ int main(int argc, char *argv[]) NULL); g_signal_connect(G_OBJECT(drawingarea), "draw", - G_CALLBACK(draw_sig), &s); + G_CALLBACK(draw_sig), scblocks); gtk_widget_show_all(window); gtk_main(); -- cgit v1.2.3