move plot style header to netsurf include directory

move plotter style header and adjust all callers to use only what they
actually require.

Docs/core-window-interface

@@ -259,7 +259,7 @@ frontends/example/corewindow.c
 #include "utils/utf8.h"
 #include "netsurf/keypress.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 /* extremely likely there will be additional headers required in a real frontend */
 #include "example/corewindow.h"

content/handlers/css/select.c

@@ -24,6 +24,7 @@
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/nsurl.h"
+#include "netsurf/plot_style.h"
 #include "netsurf/url_db.h"
 #include "desktop/system_colour.h"
 

desktop/browser_private.h

@@ -26,9 +26,10 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
+#include "netsurf/types.h"
 #include "netsurf/browser_window.h"
+
 #include "desktop/frame_types.h"
-#include "desktop/plot_style.h"
 
 struct box;
 struct hlcache_handle;

desktop/font_haru.h

@@ -26,7 +26,6 @@
 
 #include <hpdf.h>
 
-#include "desktop/plot_style.h"
 #include "desktop/font.h"
 
 bool haru_nsfont_apply_style(const plot_font_style_t *fstyle,

desktop/knockout.c

@@ -71,10 +71,10 @@
 #include "utils/errors.h"
 #include "netsurf/bitmap.h"
 #include "content/content.h"
+#include "netsurf/plotters.h"
 
 #include "desktop/gui_internal.h"
 #include "desktop/knockout.h"
-#include "netsurf/plotters.h"
 
 /* Define to enable knockout debug */
 #undef KNOCKOUT_DEBUG

desktop/options.h

@@ -30,7 +30,7 @@
 #ifndef _NETSURF_DESKTOP_OPTIONS_H_
 #define _NETSURF_DESKTOP_OPTIONS_H_
 
-#include "desktop/plot_style.h"
+#include "netsurf/types.h"
 
 /* defines for system colour table */
 #define NSOPTION_SYS_COLOUR_START NSOPTION_sys_colour_ActiveBorder

desktop/plot_style.c

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** 
+/**
- * \file desktop/plot_style.c
+ * \file
  * \brief Plotter global styles.
  *
  * These plot styles are globaly available and used in many places.
  */
 
-#include "netsurf/plotters.h"
+#include "netsurf/plot_style.h"
 
 static plot_style_t plot_style_fill_white_static = {
 	.fill_type = PLOT_OP_TYPE_SOLID,

desktop/scrollbar.c

@@ -29,14 +29,12 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
-
 #include "netsurf/browser_window.h"
-#include "desktop/system_colour.h"
 #include "netsurf/mouse.h"
-#include "desktop/scrollbar.h"
 #include "netsurf/plotters.h"
-#include "desktop/plot_style.h"
 
+#include "desktop/system_colour.h"
+#include "desktop/scrollbar.h"
 
 struct scrollbar {
 	bool horizontal;	/* Horizontal scrollbar if true, else vertical

desktop/system_colour.h

@@ -26,7 +26,7 @@
 #include <libcss/libcss.h>
 
 #include "utils/errors.h"
-#include "desktop/plot_style.h"
+#include "netsurf/types.h"
 
 /** css callback to obtain named system colours. */
 css_error ns_system_colour(void *pw, lwc_string *name, css_color *color);

desktop/textarea.h

@@ -28,8 +28,7 @@
 #include <stdbool.h>
 
 #include "utils/utils.h"
-
+#include "netsurf/plot_style.h"
-#include "desktop/plot_style.h"
 #include "netsurf/mouse.h"
 
 struct textarea;

frontends/amiga/corewindow.c

@@ -44,7 +44,7 @@
 #include "utils/utf8.h"
 #include "netsurf/keypress.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 #include <proto/exec.h>
 #include <proto/intuition.h>

frontends/atari/plot/font_freetype.c

@@ -25,7 +25,7 @@
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 #include "atari/gui.h"
 #include "atari/bitmap.h"

frontends/atari/plot/font_internal.c

@@ -25,7 +25,7 @@
 #include "utils/utf8.h"
 #include "utils/log.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 #include "atari/gui.h"
 #include "atari/bitmap.h"

frontends/atari/plot/fontplot.c

@@ -22,7 +22,7 @@
 #include <mt_gem.h>
 
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 #include "atari/bitmap.h"
 #include "atari/plot/fontplot.h"

frontends/atari/settings.c

@@ -32,7 +32,7 @@
 #include "utils/dirent.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 #include "atari/gui.h"
 #include "atari/res/netsurf.rsh"

frontends/atari/toolbar.c

@@ -35,7 +35,6 @@
 #include "netsurf/mouse.h"
 #include "netsurf/plotters.h"
 #include "netsurf/keypress.h"
-#include "desktop/plot_style.h"
 #include "desktop/browser_history.h"
 #include "desktop/hotlist.h"
 #include "desktop/textarea.h"

frontends/beos/font.h

@@ -24,7 +24,7 @@
 #ifndef NS_BEOS_FONT_H
 #define NS_BEOS_FONT_H
 
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 bool nsfont_paint(const plot_font_style_t *fstyle,
 		const char *string, size_t length,

frontends/cocoa/font.h

@@ -19,7 +19,7 @@
 #ifndef COCOA_FONT_H
 #define COCOA_FONT_H
 
-#import "desktop/plot_style.h"
+#import "netsurf/plot_style.h"
 
 void cocoa_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const struct plot_font_style *style );
 

frontends/cocoa/plotter.h

@@ -20,7 +20,7 @@
 #define COCOA_PLOTTER_H
 
 #import <Cocoa/Cocoa.h>
-#import "desktop/plot_style.h"
+#import "netsurf/plot_style.h"
 
 extern const struct plotter_table cocoa_plotters;
 

frontends/cocoa/plotter.m

@@ -22,7 +22,6 @@
 #import "utils/utils.h"
 #import "netsurf/browser_window.h"
 #import "netsurf/plotters.h"
-#import "desktop/plot_style.h"
 
 #import "cocoa/font.h"
 #import "cocoa/coordinates.h"

frontends/framebuffer/convert_image.c

@@ -262,7 +262,7 @@ main(int argc, char **argv)
 	fprintf(f, "#include <stdint.h>\n\n");
 	fprintf(f, "#include <stdbool.h>\n\n");
 	fprintf(f, "#include <libnsfb.h>\n\n");
-	fprintf(f, "#include \"desktop/plot_style.h\"\n");
+	fprintf(f, "#include \"netsurf/plot_style.h\"\n");
 	fprintf(f, "#include \"framebuffer/gui.h\"\n");
 	fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n");
 

frontends/framebuffer/fbtk.h

@@ -19,7 +19,7 @@
 #ifndef NETSURF_FB_FBTK_H
 #define NETSURF_FB_FBTK_H
 
-#include "desktop/plot_style.h"
+#include "netsurf/types.h"
 
 #ifdef FBTK_LOGGING
 #define FBTK_LOG(x) LOG(x)

frontends/framebuffer/fbtk/user.c

@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <libnsfb.h>
 
-#include "desktop/plot_style.h"
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
 

frontends/framebuffer/font_freetype.c

@@ -30,6 +30,7 @@
 #include "netsurf/utf8.h"
 #include "netsurf/layout.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/plot_style.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/font.h"

frontends/framebuffer/font_internal.c

@@ -26,6 +26,7 @@
 #include "utils/utf8.h"
 #include "netsurf/utf8.h"
 #include "netsurf/layout.h"
+#include "netsurf/plot_style.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/font.h"

frontends/gtk/corewindow.c

@@ -42,9 +42,9 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/utf8.h"
+#include "netsurf/types.h"
 #include "netsurf/keypress.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
 
 #include "gtk/compat.h"
 #include "gtk/gui.h" /* just for gtk_gui_gdkkey_to_nskey */

frontends/gtk/layout_pango.c

@@ -31,6 +31,7 @@
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "netsurf/layout.h"
+#include "netsurf/plot_style.h"
 
 #include "gtk/layout_pango.h"
 #include "gtk/plotters.h"

frontends/monkey/layout.c

@@ -24,7 +24,7 @@
 #include <stddef.h>
 
 #include "utils/utf8.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 #include "netsurf/layout.h"
 
 #include "monkey/layout.h"

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"

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"

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);

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;

frontends/windows/corewindow.c

@@ -43,7 +43,6 @@
 #include "utils/utf8.h"
 #include "netsurf/keypress.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
 
 #include "windows/windbg.h"
 #include "windows/corewindow.h"

frontends/windows/font.c

@@ -32,6 +32,7 @@
 #include "utils/utf8.h"
 #include "netsurf/layout.h"
 #include "netsurf/utf8.h"
+#include "netsurf/plot_style.h"
 
 #include "windows/font.h"
 

frontends/windows/font.h

@@ -25,6 +25,8 @@
 #ifndef NETSURF_WINDOWS_FONT_H
 #define NETSURF_WINDOWS_FONT_H
 
+struct plot_font_style;
+
 extern HWND font_hwnd;
 
 struct font_desc {
@@ -47,7 +49,7 @@ extern nserror utf8_to_font_encoding(const struct font_desc* font,
  * \param style The font style.
  * \return The win32 font handle
  */
-HFONT get_font(const plot_font_style_t *style);
+HFONT get_font(const struct plot_font_style *style);
 
 #endif /* NETSURF_WINDOWS_FONT_H */
 

include/netsurf/clipboard.h

@@ -28,7 +28,7 @@
 #include <stddef.h>
 
 #include "utils/errors.h"
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 typedef struct nsnsclipboard_styles {
 	size_t start;			/**< Start of run */

include/netsurf/content.h

@@ -28,7 +28,7 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
-#include "desktop/plot_style.h" /* color typedef */
+#include "netsurf/types.h"
 #include "netsurf/content_type.h"
 
 struct bitmap;

include/netsurf/plot_style.h

@@ -16,28 +16,88 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
- * Plotter styles.
+ * \file
+ * plotter style interfaces, generic styles and style colour helpers.
  */
 
-#ifndef _NETSURF_DESKTOP_PLOT_STYLE_H_
+#ifndef NETSURF_PLOT_STYLE_H
-#define _NETSURF_DESKTOP_PLOT_STYLE_H_
+#define NETSURF_PLOT_STYLE_H
 
 #include <stdint.h>
 #include "netsurf/types.h"
 
-/* html widget colours */
 /** light grey widget base colour */
 #define WIDGET_BASEC 0xd9d9d9
 
 /** black blob colour */
 #define WIDGET_BLOBC 0x000000
 
-/**
+/** Transparent colour value. */
- * Transparent value
- */
 #define NS_TRANSPARENT 0x01000000
 
+/** Scaling factor for font sizes */
+#define FONT_SIZE_SCALE 1024
+
+/**
+ * Type of plot operation
+ */
+typedef enum {
+	PLOT_OP_TYPE_NONE = 0, /**< No operation */
+	PLOT_OP_TYPE_SOLID, /**< Solid colour */
+	PLOT_OP_TYPE_DOT, /**< Dotted plot */
+	PLOT_OP_TYPE_DASH, /**< Dashed plot */
+} plot_operation_type_t;
+
+
+/**
+ * Plot style for stroke/fill plotters
+ */
+typedef struct plot_style_s {
+	plot_operation_type_t stroke_type; /**< Stroke plot type */
+	int stroke_width; /**< Width of stroke, in pixels */
+	colour stroke_colour; /**< Colour of stroke */
+	plot_operation_type_t fill_type; /**< Fill plot type */
+	colour fill_colour; /**< Colour of fill */
+} plot_style_t;
+
+
+/**
+ * Generic font family type
+ */
+typedef enum {
+	PLOT_FONT_FAMILY_SANS_SERIF = 0,
+	PLOT_FONT_FAMILY_SERIF,
+	PLOT_FONT_FAMILY_MONOSPACE,
+	PLOT_FONT_FAMILY_CURSIVE,
+	PLOT_FONT_FAMILY_FANTASY,
+	PLOT_FONT_FAMILY_COUNT /**< Number of generic families */
+} plot_font_generic_family_t;
+
+
+/**
+ * Font plot flags
+ */
+typedef enum {
+	FONTF_NONE = 0,
+	FONTF_ITALIC = 1,
+	FONTF_OBLIQUE = 2,
+	FONTF_SMALLCAPS = 4,
+} plot_font_flags_t;
+
+/**
+ * Font style for plotting
+ */
+typedef struct plot_font_style {
+	plot_font_generic_family_t family; /**< Generic family to plot with */
+	int size; /**< Font size, in points * FONT_SIZE_SCALE */
+	int weight; /**< Font weight: value in range [100,900] as per CSS */
+	plot_font_flags_t flags; /**< Font flags */
+	colour background; /**< Background colour to blend to, if appropriate */
+	colour foreground; /**< Colour of text */
+} plot_font_style_t;
+
+
 /* Darken a colour by taking three quarters of each channel's intensity */
 #define darken_colour(c1)				 		\
 	((((3 * (c1 & 0xff00ff)) >> 2) & 0xff00ff) |			\
@@ -100,71 +160,6 @@
 	((c >> 16) & 0xff)
 
 
-/**
- * Type of plot operation
- */
-typedef enum {
-	PLOT_OP_TYPE_NONE = 0, /**< No operation */
-	PLOT_OP_TYPE_SOLID, /**< Solid colour */
-	PLOT_OP_TYPE_DOT, /**< Dotted plot */
-	PLOT_OP_TYPE_DASH, /**< Dashed plot */
-} plot_operation_type_t;
-
-
-/**
- * Plot style for stroke/fill plotters
- */
-typedef struct plot_style_s {
-	plot_operation_type_t stroke_type; /**< Stroke plot type */
-	int stroke_width; /**< Width of stroke, in pixels */
-	colour stroke_colour; /**< Colour of stroke */
-	plot_operation_type_t fill_type; /**< Fill plot type */
-	colour fill_colour; /**< Colour of fill */
-} plot_style_t;
-
-
-/**
- * Generic font family type
- */
-typedef enum {
-	PLOT_FONT_FAMILY_SANS_SERIF = 0,
-	PLOT_FONT_FAMILY_SERIF,
-	PLOT_FONT_FAMILY_MONOSPACE,
-	PLOT_FONT_FAMILY_CURSIVE,
-	PLOT_FONT_FAMILY_FANTASY,
-	PLOT_FONT_FAMILY_COUNT /**< Number of generic families */
-} plot_font_generic_family_t;
-
-
-/**
- * Font plot flags
- */
-typedef unsigned long plot_font_flags_t;
-#define FONTF_NONE 0
-#define FONTF_ITALIC 1
-#define FONTF_OBLIQUE 2
-#define FONTF_SMALLCAPS 4
-
-
-/**
- * Scaling factor for font sizes
- */
-#define FONT_SIZE_SCALE 1024
-
-
-/**
- * Font style for plotting
- */
-typedef struct plot_font_style {
-	plot_font_generic_family_t family; /**< Generic family to plot with */
-	int size; /**< Font size, in points * FONT_SIZE_SCALE */
-	int weight; /**< Font weight: value in range [100,900] as per CSS */
-	plot_font_flags_t flags; /**< Font flags */
-	colour background; /**< Background colour to blend to, if appropriate */
-	colour foreground; /**< Colour of text */
-} plot_font_style_t;
-
-
 /* global fill styles */
 extern plot_style_t *plot_style_fill_white;
 extern plot_style_t *plot_style_fill_red;

include/netsurf/plotters.h

@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 
 struct bitmap;
 struct rect;

include/netsurf/types.h

@@ -27,6 +27,8 @@
 #ifndef NETSURF_TYPES_H
 #define NETSURF_TYPES_H
 
+#include <stdint.h>
+
 /**
  * Colour type: XBGR
  */

render/box_construct.c

@@ -41,11 +41,12 @@
 #include "utils/utils.h"
 #include "utils/string.h"
 #include "utils/ascii.h"
+#include "netsurf/css.h"
+#include "netsurf/misc.h"
+#include "netsurf/plot_style.h"
 #include "content/content_protected.h"
 #include "css/hints.h"
 #include "css/select.h"
-#include "netsurf/css.h"
-#include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"

render/font.c

@@ -23,6 +23,7 @@
  */
 
 #include "utils/nsoption.h"
+#include "netsurf/plot_style.h"
 #include "css/utils.h"
 
 #include "render/font.h"

render/font.h

@@ -27,6 +27,8 @@
 #ifndef _NETSURF_RENDER_FONT_H_
 #define _NETSURF_RENDER_FONT_H_
 
+struct plot_font_style;
+
 /**
  * Populate a font style using data from a computed CSS style
  *
@@ -34,6 +36,6 @@
  * \param fstyle  Font style to populate
  */
 void font_plot_style_from_css(const css_computed_style *css,
-			      plot_font_style_t *fstyle);
+			      struct plot_font_style *fstyle);
 
 #endif

render/form.c

@@ -40,17 +40,16 @@
 #include "utils/utf8.h"
 #include "utils/utils.h"
 #include "utils/ascii.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/plotters.h"
+#include "netsurf/misc.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
-#include "netsurf/browser_window.h"
-#include "netsurf/mouse.h"
 #include "desktop/knockout.h"
-#include "desktop/plot_style.h"
-#include "netsurf/plotters.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
 #include "render/box.h"

render/html.h

@@ -30,10 +30,10 @@
 #include <dom/dom.h>
 #include <dom/bindings/hubbub/parser.h>
 
+#include "netsurf/types.h"
 #include "netsurf/content_type.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
-#include "desktop/plot_style.h"
 #include "desktop/frame_types.h"
 
 struct fetch_multipart_data;
@@ -52,6 +52,7 @@ struct scrollbar_msg_data;
 struct search_context;
 struct selection;
 struct nsurl;
+struct plot_font_style;
 
 /**
  * Container for stylesheets used by an HTML document
@@ -158,7 +159,7 @@ void html_overflow_scroll_drag_end(struct scrollbar *scrollbar,
 
 bool text_redraw(const char *utf8_text, size_t utf8_len,
 		size_t offset, int space,
-		const plot_font_style_t *fstyle,
+		const struct plot_font_style *fstyle,
 		int x, int y,
 		const struct rect *clip,
 		int height,

utils/nsoption.c

@@ -32,7 +32,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include "desktop/plot_style.h"
+#include "netsurf/plot_style.h"
 #include "utils/errors.h"
 #include "utils/log.h"
 #include "utils/utils.h"