summaryrefslogtreecommitdiff
path: root/frontends/riscos
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2017-01-13 10:01:25 +0000
committerVincent Sanders <vince@kyllikki.org>2017-01-13 10:03:24 +0000
commit7dab7cb43d4091648ceb40684ff70aff7091c648 (patch)
tree88e77a9be8ff1dea4c20db61a5788383e070942d /frontends/riscos
parent8ffc2e753b04a9e794e7a6302d57d590b311e41f (diff)
downloadnetsurf-7dab7cb43d4091648ceb40684ff70aff7091c648.tar.gz
netsurf-7dab7cb43d4091648ceb40684ff70aff7091c648.tar.bz2
move plot style header to netsurf include directory
move plotter style header and adjust all callers to use only what they actually require.
Diffstat (limited to 'frontends/riscos')
-rw-r--r--frontends/riscos/configure/con_fonts.c2
-rw-r--r--frontends/riscos/font.c1
-rw-r--r--frontends/riscos/font.h5
-rw-r--r--frontends/riscos/image.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/frontends/riscos/configure/con_fonts.c b/frontends/riscos/configure/con_fonts.c
index 280312843..ecbf396c2 100644
--- a/frontends/riscos/configure/con_fonts.c
+++ b/frontends/riscos/configure/con_fonts.c
@@ -21,7 +21,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
#include "riscos/gui.h"
#include "riscos/font.h"
diff --git a/frontends/riscos/font.c b/frontends/riscos/font.c
index a7a394e2d..560afc785 100644
--- a/frontends/riscos/font.c
+++ b/frontends/riscos/font.c
@@ -35,6 +35,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "netsurf/layout.h"
+#include "netsurf/plot_style.h"
#include "riscos/gui.h"
#include "riscos/font.h"
diff --git a/frontends/riscos/font.h b/frontends/riscos/font.h
index 0319a7ee3..a29bad83a 100644
--- a/frontends/riscos/font.h
+++ b/frontends/riscos/font.h
@@ -25,6 +25,7 @@
#include <rufl.h>
+struct plot_font_style;
struct gui_layout_table *riscos_layout_table;
/** desktop font, size and style being used */
@@ -35,9 +36,9 @@ extern rufl_style ro_gui_desktop_font_style;
void nsfont_init(void);
bool nsfont_exists(const char *font_family);
const char *nsfont_fallback_font(void);
-bool nsfont_paint(const plot_font_style_t *fstyle, const char *string,
+bool nsfont_paint(const struct plot_font_style *fstyle, const char *string,
size_t length, int x, int y);
-void nsfont_read_style(const plot_font_style_t *fstyle,
+void nsfont_read_style(const struct plot_font_style *fstyle,
const char **font_family, unsigned int *font_size,
rufl_style *font_style);
void ro_gui_wimp_get_desktop_font(void);
diff --git a/frontends/riscos/image.h b/frontends/riscos/image.h
index a11388c13..2ed3e180d 100644
--- a/frontends/riscos/image.h
+++ b/frontends/riscos/image.h
@@ -20,7 +20,7 @@
#define _NETSURF_RISCOS_IMAGE_H_
#include <stdbool.h>
-#include "desktop/plot_style.h"
+#include "netsurf/types.h"
#include "oslib/osspriteop.h"
struct osspriteop_area;