aboutsummaryrefslogtreecommitdiff
path: root/libstorycode
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.me.uk>2019-02-22 22:20:10 +0100
committerThomas White <taw@bitwiz.me.uk>2019-02-22 22:20:10 +0100
commitaee387068f5b9013687250e8d655b56a0c5776f2 (patch)
treeb835c6a32dc1731a3a1634564fee82851e26790d /libstorycode
parent3ff425d840876c0db965b23826998161ee87c1fd (diff)
Rearrange rendering stuff
Rendering parts are allowed to access the internals of the slide structure, to avoid a profusion of getter/setter functions.
Diffstat (limited to 'libstorycode')
-rw-r--r--libstorycode/slide.c38
-rw-r--r--libstorycode/slide_priv.h63
-rw-r--r--libstorycode/slide_render_cairo.c (renamed from libstorycode/cairo/render.c)4
-rw-r--r--libstorycode/slide_render_cairo.h (renamed from libstorycode/cairo/render.h)2
4 files changed, 68 insertions, 39 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);