Rearrange rendering stuff

Rendering parts are allowed to access the internals of the slide
structure, to avoid a profusion of getter/setter functions.

6 files changed, 74 insertions, 59 deletions

diff --git a/libstorycode/slide.c b/libstorycode/slide.c
index 400b614..4e98ba2 100644
--- a/libstorycode/slide.c
+++ b/libstorycode/slide.c
@@ -30,43 +30,7 @@
 #include <stdio.h>
 
 #include "slide.h"
-
-enum slide_item_type
-{
-	SLIDE_ITEM_TEXT,
-	SLIDE_ITEM_IMAGE,
-	SLIDE_ITEM_FOOTER,
-	SLIDE_ITEM_SLIDETITLE,
-	SLIDE_ITEM_PRESTITLE,
-};
-
-
-struct slide_item
-{
-	enum slide_item_type type;
-
-	/* For TEXT */
-	char **paragraphs;
-	int n_paras;
-
-	/* For IMAGE */
-	char *filename;
-
-	/* For SLIDETITLE */
-	char *text;
-
-	/* For TEXT and IMAGE */
-	struct frame_geom geom;
-};
-
-
-struct _slide
-{
-	double logical_w;
-	double logical_h;
-	int n_items;
-	struct slide_item *items;
-};
+#include "slide_priv.h"
 
 
 Slide *slide_new()
diff --git a/libstorycode/slide_priv.h b/libstorycode/slide_priv.h
new file mode 100644
index 0000000..65d2459
--- /dev/null
+++ b/libstorycode/slide_priv.h
@@ -0,0 +1,63 @@
+/*
+ * slide_priv.h
+ *
+ * Copyright © 2019 Thomas White <taw@bitwiz.org.uk>
+ *
+ * This file is part of Colloquium.
+ *
+ * Colloquium is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef SLIDE_PRIV_H
+#define SLIDE_PRIV_H
+
+enum slide_item_type
+{
+	SLIDE_ITEM_TEXT,
+	SLIDE_ITEM_IMAGE,
+	SLIDE_ITEM_FOOTER,
+	SLIDE_ITEM_SLIDETITLE,
+	SLIDE_ITEM_PRESTITLE,
+};
+
+
+struct slide_item
+{
+	enum slide_item_type type;
+
+	/* For TEXT */
+	char **paragraphs;
+	int n_paras;
+
+	/* For IMAGE */
+	char *filename;
+
+	/* For SLIDETITLE */
+	char *text;
+
+	/* For TEXT and IMAGE */
+	struct frame_geom geom;
+};
+
+
+struct _slide
+{
+	double logical_w;
+	double logical_h;
+	int n_items;
+	struct slide_item *items;
+};
+
+#endif /* SLIDE_PRIV_H */
diff --git a/libstorycode/cairo/render.c b/libstorycode/slide_render_cairo.c
index 0d3fd6f..c2819fa 100644
--- a/libstorycode/cairo/render.c
+++ b/libstorycode/slide_render_cairo.c
@@ -37,8 +37,10 @@
 #include "narrative.h"
 #include "stylesheet.h"
 
+#include "slide_priv.h"
 
-int cairo_render_slide(Slide *s, cairo_t *cr, Stylesheet *stylesheet,
+
+int slide_render_cairo(Slide *s, cairo_t *cr, Stylesheet *stylesheet,
                        int slide_number, PangoLanguage *lang, PangoContext *pc)
 {
 	double w, h;
diff --git a/libstorycode/cairo/render.h b/libstorycode/slide_render_cairo.h
index 15fcc0c..afbdec3 100644
--- a/libstorycode/cairo/render.h
+++ b/libstorycode/slide_render_cairo.h
@@ -29,7 +29,7 @@
 
 #include "presentation.h"
 
-extern int cairo_render_slide(Slide *s, cairo_t *cr, Stylesheet *stylesheet,
+extern int slide_render_cairo(Slide *s, cairo_t *cr, Stylesheet *stylesheet,
                               int slide_number, PangoLanguage *lang,
                               PangoContext *pc);
 
diff --git a/meson.build b/meson.build
index 420c5b1..2f05a81 100644
--- a/meson.build
+++ b/meson.build
@@ -63,32 +63,19 @@ libstorycode = library('storycode',
                     'libstorycode/presentation.c',
                     'libstorycode/stylesheet.c',
                     'libstorycode/storycode.c',
+                    'libstorycode/slide_render_cairo.c',
                     storycode_lex_ch,
                     storycode_parse_ch,
                    ],
                    include_directories : libstorycode_includes,
+                   dependencies : [cairo_dep, pango_dep, gdkpixbuf_dep,
+                                   pangocairo_dep],
                    install : true)
 
 libstorycode_dep = declare_dependency(include_directories : libstorycode_includes,
                                       link_with : libstorycode)
 
 
-# libstorycode-cairo
-libstorycode_cairo_includes = include_directories('libstorycode/cairo')
-
-libstorycode_cairo = library('storycode-cairo',
-                   ['libstorycode/cairo/render.c',
-                   ],
-                   include_directories : libstorycode_cairo_includes,
-                   dependencies : [cairo_dep, pango_dep, gdkpixbuf_dep,
-                                   pangocairo_dep,
-                                   libstorycode_dep],
-                   install : true)
-
-libstorycode_cairo_dep = declare_dependency(include_directories : libstorycode_cairo_includes,
-                                            link_with : libstorycode_cairo)
-
-
 # libstorycode-gtk
 #libstorycode_gtk_includes = include_directories('libstorycode/gtk')
 #
@@ -111,8 +98,7 @@ executable('pdfstorycode',
            ],
            gresources,
            dependencies : [glib_dep, gio_dep, cairo_dep, pango_dep,
-                           pangocairo_dep,
-                           libstorycode_dep, libstorycode_cairo_dep])
+                           pangocairo_dep, libstorycode_dep])
 
 
 # Main program
diff --git a/src/pdfstorycode.c b/src/pdfstorycode.c
index e24b970..04d2b82 100644
--- a/src/pdfstorycode.c
+++ b/src/pdfstorycode.c
@@ -37,7 +37,7 @@
 #include "storycode.h"
 #include "presentation.h"
 #include "slide.h"
-#include "cairo/render.h"
+#include "slide_render_cairo.h"
 
 #include <libintl.h>
 #define _(x) gettext(x)
@@ -72,7 +72,7 @@ static int render_slides_to_pdf(Presentation *p, const char *filename)
 
 		cairo_save(cr);
 		cairo_scale(cr, w/log_w, w/log_w);
-		cairo_render_slide(s, cr, presentation_get_stylesheet(p),
+		slide_render_cairo(s, cr, presentation_get_stylesheet(p),
 		                   i, pango_language_get_default(), pc);
 		cairo_show_page(cr);
 		cairo_restore(cr);